Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined

DO NOT HAND-EDIT GLX PROTOCOL FILES.  Seriously.  How can you miss the giant
comment at the top of the file?

2 files changed, 143 insertions, 1 deletions

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index 08d52aeea3..b7459821e5 100644
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -5200,7 +5200,13 @@ glDeleteTexturesEXT(GLsizei n, const GLuint * textures)
 
     if (gc->driContext) {
         CALL_DeleteTextures(GET_DISPATCH(), (n, textures));
+<<<<<<< HEAD:src/glx/x11/indirect.c
     } else {
+=======
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
@@ -5266,9 +5272,18 @@ glGenTexturesEXT(GLsizei n, GLuint * textures)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GenTextures(GET_DISPATCH(), (n, textures));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 4;
@@ -5328,9 +5343,18 @@ glIsTextureEXT(GLuint texture)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         return CALL_IsTexture(GET_DISPATCH(), (texture));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        return CALL_IsTexture(GET_DISPATCH(), (texture));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         GLboolean retval = (GLboolean) 0;
@@ -5641,9 +5665,18 @@ glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid * table)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetColorTable(GET_DISPATCH(), (target, format, type, table));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetColorTable(GET_DISPATCH(), (target, format, type, table));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -5714,10 +5747,20 @@ glGetColorTableParameterfvEXT(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetColorTableParameterfv(GET_DISPATCH(),
                                       (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetColorTableParameterfv(GET_DISPATCH(),
+                                      (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -5784,10 +5827,20 @@ glGetColorTableParameterivEXT(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetColorTableParameteriv(GET_DISPATCH(),
                                       (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetColorTableParameteriv(GET_DISPATCH(),
+                                      (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6107,10 +6160,20 @@ gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type,
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetConvolutionFilter(GET_DISPATCH(),
                                   (target, format, type, image));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetConvolutionFilter(GET_DISPATCH(),
+                                  (target, format, type, image));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -6182,10 +6245,20 @@ gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetConvolutionParameterfv(GET_DISPATCH(),
                                        (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetConvolutionParameterfv(GET_DISPATCH(),
+                                       (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6252,10 +6325,20 @@ gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetConvolutionParameteriv(GET_DISPATCH(),
                                        (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetConvolutionParameteriv(GET_DISPATCH(),
+                                       (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6329,10 +6412,20 @@ gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format,
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetHistogram(GET_DISPATCH(),
                           (target, reset, format, type, values));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetHistogram(GET_DISPATCH(),
+                          (target, reset, format, type, values));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -6403,9 +6496,18 @@ gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetHistogramParameterfv(GET_DISPATCH(), (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetHistogramParameterfv(GET_DISPATCH(), (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6471,9 +6573,18 @@ gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetHistogramParameteriv(GET_DISPATCH(), (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetHistogramParameteriv(GET_DISPATCH(), (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6543,9 +6654,18 @@ gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format,
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, values));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, values));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -6614,9 +6734,18 @@ gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetMinmaxParameterfv(GET_DISPATCH(), (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetMinmaxParameterfv(GET_DISPATCH(), (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6679,9 +6808,18 @@ gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
+<<<<<<< HEAD:src/glx/x11/indirect.c
     if (gc->driContext) {
         CALL_GetMinmaxParameteriv(GET_DISPATCH(), (target, pname, params));
     } else {
+=======
+#ifdef GLX_DIRECT_RENDERING
+    if (gc->driContext) {
+        CALL_GetMinmaxParameteriv(GET_DISPATCH(), (target, pname, params));
+    } else
+#endif
+    {
+>>>>>>> ee2bc53... Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined:src/glx/x11/indirect.c
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
diff --git a/src/mesa/glapi/glX_proto_send.py b/src/mesa/glapi/glX_proto_send.py
index 501706acc7..daca1b767a 100644
--- a/src/mesa/glapi/glX_proto_send.py
+++ b/src/mesa/glapi/glX_proto_send.py
@@ -373,9 +373,13 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 };
 				print '{'
 				print '    __GLXcontext * const gc = __glXGetCurrentContext();'
 				print ''
+				print '#ifdef GLX_DIRECT_RENDERING'
 				print '    if (gc->driContext) {'
 				print '    %sCALL_%s(GET_DISPATCH(), (%s));' % (ret_string, func.name, func.get_called_parameter_string())
-				print '    } else {'
+				print '    } else'
+				print '#endif'
+				print '    {'
+
 				footer = '}\n}\n'
 			else:
 				print '#define %s %d' % (func.opcode_name(), func.opcode_value())