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

glamor: Rename more solid fill variables to clean up the code. 

Now the error path of allocation is more obvious: We leave things in
the a-few-boxes-at-a-time stack memory state.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
This commit is contained in:
Eric Anholt 2014-01-06 07:05:02 +08:00
parent ec3ab2f67b
commit 53996e252e
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
glamor/glamor_fill.c
View File

@ -187,9 +187,9 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
GLfloat xscale, yscale; GLfloat xscale, yscale;
float vertices[32]; float stack_vertices[32];
float *pvertices = vertices; float *vertices = stack_vertices;
int valid_nbox = ARRAY_SIZE(vertices) / (4 * 2); int valid_nbox = ARRAY_SIZE(stack_vertices) / (4 * 2);
glamor_set_destination_pixmap_priv_nc(pixmap_priv); glamor_set_destination_pixmap_priv_nc(pixmap_priv);
@ -201,19 +201,17 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale); pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale);
if (nbox > valid_nbox) { if (nbox > valid_nbox) {
int allocated_box; int allocated_nbox;
float *new_vertices;
if (nbox > GLAMOR_COMPOSITE_VBO_VERT_CNT / 6) { if (nbox > GLAMOR_COMPOSITE_VBO_VERT_CNT / 6)
allocated_box = GLAMOR_COMPOSITE_VBO_VERT_CNT / 6; allocated_nbox = GLAMOR_COMPOSITE_VBO_VERT_CNT / 6;
}
else else
allocated_box = nbox; allocated_nbox = nbox;
pvertices = malloc(allocated_box * 4 * 2 * sizeof(float)); new_vertices = malloc(allocated_nbox * 4 * 2 * sizeof(float));
if (pvertices) if (new_vertices) {
valid_nbox = allocated_box; vertices = new_vertices;
else { valid_nbox = allocated_nbox;
pvertices = vertices;
valid_nbox = ARRAY_SIZE(vertices) / (4 * 2);
} }
} }
@ -221,14 +219,14 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo);
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), pvertices); GL_FALSE, 2 * sizeof(float), vertices);
glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
while (nbox) { while (nbox) {
int box_cnt, i; int box_cnt, i;
float *next_box; float *next_box;
next_box = pvertices; next_box = vertices;
box_cnt = nbox > valid_nbox ? valid_nbox : nbox; box_cnt = nbox > valid_nbox ? valid_nbox : nbox;
for (i = 0; i < box_cnt; i++) { for (i = 0; i < box_cnt; i++) {
glamor_set_normalize_vcoords(pixmap_priv, xscale, yscale, glamor_set_normalize_vcoords(pixmap_priv, xscale, yscale,
@ -253,8 +251,8 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
box += box_cnt; box += box_cnt;
} }
if (pvertices != vertices) if (vertices != stack_vertices)
free(pvertices); free(vertices);
glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
glUseProgram(0); glUseProgram(0);