Fix some mixed spaces / tabs issues in generated code. Commit generated

files that have been trivially changed by other recent commits.

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index d2189090991067c38b5f18e53f619ebc7d8f2ae5..dd9a2f75ca861eae74dd0b57d7d9579bb1b32ba4 100644 (file)
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -64,19 +64,19 @@ read_reply( Display *dpy, size_t size, void * dest, GLboolean reply_is_always_ar
     
     (void) _XReply(dpy, (xReply *) & reply, 0, False);
     if (size != 0) {
-       if ((reply.length > 0) || reply_is_always_array) {
-           const GLint bytes = (reply_is_always_array) 
-             ? (4 * reply.length) : (reply.size * size);
-           const GLint extra = 4 - (bytes & 3);
-
-           _XRead(dpy, dest, bytes);
-           if ( extra < 4 ) {
-               _XEatData(dpy, extra);
-           }
-       }
-       else {
-           (void) memcpy( dest, &(reply.pad3), size);
-       }
+        if ((reply.length > 0) || reply_is_always_array) {
+            const GLint bytes = (reply_is_always_array) 
+              ? (4 * reply.length) : (reply.size * size);
+            const GLint extra = 4 - (bytes & 3);
+
+            _XRead(dpy, dest, bytes);
+            if ( extra < 4 ) {
+                _XEatData(dpy, extra);
+            }
+        }
+        else {
+            (void) memcpy( dest, &(reply.pad3), size);
+        }
     }
 
     return reply.retval;

diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h
index cb14dbc75e88c258c768733bafad55435fbd24ff..a25079090c6dcada801f8e21acc88a4c0cfc3eaf 100644 (file)
--- a/src/glx/x11/indirect.h
+++ b/src/glx/x11/indirect.h
@@ -519,6 +519,7 @@ extern HIDDEN void __indirect_glPointParameterivNV(GLenum pname, const GLint * p
 extern HIDDEN void __indirect_glMultiDrawArraysEXT(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount);
 extern HIDDEN void __indirect_glMultiDrawElementsEXT(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount);
 extern HIDDEN void __indirect_glActiveStencilFaceEXT(GLenum face);
+
 #  undef HIDDEN
 
 #endif /* !defined( _INDIRECT_H_ ) */

diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index c21e1ee086f8447a6c84916865b487c88c49a538..ae6939bc12eaf56d59b230d3bb23dbf2a69d5474 100644 (file)
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -132,6 +132,7 @@ __glLightModelfv_size( GLenum e )
         case GL_LIGHT_MODEL_LOCAL_VIEWER:
         case GL_LIGHT_MODEL_TWO_SIDE:
         case GL_LIGHT_MODEL_COLOR_CONTROL:
+/*      case GL_LIGHT_MODEL_COLOR_CONTROL_EXT:*/
             return 1;
         case GL_LIGHT_MODEL_AMBIENT:
             return 4;

diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h
index 2001c56c4ed638dc3adeea4253e73b5ac41ce7b2..ba7fc35b24baa0ef758c3bfb61e0b40942073f81 100644 (file)
--- a/src/glx/x11/indirect_size.h
+++ b/src/glx/x11/indirect_size.h
@@ -81,8 +81,8 @@ extern INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
 
-#  undef INTERNAL
 #  undef PURE
 #  undef FASTCALL
+#  undef INTERNAL
 
 #endif /* !defined( _INDIRECT_SIZE_H_ ) */

diff --git a/src/mesa/glapi/glX_proto_send.py b/src/mesa/glapi/glX_proto_send.py
index 6ee93a5c1e641726b69406aa433cfee3d7ae7c22..334caf825273c271297a9e3ae61c04f0b34d66bd 100644 (file)
--- a/src/mesa/glapi/glX_proto_send.py
+++ b/src/mesa/glapi/glX_proto_send.py
@@ -148,19 +148,19 @@ read_reply( Display *dpy, size_t size, void * dest, GLboolean reply_is_always_ar
     
     (void) _XReply(dpy, (xReply *) & reply, 0, False);
     if (size != 0) {
-       if ((reply.length > 0) || reply_is_always_array) {
-           const GLint bytes = (reply_is_always_array) 
-             ? (4 * reply.length) : (reply.size * size);
-           const GLint extra = 4 - (bytes & 3);
-
-           _XRead(dpy, dest, bytes);
-           if ( extra < 4 ) {
-               _XEatData(dpy, extra);
-           }
-       }
-       else {
-           (void) memcpy( dest, &(reply.pad3), size);
-       }
+        if ((reply.length > 0) || reply_is_always_array) {
+            const GLint bytes = (reply_is_always_array) 
+              ? (4 * reply.length) : (reply.size * size);
+            const GLint extra = 4 - (bytes & 3);
+
+            _XRead(dpy, dest, bytes);
+            if ( extra < 4 ) {
+                _XEatData(dpy, extra);
+            }
+        }
+        else {
+            (void) memcpy( dest, &(reply.pad3), size);
+        }
     }
 
     return reply.retval;