[cairo-commit] src/drm

[Chris Wilson]

 src/drm/cairo-drm-i915-shader.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f75b7c4c110e880f4bdd578d9180f9afbb1d0034
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jan 27 19:20:57 2010 +0000

    drm/i915: Ensure surface is initialized.
    
    Let's try that again, this time remembering to place it on the
    conjunction of the two branches, so *both* paths are initialized.

diff --git a/src/drm/cairo-drm-i915-shader.c b/src/drm/cairo-drm-i915-shader.c
index 30f722a..cdefdf3 100644
--- a/src/drm/cairo-drm-i915-shader.c
+++ b/src/drm/cairo-drm-i915-shader.c
@@ -1487,9 +1487,6 @@ i915_shader_acquire_surface (i915_shader_t *shader,
 	    _cairo_surface_release_source_image (surface, image, image_extra);
 	    if (unlikely (status))
 		return status;
-
-	    surface_width = s->intel.drm.width;
-	    surface_height = s->intel.drm.height;
 	}
 
 	src->type.fragment = FS_TEXTURE;
@@ -1502,6 +1499,9 @@ i915_shader_acquire_surface (i915_shader_t *shader,
 	src->base.map[1] = s->map1;
 
 	drm = &s->intel.drm.base;
+
+	surface_width  = s->intel.drm.width;
+	surface_height = s->intel.drm.height;
     }
 
     /* XXX transform nx1 or 1xn surfaces to 1D */