[Glamor] [PATCH] Silence compilation warnings.
He Junyan
junyan.he at linux.intel.com
Thu Aug 9 02:22:15 PDT 2012
No regression, thanks to clear the warning.
> From: Zhigang Gong <zhigang.gong at linux.intel.com>
>
> After increase to gcc4.7, it reports more warnings, now
> fix them.
>
> Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
> ---
> src/glamor_copyarea.c | 8 -------
> src/glamor_copyplane.c | 3 ---
> src/glamor_core.c | 8 +++----
> src/glamor_egl.c | 11 +++-------
> src/glamor_eglmodule.c | 4 ++--
> src/glamor_fbo.c | 2 --
> src/glamor_fillspans.c | 3 ---
> src/glamor_glyphs.c | 55 +++++++++++++++++++++--------------------------
> src/glamor_picture.c | 6 ------
> src/glamor_pixmap.c | 6 ------
> src/glamor_polyfillrect.c | 3 ---
> src/glamor_polylines.c | 2 --
> src/glamor_priv.h | 14 +-----------
> src/glamor_render.c | 5 +++--
> src/glamor_trapezoid.c | 18 ++++++++--------
> src/glamor_utils.h | 34 ++++++++++++++---------------
> 16 files changed, 63 insertions(+), 119 deletions(-)
>
> diff --git a/src/glamor_copyarea.c b/src/glamor_copyarea.c
> index 2994179..7d06833 100644
> --- a/src/glamor_copyarea.c
> +++ b/src/glamor_copyarea.c
> @@ -392,14 +392,12 @@ _glamor_copy_n_to_n(DrawablePtr src,
> Bool upsidedown, Pixel bitplane,
> void *closure, Bool fallback)
> {
> - glamor_access_t dst_access;
> PixmapPtr dst_pixmap, src_pixmap;
> glamor_pixmap_private *dst_pixmap_priv, *src_pixmap_priv;
> glamor_screen_private *glamor_priv;
> glamor_gl_dispatch *dispatch;
> BoxPtr extent;
> RegionRec region;
> - ScreenPtr screen;
> int src_x_off, src_y_off, dst_x_off, dst_y_off;
> Bool ok = FALSE;
> int force_clip = 0;
> @@ -410,7 +408,6 @@ _glamor_copy_n_to_n(DrawablePtr src,
> dst_pixmap_priv = glamor_get_pixmap_private(dst_pixmap);
> src_pixmap = glamor_get_drawable_pixmap(src);
> src_pixmap_priv = glamor_get_pixmap_private(src_pixmap);
> - screen = dst_pixmap->drawable.pScreen;
>
> glamor_priv = glamor_get_screen_private(dst->pScreen);
>
> @@ -612,11 +609,6 @@ fall_back:
> glamor_get_drawable_location(src),
> glamor_get_drawable_location(dst));
>
> - if (gc && gc->alu != GXcopy)
> - dst_access = GLAMOR_ACCESS_RW;
> - else
> - dst_access = GLAMOR_ACCESS_WO;
> -
> if (glamor_prepare_access(dst, GLAMOR_ACCESS_RW)) {
> if (dst == src
> || glamor_prepare_access(src, GLAMOR_ACCESS_RO)) {
> diff --git a/src/glamor_copyplane.c b/src/glamor_copyplane.c
> index 6487ff7..3f2652a 100644
> --- a/src/glamor_copyplane.c
> +++ b/src/glamor_copyplane.c
> @@ -33,15 +33,12 @@ _glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
> int srcx, int srcy, int w, int h, int dstx, int dsty,
> unsigned long bitPlane, RegionPtr *pRegion, Bool fallback)
> {
> - glamor_screen_private *glamor_priv;
> -
> if (!fallback
> && glamor_ddx_fallback_check_gc(pGC)
> && glamor_ddx_fallback_check_pixmap(pSrc)
> && glamor_ddx_fallback_check_pixmap(pDst))
> goto fail;
>
> - glamor_priv = glamor_get_screen_private(pDst->pScreen);
> glamor_prepare_access(pDst, GLAMOR_ACCESS_RW);
> glamor_prepare_access(pSrc, GLAMOR_ACCESS_RO);
> *pRegion = fbCopyPlane(pSrc, pDst, pGC, srcx, srcy, w, h,
> diff --git a/src/glamor_core.c b/src/glamor_core.c
> index 8ba3347..22065bc 100644
> --- a/src/glamor_core.c
> +++ b/src/glamor_core.c
> @@ -566,15 +566,13 @@ glamor_bitmap_to_region(PixmapPtr pixmap)
>
> /* Borrow from cairo. */
> Bool
> -glamor_gl_has_extension(char *extension)
> +glamor_gl_has_extension(const char *extension)
> {
> - const char *gl_extensions;
> - char *pext;
> + const char *pext;
> int ext_len;
> ext_len = strlen(extension);
>
> - gl_extensions = (const char *) glGetString(GL_EXTENSIONS);
> - pext = (char *) gl_extensions;
> + pext = (const char*)glGetString(GL_EXTENSIONS);
>
> if (pext == NULL || extension == NULL)
> return FALSE;
> diff --git a/src/glamor_egl.c b/src/glamor_egl.c
> index a9a92a7..a248aa2 100644
> --- a/src/glamor_egl.c
> +++ b/src/glamor_egl.c
> @@ -335,8 +335,6 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
> }
> }
>
> -extern void glamor_pixmap_exchange_fbos(PixmapPtr front, PixmapPtr back);
> -
> _X_EXPORT void
> glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
> {
> @@ -399,16 +397,13 @@ static Bool
> glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
> const char *extension)
> {
> - const char *egl_extensions;
> - char *pext;
> + const char *pext;
> int ext_len;
> - ext_len = strlen(extension);
>
> - egl_extensions =
> + ext_len = strlen(extension);
> + pext =
> (const char *) eglQueryString(glamor_egl->display,
> EGL_EXTENSIONS);
> - pext = (char *) egl_extensions;
> -
> if (pext == NULL || extension == NULL)
> return FALSE;
> while ((pext = strstr(pext, extension)) != NULL) {
> diff --git a/src/glamor_eglmodule.c b/src/glamor_eglmodule.c
> index 046f4de..9a0dec9 100644
> --- a/src/glamor_eglmodule.c
> +++ b/src/glamor_eglmodule.c
> @@ -31,10 +31,10 @@
> #include "config.h"
> #endif
>
> +#include <xorg-server.h>
> #define GLAMOR_FOR_XORG
> -#include "glamor.h"
> #include <xf86Module.h>
> -#include <xorg-server.h>
> +#include "glamor.h"
>
> static XF86ModuleVersionInfo VersRec = {
> GLAMOR_EGL_MODULE_NAME,
> diff --git a/src/glamor_fbo.c b/src/glamor_fbo.c
> index 4af831d..a46a740 100644
> --- a/src/glamor_fbo.c
> +++ b/src/glamor_fbo.c
> @@ -258,7 +258,6 @@ glamor_fbo_expire(glamor_screen_private *glamor_priv)
> struct xorg_list *cache;
> glamor_pixmap_fbo *fbo_entry, *tmp;
> int i,j,k;
> - int empty_cache = TRUE;
>
> for(i = 0; i < CACHE_FORMAT_COUNT; i++)
> for(j = 0; j < CACHE_BUCKET_WCOUNT; j++)
> @@ -266,7 +265,6 @@ glamor_fbo_expire(glamor_screen_private *glamor_priv)
> cache = &glamor_priv->fbo_cache[i][j][k];
> xorg_list_for_each_entry_safe_reverse(fbo_entry, tmp, cache, list) {
> if (GLAMOR_TICK_AFTER(fbo_entry->expire, glamor_priv->tick)) {
> - empty_cache = FALSE;
> break;
> }
>
> diff --git a/src/glamor_fillspans.c b/src/glamor_fillspans.c
> index 6598249..35e881f 100644
> --- a/src/glamor_fillspans.c
> +++ b/src/glamor_fillspans.c
> @@ -36,11 +36,8 @@ _glamor_fill_spans(DrawablePtr drawable,
> BoxPtr pbox;
> int x1, x2, y;
> RegionPtr pClip = fbGetCompositeClip(gc);
> - glamor_screen_private *glamor_priv;
> Bool ret = FALSE;
>
> - glamor_priv = glamor_get_screen_private(drawable->pScreen);
> -
> if (gc->fillStyle != FillSolid && gc->fillStyle != FillTiled)
> goto fail;
>
> diff --git a/src/glamor_glyphs.c b/src/glamor_glyphs.c
> index f549904..fc361df 100644
> --- a/src/glamor_glyphs.c
> +++ b/src/glamor_glyphs.c
> @@ -222,7 +222,7 @@ get_mask_cache(struct glamor_glyph_mask_cache *maskcache, int blocks)
> {
> int free_cleared_bit, idx = -1;
> int retry_cnt = 0;
> - unsigned int bits_mask;
> + unsigned int bits_mask = 0;
>
> if (maskcache->free_bitmap == 0)
> return NULL;
> @@ -514,20 +514,20 @@ glamor_glyph_priv_get_edge_map(GlyphPtr glyph, struct glamor_glyph *priv,
> PicturePtr glyph_picture)
> {
> PixmapPtr glyph_pixmap = (PixmapPtr) glyph_picture->pDrawable;
> - struct glamor_pixmap_private *pixmap_priv;
> int j;
> - unsigned long long left_x1_map, left_x2_map, right_x1_map, right_x2_map;
> + unsigned long long left_x1_map = 0, left_x2_map = 0;
> + unsigned long long right_x1_map = 0, right_x2_map = 0;
> int bitsPerPixel;
> int stride;
> void *bits;
> int width;
> - unsigned int left_x1_data, left_x2_data, right_x1_data, right_x2_data;
> + unsigned int left_x1_data = 0, left_x2_data = 0;
> + unsigned int right_x1_data = 0, right_x2_data = 0;
>
> bitsPerPixel = glyph_pixmap->drawable.bitsPerPixel;
> stride = glyph_pixmap->devKind;
> bits = glyph_pixmap->devPrivate.ptr;
> width = glyph->info.width;
> - pixmap_priv = glamor_get_pixmap_private(glyph_pixmap);
>
> if (glyph_pixmap->drawable.width < 2
> || !(glyph_pixmap->drawable.depth == 8
> @@ -662,12 +662,6 @@ glyph_new_fixed_list(struct glamor_glyph_list *fixed_list,
> fixed_list->list[list_cnt - 1].len = cur_pos - n_off;
> } else
> fixed_list->list[0].len = cur_pos - *head_pos - n_off;
> - while(list_cnt--) {
> - DEBUGF("new fixed list type %d entry len %d x %d y %d"
> - "head_pos %d pos %d list %d has %d glyphs.\n",
> - fixed_list->type, fixed_list->nlist,
> - cur_x, cur_y, *head_pos, cur_pos, i, fixed_list->list[i++].len);
> - }
> (*fixed_cnt)++;
> }
>
> @@ -712,9 +706,9 @@ glamor_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr * glyphs,
> Bool first = TRUE, first_list = TRUE;
> Bool need_free_list_region = FALSE;
> Bool need_free_fixed_list = FALSE;
> - struct glamor_glyph *priv;
> + struct glamor_glyph *priv = NULL;
> Bool in_non_intersected_list = -1;
> - GlyphListPtr head_list, saved_list;
> + GlyphListPtr head_list;
> int head_x, head_y, head_pos;
> int fixed_cnt = 0;
> GlyphPtr *head_glyphs;
> @@ -732,9 +726,10 @@ glamor_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr * glyphs,
>
> extents = pixman_region_extents(¤t_region);
>
> - saved_list = list;
> x = 0;
> y = 0;
> + x1 = x2 = y1 = y2 = 0;
> + n = 0;
> extents->x1 = 0;
> extents->y1 = 0;
> extents->x2 = 0;
> @@ -743,10 +738,10 @@ glamor_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr * glyphs,
> head_list = list;
> DEBUGF("has %d lists.\n", nlist);
> while (nlist--) {
> - BoxRec left_box, right_box;
> + BoxRec left_box, right_box = {0};
> Bool has_left_edge_box = FALSE, has_right_edge_box = FALSE;
> Bool left_to_right;
> - struct glamor_glyph *left_priv, *right_priv;
> + struct glamor_glyph *left_priv = NULL, *right_priv = NULL;
>
> x += list->xOff;
> y += list->yOff;
> @@ -1146,7 +1141,7 @@ glamor_glyph_cache(glamor_screen_private *glamor, GlyphPtr glyph, int *out_x,
> *out_y = priv->y;
> return cache->picture;
> }
> -typedef void (*glyphs_flush)(void * arg);
> +typedef void (*glyphs_flush_func)(void * arg);
> struct glyphs_flush_dst_arg {
> CARD8 op;
> PicturePtr src;
> @@ -1223,7 +1218,7 @@ glamor_buffer_glyph(glamor_screen_private *glamor_priv,
> int x_glyph, int y_glyph,
> int dx, int dy, int w, int h,
> int glyphs_dst_mode,
> - glyphs_flush glyphs_flush, void *flush_arg)
> + glyphs_flush_func glyphs_flush, void *flush_arg)
> {
> ScreenPtr screen = glamor_priv->screen;
> glamor_composite_rect_t *rect;
> @@ -1327,7 +1322,7 @@ glamor_buffer_glyph_clip(glamor_screen_private *glamor_priv,
> int glyph_dx, int glyph_dy,
> int width, int height,
> int glyphs_mode,
> - glyphs_flush flush_func,
> + glyphs_flush_func flush_func,
> void *arg
> )
> {
> @@ -1490,24 +1485,24 @@ retry:
> glyph = *glyphs++;
> if (glyph->info.width > 0
> && glyph->info.height > 0) {
> - glyphs_flush flush_func;
> - void *arg;
> + glyphs_flush_func flush_func;
> + void *temp_arg;
> if (need_free_mask) {
> if (pmask_buffer->count)
> - flush_func = (glyphs_flush)glamor_glyphs_flush_mask;
> + flush_func = (glyphs_flush_func)glamor_glyphs_flush_mask;
> else
> flush_func = NULL;
> - arg = pmask_arg;
> + temp_arg = pmask_arg;
> } else {
> /* If we are using global mask cache, then we need to
> * flush dst instead of mask. As some dst depends on the
> * previous mask result. Just flush mask can't get all previous's
> * overlapped glyphs.*/
> if (dst_buffer.count || mask_buffer.count)
> - flush_func = (glyphs_flush)glamor_glyphs_flush_dst;
> + flush_func = (glyphs_flush_func)glamor_glyphs_flush_dst;
> else
> flush_func = NULL;
> - arg = &dst_arg;
> + temp_arg = &dst_arg;
> }
> glamor_buffer_glyph(glamor_priv, pmask_buffer,
> mask_format->format,
> @@ -1516,7 +1511,7 @@ retry:
> glyph->info.width, glyph->info.height,
> glyphs_dst_mode,
> flush_func,
> - (void*)arg);
> + (void*)temp_arg);
> }
> x += glyph->info.xOff;
> y += glyph->info.yOff;
> @@ -1538,7 +1533,7 @@ retry:
> glamor_destroy_pixmap(mask_pixmap);
> } else {
> struct glamor_glyph priv;
> - glyphs_flush flush_func;
> + glyphs_flush_func flush_func;
> BoxPtr rects;
> int nrect;
>
> @@ -1570,7 +1565,7 @@ retry:
> y += dst->pDrawable->y;
>
> if (dst_buffer.count || mask_buffer.count)
> - flush_func = (glyphs_flush)glamor_glyphs_flush_dst;
> + flush_func = (glyphs_flush_func)glamor_glyphs_flush_dst;
> else
> flush_func = NULL;
>
> @@ -1633,10 +1628,10 @@ glamor_glyphs_to_dst(CARD8 op,
>
> if (glyph->info.width > 0
> && glyph->info.height > 0) {
> - glyphs_flush flush_func;
> + glyphs_flush_func flush_func;
>
> if (dst_buffer.count || mask_buffer.count)
> - flush_func = (glyphs_flush)glamor_glyphs_flush_dst;
> + flush_func = (glyphs_flush_func)glamor_glyphs_flush_dst;
> else
> flush_func = NULL;
> glamor_buffer_glyph_clip(glamor_priv,
> diff --git a/src/glamor_picture.c b/src/glamor_picture.c
> index 44e1e40..7d5ffbb 100644
> --- a/src/glamor_picture.c
> +++ b/src/glamor_picture.c
> @@ -73,13 +73,10 @@ glamor_create_picture(PicturePtr picture)
> {
> PixmapPtr pixmap;
> glamor_pixmap_private *pixmap_priv;
> - glamor_screen_private *glamor_priv;
>
> if (!picture || !picture->pDrawable)
> return 0;
>
> - glamor_priv =
> - glamor_get_screen_private(picture->pDrawable->pScreen);
> pixmap = glamor_get_drawable_pixmap(picture->pDrawable);
> pixmap_priv = glamor_get_pixmap_private(pixmap);
> if (!pixmap_priv) {
> @@ -112,13 +109,10 @@ glamor_destroy_picture(PicturePtr picture)
> {
> PixmapPtr pixmap;
> glamor_pixmap_private *pixmap_priv;
> - glamor_screen_private *glamor_priv;
>
> if (!picture || !picture->pDrawable)
> return;
>
> - glamor_priv =
> - glamor_get_screen_private(picture->pDrawable->pScreen);
> pixmap = glamor_get_drawable_pixmap(picture->pDrawable);
> pixmap_priv = glamor_get_pixmap_private(pixmap);
>
> diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c
> index f3a2a87..9bbc989 100644
> --- a/src/glamor_pixmap.c
> +++ b/src/glamor_pixmap.c
> @@ -926,7 +926,6 @@ _glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, GLenum format,
> glamor_pixmap_private *pixmap_priv;
> GLenum gl_access = 0, gl_usage = 0;
> void *data, *read;
> - ScreenPtr screen;
> glamor_screen_private *glamor_priv =
> glamor_get_screen_private(pixmap->drawable.pScreen);
> glamor_gl_dispatch *dispatch;
> @@ -936,7 +935,6 @@ _glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, GLenum format,
> int fbo_x_off, fbo_y_off;
>
> data = bits;
> - screen = pixmap->drawable.pScreen;
> pixmap_priv = glamor_get_pixmap_private(pixmap);
> if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
> return NULL;
> @@ -1193,13 +1191,11 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
> glamor_get_pixmap_private(pixmap);
> unsigned int stride;
> void *data = NULL, *dst;
> - ScreenPtr screen;
> glamor_screen_private *glamor_priv =
> glamor_get_screen_private(pixmap->drawable.pScreen);
> glamor_gl_dispatch *dispatch;
> int pbo = 0;
>
> - screen = pixmap->drawable.pScreen;
> if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
> return TRUE;
>
> @@ -1259,7 +1255,6 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
> Bool
> glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv)
> {
> - glamor_screen_private *glamor_priv;
> glamor_pixmap_fbo *old_fbo;
> glamor_pixmap_fbo *new_fbo = NULL;
> PixmapPtr scratch = NULL;
> @@ -1274,7 +1269,6 @@ glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv)
> return TRUE;
>
> old_fbo = pixmap_priv->base.fbo;
> - glamor_priv = pixmap_priv->base.glamor_priv;
>
> if (!old_fbo)
> return FALSE;
> diff --git a/src/glamor_polyfillrect.c b/src/glamor_polyfillrect.c
> index 738e8eb..4e1f7b3 100644
> --- a/src/glamor_polyfillrect.c
> +++ b/src/glamor_polyfillrect.c
> @@ -43,9 +43,6 @@ _glamor_poly_fill_rect(DrawablePtr drawable,
> register BoxPtr pbox;
> RegionPtr pClip = fbGetCompositeClip(gc);
> Bool ret = FALSE;
> - glamor_screen_private *glamor_priv;
> -
> - glamor_priv = glamor_get_screen_private(drawable->pScreen);
>
> xorg = drawable->x;
> yorg = drawable->y;
> diff --git a/src/glamor_polylines.c b/src/glamor_polylines.c
> index 70dd6c1..e723e95 100644
> --- a/src/glamor_polylines.c
> +++ b/src/glamor_polylines.c
> @@ -45,7 +45,6 @@ _glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
> xRectangle *rects;
> int x1, x2, y1, y2;
> int i;
> - glamor_screen_private *glamor_priv;
>
> /* Don't try to do wide lines or non-solid fill style. */
> if (gc->lineWidth != 0) {
> @@ -105,7 +104,6 @@ _glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
> && glamor_ddx_fallback_check_gc(gc))
> return FALSE;
>
> - glamor_priv = glamor_get_screen_private(drawable->pScreen);
> if (gc->lineWidth == 0) {
> if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
> if (glamor_prepare_access_gc(gc)) {
> diff --git a/src/glamor_priv.h b/src/glamor_priv.h
> index 1830b56..03ef6cc 100644
> --- a/src/glamor_priv.h
> +++ b/src/glamor_priv.h
> @@ -549,9 +549,6 @@ extern int glamor_debug_level;
> /* glamor.c */
> PixmapPtr glamor_get_drawable_pixmap(DrawablePtr drawable);
>
> -PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
> - unsigned int usage);
> -
> Bool glamor_destroy_pixmap(PixmapPtr pixmap);
>
> glamor_pixmap_fbo* glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv);
> @@ -568,16 +565,12 @@ void glamor_init_pixmap_fbo(ScreenPtr screen);
> void glamor_fini_pixmap_fbo(ScreenPtr screen);
> Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
> void glamor_fbo_expire(glamor_screen_private *glamor_priv);
> -void glamor_init_pixmap_fbo(ScreenPtr screen);
> -void glamor_fini_pixmap_fbo(ScreenPtr screen);
>
> glamor_pixmap_fbo *
> glamor_create_fbo_array(glamor_screen_private *glamor_priv,
> int w, int h, GLenum format, int flag,
> int block_w, int block_h, glamor_pixmap_private *);
>
> -Bool glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv);
> -
> /* glamor_copyarea.c */
> RegionPtr
> glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
> @@ -603,7 +596,6 @@ void glamor_fini_finish_access_shaders(ScreenPtr screen);
> const Bool glamor_get_drawable_location(const DrawablePtr drawable);
> void glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
> int *x, int *y);
> -Bool glamor_create_gc(GCPtr gc);
> Bool glamor_stipple(PixmapPtr pixmap, PixmapPtr stipple,
> int x, int y, int width, int height,
> unsigned char alu, unsigned long planemask,
> @@ -636,7 +628,7 @@ Bool glamor_set_alu(struct glamor_gl_dispatch *dispatch,
> Bool glamor_set_planemask(PixmapPtr pixmap, unsigned long planemask);
> Bool glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
> RegionPtr glamor_bitmap_to_region(PixmapPtr pixmap);
> -Bool glamor_gl_has_extension(char *extension);
> +Bool glamor_gl_has_extension(const char *extension);
> int glamor_gl_get_version(void);
>
> #define GLAMOR_GL_VERSION_ENCODE(major, minor) ( \
> @@ -683,7 +675,6 @@ void glamor_glyphs(CARD8 op,
> INT16 ySrc, int nlist, GlyphListPtr list,
> GlyphPtr * glyphs);
>
> -void glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph);
> /* glamor_setspans.c */
> void glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
> DDXPointPtr points, int *widths, int n, int sorted);
> @@ -947,9 +938,6 @@ void glamor_finish_access_picture(PicturePtr picture, glamor_access_t access);
>
> void glamor_destroy_picture(PicturePtr picture);
>
> -enum glamor_pixmap_status
> - glamor_upload_picture_to_texture(PicturePtr picture);
> -
> /* fixup a fbo to the exact size as the pixmap. */
> Bool
> glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv);
> diff --git a/src/glamor_render.c b/src/glamor_render.c
> index 9b80295..4cae5a5 100644
> --- a/src/glamor_render.c
> +++ b/src/glamor_render.c
> @@ -43,6 +43,7 @@
> //#define DEBUGRegionPrint(x) do {} while (0)
> #define DEBUGRegionPrint RegionPrint
> #endif
> +
> static struct blendinfo composite_op_info[] = {
> [PictOpClear] = {0, 0, GL_ZERO, GL_ZERO},
> [PictOpSrc] = {0, 0, GL_ONE, GL_ZERO},
> @@ -1715,7 +1716,7 @@ _glamor_composite(CARD8 op,
> glamor_get_screen_private(screen);
> Bool ret = TRUE;
> RegionRec region;
> - BoxPtr box, extent;
> + BoxPtr extent;
> int nbox, ok = FALSE;
> PixmapPtr sub_dest_pixmap = NULL;
> PixmapPtr sub_source_pixmap = NULL;
> @@ -1778,7 +1779,6 @@ _glamor_composite(CARD8 op,
> goto done;
> }
>
> - box = REGION_RECTS(®ion);
> nbox = REGION_NUM_RECTS(®ion);
> DEBUGF("first clipped when compositing.\n");
> DEBUGRegionPrint(®ion);
> @@ -1833,6 +1833,7 @@ _glamor_composite(CARD8 op,
> x_dest, y_dest);
>
> REGION_UNINIT(dest->pDrawable->pScreen, ®ion);
> +
> if (ok)
> goto done;
> fail:
> diff --git a/src/glamor_trapezoid.c b/src/glamor_trapezoid.c
> index 7bb75f5..57a178c 100644
> --- a/src/glamor_trapezoid.c
> +++ b/src/glamor_trapezoid.c
> @@ -81,12 +81,16 @@ _glamor_lines_crossfixedY (xLineFixed *l, xLineFixed *r)
> xFixed dy2 = r->p2.y - r->p1.y;
> xFixed_32_32 tmp = (xFixed_32_32) dy2 * dy1;
> xFixed_32_32 dividend1 = (tmp >> 32) * (l->p1.x - r->p1.x);
> + xFixed_32_32 dividend2;
> + xFixed_32_32 dividend3;
> + xFixed_32_32 divisor;
> +
> tmp = (xFixed_32_32) dx1 * dy2;
> - xFixed_32_32 dividend2 = (tmp >> 32) * l->p1.y;
> + dividend2 = (tmp >> 32) * l->p1.y;
> tmp = (xFixed_32_32) dy1 * dx2;
> - xFixed_32_32 dividend3 = (tmp >> 32) * r->p1.y;
> - xFixed_32_32 divisor = ((xFixed_32_32) dx1 * (xFixed_32_32) dy2
> - - (xFixed_32_32) dy1 * (xFixed_32_32) dx2) >> 32;
> + dividend3 = (tmp >> 32) * r->p1.y;
> + divisor = ((xFixed_32_32) dx1 * (xFixed_32_32) dy2
> + - (xFixed_32_32) dy1 * (xFixed_32_32) dx2) >> 32;
>
> if (divisor)
> return (xFixed)((dividend2 - dividend1 - dividend3) / divisor);
> @@ -1363,7 +1367,6 @@ _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
> glamor_pixmap_private *pixmap_priv;
> PixmapPtr pixmap = NULL;
> GLint trapezoid_prog;
> - float width, height;
> GLfloat xscale, yscale;
> float left_slope, right_slope;
> xTrapezoid *ptrap;
> @@ -1399,9 +1402,6 @@ _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
>
> pixmap_priv_get_dest_scale(pixmap_priv, (&xscale), (&yscale));
>
> - width = (float)(bounds->x2 - bounds->x1);
> - height = (float)(bounds->y2 - bounds->y1);
> -
> dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0);
> dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
>
> @@ -1604,11 +1604,11 @@ glamor_create_mask_picture(ScreenPtr screen,
> static int
> _glamor_trapezoid_bounds (int ntrap, xTrapezoid *traps, BoxPtr box)
> {
> + int has_large_trapezoid = 0;
> box->y1 = MAXSHORT;
> box->y2 = MINSHORT;
> box->x1 = MAXSHORT;
> box->x2 = MINSHORT;
> - int has_large_trapezoid = 0;
>
> for (; ntrap; ntrap--, traps++) {
> INT16 x1, y1, x2, y2;
> diff --git a/src/glamor_utils.h b/src/glamor_utils.h
> index 6eef722..36beb49 100644
> --- a/src/glamor_utils.h
> +++ b/src/glamor_utils.h
> @@ -39,12 +39,12 @@
> #define t_from_x_coord_y(_yscale_, _y_) (1.0 - (_y_) * (_yscale_))
> #define t_from_x_coord_y_inverted(_yscale_, _y_) ((_y_) * (_yscale_))
>
> -#define pixmap_priv_get_dest_scale(_pixmap_priv_, _pxscale_, _pyscale_)\
> - do { \
> - int w,h; \
> - PIXMAP_PRIV_GET_ACTUAL_SIZE(_pixmap_priv_, w, h); \
> - *(_pxscale_) = 1.0 / w; \
> - *(_pyscale_) = 1.0 / h; \
> +#define pixmap_priv_get_dest_scale(_pixmap_priv_, _pxscale_, _pyscale_) \
> + do { \
> + int _w_,_h_; \
> + PIXMAP_PRIV_GET_ACTUAL_SIZE(_pixmap_priv_, _w_, _h_); \
> + *(_pxscale_) = 1.0 / _w_; \
> + *(_pyscale_) = 1.0 / _h_; \
> } while(0)
>
> #define pixmap_priv_get_scale(_pixmap_priv_, _pxscale_, _pyscale_) \
> @@ -302,14 +302,14 @@
>
> #define glamor_transform_point(matrix, tx, ty, x, y) \
> do { \
> - int i; \
> - float result[4]; \
> - for (i = 0; i < 3; i++) { \
> - result[i] = (matrix)[i * 3] * (x) + (matrix)[i * 3 + 1] * (y) \
> - + (matrix)[i * 3 + 2]; \
> + int _i_; \
> + float _result_[4]; \
> + for (_i_ = 0; _i_ < 3; _i_++) { \
> + _result_[_i_] = (matrix)[_i_ * 3] * (x) + (matrix)[_i_ * 3 + 1] * (y) \
> + + (matrix)[_i_ * 3 + 2]; \
> } \
> - tx = result[0] / result[2]; \
> - ty = result[1] / result[2]; \
> + tx = _result_[0] / _result_[2]; \
> + ty = _result_[1] / _result_[2]; \
> } while(0)
>
> #define _glamor_set_normalize_tpoint(xscale, yscale, _tx_, _ty_, \
> @@ -734,10 +734,10 @@
>
> #define glamor_set_const_ext(params, nparam, vertices, nverts, stride) \
> do { \
> - int i = 0, j = 0; \
> - for(; i < nverts; i++) { \
> - for(j = 0; j < nparam; j++) { \
> - vertices[stride*i + j] = params[j]; \
> + int _i_ = 0, _j_ = 0; \
> + for(; _i_ < nverts; _i_++) { \
> + for(_j_ = 0; _j_ < nparam; _j_++) { \
> + vertices[stride*_i_ + _j_] = params[_j_]; \
> } \
> } \
> } while(0)
>
More information about the Glamor
mailing list