[Glamor] [PATCH 06/15] glamor-fbo-pool: Implement fbo cache mechanism.
zhigang.gong at linux.intel.com
zhigang.gong at linux.intel.com
Fri Jan 20 00:52:04 PST 2012
From: Zhigang Gong <zhigang.gong at linux.intel.com>
We classify the cache according to the texture's format/width/height.
As openGL doesn't allow us to change a texture's format/width/height
after the internal texture object is already allocated, we can't
just calculate the size and then according ths size to put the
fbo to an bucket which is just like SNA does. We can only put
the fbo to the corresponding format/width/height bucket.
This commit only support the exact size match. The following patch
will remove this restriction, just need to handle the repeat/tile
case when the size is not exactly match.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
---
src/glamor.c | 66 ++++++++++++----
src/glamor.h | 12 +++
src/glamor_core.c | 33 +++++---
src/glamor_egl.c | 7 +-
src/glamor_fbo.c | 198 ++++++++++++++++++++++++++++++++++++++++++++--
src/glamor_fill.c | 26 ++++--
src/glamor_gl_dispatch.c | 1 +
src/glamor_gl_dispatch.h | 1 +
src/glamor_pixmap.c | 10 ++-
src/glamor_priv.h | 33 ++++++---
src/glamor_putimage.c | 5 +
src/glamor_render.c | 35 ++++++++-
src/glamor_tile.c | 26 ++++--
13 files changed, 384 insertions(+), 69 deletions(-)
diff --git a/src/glamor.c b/src/glamor.c
index 1a2ce88..1599b83 100644
--- a/src/glamor.c
+++ b/src/glamor.c
@@ -207,8 +207,10 @@ glamor_block_handler(ScreenPtr screen)
glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+ glamor_priv->tick++;
dispatch->glFlush();
dispatch->glFinish();
+ glamor_fbo_expire(glamor_priv);
}
static void
@@ -378,6 +380,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
ps->DestroyPicture = glamor_destroy_picture;
glamor_init_composite_shaders(screen);
#endif
+ glamor_init_pixmap_fbo(screen);
glamor_init_solid_shader(screen);
glamor_init_tile_shader(screen);
glamor_init_putimage_shaders(screen);
@@ -389,6 +392,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
#else
glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP;
#endif
+ glamor_priv->flags = flags;
return TRUE;
@@ -399,26 +403,54 @@ glamor_init(ScreenPtr screen, unsigned int flags)
return FALSE;
}
+static void
+glamor_release_screen_priv(ScreenPtr screen)
+{
+ glamor_screen_private *glamor_priv;
+
+ glamor_priv = glamor_get_screen_private(screen);
+#ifdef RENDER
+ glamor_fini_composite_shaders(screen);
+#endif
+ glamor_fini_pixmap_fbo(screen);
+ glamor_fini_solid_shader(screen);
+ glamor_fini_tile_shader(screen);
+ glamor_fini_putimage_shaders(screen);
+ glamor_fini_finish_access_shaders(screen);
+ glamor_pixmap_fini(screen);
+ free(glamor_priv);
+
+ dixSetPrivate(&screen->devPrivates, glamor_screen_private_key,
+ NULL);
+}
+
Bool
glamor_close_screen(int idx, ScreenPtr screen)
{
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(screen);
+ glamor_screen_private *glamor_priv;
+ int flags;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ flags = glamor_priv->flags;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(screen);
#endif
glamor_glyphs_fini(screen);
- screen->CloseScreen = glamor_priv->saved_procs.close_screen;
- screen->CreateGC = glamor_priv->saved_procs.create_gc;
- screen->CreatePixmap = glamor_priv->saved_procs.create_pixmap;
- screen->DestroyPixmap = glamor_priv->saved_procs.destroy_pixmap;
- screen->GetSpans = glamor_priv->saved_procs.get_spans;
- screen->ChangeWindowAttributes =
- glamor_priv->saved_procs.change_window_attributes;
- screen->CopyWindow = glamor_priv->saved_procs.copy_window;
- screen->BitmapToRegion = glamor_priv->saved_procs.bitmap_to_region;
+ if (flags & GLAMOR_USE_SCREEN) {
+
+ screen->CloseScreen = glamor_priv->saved_procs.close_screen;
+ screen->CreateGC = glamor_priv->saved_procs.create_gc;
+ screen->CreatePixmap = glamor_priv->saved_procs.create_pixmap;
+ screen->DestroyPixmap = glamor_priv->saved_procs.destroy_pixmap;
+ screen->GetSpans = glamor_priv->saved_procs.get_spans;
+ screen->ChangeWindowAttributes =
+ glamor_priv->saved_procs.change_window_attributes;
+ screen->CopyWindow = glamor_priv->saved_procs.copy_window;
+ screen->BitmapToRegion = glamor_priv->saved_procs.bitmap_to_region;
+ }
#ifdef RENDER
- if (ps) {
+ if (ps && (flags & GLAMOR_USE_PICTURE_SCREEN)) {
+
ps->Composite = glamor_priv->saved_procs.composite;
ps->Trapezoids = glamor_priv->saved_procs.trapezoids;
ps->Glyphs = glamor_priv->saved_procs.glyphs;
@@ -426,13 +458,15 @@ glamor_close_screen(int idx, ScreenPtr screen)
ps->CreatePicture = glamor_priv->saved_procs.create_picture;
}
#endif
- if (glamor_priv->vb)
- free(glamor_priv->vb);
- free(glamor_priv);
- return screen->CloseScreen(idx, screen);
+ glamor_release_screen_priv(screen);
+ if (flags & GLAMOR_USE_SCREEN)
+ return screen->CloseScreen(idx, screen);
+ else
+ return TRUE;
}
+
void
glamor_fini(ScreenPtr screen)
{
diff --git a/src/glamor.h b/src/glamor.h
index 51061f3..f693c91 100644
--- a/src/glamor.h
+++ b/src/glamor.h
@@ -103,6 +103,18 @@ typedef enum glamor_pixmap_type {
extern _X_EXPORT Bool glamor_init(ScreenPtr screen, unsigned int flags);
extern _X_EXPORT void glamor_fini(ScreenPtr screen);
+/* This function is used to free the glamor private screen's
+ * resources. If the DDX driver is not set GLAMOR_USE_SCREEN,
+ * then, DDX need to call this function at proper stage, if
+ * it is the xorg DDX driver,then it should be called at free
+ * screen stage not the close screen stage. The reason is after
+ * call to this function, the xorg DDX may need to destroy the
+ * screen pixmap which must be a glamor pixmap which need
+ * the internal data structure still exist at that time.
+ * Otherwise, the glamor internal structure will not be freed.*/
+extern _X_EXPORT Bool glamor_close_screen(int idx, ScreenPtr screen);
+
+
/* Let glamor to know the screen's fbo. The low level
* driver should already assign a tex
* to this pixmap through the set_pixmap_texture. */
diff --git a/src/glamor_core.c b/src/glamor_core.c
index f6f9e83..dfd2233 100644
--- a/src/glamor_core.c
+++ b/src/glamor_core.c
@@ -114,9 +114,8 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access)
void
glamor_init_finish_access_shaders(ScreenPtr screen)
{
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(screen);
- glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
const char *vs_source =
"attribute vec4 v_position;\n"
"attribute vec4 v_texcoord0;\n"
@@ -174,25 +173,23 @@ glamor_init_finish_access_shaders(ScreenPtr screen)
GLint fs_prog, vs_prog, avs_prog, set_alpha_prog;
GLint sampler_uniform_location;
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
glamor_priv->finish_access_prog[0] = dispatch->glCreateProgram();
glamor_priv->finish_access_prog[1] = dispatch->glCreateProgram();
- vs_prog =
- glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER,
+ vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER,
vs_source);
- fs_prog =
- glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
+ fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
fs_source);
dispatch->glAttachShader(glamor_priv->finish_access_prog[0],
vs_prog);
dispatch->glAttachShader(glamor_priv->finish_access_prog[0],
fs_prog);
- avs_prog =
- glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER,
+ avs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER,
vs_source);
- set_alpha_prog =
- glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
+ set_alpha_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
set_alpha_source);
dispatch->glAttachShader(glamor_priv->finish_access_prog[1],
avs_prog);
@@ -255,6 +252,20 @@ glamor_init_finish_access_shaders(ScreenPtr screen)
}
void
+glamor_fini_finish_access_shaders(ScreenPtr screen)
+{
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
+ dispatch->glDeleteProgram(glamor_priv->finish_access_prog[0]);
+ dispatch->glDeleteProgram(glamor_priv->finish_access_prog[1]);
+}
+
+
+
+void
glamor_finish_access(DrawablePtr drawable, glamor_access_t access_mode)
{
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
diff --git a/src/glamor_egl.c b/src/glamor_egl.c
index 1b57b46..3d581d2 100644
--- a/src/glamor_egl.c
+++ b/src/glamor_egl.c
@@ -77,7 +77,6 @@ glamor_identify(int flags)
struct glamor_egl_screen_private {
EGLDisplay display;
EGLContext context;
- EGLImageKHR root;
EGLint major, minor;
CreateScreenResourcesProcPtr CreateScreenResources;
@@ -250,10 +249,6 @@ glamor_egl_close_screen(ScreenPtr screen)
glamor_egl_get_screen_private(scrn);
glamor_fini(screen);
- eglDestroyImageKHR(glamor_egl->display, glamor_egl->root);
-
- glamor_egl->root = EGL_NO_IMAGE_KHR;
-
return TRUE;
}
@@ -402,6 +397,8 @@ glamor_egl_free_screen(int scrnIndex, int flags)
}
free(glamor_egl);
}
+
+ glamor_close_screen(scrn->scrnIndex, scrn->pScreen);
}
Bool
diff --git a/src/glamor_fbo.c b/src/glamor_fbo.c
index 068d877..cc7a14c 100644
--- a/src/glamor_fbo.c
+++ b/src/glamor_fbo.c
@@ -6,6 +6,109 @@
#include "glamor_priv.h"
+#define GLAMOR_CACHE_EXPIRE_MAX 1000
+
+#define GLAMOR_CACHE_DEFAULT 0
+#define GLAMOR_CACHE_EXACT_SIZE 1
+
+/* Loop from the tail to the head. */
+#define list_for_each_entry_reverse(pos, head, member) \
+ for (pos = __container_of((head)->prev, pos, member); \
+ &pos->member != (head); \
+ pos = __container_of(pos->member.prev, pos, member))
+
+
+#define list_for_each_entry_safe_reverse(pos, tmp, head, member) \
+ for (pos = __container_of((head)->prev, pos, member), \
+ tmp = __container_of(pos->member.prev, pos, member); \
+ &pos->member != (head); \
+ pos = tmp, tmp = __container_of(pos->member.prev, tmp, member))
+
+
+inline static int cache_wbucket(int size)
+{
+ int order = ffs(size / 256);
+ if (order > CACHE_BUCKET_WCOUNT)
+ order = CACHE_BUCKET_WCOUNT;
+ return order;
+}
+
+inline static int cache_hbucket(int size)
+{
+ int order = ffs(size / 256);
+ if (order > CACHE_BUCKET_HCOUNT)
+ order = CACHE_BUCKET_HCOUNT;
+ return order;
+}
+
+inline static int cache_format(GLenum format)
+{
+ switch (format) {
+#if 0
+ case GL_ALPHA:
+ return 1;
+#endif
+ case GL_RGBA:
+ default:
+ return 0;
+ }
+}
+
+glamor_pixmap_fbo *
+glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
+ int w, int h, GLenum format, int flag)
+{
+ struct list *cache;
+ glamor_pixmap_fbo *fbo_entry;
+ int size;
+
+ cache = &glamor_priv->fbo_cache[cache_format(format)]
+ [cache_wbucket(w)]
+ [cache_hbucket(h)];
+ if (flag != GLAMOR_CACHE_EXACT_SIZE) {
+ list_for_each_entry(fbo_entry, cache, list) {
+ if (fbo_entry->width == w && fbo_entry->height == h) {
+
+ DEBUGF("Request w %d h %d \n", w, h);
+ DEBUGF("got cache entry %p w %d h %d fbo %d tex %d\n",
+ fbo_entry, fbo_entry->width, fbo_entry->height,
+ fbo_entry->fb, fbo_entry->tex);
+ list_del(&fbo_entry->list);
+ return fbo_entry;
+ }
+ }
+ }
+ else {
+ list_for_each_entry(fbo_entry, cache, list) {
+ if (fbo_entry->width == w && fbo_entry->height == h) {
+
+ DEBUGF("Request w %d h %d \n", w, h);
+ DEBUGF("got cache entry %p w %d h %d fbo %d tex %d\n",
+ fbo_entry, fbo_entry->width, fbo_entry->height,
+ fbo_entry->fb, fbo_entry->tex);
+ list_del(&fbo_entry->list);
+ return fbo_entry;
+ }
+ }
+ }
+
+ return NULL;
+}
+
+void
+glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
+{
+ struct list *cache;
+
+ cache = &fbo->glamor_priv->fbo_cache[cache_format(fbo->format)]
+ [cache_wbucket(fbo->width)]
+ [cache_hbucket(fbo->height)];
+ DEBUGF("Put cache entry %p to cache %p w %d h %d format %x fbo %d tex %d \n", fbo, cache,
+ fbo->width, fbo->height, fbo->format, fbo->fb, fbo->tex);
+ list_add(&fbo->list, cache);
+ fbo->expire = fbo->glamor_priv->tick + GLAMOR_CACHE_EXPIRE_MAX;
+}
+
glamor_pixmap_fbo *
glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
int w, int h, int depth, GLint tex, int flag)
@@ -18,6 +121,7 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
if (fbo == NULL)
return NULL;
+ list_init(&fbo->list);
gl_iformat_for_depth(depth, &format);
fbo->tex = tex;
@@ -31,13 +135,11 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
return fbo;
}
-/* Make sure already detached from any pixmap. */
-void
-glamor_destroy_fbo(glamor_pixmap_fbo *fbo)
+static void
+glamor_purge_fbo(glamor_pixmap_fbo *fbo)
{
glamor_gl_dispatch *dispatch = &fbo->glamor_priv->dispatch;
-
- DEBUGF("Destroy fbo %p tex %d fb %d \n", fbo, fbo->tex, fbo->fb);
+ DEBUGF("Purge fbo %p tex %d fb %d \n", fbo, fbo->tex, fbo->fb);
if (fbo->fb)
dispatch->glDeleteFramebuffers(1, &fbo->fb);
if (fbo->tex)
@@ -48,6 +150,79 @@ glamor_destroy_fbo(glamor_pixmap_fbo *fbo)
free(fbo);
}
+void
+glamor_fbo_expire(glamor_screen_private *glamor_priv)
+{
+ struct 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++)
+ for(k = 0; k < CACHE_BUCKET_HCOUNT; k++) {
+ cache = &glamor_priv->fbo_cache[i][j][k];
+ 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;
+ }
+ list_del(&fbo_entry->list);
+ DEBUGF("cache %p fbo %p expired %d current %d \n", cache, fbo_entry,
+ fbo_entry->expire, glamor_priv->tick);
+ glamor_purge_fbo(fbo_entry);
+ }
+ }
+
+}
+
+void
+glamor_init_pixmap_fbo(ScreenPtr screen)
+{
+ glamor_screen_private *glamor_priv;
+ int i,j,k;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ for(i = 0; i < CACHE_FORMAT_COUNT; i++)
+ for(j = 0; j < CACHE_BUCKET_WCOUNT; j++)
+ for(k = 0; k < CACHE_BUCKET_HCOUNT; k++)
+ {
+ list_init(&glamor_priv->fbo_cache[i][j][k]);
+ }
+}
+
+void
+glamor_fini_pixmap_fbo(ScreenPtr screen)
+{
+ struct list *cache;
+ glamor_screen_private *glamor_priv;
+ glamor_pixmap_fbo *fbo_entry, *tmp;
+ int i,j,k;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ for(i = 0; i < CACHE_FORMAT_COUNT; i++)
+ for(j = 0; j < CACHE_BUCKET_WCOUNT; j++)
+ for(k = 0; k < CACHE_BUCKET_HCOUNT; k++)
+ {
+ cache = &glamor_priv->fbo_cache[i][j][k];
+ list_for_each_entry_safe_reverse(fbo_entry, tmp, cache, list) {
+ list_del(&fbo_entry->list);
+ glamor_purge_fbo(fbo_entry);
+ }
+
+ }
+}
+
+void
+glamor_destroy_fbo(glamor_pixmap_fbo *fbo)
+{
+ glamor_gl_dispatch *dispatch = &fbo->glamor_priv->dispatch;
+
+ list_del(&fbo->list);
+ glamor_pixmap_fbo_cache_put(fbo);
+
+}
+
glamor_pixmap_fbo *
glamor_create_fbo(glamor_screen_private *glamor_priv,
int w, int h, int depth, int flag)
@@ -56,8 +231,19 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
glamor_pixmap_fbo *fbo;
GLenum format;
GLint tex;
+ int cache_flag;
+
+ if (flag == GLAMOR_CREATE_PIXMAP_FIXUP)
+ cache_flag = GLAMOR_CACHE_EXACT_SIZE;
+ else
+ cache_flag = 0;
gl_iformat_for_depth(depth, &format);
+ fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h,
+ format, GLAMOR_CACHE_EXACT_SIZE);
+ if (fbo)
+ return fbo;
+
dispatch = &glamor_priv->dispatch;
dispatch->glGenTextures(1, &tex);
dispatch->glBindTexture(GL_TEXTURE_2D, tex);
@@ -69,8 +255,8 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
GL_UNSIGNED_BYTE, NULL);
fbo = glamor_create_fbo_from_tex(glamor_priv, w, h, depth, tex, flag);
- DEBUGF("Creat fbo %p tex %d width %d height %d \n", fbo, tex, w, h);
+ DEBUGF("Creat new fbo %p tex %d width %d height %d \n", fbo, tex, w, h);
return fbo;
}
diff --git a/src/glamor_fill.c b/src/glamor_fill.c
index da8097a..df97ad0 100644
--- a/src/glamor_fill.c
+++ b/src/glamor_fill.c
@@ -101,9 +101,8 @@ glamor_fill(DrawablePtr drawable,
void
glamor_init_solid_shader(ScreenPtr screen)
{
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(screen);
- glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
const char *solid_vs =
"attribute vec4 v_position;"
"void main()\n" "{\n" " gl_Position = v_position;\n"
@@ -113,12 +112,12 @@ glamor_init_solid_shader(ScreenPtr screen)
"void main()\n" "{\n" " gl_FragColor = color;\n" "}\n";
GLint fs_prog, vs_prog;
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
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);
+ 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);
@@ -131,6 +130,17 @@ glamor_init_solid_shader(ScreenPtr screen)
"color");
}
+void
+glamor_fini_solid_shader(ScreenPtr screen)
+{
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
+ dispatch->glDeleteProgram(glamor_priv->solid_prog);
+}
+
Bool
glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
unsigned char alu, unsigned long planemask,
diff --git a/src/glamor_gl_dispatch.c b/src/glamor_gl_dispatch.c
index f8516b4..493c967 100644
--- a/src/glamor_gl_dispatch.c
+++ b/src/glamor_gl_dispatch.c
@@ -61,6 +61,7 @@ glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
INIT_FUNC(dispatch, glUniform4f, get_proc_address);
INIT_FUNC(dispatch, glUniform4fv, get_proc_address);
INIT_FUNC(dispatch, glCreateProgram, get_proc_address);
+ INIT_FUNC(dispatch, glDeleteProgram, get_proc_address);
INIT_FUNC(dispatch, glCreateShader, get_proc_address);
INIT_FUNC(dispatch, glCompileShader, get_proc_address);
INIT_FUNC(dispatch, glAttachShader, get_proc_address);
diff --git a/src/glamor_gl_dispatch.h b/src/glamor_gl_dispatch.h
index a8a699b..024de26 100644
--- a/src/glamor_gl_dispatch.h
+++ b/src/glamor_gl_dispatch.h
@@ -97,6 +97,7 @@ typedef struct glamor_gl_dispatch {
void (*glUniform4fv) (GLint location, GLsizei count,
const GLfloat * value);
GLuint(*glCreateProgram) (void);
+ GLuint(*glDeleteProgram) (GLuint);
GLuint(*glCreateShader) (GLenum type);
void (*glCompileShader) (GLuint shader);
void (*glAttachShader) (GLuint program, GLuint shader);
diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c
index 5adbcef..d0b3489 100644
--- a/src/glamor_pixmap.c
+++ b/src/glamor_pixmap.c
@@ -63,12 +63,18 @@ glamor_pixmap_validate_function_t pixmap_validate_funcs[] = {
void
glamor_pixmap_init(ScreenPtr screen)
{
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(screen);
+ glamor_screen_private *glamor_priv;
+
+ glamor_priv = glamor_get_screen_private(screen);
glamor_priv->pixmap_validate_funcs = pixmap_validate_funcs;
}
void
+glamor_pixmap_fini(ScreenPtr screen)
+{
+}
+
+void
glamor_validate_pixmap(PixmapPtr pixmap)
{
glamor_pixmap_validate_function_t validate_op;
diff --git a/src/glamor_priv.h b/src/glamor_priv.h
index 1e21cb0..0b08c37 100644
--- a/src/glamor_priv.h
+++ b/src/glamor_priv.h
@@ -159,18 +159,24 @@ struct glamor_saved_procs {
UnrealizeGlyphProcPtr unrealize_glyph;
};
-#define CACHE_FORMAT_COUNT 2
-#define CACHE_BUCKET_WCOUNT 16
-#define CACHE_BUCKET_HCOUNT 16
+#define CACHE_FORMAT_COUNT 1
+#define CACHE_BUCKET_WCOUNT 4
+#define CACHE_BUCKET_HCOUNT 4
+
+#define GLAMOR_TICK_AFTER(t0, t1) \
+ (((int)(t1) - (int)(t0)) < 0)
typedef struct glamor_screen_private {
struct glamor_gl_dispatch dispatch;
int yInverted;
+ unsigned int tick;
enum glamor_gl_flavor gl_flavor;
int has_pack_invert;
int has_fbo_blit;
int max_fbo_size;
+ struct list fbo_cache[CACHE_FORMAT_COUNT][CACHE_BUCKET_WCOUNT][CACHE_BUCKET_HCOUNT];
+
/* glamor_solid */
GLint solid_prog;
GLint solid_color_uniform_location;
@@ -207,6 +213,7 @@ typedef struct glamor_screen_private {
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
int delayed_fallback_pending;
glamor_pixmap_validate_function_t *pixmap_validate_funcs;
+ int flags;
} glamor_screen_private;
typedef enum glamor_access {
@@ -246,6 +253,8 @@ typedef union _glamor_pending_op {
**/
typedef struct glamor_pixmap_fbo {
+ struct list list;
+ unsigned int expire;
unsigned char pbo_valid;
GLuint tex;
GLuint fb;
@@ -321,8 +330,6 @@ extern int glamor_debug_level;
/* glamor.c */
PixmapPtr glamor_get_drawable_pixmap(DrawablePtr drawable);
-Bool glamor_close_screen(int idx, ScreenPtr screen);
-
PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
unsigned int usage);
@@ -336,15 +343,15 @@ glamor_pixmap_fbo * glamor_create_fbo(glamor_screen_private *glamor_priv,
int w, int h, int depth, int flag);
void glamor_destroy_fbo(glamor_pixmap_fbo *fbo);
+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);
Bool glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv);
-#define GLAMOR_CACHE_GET_DEFAULT 0
-#define GLAMOR_CACHE_GET_EAXCT_SIZE 1
-#define GLAMOR_CACHE_GET_UPLOAD 2
-
-
/* glamor_copyarea.c */
RegionPtr
glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
@@ -366,6 +373,7 @@ void glamor_finish_access_window(WindowPtr window);
Bool glamor_prepare_access_gc(GCPtr gc);
void glamor_finish_access_gc(GCPtr gc);
void glamor_init_finish_access_shaders(ScreenPtr screen);
+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);
@@ -427,6 +435,7 @@ void glamor_fill_spans(DrawablePtr drawable,
int n, DDXPointPtr points, int *widths, int sorted);
void glamor_init_solid_shader(ScreenPtr screen);
+void glamor_fini_solid_shader(ScreenPtr screen);
/* glamor_getspans.c */
void
@@ -468,6 +477,7 @@ void
glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
int w, int h, int leftPad, int format, char *bits);
void glamor_init_putimage_shaders(ScreenPtr screen);
+void glamor_fini_putimage_shaders(ScreenPtr screen);
/* glamor_render.c */
void glamor_composite(CARD8 op,
@@ -484,6 +494,7 @@ void glamor_trapezoids(CARD8 op,
PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
int ntrap, xTrapezoid * traps);
void glamor_init_composite_shaders(ScreenPtr screen);
+void glamor_fini_composite_shaders(ScreenPtr screen);
void glamor_composite_glyph_rects(CARD8 op,
PicturePtr src, PicturePtr mask,
PicturePtr dst, int nrect,
@@ -501,6 +512,7 @@ Bool glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
unsigned char alu, unsigned long planemask,
int tile_x, int tile_y);
void glamor_init_tile_shader(ScreenPtr screen);
+void glamor_fini_tile_shader(ScreenPtr screen);
/* glamor_triangles.c */
void
@@ -514,6 +526,7 @@ glamor_triangles(CARD8 op,
/* glamor_pixmap.c */
void glamor_pixmap_init(ScreenPtr screen);
+void glamor_pixmap_fini(ScreenPtr screen);
/**
* Download a pixmap's texture to cpu memory. If success,
* One copy of current pixmap's texture will be put into
diff --git a/src/glamor_putimage.c b/src/glamor_putimage.c
index f285d95..26d5cf7 100644
--- a/src/glamor_putimage.c
+++ b/src/glamor_putimage.c
@@ -239,6 +239,11 @@ glamor_put_image_xybitmap(DrawablePtr drawable, GCPtr gc,
}
#endif
+void
+glamor_fini_putimage_shaders(ScreenPtr screen)
+{
+}
+
static Bool
_glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
diff --git a/src/glamor_render.c b/src/glamor_render.c
index 99b60c6..19ed22e 100644
--- a/src/glamor_render.c
+++ b/src/glamor_render.c
@@ -309,11 +309,12 @@ glamor_init_eb(unsigned short *eb, int vert_cnt)
void
glamor_init_composite_shaders(ScreenPtr screen)
{
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(screen);
- glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
unsigned short *eb;
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
dispatch->glGenBuffers(1, &glamor_priv->vbo);
dispatch->glGenBuffers(1, &glamor_priv->ebo);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo);
@@ -326,6 +327,34 @@ glamor_init_composite_shaders(ScreenPtr screen)
dispatch->glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
}
+
+
+void
+glamor_fini_composite_shaders(ScreenPtr screen)
+{
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
+ glamor_composite_shader *shader;
+ int i,j,k;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
+ dispatch->glDeleteBuffers(1, &glamor_priv->vbo);
+ dispatch->glDeleteBuffers(1, &glamor_priv->ebo);
+
+
+ for(i = 0; i < SHADER_SOURCE_COUNT; i++)
+ for(j = 0; j < SHADER_MASK_COUNT; j++)
+ for(k = 0; k < SHADER_IN_COUNT; k++)
+ {
+ shader = &glamor_priv->composite_shader[i][j][k];
+ if (shader->prog)
+ dispatch->glDeleteProgram(shader->prog);
+ }
+
+}
+
+
static Bool
glamor_set_composite_op(ScreenPtr screen,
CARD8 op, PicturePtr dest, PicturePtr mask)
diff --git a/src/glamor_tile.c b/src/glamor_tile.c
index 9dadf5e..7e0e6ac 100644
--- a/src/glamor_tile.c
+++ b/src/glamor_tile.c
@@ -39,9 +39,8 @@
void
glamor_init_tile_shader(ScreenPtr screen)
{
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(screen);
- glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
const char *tile_vs =
"attribute vec4 v_position;\n"
"attribute vec4 v_texcoord0;\n"
@@ -60,12 +59,12 @@ glamor_init_tile_shader(ScreenPtr screen)
GLint fs_prog, vs_prog;
GLint sampler_uniform_location;
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
glamor_priv->tile_prog = dispatch->glCreateProgram();
- vs_prog =
- glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, tile_vs);
- fs_prog =
- glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
- tile_fs);
+ vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, tile_vs);
+ fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
+ tile_fs);
dispatch->glAttachShader(glamor_priv->tile_prog, vs_prog);
dispatch->glAttachShader(glamor_priv->tile_prog, fs_prog);
@@ -84,6 +83,17 @@ glamor_init_tile_shader(ScreenPtr screen)
dispatch->glUseProgram(0);
}
+void
+glamor_fini_tile_shader(ScreenPtr screen)
+{
+ glamor_screen_private *glamor_priv;
+ glamor_gl_dispatch *dispatch;
+
+ glamor_priv = glamor_get_screen_private(screen);
+ dispatch = &glamor_priv->dispatch;
+ dispatch->glDeleteProgram(glamor_priv->tile_prog);
+}
+
Bool
glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
int x, int y, int width, int height,
--
1.7.4.4
More information about the Glamor
mailing list