[Glamor] [PATCH 11/15] glamor_gl_dispatch: fix the dispatch initialization on GLES2.

[zhigang.gong at linux.intel.com]

From: Peng Li <peng.li at intel.com>

Some gles2 implementation doesn's support get_proc_address.
And we also need to avoid get those missing functions pointers
when we are GLES2.

Signed-off-by: Peng Li <peng.li at intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
---
 src/glamor_gl_dispatch.c |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/glamor_gl_dispatch.c b/src/glamor_gl_dispatch.c
index 493c967..da66380 100644
--- a/src/glamor_gl_dispatch.c
+++ b/src/glamor_gl_dispatch.c
@@ -1,24 +1,36 @@
 #include "glamor_priv.h"
+#include <dlfcn.h>
 
 #define INIT_FUNC(dst,func_name,get)			\
   dst->func_name = get(#func_name);			\
-  if (dst->func_name == NULL)				\
-    { ErrorF("Failed to get function %s", #func_name);	\
-	goto fail; }
+  if (dst->func_name == NULL) {				\
+    dst->func_name = (void *)dlsym(NULL, #func_name);	\
+    if (dst->func_name == NULL) {			\
+      ErrorF("Failed to get function %s\n", #func_name);\
+      goto fail;					\
+    }							\
+  }							\
 
 _X_EXPORT Bool
 glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
 			     int gl_version,
 			     void *(*get_proc_address) (const char *))
 {
+#ifndef GLAMOR_GLES2
 	INIT_FUNC(dispatch, glMatrixMode, get_proc_address);
 	INIT_FUNC(dispatch, glLoadIdentity, get_proc_address);
-	INIT_FUNC(dispatch, glViewport, get_proc_address);
 	INIT_FUNC(dispatch, glRasterPos2i, get_proc_address);
+	INIT_FUNC(dispatch, glDrawPixels, get_proc_address);
+	INIT_FUNC(dispatch, glLogicOp, get_proc_address);
+	INIT_FUNC(dispatch, glMapBuffer, get_proc_address);
+	INIT_FUNC(dispatch, glMapBufferRange, get_proc_address);
+	INIT_FUNC(dispatch, glUnmapBuffer, get_proc_address);
+	INIT_FUNC(dispatch, glBlitFramebuffer, get_proc_address);
+#endif
+	INIT_FUNC(dispatch, glViewport, get_proc_address);
 	INIT_FUNC(dispatch, glDrawArrays, get_proc_address);
 	INIT_FUNC(dispatch, glDrawElements, get_proc_address);
 	INIT_FUNC(dispatch, glReadPixels, get_proc_address);
-	INIT_FUNC(dispatch, glDrawPixels, get_proc_address);
 	INIT_FUNC(dispatch, glPixelStorei, get_proc_address);
 	INIT_FUNC(dispatch, glTexParameteri, get_proc_address);
 	INIT_FUNC(dispatch, glTexImage2D, get_proc_address);
@@ -34,13 +46,9 @@ glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
 	INIT_FUNC(dispatch, glEnable, get_proc_address);
 	INIT_FUNC(dispatch, glDisable, get_proc_address);
 	INIT_FUNC(dispatch, glBlendFunc, get_proc_address);
-	INIT_FUNC(dispatch, glLogicOp, get_proc_address);
 	INIT_FUNC(dispatch, glActiveTexture, get_proc_address);
 	INIT_FUNC(dispatch, glGenBuffers, get_proc_address);
 	INIT_FUNC(dispatch, glBufferData, get_proc_address);
-	INIT_FUNC(dispatch, glMapBuffer, get_proc_address);
-	INIT_FUNC(dispatch, glMapBufferRange, get_proc_address);
-	INIT_FUNC(dispatch, glUnmapBuffer, get_proc_address);
 	INIT_FUNC(dispatch, glBindBuffer, get_proc_address);
 	INIT_FUNC(dispatch, glDeleteBuffers, get_proc_address);
 	INIT_FUNC(dispatch, glFramebufferTexture2D, get_proc_address);
@@ -48,7 +56,6 @@ glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
 	INIT_FUNC(dispatch, glDeleteFramebuffers, get_proc_address);
 	INIT_FUNC(dispatch, glGenFramebuffers, get_proc_address);
 	INIT_FUNC(dispatch, glCheckFramebufferStatus, get_proc_address);
-	INIT_FUNC(dispatch, glBlitFramebuffer, get_proc_address);
 	INIT_FUNC(dispatch, glVertexAttribPointer, get_proc_address);
 	INIT_FUNC(dispatch, glDisableVertexAttribArray, get_proc_address);
 	INIT_FUNC(dispatch, glEnableVertexAttribArray, get_proc_address);
-- 
1.7.4.4