xf86-video-intel: 2 commits - src/i915_render.c

[Chris Wilson]

 src/i915_render.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit a5a1ab7bbc58ec884cd0b90fe7139f402291b92f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jan 28 17:20:06 2011 +0000

    i915: Remove unused 'w' and 'h'
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i915_render.c b/src/i915_render.c
index 38c27b3..d04e8e1 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -302,12 +302,10 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
 	ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	uint32_t format, pitch, filter;
-	int w, h, i;
 	uint32_t wrap_mode, tiling_bits;
+	int i;
 
 	pitch = intel_pixmap_pitch(pixmap);
-	w = picture->pDrawable->width;
-	h = picture->pDrawable->height;
 	intel->scale_units[unit][0] = 1. / pixmap->drawable.width;
 	intel->scale_units[unit][1] = 1. / pixmap->drawable.height;
 
commit 2c9b3225d8c7b53e2d921705dbb069710abcea5d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jan 28 17:19:39 2011 +0000

    i915: Remove unused 'num_floats' variable
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i915_render.c b/src/i915_render.c
index 9739a72..38c27b3 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -547,7 +547,7 @@ i915_emit_composite_primitive(PixmapPtr dest,
 	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	Bool is_affine_src = TRUE, is_affine_mask = TRUE;
-	int per_vertex, num_floats;
+	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];
@@ -666,8 +666,6 @@ i915_emit_composite_primitive(PixmapPtr dest,
 		}
 	}
 
-	num_floats = 3 * per_vertex;
-
 	OUT_VERTEX(dstX + w);
 	OUT_VERTEX(dstY + h);
 	if (! intel->render_source_is_solid) {