intel: Update renderbuffers before looking up CopyTexImage's read buffer.
authorEric Anholt <eric@anholt.net>
Wed, 15 Dec 2010 19:37:45 +0000 (11:37 -0800)
committerEric Anholt <eric@anholt.net>
Thu, 16 Dec 2010 18:48:19 +0000 (10:48 -0800)
Not fixing a particular bug, just noticed by code inspection.

src/mesa/drivers/dri/intel/intel_tex_copy.c

index 87b31bf..5540c98 100644 (file)
@@ -101,8 +101,11 @@ do_copy_texsubimage(struct intel_context *intel,
                     GLint x, GLint y, GLsizei width, GLsizei height)
 {
    struct gl_context *ctx = &intel->ctx;
-   const struct intel_region *src = get_teximage_source(intel, internalFormat);
+   const struct intel_region *src;
 
+   /* intel_flush(ctx); */
+   intel_prepare_render(intel);
+   src = get_teximage_source(intel, internalFormat);
    if (!intelImage->mt || !src || !src->buffer) {
       if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS))
         fprintf(stderr, "%s fail %p %p (0x%08x)\n",
@@ -116,8 +119,6 @@ do_copy_texsubimage(struct intel_context *intel,
       return GL_FALSE;
    }
 
-   /* intel_flush(ctx); */
-   intel_prepare_render(intel);
    {
       drm_intel_bo *dst_bo = intel_region_buffer(intel,
                                                 intelImage->mt->region,