diff options
Diffstat (limited to 'xorg-server/glx/indirect_dispatch.c')
| -rw-r--r-- | xorg-server/glx/indirect_dispatch.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c index b720a4bfc..5c325d25e 100644 --- a/xorg-server/glx/indirect_dispatch.c +++ b/xorg-server/glx/indirect_dispatch.c @@ -25,6 +25,14 @@ * SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#else + +#include "glheader.h" + +#endif + #include <X11/Xmd.h> #include <GL/gl.h> #include <GL/glxproto.h> @@ -98,8 +106,6 @@ void __glXDisp_CallLists(GLbyte * pc) const GLenum type = *(GLenum *)(pc + 4); const GLvoid * lists = (const GLvoid *)(pc + 8); - lists = (const GLvoid *) (pc + 8); - CALL_CallLists( GET_DISPATCH(), ( n, type, @@ -160,7 +166,7 @@ void __glXDisp_Begin(GLbyte * pc) void __glXDisp_Bitmap(GLbyte * pc) { - const GLubyte * const bitmap = (const GLubyte *) ((pc + 44)); + const GLubyte * const bitmap = (const GLubyte *) (pc + 44); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); @@ -1037,7 +1043,7 @@ void __glXDisp_PolygonMode(GLbyte * pc) void __glXDisp_PolygonStipple(GLbyte * pc) { - const GLubyte * const mask = (const GLubyte *) ((pc + 20)); + const GLubyte * const mask = (const GLubyte *) (pc + 20); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); @@ -1116,7 +1122,7 @@ void __glXDisp_TexParameteriv(GLbyte * pc) void __glXDisp_TexImage1D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) ((pc + 52)); + const GLvoid * const pixels = (const GLvoid *) (pc + 52); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -1140,7 +1146,7 @@ void __glXDisp_TexImage1D(GLbyte * pc) void __glXDisp_TexImage2D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) ((pc + 52)); + const GLvoid * const pixels = (const GLvoid *) (pc + 52); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -1746,7 +1752,7 @@ void __glXDisp_CopyPixels(GLbyte * pc) void __glXDisp_DrawPixels(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) ((pc + 36)); + const GLvoid * const pixels = (const GLvoid *) (pc + 36); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -2972,7 +2978,7 @@ void __glXDisp_PrioritizeTextures(GLbyte * pc) void __glXDisp_TexSubImage1D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) ((pc + 56)); + const GLvoid * const pixels = (const GLvoid *) (pc + 56); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -2995,7 +3001,7 @@ void __glXDisp_TexSubImage1D(GLbyte * pc) void __glXDisp_TexSubImage2D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) ((pc + 56)); + const GLvoid * const pixels = (const GLvoid *) (pc + 56); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3037,7 +3043,7 @@ void __glXDisp_BlendEquation(GLbyte * pc) void __glXDisp_ColorTable(GLbyte * pc) { - const GLvoid * const table = (const GLvoid *) ((pc + 40)); + const GLvoid * const table = (const GLvoid *) (pc + 40); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3214,7 +3220,7 @@ int __glXDisp_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc) void __glXDisp_ColorSubTable(GLbyte * pc) { - const GLvoid * const data = (const GLvoid *) ((pc + 40)); + const GLvoid * const data = (const GLvoid *) (pc + 40); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3247,7 +3253,7 @@ void __glXDisp_CopyColorSubTable(GLbyte * pc) void __glXDisp_ConvolutionFilter1D(GLbyte * pc) { - const GLvoid * const image = (const GLvoid *) ((pc + 44)); + const GLvoid * const image = (const GLvoid *) (pc + 44); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3269,7 +3275,7 @@ void __glXDisp_ConvolutionFilter1D(GLbyte * pc) void __glXDisp_ConvolutionFilter2D(GLbyte * pc) { - const GLvoid * const image = (const GLvoid *) ((pc + 44)); + const GLvoid * const image = (const GLvoid *) (pc + 44); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3771,7 +3777,7 @@ void __glXDisp_TexImage3D(GLbyte * pc) void __glXDisp_TexSubImage3D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) ((pc + 88)); + const GLvoid * const pixels = (const GLvoid *) (pc + 88); __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); |