xserver: Branch 'master'
Kristian Høgsberg
krh at kemper.freedesktop.org
Fri Nov 9 09:52:28 PST 2007
GL/glx/indirect_dispatch.c | 25 -------------------------
GL/glx/indirect_dispatch.h | 4 ----
GL/glx/indirect_dispatch_swap.c | 25 -------------------------
GL/glx/indirect_size_get.c | 4 ++++
GL/glx/indirect_table.c | 2 +-
5 files changed, 5 insertions(+), 55 deletions(-)
New commits:
commit f48087b6c33c1f84bf2cfc0744b1c38697321c07
Author: Kristian Høgsberg <krh at temari.boston.redhat.com>
Date: Fri Nov 9 05:49:26 2007 -0500
Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).
diff --git a/GL/glx/indirect_dispatch.c b/GL/glx/indirect_dispatch.c
index 00a9f96..2afd3eb 100644
--- a/GL/glx/indirect_dispatch.c
+++ b/GL/glx/indirect_dispatch.c
@@ -5169,31 +5169,6 @@ void __glXDisp_LoadProgramNV(GLbyte * pc)
) );
}
-void __glXDisp_ProgramParameter4dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
- if ((unsigned long)(pc) & 7) {
- (void) memmove(pc-4, pc, 40);
- pc -= 4;
- }
-#endif
-
- CALL_ProgramParameter4dvNV( GET_DISPATCH(), (
- *(GLenum *)(pc + 0),
- *(GLuint *)(pc + 4),
- (const GLdouble *)(pc + 8)
- ) );
-}
-
-void __glXDisp_ProgramParameter4fvNV(GLbyte * pc)
-{
- CALL_ProgramParameter4fvNV( GET_DISPATCH(), (
- *(GLenum *)(pc + 0),
- *(GLuint *)(pc + 4),
- (const GLfloat *)(pc + 8)
- ) );
-}
-
void __glXDisp_ProgramParameters4dvNV(GLbyte * pc)
{
const GLuint num = *(GLuint *)(pc + 8);
diff --git a/GL/glx/indirect_dispatch.h b/GL/glx/indirect_dispatch.h
index bb39638..e81c382 100644
--- a/GL/glx/indirect_dispatch.h
+++ b/GL/glx/indirect_dispatch.h
@@ -149,8 +149,6 @@ extern HIDDEN int __glXDisp_GetProgramNamedParameterfvNV(struct __GLXclientState
extern HIDDEN int __glXDispSwap_GetProgramNamedParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
extern HIDDEN void __glXDisp_PointParameterfEXT(GLbyte * pc);
extern HIDDEN void __glXDispSwap_PointParameterfEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramParameter4dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramParameter4dvNV(GLbyte * pc);
extern HIDDEN void __glXDisp_TexCoord2sv(GLbyte * pc);
extern HIDDEN void __glXDispSwap_TexCoord2sv(GLbyte * pc);
extern HIDDEN void __glXDisp_Vertex4dv(GLbyte * pc);
@@ -425,8 +423,6 @@ extern HIDDEN void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc);
extern HIDDEN void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc);
extern HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
extern HIDDEN int __glXDispSwap_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ProgramParameter4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramParameter4fvNV(GLbyte * pc);
extern HIDDEN void __glXDisp_RasterPos2sv(GLbyte * pc);
extern HIDDEN void __glXDispSwap_RasterPos2sv(GLbyte * pc);
extern HIDDEN void __glXDisp_Color4ubv(GLbyte * pc);
diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index c0bb71c..f137cbe 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/GL/glx/indirect_dispatch_swap.c
@@ -5325,31 +5325,6 @@ void __glXDispSwap_LoadProgramNV(GLbyte * pc)
) );
}
-void __glXDispSwap_ProgramParameter4dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
- if ((unsigned long)(pc) & 7) {
- (void) memmove(pc-4, pc, 40);
- pc -= 4;
- }
-#endif
-
- CALL_ProgramParameter4dvNV( GET_DISPATCH(), (
- (GLenum )bswap_ENUM ( pc + 0 ),
- (GLuint )bswap_CARD32 ( pc + 4 ),
- (const GLdouble *)bswap_64_array( (uint64_t *) (pc + 8), 4 )
- ) );
-}
-
-void __glXDispSwap_ProgramParameter4fvNV(GLbyte * pc)
-{
- CALL_ProgramParameter4fvNV( GET_DISPATCH(), (
- (GLenum )bswap_ENUM ( pc + 0 ),
- (GLuint )bswap_CARD32 ( pc + 4 ),
- (const GLfloat *)bswap_32_array( (uint32_t *) (pc + 8), 4 )
- ) );
-}
-
void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
{
const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 );
diff --git a/GL/glx/indirect_size_get.c b/GL/glx/indirect_size_get.c
index 9285714..f64fb7e 100644
--- a/GL/glx/indirect_size_get.c
+++ b/GL/glx/indirect_size_get.c
@@ -652,6 +652,10 @@ __glGetBooleanv_size(GLenum e)
case GL_WEIGHT_ARRAY_SIZE_ARB:
case GL_WEIGHT_ARRAY_ARB:
case GL_PACK_INVERT_MESA:
+ case GL_STENCIL_BACK_FUNC_ATI:
+ case GL_STENCIL_BACK_FAIL_ATI:
+ case GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI:
+ case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:
case GL_FRAGMENT_PROGRAM_ARB:
case GL_MAX_DRAW_BUFFERS_ARB:
/* case GL_MAX_DRAW_BUFFERS_ATI:*/
diff --git a/GL/glx/indirect_table.c b/GL/glx/indirect_table.c
index 3da1f43..cb32026 100644
--- a/GL/glx/indirect_table.c
+++ b/GL/glx/indirect_table.c
@@ -644,7 +644,7 @@ static const void *Render_function_table[400][2] = {
/* [ 301] = 4181 */ {__glXDisp_ExecuteProgramNV, __glXDispSwap_ExecuteProgramNV},
/* [ 302] = 4182 */ {__glXDisp_RequestResidentProgramsNV, __glXDispSwap_RequestResidentProgramsNV},
/* [ 303] = 4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
- /* [ 304] = 4184 */ {__glXDisp_ProgramParameter4fvNV, __glXDispSwap_ProgramParameter4fvNV},
+ /* [ 304] = 4184 */ {__glXDisp_ProgramEnvParameter4fvARB, __glXDispSwap_ProgramEnvParameter4fvARB},
/* [ 305] = 4185 */ {__glXDisp_ProgramEnvParameter4dvARB, __glXDispSwap_ProgramEnvParameter4dvARB},
/* [ 306] = 4186 */ {__glXDisp_ProgramParameters4fvNV, __glXDispSwap_ProgramParameters4fvNV},
/* [ 307] = 4187 */ {__glXDisp_ProgramParameters4dvNV, __glXDispSwap_ProgramParameters4dvNV},
More information about the xorg-commit
mailing list