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

glamor: Drop a dead flag to glamor_create_fbo_array(). 

v2: Don't forget to set priv->block_w/block_h like the wrapper used
    to.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
This commit is contained in:
Eric Anholt 2015-02-05 11:46:32 -08:00
parent fe3fedf280
commit bfb6a290af
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
glamor/glamor_fbo.c
View File

@ -358,20 +358,24 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
return fbo; return fbo;
} }
static glamor_pixmap_fbo * /**
_glamor_create_fbo_array(glamor_screen_private *glamor_priv, * Create storage for the w * h region, using FBOs of the GL's maximum
* supported size.
*/
glamor_pixmap_fbo *
glamor_create_fbo_array(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, int flag, int w, int h, GLenum format, int flag,
int block_w, int block_h, int block_w, int block_h,
glamor_pixmap_private *pixmap_priv, int has_fbo) glamor_pixmap_private *priv)
{ {
int block_wcnt; int block_wcnt;
int block_hcnt; int block_hcnt;
glamor_pixmap_fbo **fbo_array; glamor_pixmap_fbo **fbo_array;
BoxPtr box_array; BoxPtr box_array;
int i, j; int i, j;
glamor_pixmap_private *priv;
priv = pixmap_priv; priv->block_w = block_w;
priv->block_h = block_h;
block_wcnt = (w + block_w - 1) / block_w; block_wcnt = (w + block_w - 1) / block_w;
block_hcnt = (h + block_h - 1) / block_h; block_hcnt = (h + block_h - 1) / block_h;
@ -402,13 +406,10 @@ _glamor_create_fbo_array(glamor_screen_private *glamor_priv,
fbo_w = fbo_w =
box_array[i * block_wcnt + j].x2 - box_array[i * block_wcnt + box_array[i * block_wcnt + j].x2 - box_array[i * block_wcnt +
j].x1; j].x1;
if (!has_fbo) fbo_array[i * block_wcnt + j] = glamor_create_fbo(glamor_priv,
fbo_array[i * block_wcnt + j] = glamor_create_fbo(glamor_priv, fbo_w, fbo_h,
fbo_w, fbo_h, format,
format, GLAMOR_CREATE_PIXMAP_FIXUP);
GLAMOR_CREATE_PIXMAP_FIXUP);
else
fbo_array[i * block_wcnt + j] = priv->fbo;
if (fbo_array[i * block_wcnt + j] == NULL) if (fbo_array[i * block_wcnt + j] == NULL)
goto cleanup; goto cleanup;
} }
@ -430,20 +431,6 @@ _glamor_create_fbo_array(glamor_screen_private *glamor_priv,
return NULL; return NULL;
} }
/* Create a fbo array to cover the w*h region, by using block_w*block_h
* block.*/
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 *pixmap_priv)
{
pixmap_priv->block_w = block_w;
pixmap_priv->block_h = block_h;
return _glamor_create_fbo_array(glamor_priv, w, h, format, flag,
block_w, block_h, pixmap_priv, 0);
}
glamor_pixmap_fbo * glamor_pixmap_fbo *
glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv) glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv)
{ {