[Glamor] [PATCH 1/2] Add glFinish after glFlush.

zhigang.gong at linux.intel.com zhigang.gong at linux.intel.com
Tue Jan 10 01:07:21 PST 2012


From: Zhigang Gong <zhigang.gong at linux.intel.com>

Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
---
 src/glamor.c             |    1 +
 src/glamor_gl_dispatch.c |    1 +
 src/glamor_gl_dispatch.h |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/glamor.c b/src/glamor.c
index 3634e70..6ee11f7 100644
--- a/src/glamor.c
+++ b/src/glamor.c
@@ -224,6 +224,7 @@ glamor_block_handler(ScreenPtr screen)
 	glamor_gl_dispatch *dispatch = &glamor_priv->dispatch;
 
 	dispatch->glFlush();
+	dispatch->glFinish();
 }
 
 static void
diff --git a/src/glamor_gl_dispatch.c b/src/glamor_gl_dispatch.c
index 5a47b45..f8516b4 100644
--- a/src/glamor_gl_dispatch.c
+++ b/src/glamor_gl_dispatch.c
@@ -27,6 +27,7 @@ glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
 	INIT_FUNC(dispatch, glBindTexture, get_proc_address);
 	INIT_FUNC(dispatch, glTexSubImage2D, get_proc_address);
 	INIT_FUNC(dispatch, glFlush, get_proc_address);
+	INIT_FUNC(dispatch, glFinish, get_proc_address);
 	INIT_FUNC(dispatch, glGetIntegerv, get_proc_address);
 	INIT_FUNC(dispatch, glGetString, get_proc_address);
 	INIT_FUNC(dispatch, glScissor, get_proc_address);
diff --git a/src/glamor_gl_dispatch.h b/src/glamor_gl_dispatch.h
index 8fcb3dc..a8a699b 100644
--- a/src/glamor_gl_dispatch.h
+++ b/src/glamor_gl_dispatch.h
@@ -41,6 +41,7 @@ typedef struct glamor_gl_dispatch {
 				 const GLvoid * pixels);
 	/* MISC */
 	void (*glFlush) (void);
+	void (*glFinish) (void);
 	void (*glGetIntegerv) (GLenum pname, GLint * params);
 	const GLubyte *(*glGetString) (GLenum name);
 	void (*glScissor) (GLint x, GLint y, GLsizei width,
-- 
1.7.4.4



More information about the Glamor mailing list