summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2005-02-05 00:59:57 +0000
committerIan Romanick <[email protected]>2005-02-05 00:59:57 +0000
commita02b83115a865a58d3f0d118a6b3ad2922a0ab75 (patch)
tree97c5fffcbe01ddb936f57afa99b5813bbd64ed37
parent0a755ade51be419488ba621d843de939749ad76c (diff)
Fix some mixed spaces / tabs issues in generated code. Commit generated
files that have been trivially changed by other recent commits.
-rw-r--r--src/glx/x11/indirect.c26
-rw-r--r--src/glx/x11/indirect.h1
-rw-r--r--src/glx/x11/indirect_size.c1
-rw-r--r--src/glx/x11/indirect_size.h2
-rw-r--r--src/mesa/glapi/glX_proto_send.py26
5 files changed, 29 insertions, 27 deletions
diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index d2189090991..dd9a2f75ca8 100644
--- 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 cb14dbc75e8..a25079090c6 100644
--- 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 c21e1ee086f..ae6939bc12e 100644
--- 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 2001c56c4ed..ba7fc35b24b 100644
--- 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 6ee93a5c1e6..334caf82527 100644
--- 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;