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

glamor_fbo: Added one macro to disable fbo cache. 

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2012-03-16 16:42:46 +08:00 committed by Eric Anholt
parent 94186db527
commit 7036cfdd0d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glamor/glamor_fbo.c
View File

@ -8,6 +8,8 @@
#define GLAMOR_CACHE_EXACT_SIZE 1 #define GLAMOR_CACHE_EXACT_SIZE 1
#define GLAMOR_CACHE_TEXTURE 2 #define GLAMOR_CACHE_TEXTURE 2
//#define NO_FBO_CACHE 1
/* Loop from the tail to the head. */ /* Loop from the tail to the head. */
#define xorg_list_for_each_entry_reverse(pos, head, member) \ #define xorg_list_for_each_entry_reverse(pos, head, member) \
for (pos = __container_of((head)->prev, pos, member); \ for (pos = __container_of((head)->prev, pos, member); \
@ -80,7 +82,9 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
struct xorg_list *cache; struct xorg_list *cache;
glamor_pixmap_fbo *fbo_entry; glamor_pixmap_fbo *fbo_entry;
int size; int size;
#ifdef NO_FBO_CACHE
return NULL;
#else
if (!(flag & GLAMOR_CACHE_TEXTURE)) if (!(flag & GLAMOR_CACHE_TEXTURE))
cache = &glamor_priv->fbo_cache[cache_format(format)] cache = &glamor_priv->fbo_cache[cache_format(format)]
[cache_wbucket(w)] [cache_wbucket(w)]
@ -117,6 +121,7 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
} }
return NULL; return NULL;
#endif
} }
void void
@ -135,11 +140,14 @@ glamor_purge_fbo(glamor_pixmap_fbo *fbo)
} }
void static void
glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo) glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
{ {
struct xorg_list *cache; struct xorg_list *cache;
#ifdef NO_FBO_CACHE
glamor_purge_fbo(fbo);
return;
#else
if (fbo->fb == 0) { if (fbo->fb == 0) {
glamor_purge_fbo(fbo); glamor_purge_fbo(fbo);
return; return;
@ -157,6 +165,7 @@ glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
fbo->width, fbo->height, fbo->format, fbo->fb, fbo->tex); fbo->width, fbo->height, fbo->format, fbo->fb, fbo->tex);
xorg_list_add(&fbo->list, cache); xorg_list_add(&fbo->list, cache);
fbo->expire = fbo->glamor_priv->tick + GLAMOR_CACHE_EXPIRE_MAX; fbo->expire = fbo->glamor_priv->tick + GLAMOR_CACHE_EXPIRE_MAX;
#endif
} }
glamor_pixmap_fbo * glamor_pixmap_fbo *