From 84c1b82081f66872cca82358d122f142e4bfb70e Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 1 Feb 2006 16:40:23 +0000 Subject: [PATCH] Disable check_copytex_fragment_ops - it doesn't really apply. --- src/mesa/drivers/dri/i915/intel_tex_copy.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_tex_copy.c b/src/mesa/drivers/dri/i915/intel_tex_copy.c index 0f202fdc878..35da0b62e00 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_copy.c +++ b/src/mesa/drivers/dri/i915/intel_tex_copy.c @@ -45,8 +45,9 @@ static struct intel_region *get_teximage_source( struct intel_context *intel, GLenum internalFormat ) { - DBG("%s %s\n", __FUNCTION__, - _mesa_lookup_enum_by_nr(internalFormat)); + if (0) + _mesa_printf("%s %s\n", __FUNCTION__, + _mesa_lookup_enum_by_nr(internalFormat)); switch (internalFormat) { case GL_DEPTH_COMPONENT: @@ -72,6 +73,8 @@ static struct intel_region *get_teximage_source( struct intel_context *intel, static GLboolean check_copytex_fragment_ops( const GLcontext *ctx ) { + return GL_TRUE; + return !(ctx->Color.AlphaEnabled || /* ctx->Depth.Test || */ ctx->Fog.Enabled || @@ -97,7 +100,7 @@ static GLboolean do_copy_texsubimage( struct intel_context *intel, struct intel_region *src = get_teximage_source(intel, internalFormat); GLuint ret = GL_TRUE; - if (!intelImage->mt) + if (!intelImage->mt || !src) return GL_FALSE; if (!check_copytex_fragment_ops( ctx ))