diff options
author | Ian Romanick <idr@umwelt.(none)> | 2006-08-25 13:01:51 -0700 |
---|---|---|
committer | Ian Romanick <idr@umwelt.(none)> | 2006-08-25 13:01:51 -0700 |
commit | 2fde560bbb9c1148f26fd969dc30c4e736672b7c (patch) | |
tree | b74010a9a78bfbbfb54cd39dda02f2648c67644f | |
parent | e2d529963ed40b5f113cf82c17809d241cd4aac1 (diff) |
Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Re-generate from gl_API.xml 1.65. This provides the missing bits for
GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Enable those extensions.
-rw-r--r-- | GL/glx/glxscreens.c | 2 | ||||
-rw-r--r-- | GL/glx/indirect_dispatch.c | 8 | ||||
-rw-r--r-- | GL/glx/indirect_dispatch.h | 6 | ||||
-rw-r--r-- | GL/glx/indirect_dispatch_swap.c | 8 | ||||
-rw-r--r-- | GL/glx/indirect_size_get.c | 1 | ||||
-rw-r--r-- | GL/glx/indirect_table.c | 4 |
6 files changed, 25 insertions, 4 deletions
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 41e08aff2..43447a4e4 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -74,6 +74,7 @@ static const char GLServerExtensions[] = "GL_EXT_abgr " "GL_EXT_bgra " "GL_EXT_blend_color " + "GL_EXT_blend_equation_separate " "GL_EXT_blend_func_separate " "GL_EXT_blend_logic_op " "GL_EXT_blend_minmax " @@ -104,6 +105,7 @@ static const char GLServerExtensions[] = "GL_EXT_texture_env_add " "GL_EXT_texture_env_combine " "GL_EXT_texture_env_dot3 " + "GL_EXT_texture_filter_ansiotropic " "GL_EXT_texture_lod " "GL_EXT_texture_lod_bias " "GL_EXT_texture_mirror_clamp " diff --git a/GL/glx/indirect_dispatch.c b/GL/glx/indirect_dispatch.c index 9c2b7b12b..04bb2049e 100644 --- a/GL/glx/indirect_dispatch.c +++ b/GL/glx/indirect_dispatch.c @@ -5466,6 +5466,14 @@ void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc) ) ); } +void __glXDisp_BlendEquationSeparateEXT(GLbyte * pc) +{ + CALL_BlendEquationSeparateEXT( GET_DISPATCH(), ( + *(GLenum *)(pc + 0), + *(GLenum *)(pc + 4) + ) ); +} + void __glXDisp_BindFramebufferEXT(GLbyte * pc) { CALL_BindFramebufferEXT( GET_DISPATCH(), ( diff --git a/GL/glx/indirect_dispatch.h b/GL/glx/indirect_dispatch.h index a0da3e505..2a2fd27c6 100644 --- a/GL/glx/indirect_dispatch.h +++ b/GL/glx/indirect_dispatch.h @@ -73,6 +73,8 @@ extern HIDDEN void __glXDisp_RasterPos4dv(GLbyte * pc); extern HIDDEN void __glXDispSwap_RasterPos4dv(GLbyte * pc); extern HIDDEN void __glXDisp_PolygonStipple(GLbyte * pc); extern HIDDEN void __glXDispSwap_PolygonStipple(GLbyte * pc); +extern HIDDEN void __glXDisp_BlendEquationSeparateEXT(GLbyte * pc); +extern HIDDEN void __glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc); extern HIDDEN int __glXDisp_GetPixelMapfv(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN int __glXDispSwap_GetPixelMapfv(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN void __glXDisp_Color3uiv(GLbyte * pc); @@ -247,8 +249,6 @@ extern HIDDEN void __glXDisp_PixelMapfv(GLbyte * pc); extern HIDDEN void __glXDispSwap_PixelMapfv(GLbyte * pc); extern HIDDEN void __glXDisp_Color3usv(GLbyte * pc); extern HIDDEN void __glXDispSwap_Color3usv(GLbyte * pc); -extern HIDDEN void __glXDisp_DrawBuffersARB(GLbyte * pc); -extern HIDDEN void __glXDispSwap_DrawBuffersARB(GLbyte * pc); extern HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN int __glXDispSwap_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *); @@ -891,6 +891,8 @@ extern HIDDEN int __glXDisp_IsList(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN int __glXDispSwap_IsList(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN int __glXDisp_RenderMode(struct __GLXclientStateRec *, GLbyte *); extern HIDDEN int __glXDispSwap_RenderMode(struct __GLXclientStateRec *, GLbyte *); +extern HIDDEN void __glXDisp_DrawBuffersARB(GLbyte * pc); +extern HIDDEN void __glXDispSwap_DrawBuffersARB(GLbyte * pc); extern HIDDEN void __glXDisp_LoadName(GLbyte * pc); extern HIDDEN void __glXDispSwap_LoadName(GLbyte * pc); extern HIDDEN void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc); diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c index 06c1d0363..9a06cceb4 100644 --- a/GL/glx/indirect_dispatch_swap.c +++ b/GL/glx/indirect_dispatch_swap.c @@ -5631,6 +5631,14 @@ void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc) ) ); } +void __glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc) +{ + CALL_BlendEquationSeparateEXT( GET_DISPATCH(), ( + (GLenum )bswap_ENUM ( pc + 0 ), + (GLenum )bswap_ENUM ( pc + 4 ) + ) ); +} + void __glXDispSwap_BindFramebufferEXT(GLbyte * pc) { CALL_BindFramebufferEXT( GET_DISPATCH(), ( diff --git a/GL/glx/indirect_size_get.c b/GL/glx/indirect_size_get.c index c16b29a89..6ca9a3505 100644 --- a/GL/glx/indirect_size_get.c +++ b/GL/glx/indirect_size_get.c @@ -609,6 +609,7 @@ __glGetBooleanv_size( GLenum e ) case GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB: /* case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:*/ case GL_MAX_TEXTURE_LOD_BIAS: + case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT: case GL_MAX_SHININESS_NV: case GL_MAX_SPOT_EXPONENT_NV: case GL_TEXTURE_CUBE_MAP: diff --git a/GL/glx/indirect_table.c b/GL/glx/indirect_table.c index 8671a8475..3e294ad5e 100644 --- a/GL/glx/indirect_table.c +++ b/GL/glx/indirect_table.c @@ -703,7 +703,7 @@ static const void *Render_function_table[384][2] = { /* [ 353] = 4225 */ {NULL, NULL}, /* [ 354] = 4226 */ {NULL, NULL}, /* [ 355] = 4227 */ {NULL, NULL}, - /* [ 356] = 4228 */ {NULL, NULL}, + /* [ 356] = 4228 */ {__glXDisp_BlendEquationSeparateEXT, __glXDispSwap_BlendEquationSeparateEXT}, /* [ 357] = 4229 */ {NULL, NULL}, /* [ 358] = 4230 */ {__glXDisp_VertexAttrib4bvARB, __glXDispSwap_VertexAttrib4bvARB}, /* [ 359] = 4231 */ {__glXDisp_VertexAttrib4ivARB, __glXDispSwap_VertexAttrib4ivARB}, @@ -1090,7 +1090,7 @@ static const int_fast16_t Render_size_table[384][2] = { /* [353] = 4225 */ { 0, ~0}, /* [354] = 4226 */ { 0, ~0}, /* [355] = 4227 */ { 0, ~0}, - /* [356] = 4228 */ { 0, ~0}, + /* [356] = 4228 */ { 12, ~0}, /* [357] = 4229 */ { 0, ~0}, /* [358] = 4230 */ { 12, ~0}, /* [359] = 4231 */ { 24, ~0}, |