[Glamor] [PATCH] glamor: differentiate GL and GLES function in dispatch table

[Li Peng]

The glamor gl dispatch table is mixed with GL and GLES functions.
if user want to build glamor with option "--enable-glamor-gles2",
glamor has to tell the difference, otherwise we will get a trouble.

Also try dlsym to get function pointers in the dispatch table, if
eglGetProcAddress() fails to return a valid value.

Signed-off-by: Li Peng <peng.li at intel.com>
---
 src/glamor_gl_dispatch.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/glamor_gl_dispatch.c b/src/glamor_gl_dispatch.c
index f8516b4..a5c9749 100644
--- a/src/glamor_gl_dispatch.c
+++ b/src/glamor_gl_dispatch.c
@@ -1,24 +1,37 @@
 #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; }
+    {							\
+      dst->func_name = (void *)dlsym(NULL, #func_name);	\
+      if (dst->func_name == NULL)				\
+	{							\
+	  ErrorF("Failed to get function %s", #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);
+#endif
 	INIT_FUNC(dispatch, glViewport, get_proc_address);
+#ifndef GLAMOR_GLES2
 	INIT_FUNC(dispatch, glRasterPos2i, get_proc_address);
+#endif
 	INIT_FUNC(dispatch, glDrawArrays, get_proc_address);
 	INIT_FUNC(dispatch, glDrawElements, get_proc_address);
 	INIT_FUNC(dispatch, glReadPixels, get_proc_address);
+#ifndef GLAMOR_GLES2
 	INIT_FUNC(dispatch, glDrawPixels, get_proc_address);
+#endif
 	INIT_FUNC(dispatch, glPixelStorei, get_proc_address);
 	INIT_FUNC(dispatch, glTexParameteri, get_proc_address);
 	INIT_FUNC(dispatch, glTexImage2D, get_proc_address);
@@ -34,13 +47,17 @@ 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);
+#ifndef GLAMOR_GLES2
 	INIT_FUNC(dispatch, glLogicOp, get_proc_address);
+#endif
 	INIT_FUNC(dispatch, glActiveTexture, get_proc_address);
 	INIT_FUNC(dispatch, glGenBuffers, get_proc_address);
 	INIT_FUNC(dispatch, glBufferData, get_proc_address);
+#ifndef GLAMOR_GLES2
 	INIT_FUNC(dispatch, glMapBuffer, get_proc_address);
 	INIT_FUNC(dispatch, glMapBufferRange, get_proc_address);
 	INIT_FUNC(dispatch, glUnmapBuffer, get_proc_address);
+#endif
 	INIT_FUNC(dispatch, glBindBuffer, get_proc_address);
 	INIT_FUNC(dispatch, glDeleteBuffers, get_proc_address);
 	INIT_FUNC(dispatch, glFramebufferTexture2D, get_proc_address);
@@ -48,7 +65,9 @@ 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);
+#ifndef GLAMOR_GLES2
 	INIT_FUNC(dispatch, glBlitFramebuffer, get_proc_address);
+#endif
 	INIT_FUNC(dispatch, glVertexAttribPointer, get_proc_address);
 	INIT_FUNC(dispatch, glDisableVertexAttribArray, get_proc_address);
 	INIT_FUNC(dispatch, glEnableVertexAttribArray, get_proc_address);
-- 
1.7.2.2