diff options
Diffstat (limited to 'xorg-server/glx/indirect_dispatch.c')
-rw-r--r-- | xorg-server/glx/indirect_dispatch.c | 76 |
1 files changed, 62 insertions, 14 deletions
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c index ecd2bc8de..b720a4bfc 100644 --- a/xorg-server/glx/indirect_dispatch.c +++ b/xorg-server/glx/indirect_dispatch.c @@ -98,6 +98,8 @@ 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, @@ -158,7 +160,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) ); @@ -1035,7 +1037,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) ); @@ -1114,7 +1116,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) ); @@ -1138,7 +1140,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) ); @@ -1744,7 +1746,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) ); @@ -2970,7 +2972,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) ); @@ -2993,7 +2995,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) ); @@ -3035,7 +3037,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) ); @@ -3212,7 +3214,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) ); @@ -3245,7 +3247,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) ); @@ -3267,7 +3269,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) ); @@ -3769,7 +3771,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) ); @@ -4729,6 +4731,25 @@ void __glXDisp_DrawBuffersARB(GLbyte * pc) ) ); } +void __glXDisp_ClampColorARB(GLbyte * pc) +{ + CALL_ClampColorARB( GET_DISPATCH(), ( + *(GLenum *)(pc + 0), + *(GLenum *)(pc + 4) + ) ); +} + +void __glXDisp_RenderbufferStorageMultisample(GLbyte * pc) +{ + CALL_RenderbufferStorageMultisample( GET_DISPATCH(), ( + *(GLenum *)(pc + 0), + *(GLsizei *)(pc + 4), + *(GLenum *)(pc + 8), + *(GLsizei *)(pc + 12), + *(GLsizei *)(pc + 16) + ) ); +} + void __glXDisp_SampleMaskSGIS(GLbyte * pc) { CALL_SampleMaskSGIS( GET_DISPATCH(), ( @@ -5166,7 +5187,7 @@ void __glXDisp_LoadProgramNV(GLbyte * pc) void __glXDisp_ProgramParameters4dvNV(GLbyte * pc) { - const GLuint num = *(GLuint *)(pc + 8); + const GLsizei num = *(GLsizei *)(pc + 8); #ifdef __GLX_ALIGN64 const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; @@ -5186,7 +5207,7 @@ void __glXDisp_ProgramParameters4dvNV(GLbyte * pc) void __glXDisp_ProgramParameters4fvNV(GLbyte * pc) { - const GLuint num = *(GLuint *)(pc + 8); + const GLsizei num = *(GLsizei *)(pc + 8); CALL_ProgramParameters4fvNV( GET_DISPATCH(), ( *(GLenum *)(pc + 0), @@ -5882,3 +5903,30 @@ void __glXDisp_RenderbufferStorageEXT(GLbyte * pc) ) ); } +void __glXDisp_BlitFramebufferEXT(GLbyte * pc) +{ + CALL_BlitFramebufferEXT( GET_DISPATCH(), ( + *(GLint *)(pc + 0), + *(GLint *)(pc + 4), + *(GLint *)(pc + 8), + *(GLint *)(pc + 12), + *(GLint *)(pc + 16), + *(GLint *)(pc + 20), + *(GLint *)(pc + 24), + *(GLint *)(pc + 28), + *(GLbitfield *)(pc + 32), + *(GLenum *)(pc + 36) + ) ); +} + +void __glXDisp_FramebufferTextureLayerEXT(GLbyte * pc) +{ + CALL_FramebufferTextureLayerEXT( GET_DISPATCH(), ( + *(GLenum *)(pc + 0), + *(GLenum *)(pc + 4), + *(GLuint *)(pc + 8), + *(GLint *)(pc + 12), + *(GLint *)(pc + 16) + ) ); +} + |