Initial version.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>

glamor/Makefile.am

-noinst_LTLIBRARIES = libglamor.la
+inst_LTLIBRARIES = libglamor.la
 
 # Override these since glamor doesn't need them and the needed files aren't
 # built (in hw/xfree86/os-support/solaris) until after glamor is built
 SOLARIS_ASM_CFLAGS=""
 
-if XORG
-sdk_HEADERS = glamor.h
-endif
-
 if GLAMOR_GLES2
 libglamor_la_LIBADD = $(GLESV2_LIBS)
 else
 libglamor_la_LIBADD = $(GL_LIBS)
 endif
 
-if XORG
-sdk_HEADERS = glamor.h
-endif
+instdir = $(moduledir)
 
 INCLUDES = \
 	$(XORG_INCS)
 
-
 AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
 
+libglamor_la_LDFLAGS = -avoid-version
+
 libglamor_la_SOURCES = \
 	glamor.c \
 	glamor_copyarea.c \
@@ -45,3 +40,17 @@ libglamor_la_SOURCES = \
 	glamor_window.c\
         glamor_gl_dispatch.c\
 	glamor.h
+
+sdk_HEADERS = glamor.h
+
+if EGL
+LIBGLAMOR_EGL = libglamor_egl.la
+module_LTLIBRARIES = $(LIBGLAMOR_EGL) 
+libglamor_egl_la_DEPENDENCIES = libglamor.la
+libglamor_egl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor
+#libglamor_egl_la_LIBADD = $(top_builddir)/src/libglamor.la
+libglamor_egl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
+libglamor_egl_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
+endif
+
+

glamor/glamor.h

@@ -39,25 +39,43 @@
 #include "fb.h"
 #include "fbpict.h"
 
-#endif /* GLAMOR_H */
+#endif				/* GLAMOR_H */
 
 
-#define GLAMOR_INVERTED_Y_AXIS  1
-#define GLAMOR_HOSTX            2
-#define GLAMOR_VALID_FLAGS      (GLAMOR_INVERTED_Y_AXIS | GLAMOR_HOSTX)
+#define GLAMOR_INVERTED_Y_AXIS  	1
+#define GLAMOR_USE_SCREEN		2
+#define GLAMOR_USE_PICTURE_SCREEN 	4
+
+#define GLAMOR_VALID_FLAGS      (GLAMOR_INVERTED_Y_AXIS  		\
+				 | GLAMOR_USE_SCREEN 			\
+                                 | GLAMOR_USE_PICTURE_SCREEN)
 
 #define GLAMOR_EGL_EXTERNAL_BUFFER 3
 
 extern _X_EXPORT Bool glamor_init(ScreenPtr screen, unsigned int flags);
 extern _X_EXPORT void glamor_fini(ScreenPtr screen);
-extern _X_EXPORT void glamor_set_screen_pixmap_texture(ScreenPtr screen, int w, int h, unsigned int tex);
-extern _X_EXPORT Bool glamor_glyphs_init (ScreenPtr pScreen);
-void glamor_set_pixmap_texture(PixmapPtr pixmap, int w, int h, unsigned int tex);
+extern _X_EXPORT void glamor_set_screen_pixmap_texture(ScreenPtr screen,
+						       int w, int h,
+						       unsigned int tex);
+extern _X_EXPORT Bool glamor_glyphs_init(ScreenPtr pScreen);
+void glamor_set_pixmap_texture(PixmapPtr pixmap, int w, int h,
+			       unsigned int tex);
+
+extern _X_EXPORT void glamor_destroy_textured_pixmap(PixmapPtr pixmap);
+extern _X_EXPORT void glamor_block_handler(ScreenPtr screen);
 
 #ifdef GLAMOR_FOR_XORG
 extern _X_EXPORT Bool glamor_egl_init(ScrnInfoPtr scrn, int fd);
-extern _X_EXPORT Bool glamor_create_egl_screen_image(ScreenPtr screen, int handle, int stride);
-extern _X_EXPORT Bool glamor_create_egl_pixmap_image(PixmapPtr pixmap, int handle, int stride);
-extern _X_EXPORT Bool glamor_close_egl_screen(ScreenPtr screen);
-extern _X_EXPORT void glamor_free_egl_screen(int scrnIndex, int flags);
+extern _X_EXPORT Bool glamor_egl_create_textured_screen(ScreenPtr screen,
+							int handle,
+							int stride);
+extern _X_EXPORT Bool glamor_egl_create_textured_pixmap(PixmapPtr pixmap,
+							int handle,
+							int stride);
+
+extern _X_EXPORT Bool glamor_egl_close_screen(ScreenPtr screen);
+extern _X_EXPORT void glamor_egl_free_screen(int scrnIndex, int flags);
+
+extern _X_EXPORT Bool glamor_egl_init_textured_pixmap(ScreenPtr screen);
+extern _X_EXPORT void glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap);
 #endif

glamor/glamor_copywindow.c

@@ -32,29 +32,31 @@
  * Screen CopyWindow implementation.
  */
 
-void glamor_copy_window(WindowPtr win, DDXPointRec old_origin,
-			RegionPtr src_region)
+void
+glamor_copy_window(WindowPtr win, DDXPointRec old_origin,
+		   RegionPtr src_region)
 {
-    RegionRec dst_region;
-    int dx, dy;
-    PixmapPtr pixmap = win->drawable.pScreen->GetWindowPixmap(win);
+	RegionRec dst_region;
+	int dx, dy;
+	PixmapPtr pixmap = win->drawable.pScreen->GetWindowPixmap(win);
 
-    dx = old_origin.x - win->drawable.x;
-    dy = old_origin.y - win->drawable.y;
-    REGION_TRANSLATE(win->drawable.pScreen, src_region, -dx, -dy);
+	dx = old_origin.x - win->drawable.x;
+	dy = old_origin.y - win->drawable.y;
+	REGION_TRANSLATE(win->drawable.pScreen, src_region, -dx, -dy);
 
-    REGION_INIT(win->drawable.pScreen, &dst_region, NullBox, 0);
+	REGION_INIT(win->drawable.pScreen, &dst_region, NullBox, 0);
 
-    REGION_INTERSECT(win->drawable.pScreen, &dst_region, &win->borderClip,
-		     src_region);
+	REGION_INTERSECT(win->drawable.pScreen, &dst_region,
+			 &win->borderClip, src_region);
 #ifdef COMPOSITE
-    if (pixmap->screen_x || pixmap->screen_y)
-	REGION_TRANSLATE(win->drawable.pScreen, &dst_region,
-			 -pixmap->screen_x, -pixmap->screen_y);
+	if (pixmap->screen_x || pixmap->screen_y)
+		REGION_TRANSLATE(win->drawable.pScreen, &dst_region,
+				 -pixmap->screen_x, -pixmap->screen_y);
 #endif
 
-    miCopyRegion(&pixmap->drawable, &pixmap->drawable,
-		 NULL, &dst_region, dx, dy, glamor_copy_n_to_n, 0, NULL);
+	miCopyRegion(&pixmap->drawable, &pixmap->drawable,
+		     NULL, &dst_region, dx, dy, glamor_copy_n_to_n, 0,
+		     NULL);
 
-    REGION_UNINIT(win->drawable.pScreen, &dst_region);
+	REGION_UNINIT(win->drawable.pScreen, &dst_region);
 }

glamor/glamor_debug.h

@@ -11,7 +11,8 @@
 #define GLAMOR_DEBUG_TEXTURE_DYNAMIC_UPLOAD   3
 
 extern void
-AbortServer(void) _X_NORETURN;
+AbortServer(void)
+    _X_NORETURN;
 
 #define GLAMOR_PANIC(_format_, ...)			\
   do {							\
@@ -19,9 +20,9 @@ AbortServer(void) _X_NORETURN;
 		   " at %32s line %d: " _format_ "\n",	\
 		   __FUNCTION__, __LINE__,		\
 		   ##__VA_ARGS__ );			\
-    AbortServer();					\
+    exit(1);                                            \
   } while(0)
-                        
+
 
 
 

glamor/glamor_eglmodule.c

+/*
+ * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the XFree86 Project shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from the
+ * XFree86 Project.
+ */
+
+#include <xorg-server.h>
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo VersRec = {
+	"glamor_egl",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XORG_VERSION_CURRENT,
+	1, 0, 0,
+	ABI_CLASS_ANSIC,	/* Only need the ansic layer */
+	ABI_ANSIC_VERSION,
+	MOD_CLASS_NONE,
+	{0, 0, 0, 0}		/* signature, to be patched into the file by a tool */
+};
+
+_X_EXPORT XF86ModuleData glamor_eglModuleData = { &VersRec, NULL, NULL };

glamor/glamor_fill.c

@@ -32,174 +32,167 @@
  * GC fill implementation, based loosely on fb_fill.c
  */
 
-void
+Bool
 glamor_fill(DrawablePtr drawable,
-	    GCPtr gc,
-	    int x,
-	    int y,
-	    int width,
-	    int height)
+	    GCPtr gc, int x, int y, int width, int height)
 {
-    PixmapPtr dst_pixmap = glamor_get_drawable_pixmap(drawable);
-    int off_x, off_y;
-
-    glamor_get_drawable_deltas(drawable, dst_pixmap, &off_x, &off_y);
-
-    switch (gc->fillStyle) {
-    case FillSolid:
-	if (!glamor_solid(dst_pixmap,
-                         x + off_x,
-                         y + off_y,
-		         width,
-		         height,
-		         gc->alu,
-		         gc->planemask,
-		         gc->fgPixel))
-	goto fail;
-	break;
-    case FillStippled:
-    case FillOpaqueStippled:
-	if (!glamor_stipple(dst_pixmap,
-		       gc->stipple,
-		       x + off_x,
-		       y + off_y,
-		       width,
-		       height,
-		       gc->alu,
-		       gc->planemask,
-		       gc->fgPixel,
-		       gc->bgPixel,
-		       gc->patOrg.x,
-		       gc->patOrg.y))
-	goto fail;
-        return;
-	break;
-    case FillTiled:
-	if (!glamor_tile(dst_pixmap,
-		    gc->tile.pixmap,
-		    x + off_x,
-		    y + off_y,
-		    width,
-		    height,
-		    gc->alu,
-		    gc->planemask,
-		    drawable->x + x + off_x - gc->patOrg.x,
-		    drawable->y + y + off_y - gc->patOrg.y))
-	goto fail;
-	break;
-    }
-    return;
-fail:
-    if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
-	if (glamor_prepare_access_gc(gc)) {
-            fbFill(drawable, gc, x, y, width, height);
-	    glamor_finish_access_gc(gc);
+	PixmapPtr dst_pixmap = glamor_get_drawable_pixmap(drawable);
+	int off_x, off_y;
+
+	glamor_get_drawable_deltas(drawable, dst_pixmap, &off_x, &off_y);
+
+	switch (gc->fillStyle) {
+	case FillSolid:
+		if (!glamor_solid(dst_pixmap,
+				  x + off_x,
+				  y + off_y,
+				  width, height, gc->alu, gc->planemask,
+				  gc->fgPixel))
+			goto fail;
+		break;
+	case FillStippled:
+	case FillOpaqueStippled:
+		if (!glamor_stipple(dst_pixmap,
+				    gc->stipple,
+				    x + off_x,
+				    y + off_y,
+				    width,
+				    height,
+				    gc->alu,
+				    gc->planemask,
+				    gc->fgPixel,
+				    gc->bgPixel, gc->patOrg.x,
+				    gc->patOrg.y))
+			goto fail;
+		break;
+	case FillTiled:
+		if (!glamor_tile(dst_pixmap,
+				 gc->tile.pixmap,
+				 x + off_x,
+				 y + off_y,
+				 width,
+				 height,
+				 gc->alu,
+				 gc->planemask,
+				 drawable->x + x + off_x - gc->patOrg.x,
+				 drawable->y + y + off_y - gc->patOrg.y))
+			goto fail;
+		break;
+	}
+	return TRUE;
+      fail:
+	if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
+		if (glamor_prepare_access_gc(gc)) {
+			fbFill(drawable, gc, x, y, width, height);
+			glamor_finish_access_gc(gc);
+		}
+		glamor_finish_access(drawable);
 	}
-	glamor_finish_access(drawable);
-    }
-return;
+	return TRUE;
 
 }
 
 void
 glamor_init_solid_shader(ScreenPtr screen)
 {
-    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-    glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
-    const char *solid_vs =
-        "attribute vec4 v_position;"
-	"void main()\n"
-	"{\n"
-        "       gl_Position = v_position;\n"
-	"}\n";
-    const char *solid_fs =
-        GLAMOR_DEFAULT_PRECISION
-	"uniform vec4 color;\n"
-	"void main()\n"
-	"{\n"
-	"	gl_FragColor = color;\n"
-	"}\n";
-    GLint fs_prog, vs_prog;
-
-    glamor_priv->solid_prog = dispatch->glCreateProgram();
-    vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, solid_vs);
-    fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, solid_fs);
-    dispatch->glAttachShader(glamor_priv->solid_prog, vs_prog);
-    dispatch->glAttachShader(glamor_priv->solid_prog, fs_prog);
-    
-    dispatch->glBindAttribLocation(glamor_priv->solid_prog, GLAMOR_VERTEX_POS, "v_position");
-    glamor_link_glsl_prog(dispatch, glamor_priv->solid_prog);
-
-    glamor_priv->solid_color_uniform_location =
-	dispatch->glGetUniformLocation(glamor_priv->solid_prog, "color");
+	glamor_screen_private *glamor_priv =
+	    glamor_get_screen_private(screen);
+	glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+	const char *solid_vs =
+	    "attribute vec4 v_position;"
+	    "void main()\n" "{\n" "       gl_Position = v_position;\n"
+	    "}\n";
+	const char *solid_fs =
+	    GLAMOR_DEFAULT_PRECISION "uniform vec4 color;\n"
+	    "void main()\n" "{\n" "	gl_FragColor = color;\n" "}\n";
+	GLint fs_prog, vs_prog;
+
+	glamor_priv->solid_prog = dispatch->glCreateProgram();
+	vs_prog =
+	    glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, solid_vs);
+	fs_prog =
+	    glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
+				     solid_fs);
+	dispatch->glAttachShader(glamor_priv->solid_prog, vs_prog);
+	dispatch->glAttachShader(glamor_priv->solid_prog, fs_prog);
+
+	dispatch->glBindAttribLocation(glamor_priv->solid_prog,
+				       GLAMOR_VERTEX_POS, "v_position");
+	glamor_link_glsl_prog(dispatch, glamor_priv->solid_prog);
+
+	glamor_priv->solid_color_uniform_location =
+	    dispatch->glGetUniformLocation(glamor_priv->solid_prog,
+					   "color");
 }
 
 Bool
 glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
-	     unsigned char alu, unsigned long planemask, unsigned long fg_pixel)
+	     unsigned char alu, unsigned long planemask,
+	     unsigned long fg_pixel)
 {
-    ScreenPtr screen = pixmap->drawable.pScreen;
-    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
-    glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
-    int x1 = x;
-    int x2 = x + width;
-    int y1 = y;
-    int y2 = y + height;
-    GLfloat color[4];
-    float vertices[8];
-    GLfloat xscale, yscale;
-    if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) {
-        glamor_fallback("dest %p has no fbo.\n", pixmap);
-	goto fail;
-    }
-    glamor_set_alu(dispatch, alu);
-    if (!glamor_set_planemask(pixmap, planemask)) {
-      glamor_fallback("Failedto set planemask  in glamor_solid.\n");
-      goto fail;
-    } 
-
-    glamor_get_rgba_from_pixel(fg_pixel, 
-                              &color[0], 
-                              &color[1], 
-                              &color[2], 
-                              &color[3],
-                              format_for_pixmap(pixmap));
+	ScreenPtr screen = pixmap->drawable.pScreen;
+	glamor_screen_private *glamor_priv =
+	    glamor_get_screen_private(screen);
+	glamor_pixmap_private *pixmap_priv =
+	    glamor_get_pixmap_private(pixmap);
+	glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+	int x1 = x;
+	int x2 = x + width;
+	int y1 = y;
+	int y2 = y + height;
+	GLfloat color[4];
+	float vertices[8];
+	GLfloat xscale, yscale;
+	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) {
+		glamor_fallback("dest %p has no fbo.\n", pixmap);
+		goto fail;
+	}
+	glamor_set_alu(dispatch, alu);
+	if (!glamor_set_planemask(pixmap, planemask)) {
+		glamor_fallback
+		    ("Failedto set planemask  in glamor_solid.\n");
+		goto fail;
+	}
+
+	glamor_get_rgba_from_pixel(fg_pixel,
+				   &color[0],
+				   &color[1],
+				   &color[2],
+				   &color[3], format_for_pixmap(pixmap));
 #ifdef GLAMOR_DELAYED_FILLING
-    if (x == 0 && y == 0 
-        && width == pixmap->drawable.width 
-        && height == pixmap->drawable.height 
-        && pixmap_priv->fb != glamor_priv->screen_fbo ) {
-      pixmap_priv->pending_op.type = GLAMOR_PENDING_FILL;
-      memcpy(&pixmap_priv->pending_op.fill.color4fv,
-	     color, 4*sizeof(GLfloat));
-      pixmap_priv->pending_op.fill.colori = fg_pixel;
-      return TRUE;
-    }
+	if (x == 0 && y == 0
+	    && width == pixmap->drawable.width
+	    && height == pixmap->drawable.height
+	    && pixmap_priv->fb != glamor_priv->screen_fbo) {
+		pixmap_priv->pending_op.type = GLAMOR_PENDING_FILL;
+		memcpy(&pixmap_priv->pending_op.fill.color4fv,
+		       color, 4 * sizeof(GLfloat));
+		pixmap_priv->pending_op.fill.colori = fg_pixel;
+		return TRUE;
+	}
 #endif
-    glamor_set_destination_pixmap_priv_nc(pixmap_priv);
-    glamor_validate_pixmap(pixmap);
-
-    dispatch->glUseProgram(glamor_priv->solid_prog);
- 
-    dispatch->glUniform4fv(glamor_priv->solid_color_uniform_location, 1, color);
-
-    dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, GL_FALSE,
-                          2 * sizeof(float), vertices);
-    dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
-    pixmap_priv_get_scale(pixmap_priv, &xscale, &yscale);
-
-    glamor_set_normalize_vcoords(xscale, yscale, x1, y1, x2, y2,
-				 glamor_priv->yInverted,
-				 vertices);
-    dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-    dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
-    dispatch->glUseProgram(0);
-    return TRUE;
-fail:
-    glamor_set_alu(dispatch, GXcopy);
-    glamor_set_planemask(pixmap, ~0);
-    return FALSE;
+	glamor_set_destination_pixmap_priv_nc(pixmap_priv);
+	glamor_validate_pixmap(pixmap);
+
+	dispatch->glUseProgram(glamor_priv->solid_prog);
+
+	dispatch->glUniform4fv(glamor_priv->solid_color_uniform_location,
+			       1, color);
+
+	dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
+					GL_FALSE, 2 * sizeof(float),
+					vertices);
+	dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
+	pixmap_priv_get_scale(pixmap_priv, &xscale, &yscale);
+
+	glamor_set_normalize_vcoords(xscale, yscale, x1, y1, x2, y2,
+				     glamor_priv->yInverted, vertices);
+	dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+	dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
+	dispatch->glUseProgram(0);
+	return TRUE;
+      fail:
+	glamor_set_alu(dispatch, GXcopy);
+	glamor_set_planemask(pixmap, ~0);
+	return FALSE;
 }
-
-

glamor/glamor_fillspans.c

@@ -32,58 +32,54 @@
 
 void
 glamor_fill_spans(DrawablePtr drawable,
-		  GCPtr	gc,
-		  int n,
-		  DDXPointPtr points,
-		  int *widths,
-		  int sorted)
+		  GCPtr gc,
+		  int n, DDXPointPtr points, int *widths, int sorted)
 {
-    DDXPointPtr ppt;
-    int nbox;
-    BoxPtr pbox;
-    int x1, x2, y;
-    RegionPtr pClip = fbGetCompositeClip(gc);
+	DDXPointPtr ppt;
+	int nbox;
+	BoxPtr pbox;
+	int x1, x2, y;
+	RegionPtr pClip = fbGetCompositeClip(gc);
 
-    if (gc->fillStyle != FillSolid && gc->fillStyle != FillTiled) 
-	goto fail;
+	if (gc->fillStyle != FillSolid && gc->fillStyle != FillTiled)
+		goto fail;
 
 	ppt = points;
-        while (n--) {
-                x1 = ppt->x;
-                y = ppt->y;
-                x2 = x1 + (int)*widths;
-                ppt++;
-                widths++;
+	while (n--) {
+		x1 = ppt->x;
+		y = ppt->y;
+		x2 = x1 + (int) *widths;
+		ppt++;
+		widths++;
 
-                nbox = REGION_NUM_RECTS(pClip);
-                pbox = REGION_RECTS(pClip);
-                while (nbox--) {
-                        if (pbox->y1 > y || pbox->y2 <= y)
-                                continue;
+		nbox = REGION_NUM_RECTS(pClip);
+		pbox = REGION_RECTS(pClip);
+		while (nbox--) {
+			if (pbox->y1 > y || pbox->y2 <= y)
+				continue;
 
-                        if (x1 < pbox->x1)
-                                x1 = pbox->x1;
+			if (x1 < pbox->x1)
+				x1 = pbox->x1;
 
-                        if (x2 > pbox->x2)
-                                x2 = pbox->x2;
+			if (x2 > pbox->x2)
+				x2 = pbox->x2;
 
-                        if (x2 <= x1)
-                                continue;
-                        glamor_fill (drawable,gc,
-                                     x1, y,
-                                     x2 - x1 ,  1);
-                        pbox++;
-                }
-        }
-    return;
-fail:
-    glamor_fallback("to %p (%c)\n", drawable,
-		    glamor_get_drawable_location(drawable));
-    if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
-	if (glamor_prepare_access_gc(gc)) {
-	    fbFillSpans(drawable, gc, n, points, widths, sorted);
-	    glamor_finish_access_gc(gc);
+			if (x2 <= x1)
+				continue;
+			glamor_fill(drawable, gc, x1, y, x2 - x1, 1);
+			pbox++;
+		}
+	}
+	return;
+      fail:
+	glamor_fallback("to %p (%c)\n", drawable,
+			glamor_get_drawable_location(drawable));
+	if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
+		if (glamor_prepare_access_gc(gc)) {
+			fbFillSpans(drawable, gc, n, points, widths,
+				    sorted);
+			glamor_finish_access_gc(gc);
+		}
+		glamor_finish_access(drawable);
 	}
-	glamor_finish_access(drawable);
-    }
 }

glamor/glamor_getspans.c

@@ -34,77 +34,73 @@
 void
 glamor_get_spans(DrawablePtr drawable,
 		 int wmax,
-		 DDXPointPtr points,
-		 int *widths,
-		 int count,
-		 char *dst)
+		 DDXPointPtr points, int *widths, int count, char *dst)
 {
-    PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
-    GLenum format, type;
-    int no_alpha, no_revert;