From 095c3a5cb16dae5c1e4cf85bffd3cb2465ab9e28 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 15 Dec 2008 13:25:20 -0800 Subject: i965: Update state before checking for fallbacks in brw_try_draw_prims. This got flipped around in 7855b2aef6bd9e9c2d73260b5cd166159b2525c6. Bug #18907. Thanks to idr for pointing me at a nicer testcase than blender. --- src/mesa/drivers/dri/i965/brw_draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index c3a26fc82e..785fb784ca 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -309,12 +309,12 @@ static GLboolean brw_try_draw_prims( GLcontext *ctx, if (first_time || (brw->state.dirty.brw & BRW_NEW_PRIMITIVE)) { first_time = GL_FALSE; + brw_validate_state(brw); + /* Various fallback checks: */ if (brw->intel.Fallback) goto out; - brw_validate_state(brw); - /* Check that we can fit our state in with our existing batchbuffer, or * flush otherwise. */ -- cgit v1.2.3 From dc58da3e063d2a4018eea9149b43a3656a93a7ca Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 15 Dec 2008 15:10:18 -0800 Subject: intel: stub out CompressedTexSubImage2D instead of segfaulting. --- src/mesa/drivers/dri/intel/intel_tex.c | 1 + src/mesa/drivers/dri/intel/intel_tex.h | 10 ++++++++++ src/mesa/drivers/dri/intel/intel_tex_subimage.c | 15 +++++++++++++++ 3 files changed, 26 insertions(+) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index 82f8b87009..e64d8a1556 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.c +++ b/src/mesa/drivers/dri/intel/intel_tex.c @@ -231,6 +231,7 @@ intelInitTextureFuncs(struct dd_function_table *functions) /* compressed texture functions */ functions->CompressedTexImage2D = intelCompressedTexImage2D; + functions->CompressedTexSubImage2D = intelCompressedTexSubImage2D; functions->GetCompressedTexImage = intelGetCompressedTexImage; functions->NewTextureObject = intelNewTextureObject; diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h index 6219c1c953..742ccc043a 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.h +++ b/src/mesa/drivers/dri/intel/intel_tex.h @@ -130,6 +130,16 @@ void intelCompressedTexImage2D( GLcontext *ctx, GLenum target, GLint level, struct gl_texture_object *texObj, struct gl_texture_image *texImage ); +void intelCompressedTexSubImage2D(GLcontext * ctx, + GLenum target, + GLint level, + GLint xoffset, GLint yoffset, + GLsizei width, GLsizei height, + GLenum format, GLsizei imageSize, + const GLvoid * pixels, + struct gl_texture_object *texObj, + struct gl_texture_image *texImage); + void intelGetCompressedTexImage(GLcontext *ctx, GLenum target, GLint level, GLvoid *pixels, struct gl_texture_object *texObj, diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c index b752361886..f86de56897 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c @@ -184,3 +184,18 @@ intelTexSubImage1D(GLcontext * ctx, format, type, pixels, packing, texObj, texImage); } + +void +intelCompressedTexSubImage2D(GLcontext * ctx, + GLenum target, + GLint level, + GLint xoffset, GLint yoffset, + GLsizei width, GLsizei height, + GLenum format, GLsizei imageSize, + const GLvoid * pixels, + struct gl_texture_object *texObj, + struct gl_texture_image *texImage) +{ + fprintf(stderr, "stubbed CompressedTexSubImage2D: %dx%d@%dx%d\n", + width, height, xoffset, yoffset); +} -- cgit v1.2.3