diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-13 14:10:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-13 14:14:40 +0100 |
| commit | 5fea2478cd5ab4156c182210d28c5e27e5f67403 (patch) | |
| tree | ceb4595e8d1d766efef45f9847778e0d5fb9a57c /src/i915_render.c | |
| parent | e499f207c161d1b3cd75f065dc89021ff5f40b63 (diff) | |
Lots of trivial semantic fixes
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i915_render.c')
| -rw-r--r-- | src/i915_render.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index 0ad991a7..acbd82ca 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -344,7 +344,6 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit) (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT); break; default: - filter = 0; intel_debug_fallback(scrn, "Bad filter 0x%x\n", picture->filter); return FALSE; @@ -486,13 +485,10 @@ i915_emit_composite_primitive(intel_screen_private *intel, int w, int h) { Bool is_affine_src = TRUE, is_affine_mask = TRUE; - int per_vertex; int tex_unit = 0; int src_unit = -1, mask_unit = -1; float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3]; - per_vertex = 2; /* dest x/y */ - src_unit = tex_unit++; is_affine_src = intel_transform_is_affine(intel->transform[src_unit]); @@ -517,8 +513,6 @@ i915_emit_composite_primitive(intel_screen_private *intel, &src_x[2], &src_y[2])) return; - - per_vertex += 2; /* src x/y */ } else { if (!intel_get_transformed_coordinates_3d(srcX, srcY, intel-> @@ -543,8 +537,6 @@ i915_emit_composite_primitive(intel_screen_private *intel, &src_y[2], &src_w[2])) return; - - per_vertex += 4; /* src x/y/z/w */ } if (intel->render_mask) { @@ -572,8 +564,6 @@ i915_emit_composite_primitive(intel_screen_private *intel, &mask_x[2], &mask_y[2])) return; - - per_vertex += 2; /* mask x/y */ } else { if (!intel_get_transformed_coordinates_3d(maskX, maskY, intel-> @@ -598,8 +588,6 @@ i915_emit_composite_primitive(intel_screen_private *intel, &mask_y[2], &mask_w[2])) return; - - per_vertex += 4; /* mask x/y/z/w */ } } @@ -723,7 +711,8 @@ i915_prepare_composite(int op, PicturePtr source_picture, else floats_per_vertex += 4; /* src x/y/z/w */ - if (mask != NULL) { + if (mask_picture != NULL) { + assert(mask != NULL); if (!i915_texture_setup(mask_picture, mask, tex_unit++)) { intel_debug_fallback(scrn, "fail to setup mask texture\n"); |