frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code clean up. 

Remove unused variables.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2012-04-15 23:18:47 +08:00 committed by Eric Anholt
parent 65c5605c96
commit e15bc12074
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glamor/glamor_getimage.c
View File

@ -36,30 +36,21 @@ _glamor_get_image(DrawablePtr drawable, int x, int y, int w, int h,
{ {
PixmapPtr pixmap; PixmapPtr pixmap;
struct glamor_pixmap_private *pixmap_priv; struct glamor_pixmap_private *pixmap_priv;
struct glamor_screen_private *glamor_priv;
int x_off, y_off; int x_off, y_off;
GLenum tex_format, tex_type;
int no_alpha, revert;
glamor_pixmap_fbo *temp_fbo = NULL;
glamor_gl_dispatch * dispatch;
Bool ret = FALSE; Bool ret = FALSE;
int swap_rb;
int stride; int stride;
void *data; void *data;
if (format != ZPixmap) if (format != ZPixmap)
goto fall_back; goto fall_back;
glamor_priv = glamor_get_screen_private(drawable->pScreen);
pixmap = glamor_get_drawable_pixmap(drawable); pixmap = glamor_get_drawable_pixmap(drawable);
glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off); glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
if (!glamor_set_planemask(pixmap, planeMask)) { if (!glamor_set_planemask(pixmap, planeMask)) {
glamor_fallback glamor_fallback
("Failedto set planemask in glamor_solid.\n"); ("Failedto set planemask in glamor_solid.\n");
goto fall_back; goto fall_back;
} }
glamor_priv = glamor_get_screen_private(drawable->pScreen);
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);

8
glamor/glamor_putimage.c
View File

@ -249,20 +249,12 @@ static Bool
_glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y, _glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
int w, int h, int left_pad, int image_format, char *bits, Bool fallback) int w, int h, int left_pad, int image_format, char *bits, Bool fallback)
{ {
glamor_screen_private *glamor_priv =
glamor_get_screen_private(drawable->pScreen);
glamor_gl_dispatch *dispatch;
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable); PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
glamor_pixmap_private *pixmap_priv = glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap); glamor_get_pixmap_private(pixmap);
GLenum type, format, iformat;
RegionPtr clip; RegionPtr clip;
BoxPtr pbox;
int nbox;
int src_stride = PixmapBytePad(w, drawable->depth);
int x_off, y_off; int x_off, y_off;
float vertices[8], texcoords[8]; float vertices[8], texcoords[8];
GLfloat xscale, yscale, txscale, tyscale;
Bool ret = FALSE; Bool ret = FALSE;
PixmapPtr temp_pixmap; PixmapPtr temp_pixmap;
glamor_pixmap_private *temp_pixmap_priv; glamor_pixmap_private *temp_pixmap_priv;