diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-04-15 23:18:47 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-04-27 15:53:37 +0800 |
| commit | eab6b8f93759293b57a57b14eab826bc31c3861a (patch) | |
| tree | d9cc1f0f06f4f1f9e8ff345cfb04c7a5d3b5db62 | |
| parent | f2fa4f33148d198d3bec1f4c5391bf35c931ea53 (diff) | |
code clean up.
Remove unused variables.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | src/glamor_getimage.c | 9 | ||||
| -rw-r--r-- | src/glamor_putimage.c | 8 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/glamor_getimage.c b/src/glamor_getimage.c index ddf057f..af65826 100644 --- a/src/glamor_getimage.c +++ b/src/glamor_getimage.c @@ -36,30 +36,21 @@ _glamor_get_image(DrawablePtr drawable, int x, int y, int w, int h, { PixmapPtr pixmap; struct glamor_pixmap_private *pixmap_priv; - struct glamor_screen_private *glamor_priv; 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; - int swap_rb; int stride; void *data; if (format != ZPixmap) goto fall_back; - glamor_priv = glamor_get_screen_private(drawable->pScreen); pixmap = glamor_get_drawable_pixmap(drawable); glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off); - if (!glamor_set_planemask(pixmap, planeMask)) { glamor_fallback ("Failedto set planemask in glamor_solid.\n"); goto fall_back; } - glamor_priv = glamor_get_screen_private(drawable->pScreen); pixmap_priv = glamor_get_pixmap_private(pixmap); diff --git a/src/glamor_putimage.c b/src/glamor_putimage.c index cf8bf99..011e077 100644 --- a/src/glamor_putimage.c +++ b/src/glamor_putimage.c @@ -249,20 +249,12 @@ static Bool _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) { - glamor_screen_private *glamor_priv = - glamor_get_screen_private(drawable->pScreen); - glamor_gl_dispatch *dispatch; PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable); glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); - GLenum type, format, iformat; RegionPtr clip; - BoxPtr pbox; - int nbox; - int src_stride = PixmapBytePad(w, drawable->depth); int x_off, y_off; float vertices[8], texcoords[8]; - GLfloat xscale, yscale, txscale, tyscale; Bool ret = FALSE; PixmapPtr temp_pixmap; glamor_pixmap_private *temp_pixmap_priv; |