apple: Use _glapi_create_table_from_handle to initialize our dispatch table

[mesa.git] / src / glx / singlepix.c

diff --git a/src/glx/singlepix.c b/src/glx/singlepix.c
index c4010d79bd09ee6fcb7db4c04c38ba2921cfe3f1..d8a71664d0509b112057679adbb1db7f0227f785 100644 (file)
--- a/src/glx/singlepix.c
+++ b/src/glx/singlepix.c
@@ -31,10 +31,8 @@
 #include "packsingle.h"
 #include "indirect.h"
 #include "glapitable.h"
-#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "glapioffsets.h"
 #include <GL/glxproto.h>
 
 void
@@ -110,19 +108,17 @@ __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type,
 }
 
 
-#define CONCAT(a,b) a ## b
-#define NAME(o) CONCAT(gl_dispatch_stub_, o)
-
-void NAME(_gloffset_GetSeparableFilter) (GLenum target, GLenum format,
-                                         GLenum type, GLvoid * row,
-                                         GLvoid * column, GLvoid * span)
+/* it is defined to gl_dispatch_stub_NNN in indirect.h */
+void gl_dispatch_stub_GetSeparableFilterEXT (GLenum target, GLenum format,
+                                             GLenum type, GLvoid * row,
+                                             GLvoid * column, GLvoid * span)
 {
-   __GLXcontext *const gc = __glXGetCurrentContext();
+   struct glx_context *const gc = __glXGetCurrentContext();
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
-   if (gc->driContext) {
-      CALL_GetSeparableFilter(GET_DISPATCH(),
-                              (target, format, type, row, column, span));
+   if (gc->isDirect) {
+      GET_DISPATCH()->GetSeparableFilter(target, format, type,
+                                         row, column, span);
       return;
    }
    else