diff options
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/x11/indirect.c | 26 | ||||
| -rw-r--r-- | src/glx/x11/indirect.h | 1 | ||||
| -rw-r--r-- | src/glx/x11/indirect_size.c | 1 | ||||
| -rw-r--r-- | src/glx/x11/indirect_size.h | 2 |
4 files changed, 16 insertions, 14 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_ ) */ |