diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'mesalib')
117 files changed, 3349 insertions, 3167 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 55a9fa712..9a3fde185 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -30,7 +30,7 @@ AC_SUBST([OSMESA_VERSION]) dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24 -LIBDRM_RADEON_REQUIRED=2.4.39 +LIBDRM_RADEON_REQUIRED=2.4.40 LIBDRM_INTEL_REQUIRED=2.4.38 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED=2.4.33 diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 4f44764c2..28f6ae603 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -34,8 +34,7 @@ sRGB framebuffer format (GL_EXT_framebuffer_sRGB) DONE (i965, r600) glClearBuffer commands DONE glGetStringi command DONE glTexParameterI, glGetTexParameterI commands DONE -glVertexAttribI commands ~50% done (converts int - values to floats) +glVertexAttribI commands DONE Depth format cube textures DONE GLX_ARB_create_context (GLX 1.4 is required) DONE diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index bba3f0179..e9496a8d5 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -529,7 +529,7 @@ def generate(env): env.PkgCheckModules('XF86VIDMODE', ['xxf86vm']) env.PkgCheckModules('DRM', ['libdrm >= 2.4.24']) env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30']) - env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.31']) + env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.40']) env.PkgCheckModules('XORG', ['xorg-server >= 1.6.0']) env.PkgCheckModules('KMS', ['libkms >= 2.4.24']) env.PkgCheckModules('UDEV', ['libudev > 150']) diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index bb784d6b3..d10ce231c 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c @@ -1609,7 +1609,8 @@ void util_blitter_custom_depth_stencil(struct blitter_context *blitter, blitter_disable_render_cond(ctx); /* bind states */ - pipe->bind_blend_state(pipe, ctx->blend[PIPE_MASK_RGBA]); + pipe->bind_blend_state(pipe, cbsurf ? ctx->blend[PIPE_MASK_RGBA] : + ctx->blend[0]); pipe->bind_depth_stencil_alpha_state(pipe, dsa_stage); ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 0, FALSE)); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); diff --git a/mesalib/src/gallium/auxiliary/util/u_framebuffer.h b/mesalib/src/gallium/auxiliary/util/u_framebuffer.h index e7dc1e9e4..a89066230 100644 --- a/mesalib/src/gallium/auxiliary/util/u_framebuffer.h +++ b/mesalib/src/gallium/auxiliary/util/u_framebuffer.h @@ -33,6 +33,10 @@ #include "pipe/p_state.h" +#ifdef __cplusplus +extern "C" { +#endif + extern boolean util_framebuffer_state_equal(const struct pipe_framebuffer_state *dst, const struct pipe_framebuffer_state *src); @@ -51,4 +55,8 @@ util_framebuffer_min_size(const struct pipe_framebuffer_state *fb, unsigned *width, unsigned *height); +#ifdef __cplusplus +} +#endif + #endif /* U_FRAMEBUFFER_H */ diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 5157661b3..d450aa1e4 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -4058,7 +4058,7 @@ ast_uniform_block::hir(exec_list *instructions, decl_list->hir(&declared_variables, state); foreach_list_const(node, &declared_variables) { - struct ir_variable *var = (ir_variable *)node; + ir_variable *var = (ir_variable *)node; struct gl_uniform_buffer_variable *ubo_var = &ubo->Uniforms[ubo->NumUniforms++]; diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index 1c7aadaca..7b0a487b6 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -780,7 +780,7 @@ ir_constant::get_float_component(unsigned i) const case GLSL_TYPE_UINT: return (float) this->value.u[i]; case GLSL_TYPE_INT: return (float) this->value.i[i]; case GLSL_TYPE_FLOAT: return this->value.f[i]; - case GLSL_TYPE_BOOL: return this->value.b[i] ? 1.0 : 0.0; + case GLSL_TYPE_BOOL: return this->value.b[i] ? 1.0f : 0.0f; default: assert(!"Should not get here."); break; } diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp index d96e25c18..c62f0b115 100644 --- a/mesalib/src/glsl/ir_builder.cpp +++ b/mesalib/src/glsl/ir_builder.cpp @@ -77,7 +77,7 @@ swizzle(operand a, int swizzle, int components) } ir_swizzle * -swizzle_for_size(operand a, int components) +swizzle_for_size(operand a, unsigned components) { void *mem_ctx = ralloc_parent(a.val); diff --git a/mesalib/src/glsl/ir_builder.h b/mesalib/src/glsl/ir_builder.h index 7a0a196ee..067858df4 100644 --- a/mesalib/src/glsl/ir_builder.h +++ b/mesalib/src/glsl/ir_builder.h @@ -94,7 +94,7 @@ ir_expression *saturate(operand a); /** * Swizzle away later components, but preserve the ordering. */ -ir_swizzle *swizzle_for_size(operand a, int components); +ir_swizzle *swizzle_for_size(operand a, unsigned components); ir_swizzle *swizzle_xxxx(operand a); ir_swizzle *swizzle_yyyy(operand a); diff --git a/mesalib/src/glsl/lower_mat_op_to_vec.cpp b/mesalib/src/glsl/lower_mat_op_to_vec.cpp index a371afc14..08cae29fa 100644 --- a/mesalib/src/glsl/lower_mat_op_to_vec.cpp +++ b/mesalib/src/glsl/lower_mat_op_to_vec.cpp @@ -122,7 +122,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int b_col, i; + unsigned b_col, i; ir_assignment *assign; ir_expression *expr; @@ -154,7 +154,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int i; + unsigned i; ir_assignment *assign; ir_expression *expr; @@ -183,7 +183,7 @@ ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int i; + unsigned i; for (i = 0; i < b->type->matrix_columns; i++) { ir_rvalue *column_result; @@ -208,7 +208,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int i; + unsigned i; for (i = 0; i < a->type->matrix_columns; i++) { ir_expression *column_expr; diff --git a/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp b/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp index fce9c3424..789f62afe 100644 --- a/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp +++ b/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp @@ -71,7 +71,7 @@ ir_vec_index_to_cond_assign_visitor::convert_vec_index_to_cond_assign(ir_rvalue ir_assignment *assign; ir_variable *index, *var; ir_dereference *deref; - int i; + unsigned i; if (!orig_deref) return ir; @@ -164,7 +164,7 @@ ir_vec_index_to_cond_assign_visitor::visit_leave(ir_assignment *ir) ir_variable *index, *var; ir_dereference_variable *deref; ir_assignment *assign; - int i; + unsigned i; ir->rhs = convert_vec_index_to_cond_assign(ir->rhs); if (ir->condition) diff --git a/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp b/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp index 46fd6ace1..264d6dc07 100644 --- a/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp +++ b/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp @@ -93,7 +93,7 @@ ir_vec_index_to_swizzle_visitor::convert_vec_index_to_swizzle(ir_rvalue *ir) * large. For simplicity sake, just clamp the index to [0, size-1]. */ const int i = MIN2(MAX2(ir_constant->value.i[0], 0), - (deref->array->type->vector_elements - 1)); + ((int) deref->array->type->vector_elements - 1)); return new(ctx) ir_swizzle(deref->array, i, 0, 0, 0, 1); } diff --git a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index bd8427eaf..2bffc4e08 100644 --- a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -5,7 +5,8 @@ <category name="GL_APPLE_vertex_array_object" number="273"> <enum name="VERTEX_ARRAY_BINDING_APPLE" value="0x85B5"/> - <function name="BindVertexArrayAPPLE" offset="assign" static_dispatch="false"> + <function name="BindVertexArrayAPPLE" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="array" type="GLuint"/> </function> @@ -14,7 +15,8 @@ <param name="arrays" type="const GLuint *" count="n"/> </function> - <function name="GenVertexArraysAPPLE" offset="assign" static_dispatch="false"> + <function name="GenVertexArraysAPPLE" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *" count="n" output="true"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml b/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml index 8e81553f6..1478e3970 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml @@ -8,7 +8,8 @@ <category name="GL_ARB_base_instance" number="107"> - <function name="DrawArraysInstancedBaseInstance" offset="assign"> + <function name="DrawArraysInstancedBaseInstance" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> @@ -16,7 +17,8 @@ <param name="baseinstance" type="GLuint"/> </function> - <function name="DrawElementsInstancedBaseInstance" offset="assign"> + <function name="DrawElementsInstancedBaseInstance" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -25,7 +27,8 @@ <param name="baseinstance" type="GLuint"/> </function> - <function name="DrawElementsInstancedBaseVertexBaseInstance" offset="assign"> + <function name="DrawElementsInstancedBaseVertexBaseInstance" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index 0b6947cc5..c08017aa5 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -8,24 +8,25 @@ <category name="GL_ARB_draw_buffers_blend" number="69"> - <function name="BlendEquationiARB" offset="assign"> + <function name="BlendEquationiARB" offset="assign" mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="BlendEquationSeparateiARB" offset="assign"> + <function name="BlendEquationSeparateiARB" offset="assign" + mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> - <function name="BlendFunciARB" offset="assign"> + <function name="BlendFunciARB" offset="assign" mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="src" type="GLenum"/> <param name="dst" type="GLenum"/> </function> - <function name="BlendFuncSeparateiARB" offset="assign"> + <function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="srcRGB" type="GLenum"/> <param name="dstRGB" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index 851f1faec..986654848 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -8,7 +8,7 @@ <category name="GL_ARB_draw_elements_base_vertex" number="62"> - <function name="DrawElementsBaseVertex" offset="assign"> + <function name="DrawElementsBaseVertex" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -16,7 +16,8 @@ <param name="basevertex" type="GLint"/> </function> - <function name="DrawRangeElementsBaseVertex" offset="assign"> + <function name="DrawRangeElementsBaseVertex" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -26,7 +27,8 @@ <param name="basevertex" type="GLint"/> </function> - <function name="MultiDrawElementsBaseVertex" offset="assign"> + <function name="MultiDrawElementsBaseVertex" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -35,7 +37,8 @@ <param name="basevertex" type="const GLint *"/> </function> - <function name="DrawElementsInstancedBaseVertex" offset="assign"> + <function name="DrawElementsInstancedBaseVertex" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml index 57bb776ac..7ee7629c7 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml @@ -8,14 +8,14 @@ <category name="GL_ARB_draw_instanced" number="44"> - <function name="DrawArraysInstancedARB" offset="assign"> + <function name="DrawArraysInstancedARB" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawElementsInstancedARB" offset="assign"> + <function name="DrawElementsInstancedARB" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml index 97a4e2e8f..73f0a9c3d 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml @@ -45,7 +45,7 @@ <param name="level" type="GLint"/> <param name="layer" type="GLint"/> </function> - <function name="FramebufferTextureFaceARB" offset="assign"> + <function name="FramebufferTextureFaceARB" exec="skip" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml index 8da5c41e8..7db166564 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml @@ -11,7 +11,8 @@ <enum name="NUM_PROGRAM_BINARY_FORMATS" value="0x87FE"/> <enum name="PROGRAM_BINARY_FORMATS" value="0x87FF"/> - <function name="GetProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> + <function name="GetProgramBinary" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -19,14 +20,16 @@ <param name="binary" type="GLvoid *"/> </function> - <function name="ProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> + <function name="ProgramBinary" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="binaryFormat" type="GLenum"/> <param name="binary" type="const GLvoid *"/> <param name="length" type="GLsizei"/> </function> - <function name="ProgramParameteri" offset="assign" static_dispatch="false" es2="3.0"> + <function name="ProgramParameteri" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="value" type="GLint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml index 822f54374..9a30b0c9e 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml @@ -10,7 +10,7 @@ <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/> - <function name="VertexAttribDivisorARB" offset="assign"> + <function name="VertexAttribDivisorARB" offset="assign" mesa_name="-ARB"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml index b347ef35c..14048bf49 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml @@ -25,21 +25,21 @@ </function> <!-- OpenGL 1.0 sized buffer queries --> - <function name="GetnMapdvARB" offset="assign"> + <function name="GetnMapdvARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="v" type="GLdouble *" output="true"/> </function> - <function name="GetnMapfvARB" offset="assign"> + <function name="GetnMapfvARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="v" type="GLfloat *" output="true"/> </function> - <function name="GetnMapivARB" offset="assign"> + <function name="GetnMapivARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="bufSize" type="GLsizei"/> @@ -48,19 +48,19 @@ - <function name="GetnPixelMapfvARB" offset="assign"> + <function name="GetnPixelMapfvARB" offset="assign" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="values" type="GLfloat *" output="true"/> </function> - <function name="GetnPixelMapuivARB" offset="assign"> + <function name="GetnPixelMapuivARB" offset="assign" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="values" type="GLuint *" output="true"/> </function> - <function name="GetnPixelMapusvARB" offset="assign"> + <function name="GetnPixelMapusvARB" offset="assign" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="values" type="GLushort *" output="true"/> @@ -95,7 +95,7 @@ <!-- ARB_imaging sized buffer queries --> - <function name="GetnColorTableARB" offset="assign"> + <function name="GetnColorTableARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -103,7 +103,7 @@ <param name="table" type="GLvoid *" output="true"/> </function> - <function name="GetnConvolutionFilterARB" offset="assign"> + <function name="GetnConvolutionFilterARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -111,7 +111,7 @@ <param name="image" type="GLvoid *" output="true"/> </function> - <function name="GetnSeparableFilterARB" offset="assign"> + <function name="GetnSeparableFilterARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -122,7 +122,7 @@ <param name="span" type="GLvoid *" output="true"/> </function> - <function name="GetnHistogramARB" offset="assign"> + <function name="GetnHistogramARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> @@ -131,7 +131,7 @@ <param name="values" type="GLvoid *" output="true"/> </function> - <function name="GetnMinmaxARB" offset="assign"> + <function name="GetnMinmaxARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml index 57680f553..8884591ca 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml @@ -11,7 +11,7 @@ <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB" value="0x8C2D"/> <enum name="TEXTURE_BUFFER_FORMAT_ARB" value="0x8C2E"/> - <function name="TexBufferARB" offset="assign"> + <function name="TexBufferARB" offset="assign" mesa_name="-ARB"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml index 7d12d9774..6c6090c1c 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml @@ -7,214 +7,244 @@ <enum name="INT_2_10_10_10_REV" value = "0x8D9F"/> - <function name="VertexP2ui" offset="assign"> + <function name="VertexP2ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="GLuint"/> </function> - <function name="VertexP3ui" offset="assign"> + <function name="VertexP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="GLuint"/> </function> - <function name="VertexP4ui" offset="assign"> + <function name="VertexP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="GLuint"/> </function> - <function name="VertexP2uiv" offset="assign"> + <function name="VertexP2uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexP3uiv" offset="assign"> + <function name="VertexP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexP4uiv" offset="assign"> + <function name="VertexP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="const GLuint *"/> </function> - <function name="TexCoordP1ui" offset="assign"> + <function name="TexCoordP1ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP2ui" offset="assign"> + <function name="TexCoordP2ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP3ui" offset="assign"> + <function name="TexCoordP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP4ui" offset="assign"> + <function name="TexCoordP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP1uiv" offset="assign"> + <function name="TexCoordP1uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="TexCoordP2uiv" offset="assign"> + <function name="TexCoordP2uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="TexCoordP3uiv" offset="assign"> + <function name="TexCoordP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="TexCoordP4uiv" offset="assign"> + <function name="TexCoordP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP1ui" offset="assign"> + <function name="MultiTexCoordP1ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP2ui" offset="assign"> + <function name="MultiTexCoordP2ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP3ui" offset="assign"> + <function name="MultiTexCoordP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP4ui" offset="assign"> + <function name="MultiTexCoordP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP1uiv" offset="assign"> + <function name="MultiTexCoordP1uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP2uiv" offset="assign"> + <function name="MultiTexCoordP2uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP3uiv" offset="assign"> + <function name="MultiTexCoordP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP4uiv" offset="assign"> + <function name="MultiTexCoordP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="NormalP3ui" offset="assign"> + <function name="NormalP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="NormalP3uiv" offset="assign"> + <function name="NormalP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="ColorP3ui" offset="assign"> + <function name="ColorP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="GLuint"/> </function> - <function name="ColorP4ui" offset="assign"> + <function name="ColorP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="GLuint"/> </function> - <function name="ColorP3uiv" offset="assign"> + <function name="ColorP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="const GLuint *"/> </function> - <function name="ColorP4uiv" offset="assign"> + <function name="ColorP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="const GLuint *"/> </function> - <function name="SecondaryColorP3ui" offset="assign"> + <function name="SecondaryColorP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="GLuint"/> </function> - <function name="SecondaryColorP3uiv" offset="assign"> + <function name="SecondaryColorP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="const GLuint *"/> </function> - <function name="VertexAttribP1ui" offset="assign"> + <function name="VertexAttribP1ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP2ui" offset="assign"> + <function name="VertexAttribP2ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP3ui" offset="assign"> + <function name="VertexAttribP3ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP4ui" offset="assign"> + <function name="VertexAttribP4ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP1uiv" offset="assign"> + <function name="VertexAttribP1uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexAttribP2uiv" offset="assign"> + <function name="VertexAttribP2uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexAttribP3uiv" offset="assign"> + <function name="VertexAttribP3uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexAttribP4uiv" offset="assign"> + <function name="VertexAttribP4uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml index efbe61f74..affd55a5f 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml @@ -8,7 +8,7 @@ <category name="GL_EXT_draw_buffers2" number="340"> - <function name="ColorMaskIndexedEXT" offset="assign"> + <function name="ColorMaskIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -16,29 +16,29 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleanIndexedvEXT" offset="assign"> + <function name="GetBooleanIndexedvEXT" offset="assign" mesa_name="-EXT"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegerIndexedvEXT" offset="assign"> + <function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> </function> - <function name="EnableIndexedEXT" offset="assign"> + <function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="DisableIndexedEXT" offset="assign"> + <function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name ="IsEnabledIndexedEXT" offset="assign"> + <function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml index bf2f6a3ed..b008f2e65 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -44,25 +44,25 @@ </enum> - <function name="VertexAttribI1iEXT" offset="assign"> + <function name="VertexAttribI1iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> </function> - <function name="VertexAttribI2iEXT" offset="assign"> + <function name="VertexAttribI2iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="VertexAttribI3iEXT" offset="assign"> + <function name="VertexAttribI3iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="VertexAttribI4iEXT" offset="assign"> + <function name="VertexAttribI4iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> @@ -70,25 +70,25 @@ <param name="w" type="GLint"/> </function> - <function name="VertexAttribI1uiEXT" offset="assign"> + <function name="VertexAttribI1uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> </function> - <function name="VertexAttribI2uiEXT" offset="assign"> + <function name="VertexAttribI2uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="VertexAttribI3uiEXT" offset="assign"> + <function name="VertexAttribI3uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="VertexAttribI4uiEXT" offset="assign"> + <function name="VertexAttribI4uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -96,67 +96,73 @@ <param name="w" type="GLuint"/> </function> - <function name="VertexAttribI1ivEXT" offset="assign"> + <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI2ivEXT" offset="assign"> + <function name="VertexAttribI2ivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI3ivEXT" offset="assign"> + <function name="VertexAttribI3ivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI4ivEXT" offset="assign"> + <function name="VertexAttribI4ivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI1uivEXT" offset="assign"> + <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI2uivEXT" offset="assign"> + <function name="VertexAttribI2uivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI3uivEXT" offset="assign"> + <function name="VertexAttribI3uivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4uivEXT" offset="assign"> + <function name="VertexAttribI4uivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4bvEXT" offset="assign"> + <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttribI4svEXT" offset="assign"> + <function name="VertexAttribI4svEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttribI4ubvEXT" offset="assign"> + <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttribI4usvEXT" offset="assign"> + <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttribIPointerEXT" offset="assign"> + <function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -164,37 +170,37 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIivEXT" offset="assign"> + <function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuivEXT" offset="assign"> + <function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1uiEXT" offset="assign"> + <function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2uiEXT" offset="assign"> + <function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3uiEXT" offset="assign"> + <function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4uiEXT" offset="assign"> + <function name="Uniform4uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -202,43 +208,43 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uivEXT" offset="assign"> + <function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uivEXT" offset="assign"> + <function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uivEXT" offset="assign"> + <function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uivEXT" offset="assign"> + <function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="GetUniformuivEXT" offset="assign"> + <function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="BindFragDataLocationEXT" offset="assign"> + <function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> </function> - <function name="GetFragDataLocationEXT" offset="assign"> + <function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT"> <return type="GLint"/> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml b/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml index 6ec56157c..03f90a1b1 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml @@ -8,16 +8,16 @@ <!-- Alias of CURRENT_PROGRAM --> <enum name="ACTIVE_PROGRAM_EXT" value="0x8B8D"/> - <function name="UseShaderProgramEXT" offset="assign"> + <function name="UseShaderProgramEXT" deprecated="3.1" offset="assign"> <param name="type" type="GLenum"/> <param name="program" type="GLuint"/> </function> - <function name="ActiveProgramEXT" offset="assign"> + <function name="ActiveProgramEXT" deprecated="3.1" offset="assign"> <param name="program" type="GLuint"/> </function> - <function name="CreateShaderProgramEXT" offset="assign"> + <function name="CreateShaderProgramEXT" deprecated="3.1" offset="assign"> <param name="type" type="GLenum"/> <param name="string" type="const GLchar *"/> <return type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml index 7e5a8cbeb..dac399964 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml @@ -69,25 +69,25 @@ <param name="a" type="GLuint"/> </function> - <function name="TexParameterIivEXT" offset="assign"> + <function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuivEXT" offset="assign"> + <function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIivEXT" offset="assign"> + <function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuivEXT" offset="assign"> + <function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index dbd7513c7..e9b27582a 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -24,7 +24,7 @@ <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT" value="0x8C7F"/> <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT" value="0x8C76"/> - <function name="BindBufferRangeEXT" offset="assign"> + <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -39,27 +39,29 @@ <param name="offset" type="GLintptr"/> </function> - <function name="BindBufferBaseEXT" offset="assign"> + <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="BeginTransformFeedbackEXT" offset="assign"> + <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedbackEXT" offset="assign"> + <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> </function> - <function name="TransformFeedbackVaryingsEXT" offset="assign"> + <function name="TransformFeedbackVaryingsEXT" offset="assign" + mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const char **"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVaryingEXT" offset="assign"> + <function name="GetTransformFeedbackVaryingEXT" offset="assign" + mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -108,7 +110,7 @@ <function name="ResumeTransformFeedback" offset="assign" es2="3.0"> </function> - <function name="DrawTransformFeedback" offset="assign"> + <function name="DrawTransformFeedback" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index 808d3cdc7..82566d8a3 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -598,19 +598,20 @@ <enum name="MAX_FRAGMENT_INPUT_COMPONENTS" value="0x9125"/> <enum name="CONTEXT_PROFILE_MASK" value="0x9126"/> - <function name="GetInteger64i_v" offset="assign" es2="3.0"> + <function name="GetInteger64i_v" offset="assign" es2="3.0" exec="skip"> <param name="cap" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint64 *"/> </function> - <function name="GetBufferParameteri64v" offset="assign" es2="3.0"> + <function name="GetBufferParameteri64v" offset="assign" es2="3.0" + exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *"/> </function> - <function name="FramebufferTexture" offset="assign"> + <function name="FramebufferTexture" offset="assign" exec="skip"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 14bb2dfe6..13943e839 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -55,6 +55,7 @@ MESA_OUTPUTS = \ $(MESA_GLAPI_OUTPUTS) \ $(MESA_GLAPI_ASM_OUTPUTS) \ $(MESA_DIR)/main/enums.c \ + $(MESA_DIR)/main/api_exec.c \ $(MESA_DIR)/main/dispatch.h \ $(MESA_DIR)/main/remap_helper.h \ $(MESA_GLX_DIR)/indirect.c \ @@ -215,6 +216,9 @@ $(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON) $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ +$(MESA_DIR)/main/api_exec.c: gl_genexec.py $(COMMON) + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ + $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@ diff --git a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml index 8bb31dd1f..8bb5c22ca 100644 --- a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml +++ b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml @@ -13,12 +13,12 @@ <enum name="QUERY_BY_REGION_WAIT_NV" value="0x8E15"/> <enum name="QUERY_BY_REGION_NO_WAIT_NV" value="0x8E16"/> - <function name="BeginConditionalRenderNV" offset="assign"> + <function name="BeginConditionalRenderNV" offset="assign" mesa_name="-NV"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRenderNV" offset="assign"> + <function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV"> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml index abe7dda00..d19fc8cf1 100644 --- a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -11,10 +11,11 @@ <enum name="PRIMITIVE_RESTART_NV" value="0x8558"/> <enum name="PRIMITIVE_RESTART_INDEX_NV" value="0x8559"/> - <function name="PrimitiveRestartNV" offset="assign"> + <function name="PrimitiveRestartNV" offset="assign" deprecated="3.1" + exec="dynamic"> </function> - <function name="PrimitiveRestartIndexNV" offset="assign"> + <function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV"> <param name="index" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml index 974240c49..ad775728f 100644 --- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml +++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml @@ -14,13 +14,13 @@ <!-- OpenGL ES 1.0 --> <function name="AlphaFuncxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> <function name="ClearColorxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> @@ -28,12 +28,12 @@ </function> <function name="ClearDepthxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="depth" type="GLclampx"/> </function> <function name="Color4xOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> @@ -41,24 +41,25 @@ </function> <function name="DepthRangexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"> + <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0" + exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="FogxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="FrustumxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -68,62 +69,62 @@ </function> <function name="LightModelxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="LightModelxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="LightxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="LightxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="LineWidthxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="width" type="GLfixed"/> </function> <function name="LoadMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="MaterialxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="MaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="MultMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -132,14 +133,14 @@ </function> <function name="Normal3xOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> <function name="OrthoxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -149,18 +150,18 @@ </function> <function name="PointSizexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="size" type="GLfixed"/> </function> <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> <function name="RotatexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> @@ -168,41 +169,41 @@ </function> <function name="SampleCoveragexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> <function name="ScalexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <function name="TexEnvxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="TexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="TexParameterxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="TranslatexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -210,65 +211,65 @@ <!-- OpenGL ES 1.1 --> <function name="ClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> <function name="GetClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfixed *" output="true" count="4"/> </function> <function name="GetFixedvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetLightxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetMaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="PointParameterxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="PointParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> <function name="TexParameterxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> @@ -276,21 +277,21 @@ <!-- texgen --> <function name="GetTexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="check" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="TexGenxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="check" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> <function name="TexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="check" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index 7d4744159..8a6c27194 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -12,7 +12,7 @@ </function> <function name="ClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> @@ -24,13 +24,13 @@ </function> <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> <function name="FrustumfOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -40,7 +40,7 @@ </function> <function name="OrthofOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index 1fdb4d591..c0bbbfae1 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -73,7 +73,7 @@ <enum name="TEXTURE_CROP_RECT_OES" value="0x8B9D"/> <function name="DrawTexiOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -82,12 +82,12 @@ </function> <function name="DrawTexivOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="coords" type="const GLint *" count="5"/> </function> <function name="DrawTexfOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -96,12 +96,12 @@ </function> <function name="DrawTexfvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="coords" type="const GLfloat *" count="5"/> </function> <function name="DrawTexsOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -110,12 +110,12 @@ </function> <function name="DrawTexsvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="coords" type="const GLshort *" count="5"/> </function> <function name="DrawTexxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -124,7 +124,7 @@ </function> <function name="DrawTexxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false"> <param name="coords" type="const GLfixed *" count="5"/> </function> @@ -307,22 +307,26 @@ <enum name="WEIGHT_ARRAY_BUFFER_BINDING_OES" value="0x889E"/> <enum name="MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES" value="0x8B9E"/> - <function name="CurrentPaletteMatrixOES" alias="CurrentPaletteMatrixARB" static_dispatch="false"> + <function name="CurrentPaletteMatrixOES" alias="CurrentPaletteMatrixARB" + static_dispatch="false" exec="skip"> <param name="matrixpaletteindex" type="GLuint"/> </function> <!-- no offset --> - <function name="LoadPaletteFromModelViewMatrixOES" static_dispatch="false"> + <function name="LoadPaletteFromModelViewMatrixOES" static_dispatch="false" + exec="skip"> </function> - <function name="MatrixIndexPointerOES" alias="MatrixIndexPointerARB" static_dispatch="false"> + <function name="MatrixIndexPointerOES" alias="MatrixIndexPointerARB" + static_dispatch="false" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> </function> - <function name="WeightPointerOES" alias="WeightPointerARB" static_dispatch="false"> + <function name="WeightPointerOES" alias="WeightPointerARB" + static_dispatch="false" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -339,7 +343,8 @@ <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/> <function name="PointSizePointerOES" offset="assign" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false" + mesa_name="-OES"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -355,7 +360,7 @@ <!-- optional for es1.0 --> <category name="GL_OES_query_matrix" number="16"> <function name="QueryMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false"> <param name="mantissa" type="GLfixed *" count="16" /> <param name="exponent" type="GLint *" count="16" /> <return type="GLbitfield"/> @@ -768,7 +773,7 @@ </category> <!-- 93. GL_NV_read_buffer --> -<category name="NV_read_buffer"> +<category name="GL_NV_read_buffer"> <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0"> <param name="mode" type="GLenum"/> </function> @@ -783,7 +788,7 @@ </category> <!-- 111. GL_ANGLE_texture_compression_dxt --> -<category name="ANGLE_texture_compression_dxt" number="111"> +<category name="GL_ANGLE_texture_compression_dxt" number="111"> <enum name="COMPRESSED_RGBA_S3TC_DXT3_ANGLE" value="0x83F2"/> <enum name="COMPRESSED_RGBA_S3TC_DXT5_ANGLE" value="0x83F3"/> </category> diff --git a/mesalib/src/mapi/glapi/gen/gen.bat b/mesalib/src/mapi/glapi/gen/gen.bat index 3baeee0e2..5759bacf3 100644 --- a/mesalib/src/mapi/glapi/gen/gen.bat +++ b/mesalib/src/mapi/glapi/gen/gen.bat @@ -9,18 +9,18 @@ glx_proto_size.py -m reqsize_h --only-get -h _INDIRECT_SIZE_GET_H_ > indirect_re glx_proto_recv.py -m dispatch_c > indirect_dispatch.c glx_proto_recv.py -m dispatch_c -s > indirect_dispatch_swap.c glx_proto_recv.py -m dispatch_h -f gl_and_glX_API.xml -s > indirect_dispatch.h -gl_table.py > glapitable.h -gl_gentable.py > glapi_gentable.c -gl_table.py -m remap_table > dispatch.h +gl_table.py -f gl_and_es_API.xml > glapitable.h +gl_gentable.py -f gl_and_es_API.xml > glapi_gentable.c +gl_table.py -f gl_and_es_API.xml -m remap_table > dispatch.h rem gl_offsets.py > glapioffsets.h -gl_apitemp.py > glapitemp.h -gl_procs.py > glprocs.h +gl_apitemp.py -f gl_and_es_API.xml > glapitemp.h +gl_procs.py -f gl_and_es_API.xml > glprocs.h glX_proto_send.py -m proto > indirect.c glX_proto_send.py -m init_h > indirect.h glX_proto_send.py -m init_c > indirect_init.c gl_enums.py -f gl_and_es_API.xml > enums.c -remap_helper.py > remap_helper.h +remap_helper.py -f gl_and_es_API.xml > remap_helper.h copy ..\..\mapi\mapi_abi.py -mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h
\ No newline at end of file +mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h diff --git a/mesalib/src/mapi/glapi/gen/glX_API.xml b/mesalib/src/mapi/glapi/gen/glX_API.xml index 9e02aa498..62ad9ebbd 100644 --- a/mesalib/src/mapi/glapi/gen/glX_API.xml +++ b/mesalib/src/mapi/glapi/gen/glX_API.xml @@ -201,13 +201,13 @@ </function> </category> -<category name="GLX_MESA_copy_sub_buffer" number="215"> +<category name="GLX_MESA_copy_sub_buffer" number="215" window_system="glX"> <function name="CopySubBufferMESA"> <glx vendorpriv="5154"/> </function> </category> -<category name="GLX_EXT_texture_from_pixmap"> +<category name="GLX_EXT_texture_from_pixmap" window_system="glX"> <function name="BindTexImageEXT"> <glx vendorpriv="1330"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py index b5f2c5482..84526581a 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py @@ -80,11 +80,8 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): def printRealHeader(self): print '#ifdef HAVE_DIX_CONFIG_H' print '#include <dix-config.h>' - print '#else' - print '' - print '#include "glheader.h"' - print '' print '#endif' + print '#include "glheader.h"' print '' print '#include <X11/Xmd.h>' print '#include <GL/gl.h>' diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd index db33500c0..066d5da52 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.dtd +++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd @@ -37,7 +37,11 @@ static_dispatch (true | false) "true" vectorequiv NMTOKEN #IMPLIED es1 CDATA "none" - es2 CDATA "none"> + es2 CDATA "none" + deprecated CDATA "none" + exec NMTOKEN #IMPLIED + desktop (true | false) "true" + mesa_name CDATA #IMPLIED> <!ATTLIST size name NMTOKEN #REQUIRED count NMTOKEN #IMPLIED mode (get | set) "set"> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index af564726a..bc85534cc 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -1108,51 +1108,51 @@ <type name="DEBUGPROCARB" size="4" pointer="true"/> - <function name="NewList" offset="0"> + <function name="NewList" offset="0" deprecated="3.1"> <param name="list" type="GLuint"/> <param name="mode" type="GLenum"/> <glx sop="101"/> </function> - <function name="EndList" offset="1"> + <function name="EndList" offset="1" deprecated="3.1"> <glx sop="102"/> </function> - <function name="CallList" offset="2"> + <function name="CallList" offset="2" deprecated="3.1"> <param name="list" type="GLuint"/> <glx rop="1"/> </function> - <function name="CallLists" offset="3"> + <function name="CallLists" offset="3" deprecated="3.1"> <param name="n" type="GLsizei" counter="true"/> <param name="type" type="GLenum"/> <param name="lists" type="const GLvoid *" variable_param="type" count="n"/> <glx rop="2" large="true"/> </function> - <function name="DeleteLists" offset="4"> + <function name="DeleteLists" offset="4" deprecated="3.1"> <param name="list" type="GLuint"/> <param name="range" type="GLsizei"/> <glx sop="103"/> </function> - <function name="GenLists" offset="5"> + <function name="GenLists" offset="5" deprecated="3.1"> <param name="range" type="GLsizei"/> <return type="GLuint"/> <glx sop="104"/> </function> - <function name="ListBase" offset="6"> + <function name="ListBase" offset="6" deprecated="3.1"> <param name="base" type="GLuint"/> <glx rop="3"/> </function> - <function name="Begin" offset="7"> + <function name="Begin" offset="7" deprecated="3.1" exec="dynamic"> <param name="mode" type="GLenum"/> <glx rop="4"/> </function> - <function name="Bitmap" offset="8"> + <function name="Bitmap" offset="8" deprecated="3.1"> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="xorig" type="GLfloat"/> @@ -1163,785 +1163,876 @@ <glx rop="5" large="true"/> </function> - <function name="Color3b" offset="9" vectorequiv="Color3bv"> + <function name="Color3b" offset="9" vectorequiv="Color3bv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="Color3bv" offset="10"> + <function name="Color3bv" offset="10" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="6"/> </function> - <function name="Color3d" offset="11" vectorequiv="Color3dv"> + <function name="Color3d" offset="11" vectorequiv="Color3dv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="Color3dv" offset="12"> + <function name="Color3dv" offset="12" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="7"/> </function> - <function name="Color3f" offset="13" vectorequiv="Color3fv"> + <function name="Color3f" offset="13" vectorequiv="Color3fv" + deprecated="3.1" exec="dynamic"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> </function> - <function name="Color3fv" offset="14"> + <function name="Color3fv" offset="14" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="8"/> </function> - <function name="Color3i" offset="15" vectorequiv="Color3iv"> + <function name="Color3i" offset="15" vectorequiv="Color3iv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="Color3iv" offset="16"> + <function name="Color3iv" offset="16" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLint *" count="3"/> <glx rop="9"/> </function> - <function name="Color3s" offset="17" vectorequiv="Color3sv"> + <function name="Color3s" offset="17" vectorequiv="Color3sv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="Color3sv" offset="18"> + <function name="Color3sv" offset="18" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLshort *" count="3"/> <glx rop="10"/> </function> - <function name="Color3ub" offset="19" vectorequiv="Color3ubv"> + <function name="Color3ub" offset="19" vectorequiv="Color3ubv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="Color3ubv" offset="20"> + <function name="Color3ubv" offset="20" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="11"/> </function> - <function name="Color3ui" offset="21" vectorequiv="Color3uiv"> + <function name="Color3ui" offset="21" vectorequiv="Color3uiv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="Color3uiv" offset="22"> + <function name="Color3uiv" offset="22" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLuint *" count="3"/> <glx rop="12"/> </function> - <function name="Color3us" offset="23" vectorequiv="Color3usv"> + <function name="Color3us" offset="23" vectorequiv="Color3usv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="Color3usv" offset="24"> + <function name="Color3usv" offset="24" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLushort *" count="3"/> <glx rop="13"/> </function> - <function name="Color4b" offset="25" vectorequiv="Color4bv"> + <function name="Color4b" offset="25" vectorequiv="Color4bv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> <param name="alpha" type="GLbyte"/> </function> - <function name="Color4bv" offset="26"> + <function name="Color4bv" offset="26" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLbyte *" count="4"/> <glx rop="14"/> </function> - <function name="Color4d" offset="27" vectorequiv="Color4dv"> + <function name="Color4d" offset="27" vectorequiv="Color4dv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> <param name="alpha" type="GLdouble"/> </function> - <function name="Color4dv" offset="28"> + <function name="Color4dv" offset="28" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="15"/> </function> - <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0"> + <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0" + deprecated="3.1" exec="dynamic"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> <param name="alpha" type="GLfloat"/> </function> - <function name="Color4fv" offset="30"> + <function name="Color4fv" offset="30" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="16"/> </function> - <function name="Color4i" offset="31" vectorequiv="Color4iv"> + <function name="Color4i" offset="31" vectorequiv="Color4iv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> <param name="alpha" type="GLint"/> </function> - <function name="Color4iv" offset="32"> + <function name="Color4iv" offset="32" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLint *" count="4"/> <glx rop="17"/> </function> - <function name="Color4s" offset="33" vectorequiv="Color4sv"> + <function name="Color4s" offset="33" vectorequiv="Color4sv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> <param name="alpha" type="GLshort"/> </function> - <function name="Color4sv" offset="34"> + <function name="Color4sv" offset="34" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLshort *" count="4"/> <glx rop="18"/> </function> - <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1"> + <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> <param name="alpha" type="GLubyte"/> </function> - <function name="Color4ubv" offset="36"> + <function name="Color4ubv" offset="36" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLubyte *" count="4"/> <glx rop="19"/> </function> - <function name="Color4ui" offset="37" vectorequiv="Color4uiv"> + <function name="Color4ui" offset="37" vectorequiv="Color4uiv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> <param name="alpha" type="GLuint"/> </function> - <function name="Color4uiv" offset="38"> + <function name="Color4uiv" offset="38" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLuint *" count="4"/> <glx rop="20"/> </function> - <function name="Color4us" offset="39" vectorequiv="Color4usv"> + <function name="Color4us" offset="39" vectorequiv="Color4usv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> <param name="alpha" type="GLushort"/> </function> - <function name="Color4usv" offset="40"> + <function name="Color4usv" offset="40" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLushort *" count="4"/> <glx rop="21"/> </function> - <function name="EdgeFlag" offset="41" vectorequiv="EdgeFlagv"> + <function name="EdgeFlag" offset="41" vectorequiv="EdgeFlagv" + deprecated="3.1" exec="dynamic"> <param name="flag" type="GLboolean"/> </function> - <function name="EdgeFlagv" offset="42"> + <function name="EdgeFlagv" offset="42" deprecated="3.1" exec="loopback"> <param name="flag" type="const GLboolean *" count="1"/> <glx rop="22"/> </function> - <function name="End" offset="43"> + <function name="End" offset="43" deprecated="3.1" exec="dynamic"> <glx rop="23"/> </function> - <function name="Indexd" offset="44" vectorequiv="Indexdv"> + <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1" + exec="loopback"> <param name="c" type="GLdouble"/> </function> - <function name="Indexdv" offset="45"> + <function name="Indexdv" offset="45" deprecated="3.1" exec="loopback"> <param name="c" type="const GLdouble *" count="1"/> <glx rop="24"/> </function> - <function name="Indexf" offset="46" vectorequiv="Indexfv"> + <function name="Indexf" offset="46" vectorequiv="Indexfv" deprecated="3.1" + exec="dynamic"> <param name="c" type="GLfloat"/> </function> - <function name="Indexfv" offset="47"> + <function name="Indexfv" offset="47" deprecated="3.1" exec="dynamic"> <param name="c" type="const GLfloat *" count="1"/> <glx rop="25"/> </function> - <function name="Indexi" offset="48" vectorequiv="Indexiv"> + <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1" + exec="loopback"> <param name="c" type="GLint"/> </function> - <function name="Indexiv" offset="49"> + <function name="Indexiv" offset="49" deprecated="3.1" exec="loopback"> <param name="c" type="const GLint *" count="1"/> <glx rop="26"/> </function> - <function name="Indexs" offset="50" vectorequiv="Indexsv"> + <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1" + exec="loopback"> <param name="c" type="GLshort"/> </function> - <function name="Indexsv" offset="51"> + <function name="Indexsv" offset="51" deprecated="3.1" exec="loopback"> <param name="c" type="const GLshort *" count="1"/> <glx rop="27"/> </function> - <function name="Normal3b" offset="52" vectorequiv="Normal3bv"> + <function name="Normal3b" offset="52" vectorequiv="Normal3bv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLbyte"/> <param name="ny" type="GLbyte"/> <param name="nz" type="GLbyte"/> </function> - <function name="Normal3bv" offset="53"> + <function name="Normal3bv" offset="53" deprecated="3.1" exec="loopback"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="28"/> </function> - <function name="Normal3d" offset="54" vectorequiv="Normal3dv"> + <function name="Normal3d" offset="54" vectorequiv="Normal3dv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLdouble"/> <param name="ny" type="GLdouble"/> <param name="nz" type="GLdouble"/> </function> - <function name="Normal3dv" offset="55"> + <function name="Normal3dv" offset="55" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="29"/> </function> - <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0"> + <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0" + deprecated="3.1" exec="dynamic"> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> <param name="nz" type="GLfloat"/> </function> - <function name="Normal3fv" offset="57"> + <function name="Normal3fv" offset="57" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="30"/> </function> - <function name="Normal3i" offset="58" vectorequiv="Normal3iv"> + <function name="Normal3i" offset="58" vectorequiv="Normal3iv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLint"/> <param name="ny" type="GLint"/> <param name="nz" type="GLint"/> </function> - <function name="Normal3iv" offset="59"> + <function name="Normal3iv" offset="59" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="3"/> <glx rop="31"/> </function> - <function name="Normal3s" offset="60" vectorequiv="Normal3sv"> + <function name="Normal3s" offset="60" vectorequiv="Normal3sv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLshort"/> <param name="ny" type="GLshort"/> <param name="nz" type="GLshort"/> </function> - <function name="Normal3sv" offset="61"> + <function name="Normal3sv" offset="61" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="3"/> <glx rop="32"/> </function> - <function name="RasterPos2d" offset="62" vectorequiv="RasterPos2dv"> + <function name="RasterPos2d" offset="62" vectorequiv="RasterPos2dv" + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="RasterPos2dv" offset="63"> + <function name="RasterPos2dv" offset="63" deprecated="3.1"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="33"/> </function> - <function name="RasterPos2f" offset="64" vectorequiv="RasterPos2fv"> + <function name="RasterPos2f" offset="64" vectorequiv="RasterPos2fv" + deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="RasterPos2fv" offset="65"> + <function name="RasterPos2fv" offset="65" deprecated="3.1"> <param name="v" type="const GLfloat *" count="2"/> <glx rop="34"/> </function> - <function name="RasterPos2i" offset="66" vectorequiv="RasterPos2iv"> + <function name="RasterPos2i" offset="66" vectorequiv="RasterPos2iv" + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="RasterPos2iv" offset="67"> + <function name="RasterPos2iv" offset="67" deprecated="3.1"> <param name="v" type="const GLint *" count="2"/> <glx rop="35"/> </function> - <function name="RasterPos2s" offset="68" vectorequiv="RasterPos2sv"> + <function name="RasterPos2s" offset="68" vectorequiv="RasterPos2sv" + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="RasterPos2sv" offset="69"> + <function name="RasterPos2sv" offset="69" deprecated="3.1"> <param name="v" type="const GLshort *" count="2"/> <glx rop="36"/> </function> - <function name="RasterPos3d" offset="70" vectorequiv="RasterPos3dv"> + <function name="RasterPos3d" offset="70" vectorequiv="RasterPos3dv" + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="RasterPos3dv" offset="71"> + <function name="RasterPos3dv" offset="71" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="37"/> </function> - <function name="RasterPos3f" offset="72" vectorequiv="RasterPos3fv"> + <function name="RasterPos3f" offset="72" vectorequiv="RasterPos3fv" + deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="RasterPos3fv" offset="73"> + <function name="RasterPos3fv" offset="73" deprecated="3.1"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="38"/> </function> - <function name="RasterPos3i" offset="74" vectorequiv="RasterPos3iv"> + <function name="RasterPos3i" offset="74" vectorequiv="RasterPos3iv" + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="RasterPos3iv" offset="75"> + <function name="RasterPos3iv" offset="75" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="39"/> </function> - <function name="RasterPos3s" offset="76" vectorequiv="RasterPos3sv"> + <function name="RasterPos3s" offset="76" vectorequiv="RasterPos3sv" + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="RasterPos3sv" offset="77"> + <function name="RasterPos3sv" offset="77" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="40"/> </function> - <function name="RasterPos4d" offset="78" vectorequiv="RasterPos4dv"> + <function name="RasterPos4d" offset="78" vectorequiv="RasterPos4dv" + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="RasterPos4dv" offset="79"> + <function name="RasterPos4dv" offset="79" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="41"/> </function> - <function name="RasterPos4f" offset="80" vectorequiv="RasterPos4fv"> + <function name="RasterPos4f" offset="80" vectorequiv="RasterPos4fv" + deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <param name="w" type="GLfloat"/> </function> - <function name="RasterPos4fv" offset="81"> + <function name="RasterPos4fv" offset="81" deprecated="3.1"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="42"/> </function> - <function name="RasterPos4i" offset="82" vectorequiv="RasterPos4iv"> + <function name="RasterPos4i" offset="82" vectorequiv="RasterPos4iv" + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="RasterPos4iv" offset="83"> + <function name="RasterPos4iv" offset="83" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="43"/> </function> - <function name="RasterPos4s" offset="84" vectorequiv="RasterPos4sv"> + <function name="RasterPos4s" offset="84" vectorequiv="RasterPos4sv" + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="RasterPos4sv" offset="85"> + <function name="RasterPos4sv" offset="85" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="44"/> </function> - <function name="Rectd" offset="86" vectorequiv="Rectdv"> + <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1" + exec="loopback"> <param name="x1" type="GLdouble"/> <param name="y1" type="GLdouble"/> <param name="x2" type="GLdouble"/> <param name="y2" type="GLdouble"/> </function> - <function name="Rectdv" offset="87"> + <function name="Rectdv" offset="87" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLdouble *" count="2"/> <param name="v2" type="const GLdouble *" count="2"/> <glx rop="45"/> </function> - <function name="Rectf" offset="88" vectorequiv="Rectfv"> + <function name="Rectf" offset="88" vectorequiv="Rectfv" deprecated="3.1" + exec="dynamic"> <param name="x1" type="GLfloat"/> <param name="y1" type="GLfloat"/> <param name="x2" type="GLfloat"/> <param name="y2" type="GLfloat"/> </function> - <function name="Rectfv" offset="89"> + <function name="Rectfv" offset="89" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLfloat *" count="2"/> <param name="v2" type="const GLfloat *" count="2"/> <glx rop="46"/> </function> - <function name="Recti" offset="90" vectorequiv="Rectiv"> + <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1" + exec="loopback"> <param name="x1" type="GLint"/> <param name="y1" type="GLint"/> <param name="x2" type="GLint"/> <param name="y2" type="GLint"/> </function> - <function name="Rectiv" offset="91"> + <function name="Rectiv" offset="91" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLint *" count="2"/> <param name="v2" type="const GLint *" count="2"/> <glx rop="47"/> </function> - <function name="Rects" offset="92" vectorequiv="Rectsv"> + <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1" + exec="loopback"> <param name="x1" type="GLshort"/> <param name="y1" type="GLshort"/> <param name="x2" type="GLshort"/> <param name="y2" type="GLshort"/> </function> - <function name="Rectsv" offset="93"> + <function name="Rectsv" offset="93" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLshort *" count="2"/> <param name="v2" type="const GLshort *" count="2"/> <glx rop="48"/> </function> - <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv"> + <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> </function> - <function name="TexCoord1dv" offset="95"> + <function name="TexCoord1dv" offset="95" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="1"/> <glx rop="49"/> </function> - <function name="TexCoord1f" offset="96" vectorequiv="TexCoord1fv"> + <function name="TexCoord1f" offset="96" vectorequiv="TexCoord1fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> </function> - <function name="TexCoord1fv" offset="97"> + <function name="TexCoord1fv" offset="97" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="1"/> <glx rop="50"/> </function> - <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv"> + <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> </function> - <function name="TexCoord1iv" offset="99"> + <function name="TexCoord1iv" offset="99" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="1"/> <glx rop="51"/> </function> - <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv"> + <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> </function> - <function name="TexCoord1sv" offset="101"> + <function name="TexCoord1sv" offset="101" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="1"/> <glx rop="52"/> </function> - <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv"> + <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="TexCoord2dv" offset="103"> + <function name="TexCoord2dv" offset="103" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="53"/> </function> - <function name="TexCoord2f" offset="104" vectorequiv="TexCoord2fv"> + <function name="TexCoord2f" offset="104" vectorequiv="TexCoord2fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> </function> - <function name="TexCoord2fv" offset="105"> + <function name="TexCoord2fv" offset="105" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="2"/> <glx rop="54"/> </function> - <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv"> + <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="TexCoord2iv" offset="107"> + <function name="TexCoord2iv" offset="107" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="2"/> <glx rop="55"/> </function> - <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv"> + <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="TexCoord2sv" offset="109"> + <function name="TexCoord2sv" offset="109" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="2"/> <glx rop="56"/> </function> - <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv"> + <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="TexCoord3dv" offset="111"> + <function name="TexCoord3dv" offset="111" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="57"/> </function> - <function name="TexCoord3f" offset="112" vectorequiv="TexCoord3fv"> + <function name="TexCoord3f" offset="112" vectorequiv="TexCoord3fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> </function> - <function name="TexCoord3fv" offset="113"> + <function name="TexCoord3fv" offset="113" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="58"/> </function> - <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv"> + <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="TexCoord3iv" offset="115"> + <function name="TexCoord3iv" offset="115" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="3"/> <glx rop="59"/> </function> - <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv"> + <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="TexCoord3sv" offset="117"> + <function name="TexCoord3sv" offset="117" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="3"/> <glx rop="60"/> </function> - <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv"> + <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> <param name="q" type="GLdouble"/> </function> - <function name="TexCoord4dv" offset="119"> + <function name="TexCoord4dv" offset="119" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="61"/> </function> - <function name="TexCoord4f" offset="120" vectorequiv="TexCoord4fv"> + <function name="TexCoord4f" offset="120" vectorequiv="TexCoord4fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> <param name="q" type="GLfloat"/> </function> - <function name="TexCoord4fv" offset="121"> + <function name="TexCoord4fv" offset="121" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="62"/> </function> - <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv"> + <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> <param name="q" type="GLint"/> </function> - <function name="TexCoord4iv" offset="123"> + <function name="TexCoord4iv" offset="123" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="4"/> <glx rop="63"/> </function> - <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv"> + <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> <param name="q" type="GLshort"/> </function> - <function name="TexCoord4sv" offset="125"> + <function name="TexCoord4sv" offset="125" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="4"/> <glx rop="64"/> </function> - <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv"> + <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="Vertex2dv" offset="127"> + <function name="Vertex2dv" offset="127" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="65"/> </function> - <function name="Vertex2f" offset="128" vectorequiv="Vertex2fv"> + <function name="Vertex2f" offset="128" vectorequiv="Vertex2fv" + deprecated="3.1" exec="dynamic"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="Vertex2fv" offset="129"> + <function name="Vertex2fv" offset="129" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="2"/> <glx rop="66"/> </function> - <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv"> + <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="Vertex2iv" offset="131"> + <function name="Vertex2iv" offset="131" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="2"/> <glx rop="67"/> </function> - <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv"> + <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="Vertex2sv" offset="133"> + <function name="Vertex2sv" offset="133" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="2"/> <glx rop="68"/> </function> - <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv"> + <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="Vertex3dv" offset="135"> + <function name="Vertex3dv" offset="135" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="69"/> </function> - <function name="Vertex3f" offset="136" vectorequiv="Vertex3fv"> + <function name="Vertex3f" offset="136" vectorequiv="Vertex3fv" + deprecated="3.1" exec="dynamic"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="Vertex3fv" offset="137"> + <function name="Vertex3fv" offset="137" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="70"/> </function> - <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv"> + <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="Vertex3iv" offset="139"> + <function name="Vertex3iv" offset="139" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="3"/> <glx rop="71"/> </function> - <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv"> + <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="Vertex3sv" offset="141"> + <function name="Vertex3sv" offset="141" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="3"/> <glx rop="72"/> </function> - <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv"> + <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="Vertex4dv" offset="143"> + <function name="Vertex4dv" offset="143" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="73"/> </function> - <function name="Vertex4f" offset="144" vectorequiv="Vertex4fv"> + <function name="Vertex4f" offset="144" vectorequiv="Vertex4fv" + deprecated="3.1" exec="dynamic"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <param name="w" type="GLfloat"/> </function> - <function name="Vertex4fv" offset="145"> + <function name="Vertex4fv" offset="145" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="74"/> </function> - <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv"> + <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="Vertex4iv" offset="147"> + <function name="Vertex4iv" offset="147" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="4"/> <glx rop="75"/> </function> - <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv"> + <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="Vertex4sv" offset="149"> + <function name="Vertex4sv" offset="149" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="4"/> <glx rop="76"/> </function> - <function name="ClipPlane" offset="150"> + <function name="ClipPlane" offset="150" deprecated="3.1"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLdouble *" count="4"/> <glx rop="77"/> </function> - <function name="ColorMaterial" offset="151"> + <function name="ColorMaterial" offset="151" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> <glx rop="78"/> @@ -1952,25 +2043,25 @@ <glx rop="79"/> </function> - <function name="Fogf" offset="153" es1="1.0"> + <function name="Fogf" offset="153" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="80"/> </function> - <function name="Fogfv" offset="154" es1="1.0"> + <function name="Fogfv" offset="154" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="81"/> </function> - <function name="Fogi" offset="155"> + <function name="Fogi" offset="155" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="82"/> </function> - <function name="Fogiv" offset="156"> + <function name="Fogiv" offset="156" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="83"/> @@ -1987,59 +2078,59 @@ <glx rop="85"/> </function> - <function name="Lightf" offset="159" es1="1.0"> + <function name="Lightf" offset="159" es1="1.0" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="86"/> </function> - <function name="Lightfv" offset="160" es1="1.0"> + <function name="Lightfv" offset="160" es1="1.0" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="87"/> </function> - <function name="Lighti" offset="161"> + <function name="Lighti" offset="161" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="88"/> </function> - <function name="Lightiv" offset="162"> + <function name="Lightiv" offset="162" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="89"/> </function> - <function name="LightModelf" offset="163" es1="1.0"> + <function name="LightModelf" offset="163" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="90"/> </function> - <function name="LightModelfv" offset="164" es1="1.0"> + <function name="LightModelfv" offset="164" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="91"/> </function> - <function name="LightModeli" offset="165"> + <function name="LightModeli" offset="165" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="92"/> </function> - <function name="LightModeliv" offset="166"> + <function name="LightModeliv" offset="166" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="93"/> </function> - <function name="LineStipple" offset="167"> + <function name="LineStipple" offset="167" deprecated="3.1"> <param name="factor" type="GLint"/> <param name="pattern" type="GLushort"/> <glx rop="94"/> @@ -2050,28 +2141,30 @@ <glx rop="95"/> </function> - <function name="Materialf" offset="169" es1="1.0"> + <function name="Materialf" offset="169" es1="1.0" deprecated="3.1" + exec="loopback"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="96"/> </function> - <function name="Materialfv" offset="170" es1="1.0"> + <function name="Materialfv" offset="170" es1="1.0" deprecated="3.1" + exec="dynamic"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="97"/> </function> - <function name="Materiali" offset="171"> + <function name="Materiali" offset="171" deprecated="3.1" exec="loopback"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="98"/> </function> - <function name="Materialiv" offset="172"> + <function name="Materialiv" offset="172" deprecated="3.1" exec="loopback"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -2089,7 +2182,7 @@ <glx rop="101"/> </function> - <function name="PolygonStipple" offset="175"> + <function name="PolygonStipple" offset="175" deprecated="3.1"> <param name="mask" type="const GLubyte *" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP" img_target="0" img_pad_dimensions="false"/> <glx rop="102"/> </function> @@ -2102,7 +2195,7 @@ <glx rop="103"/> </function> - <function name="ShadeModel" offset="177" es1="1.0"> + <function name="ShadeModel" offset="177" es1="1.0" deprecated="3.1"> <param name="mode" type="GLenum"/> <glx rop="104"/> </function> @@ -2160,114 +2253,114 @@ <glx rop="110" large="true"/> </function> - <function name="TexEnvf" offset="184" es1="1.0"> + <function name="TexEnvf" offset="184" es1="1.0" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="111"/> </function> - <function name="TexEnvfv" offset="185" es1="1.0"> + <function name="TexEnvfv" offset="185" es1="1.0" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="112"/> </function> - <function name="TexEnvi" offset="186" es1="1.1"> + <function name="TexEnvi" offset="186" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="113"/> </function> - <function name="TexEnviv" offset="187" es1="1.1"> + <function name="TexEnviv" offset="187" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="114"/> </function> - <function name="TexGend" offset="188"> + <function name="TexGend" offset="188" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLdouble"/> <glx rop="115"/> </function> - <function name="TexGendv" offset="189"> + <function name="TexGendv" offset="189" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLdouble *" variable_param="pname"/> <glx rop="116"/> </function> - <function name="TexGenf" offset="190"> + <function name="TexGenf" offset="190" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="117"/> </function> - <function name="TexGenfv" offset="191"> + <function name="TexGenfv" offset="191" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="118"/> </function> - <function name="TexGeni" offset="192"> + <function name="TexGeni" offset="192" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="119"/> </function> - <function name="TexGeniv" offset="193"> + <function name="TexGeniv" offset="193" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="120"/> </function> - <function name="FeedbackBuffer" offset="194"> + <function name="FeedbackBuffer" offset="194" deprecated="3.1"> <param name="size" type="GLsizei"/> <param name="type" type="GLenum"/> <param name="buffer" type="GLfloat *" output="true"/> <glx sop="105" handcode="true"/> </function> - <function name="SelectBuffer" offset="195"> + <function name="SelectBuffer" offset="195" deprecated="3.1"> <param name="size" type="GLsizei"/> <param name="buffer" type="GLuint *" output="true"/> <glx sop="106" handcode="true"/> </function> - <function name="RenderMode" offset="196"> + <function name="RenderMode" offset="196" deprecated="3.1"> <param name="mode" type="GLenum"/> <return type="GLint"/> <glx sop="107" handcode="true"/> </function> - <function name="InitNames" offset="197"> + <function name="InitNames" offset="197" deprecated="3.1"> <glx rop="121"/> </function> - <function name="LoadName" offset="198"> + <function name="LoadName" offset="198" deprecated="3.1"> <param name="name" type="GLuint"/> <glx rop="122"/> </function> - <function name="PassThrough" offset="199"> + <function name="PassThrough" offset="199" deprecated="3.1"> <param name="token" type="GLfloat"/> <glx rop="123"/> </function> - <function name="PopName" offset="200"> + <function name="PopName" offset="200" deprecated="3.1"> <glx rop="124"/> </function> - <function name="PushName" offset="201"> + <function name="PushName" offset="201" deprecated="3.1"> <param name="name" type="GLuint"/> <glx rop="125"/> </function> @@ -2282,7 +2375,7 @@ <glx rop="127"/> </function> - <function name="ClearAccum" offset="204"> + <function name="ClearAccum" offset="204" deprecated="3.1"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> @@ -2290,7 +2383,7 @@ <glx rop="128"/> </function> - <function name="ClearIndex" offset="205"> + <function name="ClearIndex" offset="205" deprecated="3.1"> <param name="c" type="GLfloat"/> <glx rop="129"/> </function> @@ -2331,12 +2424,12 @@ <glx rop="135"/> </function> - <function name="IndexMask" offset="212"> + <function name="IndexMask" offset="212" deprecated="3.1"> <param name="mask" type="GLuint"/> <glx rop="136"/> </function> - <function name="Accum" offset="213"> + <function name="Accum" offset="213" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="value" type="GLfloat"/> <glx rop="137"/> @@ -2360,16 +2453,16 @@ <glx sop="142" handcode="true"/> </function> - <function name="PopAttrib" offset="218"> + <function name="PopAttrib" offset="218" deprecated="3.1"> <glx rop="141"/> </function> - <function name="PushAttrib" offset="219"> + <function name="PushAttrib" offset="219" deprecated="3.1"> <param name="mask" type="GLbitfield"/> <glx rop="142"/> </function> - <function name="Map1d" offset="220"> + <function name="Map1d" offset="220" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -2379,7 +2472,7 @@ <glx rop="143" handcode="true"/> </function> - <function name="Map1f" offset="221"> + <function name="Map1f" offset="221" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -2389,7 +2482,7 @@ <glx rop="144" handcode="true"/> </function> - <function name="Map2d" offset="222"> + <function name="Map2d" offset="222" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -2403,7 +2496,7 @@ <glx rop="145" handcode="true"/> </function> - <function name="Map2f" offset="223"> + <function name="Map2f" offset="223" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -2417,21 +2510,21 @@ <glx rop="146" handcode="true"/> </function> - <function name="MapGrid1d" offset="224"> + <function name="MapGrid1d" offset="224" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> <glx rop="147"/> </function> - <function name="MapGrid1f" offset="225"> + <function name="MapGrid1f" offset="225" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> <glx rop="148"/> </function> - <function name="MapGrid2d" offset="226"> + <function name="MapGrid2d" offset="226" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -2441,7 +2534,7 @@ <glx rop="149"/> </function> - <function name="MapGrid2f" offset="227"> + <function name="MapGrid2f" offset="227" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -2451,57 +2544,68 @@ <glx rop="150"/> </function> - <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv"> + <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv" + deprecated="3.1" exec="loopback"> <param name="u" type="GLdouble"/> </function> - <function name="EvalCoord1dv" offset="229"> + <function name="EvalCoord1dv" offset="229" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLdouble *" count="1"/> <glx rop="151"/> </function> - <function name="EvalCoord1f" offset="230" vectorequiv="EvalCoord1fv"> + <function name="EvalCoord1f" offset="230" vectorequiv="EvalCoord1fv" + deprecated="3.1" exec="dynamic"> <param name="u" type="GLfloat"/> </function> - <function name="EvalCoord1fv" offset="231"> + <function name="EvalCoord1fv" offset="231" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLfloat *" count="1"/> <glx rop="152"/> </function> - <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv"> + <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv" + deprecated="3.1" exec="loopback"> <param name="u" type="GLdouble"/> <param name="v" type="GLdouble"/> </function> - <function name="EvalCoord2dv" offset="233"> + <function name="EvalCoord2dv" offset="233" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLdouble *" count="2"/> <glx rop="153"/> </function> - <function name="EvalCoord2f" offset="234" vectorequiv="EvalCoord2fv"> + <function name="EvalCoord2f" offset="234" vectorequiv="EvalCoord2fv" + deprecated="3.1" exec="dynamic"> <param name="u" type="GLfloat"/> <param name="v" type="GLfloat"/> </function> - <function name="EvalCoord2fv" offset="235"> + <function name="EvalCoord2fv" offset="235" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLfloat *" count="2"/> <glx rop="154"/> </function> - <function name="EvalMesh1" offset="236"> + <function name="EvalMesh1" offset="236" deprecated="3.1" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="i1" type="GLint"/> <param name="i2" type="GLint"/> <glx rop="155"/> </function> - <function name="EvalPoint1" offset="237"> + <function name="EvalPoint1" offset="237" deprecated="3.1" + exec="dynamic"> <param name="i" type="GLint"/> <glx rop="156"/> </function> - <function name="EvalMesh2" offset="238"> + <function name="EvalMesh2" offset="238" deprecated="3.1" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="i1" type="GLint"/> <param name="i2" type="GLint"/> @@ -2510,13 +2614,14 @@ <glx rop="157"/> </function> - <function name="EvalPoint2" offset="239"> + <function name="EvalPoint2" offset="239" deprecated="3.1" + exec="dynamic"> <param name="i" type="GLint"/> <param name="j" type="GLint"/> <glx rop="158"/> </function> - <function name="AlphaFunc" offset="240" es1="1.0"> + <function name="AlphaFunc" offset="240" es1="1.0" deprecated="3.1"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampf"/> <glx rop="159"/> @@ -2552,19 +2657,19 @@ <glx rop="164"/> </function> - <function name="PixelZoom" offset="246"> + <function name="PixelZoom" offset="246" deprecated="3.1"> <param name="xfactor" type="GLfloat"/> <param name="yfactor" type="GLfloat"/> <glx rop="165"/> </function> - <function name="PixelTransferf" offset="247"> + <function name="PixelTransferf" offset="247" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="166"/> </function> - <function name="PixelTransferi" offset="248"> + <function name="PixelTransferi" offset="248" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="167"/> @@ -2582,21 +2687,21 @@ <glx sop="110" handcode="client"/> </function> - <function name="PixelMapfv" offset="251"> + <function name="PixelMapfv" offset="251" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLfloat *" count="mapsize"/> <glx rop="168" large="true"/> </function> - <function name="PixelMapuiv" offset="252"> + <function name="PixelMapuiv" offset="252" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLuint *" count="mapsize"/> <glx rop="169" large="true"/> </function> - <function name="PixelMapusv" offset="253"> + <function name="PixelMapusv" offset="253" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLushort *" count="mapsize"/> @@ -2608,7 +2713,7 @@ <glx rop="171"/> </function> - <function name="CopyPixels" offset="255"> + <function name="CopyPixels" offset="255" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -2628,7 +2733,7 @@ <glx sop="111"/> </function> - <function name="DrawPixels" offset="257"> + <function name="DrawPixels" offset="257" deprecated="3.1"> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> @@ -2643,7 +2748,7 @@ <glx sop="112" handcode="client"/> </function> - <function name="GetClipPlane" offset="259"> + <function name="GetClipPlane" offset="259" deprecated="3.1"> <param name="plane" type="GLenum"/> <param name="equation" type="GLdouble *" output="true" count="4"/> <glx sop="113" always_array="true"/> @@ -2672,74 +2777,74 @@ <glx sop="117" handcode="client"/> </function> - <function name="GetLightfv" offset="264" es1="1.1"> + <function name="GetLightfv" offset="264" es1="1.1" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="118"/> </function> - <function name="GetLightiv" offset="265"> + <function name="GetLightiv" offset="265" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="119"/> </function> - <function name="GetMapdv" offset="266"> + <function name="GetMapdv" offset="266" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="v" type="GLdouble *" output="true" variable_param="target query"/> <glx sop="120"/> </function> - <function name="GetMapfv" offset="267"> + <function name="GetMapfv" offset="267" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="v" type="GLfloat *" output="true" variable_param="target query"/> <glx sop="121"/> </function> - <function name="GetMapiv" offset="268"> + <function name="GetMapiv" offset="268" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="v" type="GLint *" output="true" variable_param="target query"/> <glx sop="122"/> </function> - <function name="GetMaterialfv" offset="269" es1="1.1"> + <function name="GetMaterialfv" offset="269" es1="1.1" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="123"/> </function> - <function name="GetMaterialiv" offset="270"> + <function name="GetMaterialiv" offset="270" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="124"/> </function> - <function name="GetPixelMapfv" offset="271"> + <function name="GetPixelMapfv" offset="271" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="values" type="GLfloat *" output="true" variable_param="map"/> <glx sop="125"/> </function> - <function name="GetPixelMapuiv" offset="272"> + <function name="GetPixelMapuiv" offset="272" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="values" type="GLuint *" output="true" variable_param="map"/> <glx sop="126"/> </function> - <function name="GetPixelMapusv" offset="273"> + <function name="GetPixelMapusv" offset="273" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="values" type="GLushort *" output="true" variable_param="map"/> <glx sop="127"/> </function> - <function name="GetPolygonStipple" offset="274"> + <function name="GetPolygonStipple" offset="274" deprecated="3.1"> <param name="mask" type="GLubyte *" output="true" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP"/> <glx sop="128"/> </function> @@ -2750,35 +2855,35 @@ <glx sop="129" handcode="true"/> </function> - <function name="GetTexEnvfv" offset="276" es1="1.1"> + <function name="GetTexEnvfv" offset="276" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="130"/> </function> - <function name="GetTexEnviv" offset="277" es1="1.1"> + <function name="GetTexEnviv" offset="277" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="131"/> </function> - <function name="GetTexGendv" offset="278"> + <function name="GetTexGendv" offset="278" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *" output="true" variable_param="pname"/> <glx sop="132"/> </function> - <function name="GetTexGenfv" offset="279"> + <function name="GetTexGenfv" offset="279" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="133"/> </function> - <function name="GetTexGeniv" offset="280"> + <function name="GetTexGeniv" offset="280" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> @@ -2830,7 +2935,7 @@ <glx sop="140" handcode="client"/> </function> - <function name="IsList" offset="287"> + <function name="IsList" offset="287" deprecated="3.1"> <param name="list" type="GLuint"/> <return type="GLboolean"/> <glx sop="141"/> @@ -2842,7 +2947,7 @@ <glx rop="174"/> </function> - <function name="Frustum" offset="289"> + <function name="Frustum" offset="289" deprecated="3.1"> <param name="left" type="GLdouble"/> <param name="right" type="GLdouble"/> <param name="bottom" type="GLdouble"/> @@ -2852,36 +2957,36 @@ <glx rop="175"/> </function> - <function name="LoadIdentity" offset="290" es1="1.0"> + <function name="LoadIdentity" offset="290" es1="1.0" deprecated="3.1"> <glx rop="176"/> </function> - <function name="LoadMatrixf" offset="291" es1="1.0"> + <function name="LoadMatrixf" offset="291" es1="1.0" deprecated="3.1"> <param name="m" type="const GLfloat *" count="16"/> <glx rop="177"/> </function> - <function name="LoadMatrixd" offset="292"> + <function name="LoadMatrixd" offset="292" deprecated="3.1"> <param name="m" type="const GLdouble *" count="16"/> <glx rop="178"/> </function> - <function name="MatrixMode" offset="293" es1="1.0"> + <function name="MatrixMode" offset="293" es1="1.0" deprecated="3.1"> <param name="mode" type="GLenum"/> <glx rop="179"/> </function> - <function name="MultMatrixf" offset="294" es1="1.0"> + <function name="MultMatrixf" offset="294" es1="1.0" deprecated="3.1"> <param name="m" type="const GLfloat *" count="16"/> <glx rop="180"/> </function> - <function name="MultMatrixd" offset="295"> + <function name="MultMatrixd" offset="295" deprecated="3.1"> <param name="m" type="const GLdouble *" count="16"/> <glx rop="181"/> </function> - <function name="Ortho" offset="296"> + <function name="Ortho" offset="296" deprecated="3.1"> <param name="left" type="GLdouble"/> <param name="right" type="GLdouble"/> <param name="bottom" type="GLdouble"/> @@ -2891,15 +2996,15 @@ <glx rop="182"/> </function> - <function name="PopMatrix" offset="297" es1="1.0"> + <function name="PopMatrix" offset="297" es1="1.0" deprecated="3.1"> <glx rop="183"/> </function> - <function name="PushMatrix" offset="298" es1="1.0"> + <function name="PushMatrix" offset="298" es1="1.0" deprecated="3.1"> <glx rop="184"/> </function> - <function name="Rotated" offset="299"> + <function name="Rotated" offset="299" deprecated="3.1"> <param name="angle" type="GLdouble"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -2907,7 +3012,7 @@ <glx rop="185"/> </function> - <function name="Rotatef" offset="300" es1="1.0"> + <function name="Rotatef" offset="300" es1="1.0" deprecated="3.1"> <param name="angle" type="GLfloat"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -2915,28 +3020,28 @@ <glx rop="186"/> </function> - <function name="Scaled" offset="301"> + <function name="Scaled" offset="301" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <glx rop="187"/> </function> - <function name="Scalef" offset="302" es1="1.0"> + <function name="Scalef" offset="302" es1="1.0" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <glx rop="188"/> </function> - <function name="Translated" offset="303"> + <function name="Translated" offset="303" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <glx rop="189"/> </function> - <function name="Translatef" offset="304" es1="1.0"> + <function name="Translatef" offset="304" es1="1.0" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -3126,12 +3231,13 @@ <enum name="ALL_CLIENT_ATTRIB_BITS" value="0xFFFFFFFF"/> <enum name="CLIENT_ALL_ATTRIB_BITS" value="0xFFFFFFFF"/> - <function name="ArrayElement" offset="306"> + <function name="ArrayElement" offset="306" deprecated="3.1" + exec="dynamic"> <param name="i" type="GLint"/> <glx handcode="true"/> </function> - <function name="ColorPointer" offset="308" es1="1.0"> + <function name="ColorPointer" offset="308" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3139,19 +3245,22 @@ <glx handcode="true"/> </function> - <function name="DisableClientState" offset="309" es1="1.0"> + <function name="DisableClientState" offset="309" es1="1.0" + deprecated="3.1"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> - <function name="DrawArrays" offset="310" es1="1.0" es2="2.0"> + <function name="DrawArrays" offset="310" es1="1.0" es2="2.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx rop="193" handcode="true"/> </function> - <function name="DrawElements" offset="311" es1="1.0" es2="2.0"> + <function name="DrawElements" offset="311" es1="1.0" es2="2.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -3159,13 +3268,13 @@ <glx handcode="true"/> </function> - <function name="EdgeFlagPointer" offset="312"> + <function name="EdgeFlagPointer" offset="312" deprecated="3.1"> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="EnableClientState" offset="313" es1="1.0"> + <function name="EnableClientState" offset="313" es1="1.0" deprecated="3.1"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> @@ -3176,28 +3285,28 @@ <glx handcode="true"/> </function> - <function name="IndexPointer" offset="314"> + <function name="IndexPointer" offset="314" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="InterleavedArrays" offset="317"> + <function name="InterleavedArrays" offset="317" deprecated="3.1"> <param name="format" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="NormalPointer" offset="318" es1="1.0"> + <function name="NormalPointer" offset="318" es1="1.0" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="TexCoordPointer" offset="320" es1="1.0"> + <function name="TexCoordPointer" offset="320" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3205,7 +3314,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointer" offset="321" es1="1.0"> + <function name="VertexPointer" offset="321" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3290,7 +3399,7 @@ <glx rop="4100" large="true"/> </function> - <function name="AreTexturesResident" offset="322"> + <function name="AreTexturesResident" offset="322" deprecated="3.1"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="const GLuint *" count="n"/> <param name="residences" type="GLboolean *" output="true" count="n"/> @@ -3322,27 +3431,28 @@ <glx sop="146"/> </function> - <function name="PrioritizeTextures" offset="331"> + <function name="PrioritizeTextures" offset="331" deprecated="3.1"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="const GLuint *" count="n"/> <param name="priorities" type="const GLclampf *" count="n"/> <glx rop="4118"/> </function> - <function name="Indexub" offset="315" vectorequiv="Indexubv"> + <function name="Indexub" offset="315" vectorequiv="Indexubv" + deprecated="3.1" exec="loopback"> <param name="c" type="GLubyte"/> </function> - <function name="Indexubv" offset="316"> + <function name="Indexubv" offset="316" deprecated="3.1" exec="loopback"> <param name="c" type="const GLubyte *" count="1"/> <glx rop="194"/> </function> - <function name="PopClientAttrib" offset="334"> + <function name="PopClientAttrib" offset="334" deprecated="3.1"> <glx handcode="true"/> </function> - <function name="PushClientAttrib" offset="335"> + <function name="PushClientAttrib" offset="335" deprecated="3.1"> <param name="mask" type="GLbitfield"/> <glx handcode="true"/> </function> @@ -3708,7 +3818,8 @@ <glx rop="4097"/> </function> - <function name="DrawRangeElements" offset="338" es2="3.0"> + <function name="DrawRangeElements" offset="338" es2="3.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -3718,7 +3829,7 @@ <glx handcode="true"/> </function> - <function name="ColorTable" offset="339"> + <function name="ColorTable" offset="339" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3728,21 +3839,21 @@ <glx rop="2053" large="true"/> </function> - <function name="ColorTableParameterfv" offset="340"> + <function name="ColorTableParameterfv" offset="340" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="2054"/> </function> - <function name="ColorTableParameteriv" offset="341"> + <function name="ColorTableParameteriv" offset="341" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="2055"/> </function> - <function name="CopyColorTable" offset="342"> + <function name="CopyColorTable" offset="342" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="x" type="GLint"/> @@ -3751,7 +3862,7 @@ <glx rop="2056"/> </function> - <function name="GetColorTable" offset="343"> + <function name="GetColorTable" offset="343" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -3759,21 +3870,21 @@ <glx sop="147" dimensions_in_reply="true"/> </function> - <function name="GetColorTableParameterfv" offset="344"> + <function name="GetColorTableParameterfv" offset="344" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="148"/> </function> - <function name="GetColorTableParameteriv" offset="345"> + <function name="GetColorTableParameteriv" offset="345" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="149"/> </function> - <function name="ColorSubTable" offset="346"> + <function name="ColorSubTable" offset="346" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="start" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -3783,7 +3894,7 @@ <glx rop="195" large="true"/> </function> - <function name="CopyColorSubTable" offset="347"> + <function name="CopyColorSubTable" offset="347" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="start" type="GLsizei"/> <param name="x" type="GLint"/> @@ -3792,7 +3903,7 @@ <glx rop="196"/> </function> - <function name="ConvolutionFilter1D" offset="348"> + <function name="ConvolutionFilter1D" offset="348" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3802,7 +3913,7 @@ <glx rop="4101" large="true"/> </function> - <function name="ConvolutionFilter2D" offset="349"> + <function name="ConvolutionFilter2D" offset="349" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3813,35 +3924,35 @@ <glx rop="4102" large="true"/> </function> - <function name="ConvolutionParameterf" offset="350"> + <function name="ConvolutionParameterf" offset="350" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat"/> <glx rop="4103"/> </function> - <function name="ConvolutionParameterfv" offset="351"> + <function name="ConvolutionParameterfv" offset="351" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="4104"/> </function> - <function name="ConvolutionParameteri" offset="352"> + <function name="ConvolutionParameteri" offset="352" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint"/> <glx rop="4105"/> </function> - <function name="ConvolutionParameteriv" offset="353"> + <function name="ConvolutionParameteriv" offset="353" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4106"/> </function> - <function name="CopyConvolutionFilter1D" offset="354"> + <function name="CopyConvolutionFilter1D" offset="354" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="x" type="GLint"/> @@ -3850,7 +3961,7 @@ <glx rop="4107"/> </function> - <function name="CopyConvolutionFilter2D" offset="355"> + <function name="CopyConvolutionFilter2D" offset="355" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="x" type="GLint"/> @@ -3860,7 +3971,7 @@ <glx rop="4108"/> </function> - <function name="GetConvolutionFilter" offset="356"> + <function name="GetConvolutionFilter" offset="356" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -3868,21 +3979,21 @@ <glx sop="150" dimensions_in_reply="true"/> </function> - <function name="GetConvolutionParameterfv" offset="357"> + <function name="GetConvolutionParameterfv" offset="357" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="151"/> </function> - <function name="GetConvolutionParameteriv" offset="358"> + <function name="GetConvolutionParameteriv" offset="358" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="152"/> </function> - <function name="GetSeparableFilter" offset="359"> + <function name="GetSeparableFilter" offset="359" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -3892,7 +4003,7 @@ <glx sop="153" handcode="true"/> </function> - <function name="SeparableFilter2D" offset="360"> + <function name="SeparableFilter2D" offset="360" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3904,7 +4015,7 @@ <glx rop="4109" handcode="true"/> </function> - <function name="GetHistogram" offset="361"> + <function name="GetHistogram" offset="361" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> @@ -3913,21 +4024,21 @@ <glx sop="154" dimensions_in_reply="true" img_reset="reset"/> </function> - <function name="GetHistogramParameterfv" offset="362"> + <function name="GetHistogramParameterfv" offset="362" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="155"/> </function> - <function name="GetHistogramParameteriv" offset="363"> + <function name="GetHistogramParameteriv" offset="363" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="156"/> </function> - <function name="GetMinmax" offset="364"> + <function name="GetMinmax" offset="364" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> @@ -3936,21 +4047,21 @@ <glx sop="157" img_reset="reset"/> </function> - <function name="GetMinmaxParameterfv" offset="365"> + <function name="GetMinmaxParameterfv" offset="365" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="158"/> </function> - <function name="GetMinmaxParameteriv" offset="366"> + <function name="GetMinmaxParameteriv" offset="366" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="159"/> </function> - <function name="Histogram" offset="367"> + <function name="Histogram" offset="367" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="internalformat" type="GLenum"/> @@ -3958,19 +4069,19 @@ <glx rop="4110"/> </function> - <function name="Minmax" offset="368"> + <function name="Minmax" offset="368" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="sink" type="GLboolean"/> <glx rop="4111"/> </function> - <function name="ResetHistogram" offset="369"> + <function name="ResetHistogram" offset="369" deprecated="3.1"> <param name="target" type="GLenum"/> <glx rop="4112"/> </function> - <function name="ResetMinmax" offset="370"> + <function name="ResetMinmax" offset="370" deprecated="3.1"> <param name="target" type="GLenum"/> <glx rop="4113"/> </function> @@ -4238,143 +4349,168 @@ </function> <function name="ClientActiveTexture" alias="ClientActiveTextureARB" - es1="1.0"> + es1="1.0" deprecated="3.1"> <param name="texture" type="GLenum"/> </function> - <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB"> + <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB"> + <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB"> + <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> </function> - <function name="MultiTexCoord1fv" alias="MultiTexCoord1fvARB"> + <function name="MultiTexCoord1fv" alias="MultiTexCoord1fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB"> + <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB"> + <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB"> + <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB"> + <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB"> + <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB"> + <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB"> + <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> </function> - <function name="MultiTexCoord2fv" alias="MultiTexCoord2fvARB"> + <function name="MultiTexCoord2fv" alias="MultiTexCoord2fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB"> + <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB"> + <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB"> + <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB"> + <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB"> + <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB"> + <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB"> + <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> </function> - <function name="MultiTexCoord3fv" alias="MultiTexCoord3fvARB"> + <function name="MultiTexCoord3fv" alias="MultiTexCoord3fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB"> + <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB"> + <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB"> + <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB"> + <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB"> + <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -4382,12 +4518,14 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB"> + <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0"> + <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -4395,12 +4533,14 @@ <param name="q" type="GLfloat"/> </function> - <function name="MultiTexCoord4fv" alias="MultiTexCoord4fvARB"> + <function name="MultiTexCoord4fv" alias="MultiTexCoord4fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB"> + <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -4408,12 +4548,14 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB"> + <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB"> + <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -4421,24 +4563,29 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB"> + <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB"> + <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB" + deprecated="3.1"> <param name="m" type="const GLfloat *"/> </function> - <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB"> + <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB" + deprecated="3.1"> <param name="m" type="const GLdouble *"/> </function> - <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB"> + <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB" + deprecated="3.1"> <param name="m" type="const GLfloat *"/> </function> - <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB"> + <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB" + deprecated="3.1"> <param name="m" type="const GLdouble *"/> </function> @@ -4648,23 +4795,24 @@ <param name="dfactorAlpha" type="GLenum"/> </function> - <function name="FogCoordf" alias="FogCoordfEXT"> + <function name="FogCoordf" alias="FogCoordfEXT" deprecated="3.1"> <param name="coord" type="GLfloat"/> </function> - <function name="FogCoordfv" alias="FogCoordfvEXT"> + <function name="FogCoordfv" alias="FogCoordfvEXT" deprecated="3.1"> <param name="coord" type="const GLfloat *"/> </function> - <function name="FogCoordd" alias="FogCoorddEXT"> + <function name="FogCoordd" alias="FogCoorddEXT" deprecated="3.1"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddv" alias="FogCoorddvEXT"> + <function name="FogCoorddv" alias="FogCoorddvEXT" deprecated="3.1"> <param name="coord" type="const GLdouble *"/> </function> - <function name="FogCoordPointer" alias="FogCoordPointerEXT"> + <function name="FogCoordPointer" alias="FogCoordPointerEXT" + deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -4705,166 +4853,183 @@ <param name="params" type="const GLint *"/> </function> - <function name="SecondaryColor3b" alias="SecondaryColor3bEXT"> + <function name="SecondaryColor3b" alias="SecondaryColor3bEXT" + deprecated="3.1"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT"> + <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT" + deprecated="3.1"> <param name="v" type="const GLbyte *"/> </function> - <function name="SecondaryColor3d" alias="SecondaryColor3dEXT"> + <function name="SecondaryColor3d" alias="SecondaryColor3dEXT" + deprecated="3.1"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT"> + <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT" + deprecated="3.1"> <param name="v" type="const GLdouble *"/> </function> - <function name="SecondaryColor3f" alias="SecondaryColor3fEXT"> + <function name="SecondaryColor3f" alias="SecondaryColor3fEXT" + deprecated="3.1" exec="dynamic"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> </function> - <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT"> + <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT" + deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *"/> </function> - <function name="SecondaryColor3i" alias="SecondaryColor3iEXT"> + <function name="SecondaryColor3i" alias="SecondaryColor3iEXT" + deprecated="3.1"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT"> + <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT" + deprecated="3.1"> <param name="v" type="const GLint *"/> </function> - <function name="SecondaryColor3s" alias="SecondaryColor3sEXT"> + <function name="SecondaryColor3s" alias="SecondaryColor3sEXT" + deprecated="3.1"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT"> + <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT" + deprecated="3.1"> <param name="v" type="const GLshort *"/> </function> - <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT"> + <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT" + deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT"> + <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT" + deprecated="3.1"> <param name="v" type="const GLubyte *"/> </function> - <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT"> + <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT" + deprecated="3.1"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT"> + <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT" + deprecated="3.1"> <param name="v" type="const GLuint *"/> </function> - <function name="SecondaryColor3us" alias="SecondaryColor3usEXT"> + <function name="SecondaryColor3us" alias="SecondaryColor3usEXT" + deprecated="3.1"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT"> + <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT" + deprecated="3.1"> <param name="v" type="const GLushort *"/> </function> - <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT"> + <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT" + deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> </function> - <function name="WindowPos2d" alias="WindowPos2dMESA"> + <function name="WindowPos2d" alias="WindowPos2dMESA" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="WindowPos2dv" alias="WindowPos2dvMESA"> + <function name="WindowPos2dv" alias="WindowPos2dvMESA" deprecated="3.1"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos2f" alias="WindowPos2fMESA"> + <function name="WindowPos2f" alias="WindowPos2fMESA" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="WindowPos2fv" alias="WindowPos2fvMESA"> + <function name="WindowPos2fv" alias="WindowPos2fvMESA" deprecated="3.1"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos2i" alias="WindowPos2iMESA"> + <function name="WindowPos2i" alias="WindowPos2iMESA" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="WindowPos2iv" alias="WindowPos2ivMESA"> + <function name="WindowPos2iv" alias="WindowPos2ivMESA" deprecated="3.1"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos2s" alias="WindowPos2sMESA"> + <function name="WindowPos2s" alias="WindowPos2sMESA" deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="WindowPos2sv" alias="WindowPos2svMESA"> + <function name="WindowPos2sv" alias="WindowPos2svMESA" deprecated="3.1"> <param name="v" type="const GLshort *"/> </function> - <function name="WindowPos3d" alias="WindowPos3dMESA"> + <function name="WindowPos3d" alias="WindowPos3dMESA" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="WindowPos3dv" alias="WindowPos3dvMESA"> + <function name="WindowPos3dv" alias="WindowPos3dvMESA" deprecated="3.1"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos3f" alias="WindowPos3fMESA"> + <function name="WindowPos3f" alias="WindowPos3fMESA" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3fv" alias="WindowPos3fvMESA"> + <function name="WindowPos3fv" alias="WindowPos3fvMESA" deprecated="3.1"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos3i" alias="WindowPos3iMESA"> + <function name="WindowPos3i" alias="WindowPos3iMESA" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="WindowPos3iv" alias="WindowPos3ivMESA"> + <function name="WindowPos3iv" alias="WindowPos3ivMESA" deprecated="3.1"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos3s" alias="WindowPos3sMESA"> + <function name="WindowPos3s" alias="WindowPos3sMESA" deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="WindowPos3sv" alias="WindowPos3svMESA"> + <function name="WindowPos3sv" alias="WindowPos3svMESA" deprecated="3.1"> <param name="v" type="const GLshort *"/> </function> </category> @@ -5828,151 +5993,164 @@ <glx handcode="true"/> </function> - <function name="MultiTexCoord1dARB" offset="376" vectorequiv="MultiTexCoord1dvARB"> + <function name="MultiTexCoord1dARB" offset="376" + vectorequiv="MultiTexCoord1dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dvARB" offset="377"> + <function name="MultiTexCoord1dvARB" offset="377" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="198"/> </function> - <function name="MultiTexCoord1fARB" offset="378" vectorequiv="MultiTexCoord1fvARB"> + <function name="MultiTexCoord1fARB" offset="378" + vectorequiv="MultiTexCoord1fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> </function> - <function name="MultiTexCoord1fvARB" offset="379"> + <function name="MultiTexCoord1fvARB" offset="379" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="1"/> <glx rop="199"/> </function> - <function name="MultiTexCoord1iARB" offset="380" vectorequiv="MultiTexCoord1ivARB"> + <function name="MultiTexCoord1iARB" offset="380" + vectorequiv="MultiTexCoord1ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1ivARB" offset="381"> + <function name="MultiTexCoord1ivARB" offset="381" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="1"/> <glx rop="200"/> </function> - <function name="MultiTexCoord1sARB" offset="382" vectorequiv="MultiTexCoord1svARB"> + <function name="MultiTexCoord1sARB" offset="382" + vectorequiv="MultiTexCoord1svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1svARB" offset="383"> + <function name="MultiTexCoord1svARB" offset="383" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="201"/> </function> - <function name="MultiTexCoord2dARB" offset="384" vectorequiv="MultiTexCoord2dvARB"> + <function name="MultiTexCoord2dARB" offset="384" + vectorequiv="MultiTexCoord2dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dvARB" offset="385"> + <function name="MultiTexCoord2dvARB" offset="385" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="202"/> </function> - <function name="MultiTexCoord2fARB" offset="386" vectorequiv="MultiTexCoord2fvARB"> + <function name="MultiTexCoord2fARB" offset="386" + vectorequiv="MultiTexCoord2fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> </function> - <function name="MultiTexCoord2fvARB" offset="387"> + <function name="MultiTexCoord2fvARB" offset="387" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="2"/> <glx rop="203"/> </function> - <function name="MultiTexCoord2iARB" offset="388" vectorequiv="MultiTexCoord2ivARB"> + <function name="MultiTexCoord2iARB" offset="388" + vectorequiv="MultiTexCoord2ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2ivARB" offset="389"> + <function name="MultiTexCoord2ivARB" offset="389" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="2"/> <glx rop="204"/> </function> - <function name="MultiTexCoord2sARB" offset="390" vectorequiv="MultiTexCoord2svARB"> + <function name="MultiTexCoord2sARB" offset="390" + vectorequiv="MultiTexCoord2svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2svARB" offset="391"> + <function name="MultiTexCoord2svARB" offset="391" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="205"/> </function> - <function name="MultiTexCoord3dARB" offset="392" vectorequiv="MultiTexCoord3dvARB"> + <function name="MultiTexCoord3dARB" offset="392" + vectorequiv="MultiTexCoord3dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dvARB" offset="393"> + <function name="MultiTexCoord3dvARB" offset="393" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="206"/> </function> - <function name="MultiTexCoord3fARB" offset="394" vectorequiv="MultiTexCoord3fvARB"> + <function name="MultiTexCoord3fARB" offset="394" + vectorequiv="MultiTexCoord3fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> </function> - <function name="MultiTexCoord3fvARB" offset="395"> + <function name="MultiTexCoord3fvARB" offset="395" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="3"/> <glx rop="207"/> </function> - <function name="MultiTexCoord3iARB" offset="396" vectorequiv="MultiTexCoord3ivARB"> + <function name="MultiTexCoord3iARB" offset="396" + vectorequiv="MultiTexCoord3ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3ivARB" offset="397"> + <function name="MultiTexCoord3ivARB" offset="397" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="3"/> <glx rop="208"/> </function> - <function name="MultiTexCoord3sARB" offset="398" vectorequiv="MultiTexCoord3svARB"> + <function name="MultiTexCoord3sARB" offset="398" + vectorequiv="MultiTexCoord3svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3svARB" offset="399"> + <function name="MultiTexCoord3svARB" offset="399" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="209"/> </function> - <function name="MultiTexCoord4dARB" offset="400" vectorequiv="MultiTexCoord4dvARB"> + <function name="MultiTexCoord4dARB" offset="400" + vectorequiv="MultiTexCoord4dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -5980,13 +6158,14 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dvARB" offset="401"> + <function name="MultiTexCoord4dvARB" offset="401" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="210"/> </function> - <function name="MultiTexCoord4fARB" offset="402" vectorequiv="MultiTexCoord4fvARB"> + <function name="MultiTexCoord4fARB" offset="402" + vectorequiv="MultiTexCoord4fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -5994,13 +6173,14 @@ <param name="q" type="GLfloat"/> </function> - <function name="MultiTexCoord4fvARB" offset="403"> + <function name="MultiTexCoord4fvARB" offset="403" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="4"/> <glx rop="211"/> </function> - <function name="MultiTexCoord4iARB" offset="404" vectorequiv="MultiTexCoord4ivARB"> + <function name="MultiTexCoord4iARB" offset="404" + vectorequiv="MultiTexCoord4ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -6008,13 +6188,14 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4ivARB" offset="405"> + <function name="MultiTexCoord4ivARB" offset="405" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="4"/> <glx rop="212"/> </function> - <function name="MultiTexCoord4sARB" offset="406" vectorequiv="MultiTexCoord4svARB"> + <function name="MultiTexCoord4sARB" offset="406" + vectorequiv="MultiTexCoord4svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -6022,7 +6203,7 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4svARB" offset="407"> + <function name="MultiTexCoord4svARB" offset="407" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="213"/> @@ -6393,47 +6574,47 @@ <size name="Get" mode="get"/> </enum> - <function name="WeightbvARB"> + <function name="WeightbvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLbyte *"/> </function> - <function name="WeightsvARB"> + <function name="WeightsvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLshort *"/> </function> - <function name="WeightivARB"> + <function name="WeightivARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLint *"/> </function> - <function name="WeightfvARB"> + <function name="WeightfvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLfloat *"/> </function> - <function name="WeightdvARB"> + <function name="WeightdvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLdouble *"/> </function> - <function name="WeightubvARB"> + <function name="WeightubvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLubyte *"/> </function> - <function name="WeightusvARB"> + <function name="WeightusvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLushort *"/> </function> - <function name="WeightuivARB"> + <function name="WeightuivARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLuint *"/> </function> - <function name="WeightPointerARB"> + <function name="WeightPointerARB" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -6441,7 +6622,7 @@ <glx handcode="true"/> </function> - <function name="VertexBlendARB"> + <function name="VertexBlendARB" exec="skip"> <param name="count" type="GLint"/> </function> </category> @@ -6476,30 +6657,30 @@ </enum> <enum name="MATRIX_INDEX_ARRAY_POINTER_ARB" value="0x8849"/> - <function name="CurrentPaletteMatrixARB"> + <function name="CurrentPaletteMatrixARB" exec="skip"> <param name="index" type="GLint"/> <glx ignore="true" rop="4329"/> </function> - <function name="MatrixIndexubvARB"> + <function name="MatrixIndexubvARB" exec="skip"> <param name="size" type="GLint" counter="true"/> <param name="indices" type="const GLubyte *" count="size"/> <glx ignore="true" rop="4326"/> </function> - <function name="MatrixIndexusvARB"> + <function name="MatrixIndexusvARB" exec="skip"> <param name="size" type="GLint" counter="true"/> <param name="indices" type="const GLushort *" count="size"/> <glx ignore="true" rop="4327"/> </function> - <function name="MatrixIndexuivARB"> + <function name="MatrixIndexuivARB" exec="skip"> <param name="size" type="GLint" counter="true"/> <param name="indices" type="const GLuint *" count="size"/> <glx ignore="true" rop="4328"/> </function> - <function name="MatrixIndexPointerARB"> + <function name="MatrixIndexPointerARB" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -6866,115 +7047,125 @@ <glx handcode="client" vendorpriv="1303"/> </function> - <function name="VertexAttrib1dARB" offset="assign" vectorequiv="VertexAttrib1dvARB"> + <function name="VertexAttrib1dARB" offset="assign" + vectorequiv="VertexAttrib1dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvARB" offset="assign"> + <function name="VertexAttrib1dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4197" doubles_in_order="true"/> </function> - <function name="VertexAttrib1fARB" offset="assign" vectorequiv="VertexAttrib1fvARB"> + <function name="VertexAttrib1fARB" offset="assign" + vectorequiv="VertexAttrib1fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> </function> - <function name="VertexAttrib1fvARB" offset="assign"> + <function name="VertexAttrib1fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="1"/> <glx rop="4193"/> </function> - <function name="VertexAttrib1sARB" offset="assign" vectorequiv="VertexAttrib1svARB"> + <function name="VertexAttrib1sARB" offset="assign" + vectorequiv="VertexAttrib1svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svARB" offset="assign"> + <function name="VertexAttrib1svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4189"/> </function> - <function name="VertexAttrib2dARB" offset="assign" vectorequiv="VertexAttrib2dvARB"> + <function name="VertexAttrib2dARB" offset="assign" + vectorequiv="VertexAttrib2dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvARB" offset="assign"> + <function name="VertexAttrib2dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4198" doubles_in_order="true"/> </function> - <function name="VertexAttrib2fARB" offset="assign" vectorequiv="VertexAttrib2fvARB"> + <function name="VertexAttrib2fARB" offset="assign" + vectorequiv="VertexAttrib2fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="VertexAttrib2fvARB" offset="assign"> + <function name="VertexAttrib2fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="2"/> <glx rop="4194"/> </function> - <function name="VertexAttrib2sARB" offset="assign" vectorequiv="VertexAttrib2svARB"> + <function name="VertexAttrib2sARB" offset="assign" + vectorequiv="VertexAttrib2svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svARB" offset="assign"> + <function name="VertexAttrib2svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4190"/> </function> - <function name="VertexAttrib3dARB" offset="assign" vectorequiv="VertexAttrib3dvARB"> + <function name="VertexAttrib3dARB" offset="assign" + vectorequiv="VertexAttrib3dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvARB" offset="assign"> + <function name="VertexAttrib3dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4199" doubles_in_order="true"/> </function> - <function name="VertexAttrib3fARB" offset="assign" vectorequiv="VertexAttrib3fvARB"> + <function name="VertexAttrib3fARB" offset="assign" + vectorequiv="VertexAttrib3fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="VertexAttrib3fvARB" offset="assign"> + <function name="VertexAttrib3fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="3"/> <glx rop="4195"/> </function> - <function name="VertexAttrib3sARB" offset="assign" vectorequiv="VertexAttrib3svARB"> + <function name="VertexAttrib3sARB" offset="assign" + vectorequiv="VertexAttrib3svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svARB" offset="assign"> + <function name="VertexAttrib3svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4191"/> </function> - <function name="VertexAttrib4dARB" offset="assign" vectorequiv="VertexAttrib4dvARB"> + <function name="VertexAttrib4dARB" offset="assign" + vectorequiv="VertexAttrib4dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -6982,13 +7173,14 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvARB" offset="assign"> + <function name="VertexAttrib4dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4200" doubles_in_order="true"/> </function> - <function name="VertexAttrib4fARB" offset="assign" vectorequiv="VertexAttrib4fvARB"> + <function name="VertexAttrib4fARB" offset="assign" + vectorequiv="VertexAttrib4fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -6996,13 +7188,14 @@ <param name="w" type="GLfloat"/> </function> - <function name="VertexAttrib4fvARB" offset="assign"> + <function name="VertexAttrib4fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="4"/> <glx rop="4196"/> </function> - <function name="VertexAttrib4sARB" offset="assign" vectorequiv="VertexAttrib4svARB"> + <function name="VertexAttrib4sARB" offset="assign" + vectorequiv="VertexAttrib4svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -7010,13 +7203,14 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svARB" offset="assign"> + <function name="VertexAttrib4svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4192"/> </function> - <function name="VertexAttrib4NubARB" offset="assign" vectorequiv="VertexAttrib4NubvARB"> + <function name="VertexAttrib4NubARB" offset="assign" + vectorequiv="VertexAttrib4NubvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -7024,67 +7218,67 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4NubvARB" offset="assign"> + <function name="VertexAttrib4NubvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4201"/> </function> - <function name="VertexAttrib4bvARB" offset="assign"> + <function name="VertexAttrib4bvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> <glx rop="4230"/> </function> - <function name="VertexAttrib4ivARB" offset="assign"> + <function name="VertexAttrib4ivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> <glx rop="4231"/> </function> - <function name="VertexAttrib4ubvARB" offset="assign"> + <function name="VertexAttrib4ubvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4232"/> </function> - <function name="VertexAttrib4usvARB" offset="assign"> + <function name="VertexAttrib4usvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> <glx rop="4233"/> </function> - <function name="VertexAttrib4uivARB" offset="assign"> + <function name="VertexAttrib4uivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> <glx rop="4234"/> </function> - <function name="VertexAttrib4NbvARB" offset="assign"> + <function name="VertexAttrib4NbvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> <glx rop="4235"/> </function> - <function name="VertexAttrib4NsvARB" offset="assign"> + <function name="VertexAttrib4NsvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4236"/> </function> - <function name="VertexAttrib4NivARB" offset="assign"> + <function name="VertexAttrib4NivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> <glx rop="4237"/> </function> - <function name="VertexAttrib4NusvARB" offset="assign"> + <function name="VertexAttrib4NusvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> <glx rop="4238"/> </function> - <function name="VertexAttrib4NuivARB" offset="assign"> + <function name="VertexAttrib4NuivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> <glx rop="4239"/> @@ -7110,7 +7304,7 @@ <glx handcode="true"/> </function> - <function name="ProgramStringARB" offset="assign"> + <function name="ProgramStringARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="len" type="GLsizei" counter="true"/> @@ -7138,7 +7332,8 @@ <return type="GLboolean"/> </function> - <function name="ProgramEnvParameter4dARB" offset="assign" vectorequiv="ProgramEnvParameter4dvARB"> + <function name="ProgramEnvParameter4dARB" offset="assign" + vectorequiv="ProgramEnvParameter4dvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> @@ -7147,14 +7342,16 @@ <param name="w" type="GLdouble"/> </function> - <function name="ProgramEnvParameter4dvARB" offset="assign"> + <function name="ProgramEnvParameter4dvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLdouble *" count="4"/> <glx rop="4185" doubles_in_order="true"/> </function> - <function name="ProgramEnvParameter4fARB" offset="assign" vectorequiv="ProgramEnvParameter4fvARB"> + <function name="ProgramEnvParameter4fARB" offset="assign" + vectorequiv="ProgramEnvParameter4fvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> @@ -7163,14 +7360,16 @@ <param name="w" type="GLfloat"/> </function> - <function name="ProgramEnvParameter4fvARB" offset="assign"> + <function name="ProgramEnvParameter4fvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLfloat *" count="4"/> <glx rop="4184"/> </function> - <function name="ProgramLocalParameter4dARB" offset="assign" vectorequiv="ProgramLocalParameter4dvARB"> + <function name="ProgramLocalParameter4dARB" offset="assign" + vectorequiv="ProgramLocalParameter4dvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> @@ -7179,14 +7378,16 @@ <param name="w" type="GLdouble"/> </function> - <function name="ProgramLocalParameter4dvARB" offset="assign"> + <function name="ProgramLocalParameter4dvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLdouble *" count="4"/> <glx rop="4216" doubles_in_order="true"/> </function> - <function name="ProgramLocalParameter4fARB" offset="assign" vectorequiv="ProgramLocalParameter4fvARB"> + <function name="ProgramLocalParameter4fARB" offset="assign" + vectorequiv="ProgramLocalParameter4fvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> @@ -7195,7 +7396,8 @@ <param name="w" type="GLfloat"/> </function> - <function name="ProgramLocalParameter4fvARB" offset="assign"> + <function name="ProgramLocalParameter4fvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLfloat *" count="4"/> @@ -7214,28 +7416,32 @@ the ARB_vertex_program protocol to unused padding. --> - <function name="GetProgramEnvParameterdvARB" offset="assign"> + <function name="GetProgramEnvParameterdvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLdouble *" output="true" count="4"/> <glx vendorpriv="1297" handcode="client" doubles_in_order="true"/> </function> - <function name="GetProgramEnvParameterfvARB" offset="assign"> + <function name="GetProgramEnvParameterfvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLfloat *" output="true" count="4"/> <glx vendorpriv="1296" handcode="client"/> </function> - <function name="GetProgramLocalParameterdvARB" offset="assign"> + <function name="GetProgramLocalParameterdvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLdouble *" output="true" count="4"/> <glx vendorpriv="1306" handcode="client" doubles_in_order="true"/> </function> - <function name="GetProgramLocalParameterfvARB" offset="assign"> + <function name="GetProgramLocalParameterfvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLfloat *" output="true" count="4"/> @@ -7243,14 +7449,14 @@ </function> - <function name="GetProgramivARB" offset="assign"> + <function name="GetProgramivARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx vendorpriv="1307"/> </function> - <function name="GetProgramStringARB" offset="assign"> + <function name="GetProgramStringARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="string" type="GLvoid *" output="true"/> @@ -8025,7 +8231,8 @@ <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/> <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/> - <function name="DrawTransformFeedbackStream" offset="assign"> + <function name="DrawTransformFeedbackStream" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8061,13 +8268,15 @@ <!-- ARB extensions #106...#108 --> <category name="GL_ARB_transform_feedback_instanced" number="109"> - <function name="DrawTransformFeedbackInstanced" offset="assign"> + <function name="DrawTransformFeedbackInstanced" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawTransformFeedbackStreamInstanced" offset="assign"> + <function name="DrawTransformFeedbackStreamInstanced" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8111,7 +8320,7 @@ <category name="GL_EXT_polygon_offset" number="3"> <enum name="POLYGON_OFFSET_BIAS_EXT" value="0x8039"/> - <function name="PolygonOffsetEXT" offset="assign"> + <function name="PolygonOffsetEXT" offset="assign" deprecated="3.1"> <param name="factor" type="GLfloat"/> <param name="bias" type="GLfloat"/> <glx rop="4098" ignore="true"/> @@ -8215,14 +8424,14 @@ </category> <category name="GL_SGIS_texture_filter4" number="7"> - <function name="GetTexFilterFuncSGIS"> + <function name="GetTexFilterFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="filter" type="GLenum"/> <param name="weights" type="GLfloat *" output="true"/> <glx vendorpriv="4101" ignore="true"/> </function> - <function name="TexFilterFuncSGIS"> + <function name="TexFilterFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="filter" type="GLenum"/> <param name="n" type="GLsizei" counter="true"/> @@ -8712,37 +8921,37 @@ </category> <category name="GL_SGIS_pixel_texture" number="15"> - <function name="PixelTexGenParameteriSGIS"> + <function name="PixelTexGenParameteriSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="PixelTexGenParameterivSGIS"> + <function name="PixelTexGenParameterivSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="PixelTexGenParameterfSGIS"> + <function name="PixelTexGenParameterfSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="PixelTexGenParameterfvSGIS"> + <function name="PixelTexGenParameterfvSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="GetPixelTexGenParameterivSGIS"> + <function name="GetPixelTexGenParameterivSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetPixelTexGenParameterfvSGIS"> + <function name="GetPixelTexGenParameterfvSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> @@ -8750,7 +8959,7 @@ </category> <category name="GL_SGIS_texture4D" number="16"> - <function name="TexImage4DSGIS"> + <function name="TexImage4DSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -8765,7 +8974,7 @@ <glx rop="2057" ignore="true"/> </function> - <function name="TexSubImage4DSGIS"> + <function name="TexSubImage4DSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -8831,14 +9040,14 @@ </category> <category name="GL_SGIS_detail_texture" number="21"> - <function name="DetailTexFuncSGIS"> + <function name="DetailTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="n" type="GLsizei" counter="true"/> <param name="points" type="const GLfloat *" count="n"/> <glx rop="2051" ignore="true"/> </function> - <function name="GetDetailTexFuncSGIS"> + <function name="GetDetailTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="points" type="GLfloat *" output="true"/> <glx vendorpriv="4096" ignore="true"/> @@ -8846,14 +9055,14 @@ </category> <category name="GL_SGIS_sharpen_texture" number="22"> - <function name="SharpenTexFuncSGIS"> + <function name="SharpenTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="n" type="GLsizei" counter="true"/> <param name="points" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="2052" ignore="true"/> </function> - <function name="GetSharpenTexFuncSGIS"> + <function name="GetSharpenTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="points" type="GLfloat *" output="true"/> <glx vendorpriv="4097" ignore="true"/> @@ -8861,13 +9070,15 @@ </category> <category name="GL_SGIS_multisample" number="25"> - <function name="SampleMaskSGIS" offset="assign" static_dispatch="false"> + <function name="SampleMaskSGIS" offset="assign" static_dispatch="false" + exec="skip"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> <glx rop="2048"/> </function> - <function name="SamplePatternSGIS" offset="assign" static_dispatch="false"> + <function name="SamplePatternSGIS" offset="assign" static_dispatch="false" + exec="skip"> <param name="pattern" type="GLenum"/> <glx rop="2049"/> </function> @@ -8898,7 +9109,7 @@ <param name="i" type="GLint"/> </function> - <function name="ColorPointerEXT" offset="assign"> + <function name="ColorPointerEXT" offset="assign" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -8913,7 +9124,7 @@ <param name="count" type="GLsizei"/> </function> - <function name="EdgeFlagPointerEXT" offset="assign"> + <function name="EdgeFlagPointerEXT" offset="assign" deprecated="3.1"> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> <param name="pointer" type="const GLboolean *"/> @@ -8925,7 +9136,7 @@ <param name="params" type="GLvoid **" output="true"/> </function> - <function name="IndexPointerEXT" offset="assign"> + <function name="IndexPointerEXT" offset="assign" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -8933,7 +9144,7 @@ <glx handcode="true"/> </function> - <function name="NormalPointerEXT" offset="assign"> + <function name="NormalPointerEXT" offset="assign" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -8941,7 +9152,7 @@ <glx handcode="true"/> </function> - <function name="TexCoordPointerEXT" offset="assign"> + <function name="TexCoordPointerEXT" offset="assign" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -8950,7 +9161,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointerEXT" offset="assign"> + <function name="VertexPointerEXT" offset="assign" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -9064,25 +9275,25 @@ <!-- Extension number 50 is a GLX extension. --> <category name="GL_SGIX_sprite" number="52"> - <function name="SpriteParameterfSGIX"> + <function name="SpriteParameterfSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="SpriteParameterfvSGIX"> + <function name="SpriteParameterfvSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="SpriteParameteriSGIX"> + <function name="SpriteParameteriSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="SpriteParameterivSGIX"> + <function name="SpriteParameterivSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> @@ -9103,13 +9314,13 @@ <size name="PointParameterfvEXT" mode="get"/> </enum> - <function name="PointParameterfEXT" offset="assign"> + <function name="PointParameterfEXT" offset="assign" mesa_name="-EXT"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="2065"/> </function> - <function name="PointParameterfvEXT" offset="assign"> + <function name="PointParameterfvEXT" offset="assign" mesa_name="-EXT"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="2066"/> @@ -9117,33 +9328,33 @@ </category> <category name="GL_SGIX_instruments" number="55"> - <function name="GetInstrumentsSGIX"> + <function name="GetInstrumentsSGIX" exec="skip"> <return type="GLint"/> <glx ignore="true"/> </function> - <function name="InstrumentsBufferSGIX"> + <function name="InstrumentsBufferSGIX" exec="skip"> <param name="size" type="GLsizei"/> <param name="buffer" type="GLint *" output="true"/> <glx ignore="true"/> </function> - <function name="PollInstrumentsSGIX"> + <function name="PollInstrumentsSGIX" exec="skip"> <param name="marker_p" type="GLint *" output="true"/> <return type="GLint"/> <glx ignore="true"/> </function> - <function name="ReadInstrumentsSGIX"> + <function name="ReadInstrumentsSGIX" exec="skip"> <param name="marker" type="GLint"/> <glx ignore="true"/> </function> - <function name="StartInstrumentsSGIX"> + <function name="StartInstrumentsSGIX" exec="skip"> <glx ignore="true"/> </function> - <function name="StopInstrumentsSGIX"> + <function name="StopInstrumentsSGIX" exec="skip"> <param name="marker" type="GLint"/> <glx ignore="true"/> </function> @@ -9167,14 +9378,14 @@ </category> <category name="GL_SGIX_framezoom" number="57"> - <function name="FrameZoomSGIX"> + <function name="FrameZoomSGIX" exec="skip"> <param name="factor" type="GLint"/> <glx rop="2072" ignore="true"/> </function> </category> <category name="GL_SGIX_tag_sample_buffer" number="58"> - <function name="TagSampleBufferSGIX"> + <function name="TagSampleBufferSGIX" exec="skip"> <glx rop="2050" ignore="true"/> </function> </category> @@ -9182,14 +9393,14 @@ <!-- Extension number 59 is not listed in the extension registry. --> <category name="GL_SGIX_reference_plane" number="60"> - <function name="ReferencePlaneSGIX"> + <function name="ReferencePlaneSGIX" exec="skip"> <param name="equation" type="const GLdouble *" count="4"/> <glx rop="2071" ignore="true"/> </function> </category> <category name="GL_SGIX_flush_raster" number="61"> - <function name="FlushRasterSGIX"> + <function name="FlushRasterSGIX" exec="skip"> <glx vendorpriv="4105" ignore="true"/> </function> </category> @@ -9203,13 +9414,13 @@ </category> <category name="GL_SGIS_fog_function" number="64"> - <function name="FogFuncSGIS"> + <function name="FogFuncSGIS" exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="points" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="2067" ignore="true"/> </function> - <function name="GetFogFuncSGIS"> + <function name="GetFogFuncSGIS" exec="skip"> <param name="points" type="GLfloat *" output="true"/> <!-- GLX protocol for this function is unknown. --> </function> @@ -9224,37 +9435,37 @@ </category> <category name="GL_HP_image_transform" number="66"> - <function name="ImageTransformParameteriHP"> + <function name="ImageTransformParameteriHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="ImageTransformParameterfHP"> + <function name="ImageTransformParameterfHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="ImageTransformParameterivHP"> + <function name="ImageTransformParameterivHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="ImageTransformParameterfvHP"> + <function name="ImageTransformParameterfvHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> - <function name="GetImageTransformParameterivHP"> + <function name="GetImageTransformParameterivHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> </function> - <function name="GetImageTransformParameterfvHP"> + <function name="GetImageTransformParameterfvHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> @@ -9301,7 +9512,7 @@ <!-- Extension number 75 is a GLU extension. --> <category name="GL_PGI_misc_hints" number="77"> - <function name="HintPGI"> + <function name="HintPGI" exec="skip"> <param name="target" type="GLenum"/> <param name="mode" type="GLint"/> <glx ignore="true"/> @@ -9385,42 +9596,42 @@ </category> <category name="GL_SGIX_list_priority" number="80"> - <function name="GetListParameterfvSGIX"> + <function name="GetListParameterfvSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetListParameterivSGIX"> + <function name="GetListParameterivSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="ListParameterfSGIX"> + <function name="ListParameterfSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="ListParameterfvSGIX"> + <function name="ListParameterfvSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="ListParameteriSGIX"> + <function name="ListParameteriSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="ListParameterivSGIX"> + <function name="ListParameterivSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> @@ -9472,7 +9683,7 @@ <!-- Extension number 92 is a GLX extension. --> <category name="GL_EXT_index_material" number="94"> - <function name="IndexMaterialEXT"> + <function name="IndexMaterialEXT" exec="skip"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> <glx ignore="true"/> @@ -9480,7 +9691,7 @@ </category> <category name="GL_EXT_index_func" number="95"> - <function name="IndexFuncEXT"> + <function name="IndexFuncEXT" exec="skip"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampf"/> <glx ignore="true"/> @@ -9491,13 +9702,13 @@ <enum name="ARRAY_ELEMENT_LOCK_FIRST_EXT" value="0x81A8"/> <enum name="ARRAY_ELEMENT_LOCK_COUNT_EXT" value="0x81A9"/> - <function name="LockArraysEXT" offset="assign"> + <function name="LockArraysEXT" offset="assign" deprecated="3.1"> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx handcode="true" ignore="true"/> </function> - <function name="UnlockArraysEXT" offset="assign"> + <function name="UnlockArraysEXT" offset="assign" deprecated="3.1"> <glx handcode="true" ignore="true"/> </function> </category> @@ -9513,13 +9724,13 @@ <size name="CullParameterdv"/> </enum> - <function name="CullParameterdvEXT"> + <function name="CullParameterdvEXT" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *"/> <!-- Spec bug. Should be const. --> <glx ignore="true"/> </function> - <function name="CullParameterfvEXT"> + <function name="CullParameterfvEXT" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *"/> <!-- Spec bug. Should be const. --> <glx ignore="true"/> @@ -9531,121 +9742,121 @@ <!-- Shouldn't this be EXT_fragment_lighting? --> <category name="GL_SGIX_fragment_lighting" number="102"> - <function name="FragmentColorMaterialSGIX"> + <function name="FragmentColorMaterialSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> <glx ignore="true"/> </function> - <function name="FragmentLightfSGIX"> + <function name="FragmentLightfSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="FragmentLightfvSGIX"> + <function name="FragmentLightfvSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="FragmentLightiSGIX"> + <function name="FragmentLightiSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="FragmentLightivSGIX"> + <function name="FragmentLightivSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="FragmentLightModelfSGIX"> + <function name="FragmentLightModelfSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="FragmentLightModelfvSGIX"> + <function name="FragmentLightModelfvSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="FragmentLightModeliSGIX"> + <function name="FragmentLightModeliSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="FragmentLightModelivSGIX"> + <function name="FragmentLightModelivSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialfSGIX"> + <function name="FragmentMaterialfSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialfvSGIX"> + <function name="FragmentMaterialfvSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialiSGIX"> + <function name="FragmentMaterialiSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialivSGIX"> + <function name="FragmentMaterialivSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="GetFragmentLightfvSGIX"> + <function name="GetFragmentLightfvSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetFragmentLightivSGIX"> + <function name="GetFragmentLightivSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetFragmentMaterialfvSGIX"> + <function name="GetFragmentMaterialfvSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetFragmentMaterialivSGIX"> + <function name="GetFragmentMaterialivSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="LightEnviSGIX"> + <function name="LightEnviSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> @@ -9682,15 +9893,15 @@ <!-- Extension number 116 is not listed in the extension registry. --> <category name="GL_EXT_light_texture" number="117"> - <function name="ApplyTextureEXT"> + <function name="ApplyTextureEXT" exec="skip"> <param name="mode" type="GLenum"/> </function> - <function name="TextureLightEXT"> + <function name="TextureLightEXT" exec="skip"> <param name="pname" type="GLenum"/> </function> - <function name="TextureMaterialEXT"> + <function name="TextureMaterialEXT" exec="skip"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> </function> @@ -9708,55 +9919,55 @@ <!-- Extension number 131 is not listed in the extension registry. --> <category name="GL_SGIX_async" number="132"> - <function name="AsyncMarkerSGIX"> + <function name="AsyncMarkerSGIX" exec="skip"> <param name="marker" type="GLuint"/> </function> - <function name="FinishAsyncSGIX"> + <function name="FinishAsyncSGIX" exec="skip"> <param name="markerp" type="GLuint *"/> <!-- Spec bug. Should be const. --> <return type="GLint"/> </function> - <function name="PollAsyncSGIX"> + <function name="PollAsyncSGIX" exec="skip"> <param name="markerp" type="GLuint *"/> <!-- Spec bug. Should be const. --> <return type="GLint"/> </function> - <function name="GenAsyncMarkersSGIX"> + <function name="GenAsyncMarkersSGIX" exec="skip"> <param name="range" type="GLsizei"/> <return type="GLuint"/> </function> - <function name="DeleteAsyncMarkersSGIX"> + <function name="DeleteAsyncMarkersSGIX" exec="skip"> <param name="marker" type="GLuint"/> <param name="range" type="GLsizei"/> </function> - <function name="IsAsyncMarkerSGIX"> + <function name="IsAsyncMarkerSGIX" exec="skip"> <param name="marker" type="GLuint"/> <return type="GLboolean"/> </function> </category> <category name="GL_INTEL_parallel_arrays" number="136"> - <function name="VertexPointervINTEL"> + <function name="VertexPointervINTEL" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> </function> - <function name="NormalPointervINTEL"> + <function name="NormalPointervINTEL" exec="skip"> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> </function> - <function name="ColorPointervINTEL"> + <function name="ColorPointervINTEL" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> </function> - <function name="TexCoordPointervINTEL"> + <function name="TexCoordPointervINTEL" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> @@ -9773,25 +9984,25 @@ </category> <category name="GL_EXT_pixel_transform" number="138"> - <function name="PixelTransformParameteriEXT"> + <function name="PixelTransformParameteriEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="PixelTransformParameterfEXT"> + <function name="PixelTransformParameterfEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="PixelTransformParameterivEXT"> + <function name="PixelTransformParameterivEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="PixelTransformParameterfvEXT"> + <function name="PixelTransformParameterfvEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> @@ -9817,24 +10028,30 @@ </category> <category name="GL_EXT_secondary_color" number="145"> - <function name="SecondaryColor3bEXT" offset="assign" vectorequiv="SecondaryColor3bvEXT"> + <function name="SecondaryColor3bEXT" offset="assign" + vectorequiv="SecondaryColor3bvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bvEXT" offset="assign"> + <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="4126"/> </function> - <function name="SecondaryColor3dEXT" offset="assign" vectorequiv="SecondaryColor3dvEXT"> + <function name="SecondaryColor3dEXT" offset="assign" + vectorequiv="SecondaryColor3dvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dvEXT" offset="assign"> + <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4130"/> </function> @@ -9850,57 +10067,72 @@ <glx rop="4129"/> </function> - <function name="SecondaryColor3iEXT" offset="assign" vectorequiv="SecondaryColor3ivEXT"> + <function name="SecondaryColor3iEXT" offset="assign" + vectorequiv="SecondaryColor3ivEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3ivEXT" offset="assign"> + <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLint *" count="3"/> <glx rop="4128"/> </function> - <function name="SecondaryColor3sEXT" offset="assign" vectorequiv="SecondaryColor3svEXT"> + <function name="SecondaryColor3sEXT" offset="assign" + vectorequiv="SecondaryColor3svEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3svEXT" offset="assign"> + <function name="SecondaryColor3svEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLshort *" count="3"/> <glx rop="4127"/> </function> - <function name="SecondaryColor3ubEXT" offset="assign" vectorequiv="SecondaryColor3ubvEXT"> + <function name="SecondaryColor3ubEXT" offset="assign" + vectorequiv="SecondaryColor3ubvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubvEXT" offset="assign"> + <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="4131"/> </function> - <function name="SecondaryColor3uiEXT" offset="assign" vectorequiv="SecondaryColor3uivEXT"> + <function name="SecondaryColor3uiEXT" offset="assign" + vectorequiv="SecondaryColor3uivEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uivEXT" offset="assign"> + <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLuint *" count="3"/> <glx rop="4133"/> </function> - <function name="SecondaryColor3usEXT" offset="assign" vectorequiv="SecondaryColor3usvEXT"> + <function name="SecondaryColor3usEXT" offset="assign" + vectorequiv="SecondaryColor3usvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usvEXT" offset="assign"> + <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLushort *" count="3"/> <glx rop="4132"/> </function> @@ -9915,7 +10147,7 @@ </category> <category name="GL_EXT_texture_perturb_normal" number="147"> - <function name="TextureNormalEXT"> + <function name="TextureNormalEXT" exec="skip"> <param name="mode" type="GLenum"/> </function> </category> @@ -9929,7 +10161,8 @@ <glx handcode="true"/> </function> - <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0"> + <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -9940,20 +10173,22 @@ </category> <category name="GL_EXT_fog_coord" number="149"> - <function name="FogCoordfEXT" offset="assign" vectorequiv="FogCoordfvEXT"> + <function name="FogCoordfEXT" offset="assign" vectorequiv="FogCoordfvEXT" + exec="dynamic"> <param name="coord" type="GLfloat"/> </function> - <function name="FogCoordfvEXT" offset="assign"> + <function name="FogCoordfvEXT" offset="assign" exec="dynamic"> <param name="coord" type="const GLfloat *" count="1"/> <glx rop="4124"/> </function> - <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT"> + <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT" + exec="loopback"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddvEXT" offset="assign"> + <function name="FogCoorddvEXT" offset="assign" exec="loopback"> <param name="coord" type="const GLdouble *" count="1"/> <glx rop="4125"/> </function> @@ -9973,113 +10208,113 @@ <!-- Extension number 154 is not listed in the extension registry. --> <category name="GL_EXT_coordinate_frame" number="156"> - <function name="Tangent3bEXT"> + <function name="Tangent3bEXT" exec="skip"> <param name="tx" type="GLbyte"/> <param name="ty" type="GLbyte"/> <param name="tz" type="GLbyte"/> </function> - <function name="Tangent3bvEXT"> + <function name="Tangent3bvEXT" exec="skip"> <param name="v" type="const GLbyte *"/> </function> - <function name="Tangent3dEXT"> + <function name="Tangent3dEXT" exec="skip"> <param name="tx" type="GLdouble"/> <param name="ty" type="GLdouble"/> <param name="tz" type="GLdouble"/> </function> - <function name="Tangent3dvEXT"> + <function name="Tangent3dvEXT" exec="skip"> <param name="v" type="const GLdouble *"/> </function> - <function name="Tangent3fEXT"> + <function name="Tangent3fEXT" exec="skip"> <param name="tx" type="GLfloat"/> <param name="ty" type="GLfloat"/> <param name="tz" type="GLfloat"/> </function> - <function name="Tangent3fvEXT"> + <function name="Tangent3fvEXT" exec="skip"> <param name="v" type="const GLfloat *"/> </function> - <function name="Tangent3iEXT"> + <function name="Tangent3iEXT" exec="skip"> <param name="tx" type="GLint"/> <param name="ty" type="GLint"/> <param name="tz" type="GLint"/> </function> - <function name="Tangent3ivEXT"> + <function name="Tangent3ivEXT" exec="skip"> <param name="v" type="const GLint *"/> </function> - <function name="Tangent3sEXT"> + <function name="Tangent3sEXT" exec="skip"> <param name="tx" type="GLshort"/> <param name="ty" type="GLshort"/> <param name="tz" type="GLshort"/> </function> - <function name="Tangent3svEXT"> + <function name="Tangent3svEXT" exec="skip"> <param name="v" type="const GLshort *"/> </function> - <function name="Binormal3bEXT"> + <function name="Binormal3bEXT" exec="skip"> <param name="bx" type="GLbyte"/> <param name="by" type="GLbyte"/> <param name="bz" type="GLbyte"/> </function> - <function name="Binormal3bvEXT"> + <function name="Binormal3bvEXT" exec="skip"> <param name="v" type="const GLbyte *"/> </function> - <function name="Binormal3dEXT"> + <function name="Binormal3dEXT" exec="skip"> <param name="bx" type="GLdouble"/> <param name="by" type="GLdouble"/> <param name="bz" type="GLdouble"/> </function> - <function name="Binormal3dvEXT"> + <function name="Binormal3dvEXT" exec="skip"> <param name="v" type="const GLdouble *"/> </function> - <function name="Binormal3fEXT"> + <function name="Binormal3fEXT" exec="skip"> <param name="bx" type="GLfloat"/> <param name="by" type="GLfloat"/> <param name="bz" type="GLfloat"/> </function> - <function name="Binormal3fvEXT"> + <function name="Binormal3fvEXT" exec="skip"> <param name="v" type="const GLfloat *"/> </function> - <function name="Binormal3iEXT"> + <function name="Binormal3iEXT" exec="skip"> <param name="bx" type="GLint"/> <param name="by" type="GLint"/> <param name="bz" type="GLint"/> </function> - <function name="Binormal3ivEXT"> + <function name="Binormal3ivEXT" exec="skip"> <param name="v" type="const GLint *"/> </function> - <function name="Binormal3sEXT"> + <function name="Binormal3sEXT" exec="skip"> <param name="bx" type="GLshort"/> <param name="by" type="GLshort"/> <param name="bz" type="GLshort"/> </function> - <function name="Binormal3svEXT"> + <function name="Binormal3svEXT" exec="skip"> <param name="v" type="const GLshort *"/> </function> - <function name="TangentPointerEXT"> + <function name="TangentPointerEXT" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> </function> - <function name="BinormalPointerEXT"> + <function name="BinormalPointerEXT" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -10113,7 +10348,7 @@ </category> <category name="GL_SGIX_pixel_texture" number="160"> - <function name="PixelTexGenSGIX"> + <function name="PixelTexGenSGIX" exec="skip"> <param name="mode" type="GLenum"/> <glx rop="2059" ignore="true"/> </function> @@ -10123,70 +10358,70 @@ <!-- Extension number 162 is not listed in the extension registry. --> <category name="GL_SUNX_constant_data" number="163"> - <function name="FinishTextureSUNX"> + <function name="FinishTextureSUNX" exec="skip"> </function> </category> <category name="GL_SUN_global_alpha" number="164"> - <function name="GlobalAlphaFactorbSUN"> + <function name="GlobalAlphaFactorbSUN" exec="skip"> <param name="factor" type="GLbyte"/> </function> - <function name="GlobalAlphaFactorsSUN"> + <function name="GlobalAlphaFactorsSUN" exec="skip"> <param name="factor" type="GLshort"/> </function> - <function name="GlobalAlphaFactoriSUN"> + <function name="GlobalAlphaFactoriSUN" exec="skip"> <param name="factor" type="GLint"/> </function> - <function name="GlobalAlphaFactorfSUN"> + <function name="GlobalAlphaFactorfSUN" exec="skip"> <param name="factor" type="GLfloat"/> </function> - <function name="GlobalAlphaFactordSUN"> + <function name="GlobalAlphaFactordSUN" exec="skip"> <param name="factor" type="GLdouble"/> </function> - <function name="GlobalAlphaFactorubSUN"> + <function name="GlobalAlphaFactorubSUN" exec="skip"> <param name="factor" type="GLubyte"/> </function> - <function name="GlobalAlphaFactorusSUN"> + <function name="GlobalAlphaFactorusSUN" exec="skip"> <param name="factor" type="GLushort"/> </function> - <function name="GlobalAlphaFactoruiSUN"> + <function name="GlobalAlphaFactoruiSUN" exec="skip"> <param name="factor" type="GLuint"/> </function> </category> <category name="GL_SUN_triangle_list" number="165"> - <function name="ReplacementCodeuiSUN"> + <function name="ReplacementCodeuiSUN" exec="skip"> <param name="code" type="GLuint"/> </function> - <function name="ReplacementCodeusSUN"> + <function name="ReplacementCodeusSUN" exec="skip"> <param name="code" type="GLushort"/> </function> - <function name="ReplacementCodeubSUN"> + <function name="ReplacementCodeubSUN" exec="skip"> <param name="code" type="GLubyte"/> </function> - <function name="ReplacementCodeuivSUN"> + <function name="ReplacementCodeuivSUN" exec="skip"> <param name="code" type="const GLuint *"/> </function> - <function name="ReplacementCodeusvSUN"> + <function name="ReplacementCodeusvSUN" exec="skip"> <param name="code" type="const GLushort *"/> </function> - <function name="ReplacementCodeubvSUN"> + <function name="ReplacementCodeubvSUN" exec="skip"> <param name="code" type="const GLubyte *"/> </function> - <function name="ReplacementCodePointerSUN"> + <function name="ReplacementCodePointerSUN" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -10194,7 +10429,7 @@ </category> <category name="GL_SUN_vertex" number="166"> - <function name="Color4ubVertex2fSUN"> + <function name="Color4ubVertex2fSUN" exec="skip"> <param name="r" type="GLubyte"/> <param name="g" type="GLubyte"/> <param name="b" type="GLubyte"/> @@ -10203,12 +10438,12 @@ <param name="y" type="GLfloat"/> </function> - <function name="Color4ubVertex2fvSUN"> + <function name="Color4ubVertex2fvSUN" exec="skip"> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Color4ubVertex3fSUN"> + <function name="Color4ubVertex3fSUN" exec="skip"> <param name="r" type="GLubyte"/> <param name="g" type="GLubyte"/> <param name="b" type="GLubyte"/> @@ -10218,12 +10453,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="Color4ubVertex3fvSUN"> + <function name="Color4ubVertex3fvSUN" exec="skip"> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Color3fVertex3fSUN"> + <function name="Color3fVertex3fSUN" exec="skip"> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> <param name="b" type="GLfloat"/> @@ -10232,12 +10467,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="Color3fVertex3fvSUN"> + <function name="Color3fVertex3fvSUN" exec="skip"> <param name="c" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Normal3fVertex3fSUN"> + <function name="Normal3fVertex3fSUN" exec="skip"> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> <param name="nz" type="GLfloat"/> @@ -10246,12 +10481,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="Normal3fVertex3fvSUN"> + <function name="Normal3fVertex3fvSUN" exec="skip"> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Color4fNormal3fVertex3fSUN"> + <function name="Color4fNormal3fVertex3fSUN" exec="skip"> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> <param name="b" type="GLfloat"/> @@ -10264,13 +10499,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="Color4fNormal3fVertex3fvSUN"> + <function name="Color4fNormal3fVertex3fvSUN" exec="skip"> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fVertex3fSUN"> + <function name="TexCoord2fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="x" type="GLfloat"/> @@ -10278,12 +10513,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fVertex3fvSUN"> + <function name="TexCoord2fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord4fVertex4fSUN"> + <function name="TexCoord4fVertex4fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="p" type="GLfloat"/> @@ -10294,12 +10529,12 @@ <param name="w" type="GLfloat"/> </function> - <function name="TexCoord4fVertex4fvSUN"> + <function name="TexCoord4fVertex4fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fColor4ubVertex3fSUN"> + <function name="TexCoord2fColor4ubVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLubyte"/> @@ -10311,13 +10546,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fColor4ubVertex3fvSUN"> + <function name="TexCoord2fColor4ubVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fColor3fVertex3fSUN"> + <function name="TexCoord2fColor3fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> @@ -10328,13 +10563,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fColor3fVertex3fvSUN"> + <function name="TexCoord2fColor3fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fNormal3fVertex3fSUN"> + <function name="TexCoord2fNormal3fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="nx" type="GLfloat"/> @@ -10345,13 +10580,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fNormal3fVertex3fvSUN"> + <function name="TexCoord2fNormal3fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fColor4fNormal3fVertex3fSUN"> + <function name="TexCoord2fColor4fNormal3fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> @@ -10366,14 +10601,14 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fColor4fNormal3fVertex3fvSUN"> + <function name="TexCoord2fColor4fNormal3fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord4fColor4fNormal3fVertex4fSUN"> + <function name="TexCoord4fColor4fNormal3fVertex4fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="p" type="GLfloat"/> @@ -10391,26 +10626,26 @@ <param name="w" type="GLfloat"/> </function> - <function name="TexCoord4fColor4fNormal3fVertex4fvSUN"> + <function name="TexCoord4fColor4fNormal3fVertex4fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiVertex3fSUN"> + <function name="ReplacementCodeuiVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiVertex3fvSUN"> + <function name="ReplacementCodeuiVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiColor4ubVertex3fSUN"> + <function name="ReplacementCodeuiColor4ubVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="r" type="GLubyte"/> <param name="g" type="GLubyte"/> @@ -10421,13 +10656,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiColor4ubVertex3fvSUN"> + <function name="ReplacementCodeuiColor4ubVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiColor3fVertex3fSUN"> + <function name="ReplacementCodeuiColor3fVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> @@ -10437,13 +10672,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiColor3fVertex3fvSUN"> + <function name="ReplacementCodeuiColor3fVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="c" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiNormal3fVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> @@ -10453,13 +10688,14 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiNormal3fVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiColor4fNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiColor4fNormal3fVertex3fSUN" + exec="skip"> <param name="rc" type="GLuint"/> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> @@ -10473,14 +10709,15 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiColor4fNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiColor4fNormal3fVertex3fvSUN" + exec="skip"> <param name="rc" type="const GLuint *"/> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiTexCoord2fVertex3fSUN"> + <function name="ReplacementCodeuiTexCoord2fVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -10489,13 +10726,14 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiTexCoord2fVertex3fvSUN"> + <function name="ReplacementCodeuiTexCoord2fVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="tc" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN" + exec="skip"> <param name="rc" type="GLuint"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -10507,14 +10745,16 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN" + exec="skip"> <param name="rc" type="const GLuint *"/> <param name="tc" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN" + exec="skip"> <param name="rc" type="GLuint"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -10530,7 +10770,8 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN" + exec="skip"> <param name="rc" type="const GLuint *"/> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> @@ -10603,17 +10844,18 @@ </category> <category name="GL_EXT_vertex_weighting" number="188"> - <function name="VertexWeightfEXT" vectorequiv="VertexWeightfvEXT"> + <function name="VertexWeightfEXT" vectorequiv="VertexWeightfvEXT" + exec="skip"> <param name="weight" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="VertexWeightfvEXT"> + <function name="VertexWeightfvEXT" exec="skip"> <param name="weight" type="const GLfloat *" count="1"/> <glx rop="4135" ignore="true"/> </function> - <function name="VertexWeightPointerEXT"> + <function name="VertexWeightPointerEXT" exec="skip"> <param name="size" type="GLsizei"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -10632,11 +10874,11 @@ </category> <category name="GL_NV_vertex_array_range" number="190"> - <function name="FlushVertexArrayRangeNV"> + <function name="FlushVertexArrayRangeNV" exec="skip"> <glx ignore="true"/> </function> - <function name="VertexArrayRangeNV"> + <function name="VertexArrayRangeNV" exec="skip"> <param name="length" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx ignore="true"/> @@ -10644,31 +10886,31 @@ </category> <category name="GL_NV_register_combiners" number="191"> - <function name="CombinerParameterfvNV"> + <function name="CombinerParameterfvNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="4137" ignore="true"/> </function> - <function name="CombinerParameterfNV"> + <function name="CombinerParameterfNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="4136" ignore="true"/> </function> - <function name="CombinerParameterivNV"> + <function name="CombinerParameterivNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4139" ignore="true"/> </function> - <function name="CombinerParameteriNV"> + <function name="CombinerParameteriNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="4138" ignore="true"/> </function> - <function name="CombinerInputNV"> + <function name="CombinerInputNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10678,7 +10920,7 @@ <glx rop="4140" ignore="true"/> </function> - <function name="CombinerOutputNV"> + <function name="CombinerOutputNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="abOutput" type="GLenum"/> @@ -10692,7 +10934,7 @@ <glx rop="4141" ignore="true"/> </function> - <function name="FinalCombinerInputNV"> + <function name="FinalCombinerInputNV" exec="skip"> <param name="variable" type="GLenum"/> <param name="input" type="GLenum"/> <param name="mapping" type="GLenum"/> @@ -10700,7 +10942,7 @@ <glx rop="4142" ignore="true"/> </function> - <function name="GetCombinerInputParameterfvNV"> + <function name="GetCombinerInputParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10709,7 +10951,7 @@ <glx vendorpriv="1270" ignore="true"/> </function> - <function name="GetCombinerInputParameterivNV"> + <function name="GetCombinerInputParameterivNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10718,7 +10960,7 @@ <glx vendorpriv="1271" ignore="true"/> </function> - <function name="GetCombinerOutputParameterfvNV"> + <function name="GetCombinerOutputParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="pname" type="GLenum"/> @@ -10726,7 +10968,7 @@ <glx vendorpriv="1272" ignore="true"/> </function> - <function name="GetCombinerOutputParameterivNV"> + <function name="GetCombinerOutputParameterivNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="pname" type="GLenum"/> @@ -10734,14 +10976,14 @@ <glx vendorpriv="1273" ignore="true"/> </function> - <function name="GetFinalCombinerInputParameterfvNV"> + <function name="GetFinalCombinerInputParameterfvNV" exec="skip"> <param name="variable" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> <glx vendorpriv="1274" ignore="true"/> </function> - <function name="GetFinalCombinerInputParameterivNV"> + <function name="GetFinalCombinerInputParameterivNV" exec="skip"> <param name="variable" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> @@ -10889,7 +11131,7 @@ <glx handcode="true"/> </function> - <function name="WindowPos4dMESA" offset="assign"> + <function name="WindowPos4dMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> @@ -10897,12 +11139,12 @@ <glx ignore="true"/> </function> - <function name="WindowPos4dvMESA" offset="assign"> + <function name="WindowPos4dvMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLdouble *"/> <glx ignore="true"/> </function> - <function name="WindowPos4fMESA" offset="assign"> + <function name="WindowPos4fMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -10910,12 +11152,12 @@ <glx ignore="true"/> </function> - <function name="WindowPos4fvMESA" offset="assign"> + <function name="WindowPos4fvMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="WindowPos4iMESA" offset="assign"> + <function name="WindowPos4iMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -10923,12 +11165,12 @@ <glx ignore="true"/> </function> - <function name="WindowPos4ivMESA" offset="assign"> + <function name="WindowPos4ivMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="WindowPos4sMESA" offset="assign"> + <function name="WindowPos4sMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -10936,7 +11178,7 @@ <glx ignore="true"/> </function> - <function name="WindowPos4svMESA" offset="assign"> + <function name="WindowPos4svMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLshort *"/> <glx ignore="true"/> </function> @@ -10971,7 +11213,7 @@ </category> <category name="GL_IBM_vertex_array_lists" number="201"> - <function name="ColorPointerListIBM"> + <function name="ColorPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -10979,7 +11221,7 @@ <param name="ptrstride" type="GLint"/> </function> - <function name="SecondaryColorPointerListIBM"> + <function name="SecondaryColorPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -10987,34 +11229,34 @@ <param name="ptrstride" type="GLint"/> </function> - <function name="EdgeFlagPointerListIBM"> + <function name="EdgeFlagPointerListIBM" exec="skip"> <param name="stride" type="GLint"/> <param name="pointer" type="const GLboolean **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="FogCoordPointerListIBM"> + <function name="FogCoordPointerListIBM" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> <param name="pointer" type="const GLvoid **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="IndexPointerListIBM"> + <function name="IndexPointerListIBM" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> <param name="pointer" type="const GLvoid **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="NormalPointerListIBM"> + <function name="NormalPointerListIBM" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> <param name="pointer" type="const GLvoid **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="TexCoordPointerListIBM"> + <function name="TexCoordPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -11022,7 +11264,7 @@ <param name="ptrstride" type="GLint"/> </function> - <function name="VertexPointerListIBM"> + <function name="VertexPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -11049,7 +11291,7 @@ </category> <category name="GL_3DFX_tbuffer" number="208"> - <function name="TbufferMask3DFX"> + <function name="TbufferMask3DFX" exec="skip"> <param name="mask" type="GLuint"/> <glx ignore="true"/> </function> @@ -11072,7 +11314,7 @@ <category name="GL_SGIS_texture_color_mask" number="214"> <enum name="TEXTURE_COLOR_WRITEMASK_SGIS" value="0x81EF"/> - <function name="TextureColorMaskSGIS"> + <function name="TextureColorMaskSGIS" exec="skip"> <param name="red" type="GLboolean"/> <param name="green" type="GLboolean"/> <param name="blue" type="GLboolean"/> @@ -11098,43 +11340,43 @@ </category> <category name="GL_NV_fence" number="222"> - <function name="DeleteFencesNV"> + <function name="DeleteFencesNV" exec="skip"> <param name="n" type="GLsizei"/> <param name="fences" type="const GLuint *"/> <glx ignore="true"/> </function> - <function name="GenFencesNV"> + <function name="GenFencesNV" exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="fences" type="GLuint *" output="true" count="n"/> <glx ignore="true"/> </function> - <function name="IsFenceNV"> + <function name="IsFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <return type="GLboolean"/> <glx ignore="true"/> </function> - <function name="TestFenceNV"> + <function name="TestFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <return type="GLboolean"/> <glx ignore="true"/> </function> - <function name="GetFenceivNV"> + <function name="GetFenceivNV" exec="skip"> <param name="fence" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> <glx ignore="true"/> </function> - <function name="FinishFenceNV"> + <function name="FinishFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <glx ignore="true"/> </function> - <function name="SetFenceNV"> + <function name="SetFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <param name="condition" type="GLenum"/> <glx ignore="true"/> @@ -11146,7 +11388,7 @@ </category> <category name="GL_NV_evaluators" number="225"> - <function name="MapControlPointsNV"> + <function name="MapControlPointsNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> @@ -11158,19 +11400,19 @@ <param name="points" type="const GLvoid *"/> </function> - <function name="MapParameterivNV"> + <function name="MapParameterivNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="MapParameterfvNV"> + <function name="MapParameterfvNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> - <function name="GetMapControlPointsNV"> + <function name="GetMapControlPointsNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> @@ -11180,33 +11422,33 @@ <param name="points" type="GLvoid *" output="true"/> </function> - <function name="GetMapParameterivNV"> + <function name="GetMapParameterivNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetMapParameterfvNV"> + <function name="GetMapParameterfvNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> </function> - <function name="GetMapAttribParameterivNV"> + <function name="GetMapAttribParameterivNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetMapAttribParameterfvNV"> + <function name="GetMapAttribParameterfvNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> </function> - <function name="EvalMapsNV"> + <function name="EvalMapsNV" exec="skip"> <param name="target" type="GLenum"/> <param name="mode" type="GLenum"/> </function> @@ -11218,13 +11460,13 @@ </category> <category name="GL_NV_register_combiners2" number="227"> - <function name="CombinerStageParameterfvNV"> + <function name="CombinerStageParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> - <function name="GetCombinerStageParameterfvNV"> + <function name="GetCombinerStageParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> @@ -11358,7 +11600,8 @@ <enum name="MAP2_VERTEX_ATTRIB14_4_NV" value="0x867E"/> <enum name="MAP2_VERTEX_ATTRIB15_4_NV" value="0x867F"/> - <function name="AreProgramsResidentNV" offset="assign"> + <function name="AreProgramsResidentNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="const GLuint *" count="n"/> <param name="residences" type="GLboolean *" output="true" count="n"/> @@ -11366,26 +11609,30 @@ <glx vendorpriv="1293"/> </function> - <function name="BindProgramNV" offset="assign"> + <function name="BindProgramNV" offset="assign" deprecated="3.1" + mesa_name="-NV"> <param name="target" type="GLenum"/> <param name="program" type="GLuint"/> <glx rop="4180"/> </function> - <function name="DeleteProgramsNV" offset="assign"> + <function name="DeleteProgramsNV" offset="assign" deprecated="3.1" + mesa_name="-NV"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="const GLuint *" count="n"/> <glx vendorpriv="1294"/> </function> - <function name="ExecuteProgramNV" offset="assign"> + <function name="ExecuteProgramNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> <param name="params" type="const GLfloat *" count="4"/> <glx rop="4181"/> </function> - <function name="GenProgramsNV" offset="assign"> + <function name="GenProgramsNV" offset="assign" deprecated="3.1" + mesa_name="-NV"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="GLuint *" output="true" count="n"/> <glx vendorpriv="1295" always_array="true"/> @@ -11397,7 +11644,8 @@ of these functions. --> - <function name="GetProgramParameterdvNV" offset="assign"> + <function name="GetProgramParameterdvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> @@ -11405,7 +11653,8 @@ <glx vendorpriv="1297"/> </function> - <function name="GetProgramParameterfvNV" offset="assign"> + <function name="GetProgramParameterfvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> @@ -11413,21 +11662,24 @@ <glx vendorpriv="1296"/> </function> - <function name="GetProgramivNV" offset="assign"> + <function name="GetProgramivNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx vendorpriv="1298"/> </function> - <function name="GetProgramStringNV" offset="assign"> + <function name="GetProgramStringNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="program" type="GLubyte *" output="true"/> <glx vendorpriv="1299" handcode="server" always_array="true"/> </function> - <function name="GetTrackMatrixivNV" offset="assign"> + <function name="GetTrackMatrixivNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="address" type="GLuint"/> <param name="pname" type="GLenum"/> @@ -11435,41 +11687,47 @@ <glx vendorpriv="1300"/> </function> - <function name="GetVertexAttribdvNV" offset="assign"> + <function name="GetVertexAttribdvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *" output="true" variable_param="pname"/> <glx vendorpriv="1301"/> </function> - <function name="GetVertexAttribfvNV" offset="assign"> + <function name="GetVertexAttribfvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx vendorpriv="1302"/> </function> - <function name="GetVertexAttribivNV" offset="assign"> + <function name="GetVertexAttribivNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx vendorpriv="1303"/> </function> - <function name="GetVertexAttribPointervNV" offset="assign"> + <function name="GetVertexAttribPointervNV" offset="assign" + mesa_name="-NV+ARB"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> <glx handcode="true"/> </function> - <function name="IsProgramNV" offset="assign"> + <function name="IsProgramNV" offset="assign" deprecated="3.1" + mesa_name="-NV+ARB"> <param name="program" type="GLuint"/> <return type="GLboolean"/> <glx vendorpriv="1304"/> </function> - <function name="LoadProgramNV" offset="assign"> + <function name="LoadProgramNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> @@ -11507,7 +11765,8 @@ <param name="params" type="const GLfloat *"/> </function> - <function name="ProgramParameters4dvNV" offset="assign"> + <function name="ProgramParameters4dvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="num" type="GLsizei" counter="true"/> @@ -11515,7 +11774,8 @@ <glx rop="4187"/> </function> - <function name="ProgramParameters4fvNV" offset="assign"> + <function name="ProgramParameters4fvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="num" type="GLsizei" counter="true"/> @@ -11523,13 +11783,15 @@ <glx rop="4186"/> </function> - <function name="RequestResidentProgramsNV" offset="assign"> + <function name="RequestResidentProgramsNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="const GLuint *" count="n"/> <glx rop="4182"/> </function> - <function name="TrackMatrixNV" offset="assign"> + <function name="TrackMatrixNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="address" type="GLuint"/> <param name="matrix" type="GLenum"/> @@ -11537,7 +11799,8 @@ <glx rop="4188"/> </function> - <function name="VertexAttribPointerNV" offset="assign"> + <function name="VertexAttribPointerNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -11546,43 +11809,50 @@ <glx handcode="true"/> </function> - <function name="VertexAttrib1sNV" offset="assign" vectorequiv="VertexAttrib1svNV"> + <function name="VertexAttrib1sNV" offset="assign" + vectorequiv="VertexAttrib1svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svNV" offset="assign"> + <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4265"/> </function> - <function name="VertexAttrib2sNV" offset="assign" vectorequiv="VertexAttrib2svNV"> + <function name="VertexAttrib2sNV" offset="assign" + vectorequiv="VertexAttrib2svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svNV" offset="assign"> + <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4266"/> </function> - <function name="VertexAttrib3sNV" offset="assign" vectorequiv="VertexAttrib3svNV"> + <function name="VertexAttrib3sNV" offset="assign" + vectorequiv="VertexAttrib3svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svNV" offset="assign"> + <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4267"/> </function> - <function name="VertexAttrib4sNV" offset="assign" vectorequiv="VertexAttrib4svNV"> + <function name="VertexAttrib4sNV" offset="assign" + vectorequiv="VertexAttrib4svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -11590,49 +11860,61 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svNV" offset="assign"> + <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4268"/> </function> - <function name="VertexAttrib1fNV" offset="assign" vectorequiv="VertexAttrib1fvNV"> + <function name="VertexAttrib1fNV" offset="assign" + vectorequiv="VertexAttrib1fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> </function> - <function name="VertexAttrib1fvNV" offset="assign"> + <function name="VertexAttrib1fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="1"/> <glx rop="4269"/> </function> - <function name="VertexAttrib2fNV" offset="assign" vectorequiv="VertexAttrib2fvNV"> + <function name="VertexAttrib2fNV" offset="assign" + vectorequiv="VertexAttrib2fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="VertexAttrib2fvNV" offset="assign"> + <function name="VertexAttrib2fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="2"/> <glx rop="4270"/> </function> - <function name="VertexAttrib3fNV" offset="assign" vectorequiv="VertexAttrib3fvNV"> + <function name="VertexAttrib3fNV" offset="assign" + vectorequiv="VertexAttrib3fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="VertexAttrib3fvNV" offset="assign"> + <function name="VertexAttrib3fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="3"/> <glx rop="4271"/> </function> - <function name="VertexAttrib4fNV" offset="assign" vectorequiv="VertexAttrib4fvNV"> + <function name="VertexAttrib4fNV" offset="assign" + vectorequiv="VertexAttrib4fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -11640,49 +11922,57 @@ <param name="w" type="GLfloat"/> </function> - <function name="VertexAttrib4fvNV" offset="assign"> + <function name="VertexAttrib4fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="4"/> <glx rop="4272"/> </function> - <function name="VertexAttrib1dNV" offset="assign" vectorequiv="VertexAttrib1dvNV"> + <function name="VertexAttrib1dNV" offset="assign" + vectorequiv="VertexAttrib1dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvNV" offset="assign"> + <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4273" doubles_in_order="true"/> </function> - <function name="VertexAttrib2dNV" offset="assign" vectorequiv="VertexAttrib2dvNV"> + <function name="VertexAttrib2dNV" offset="assign" + vectorequiv="VertexAttrib2dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvNV" offset="assign"> + <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4274" doubles_in_order="true"/> </function> - <function name="VertexAttrib3dNV" offset="assign" vectorequiv="VertexAttrib3dvNV"> + <function name="VertexAttrib3dNV" offset="assign" + vectorequiv="VertexAttrib3dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvNV" offset="assign"> + <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4275" doubles_in_order="true"/> </function> - <function name="VertexAttrib4dNV" offset="assign" vectorequiv="VertexAttrib4dvNV"> + <function name="VertexAttrib4dNV" offset="assign" + vectorequiv="VertexAttrib4dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -11690,13 +11980,16 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvNV" offset="assign"> + <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4276" doubles_in_order="true"/> </function> - <function name="VertexAttrib4ubNV" offset="assign" vectorequiv="VertexAttrib4ubvNV"> + <function name="VertexAttrib4ubNV" offset="assign" + vectorequiv="VertexAttrib4ubvNV" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -11704,97 +11997,111 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4ubvNV" offset="assign"> + <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4277"/> </function> - <function name="VertexAttribs1svNV" offset="assign"> + <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n"/> <glx rop="4202"/> </function> - <function name="VertexAttribs2svNV" offset="assign"> + <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="2"/> <glx rop="4203"/> </function> - <function name="VertexAttribs3svNV" offset="assign"> + <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="3"/> <glx rop="4204"/> </function> - <function name="VertexAttribs4svNV" offset="assign"> + <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="4"/> <glx rop="4205"/> </function> - <function name="VertexAttribs1fvNV" offset="assign"> + <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n"/> <glx rop="4206"/> </function> - <function name="VertexAttribs2fvNV" offset="assign"> + <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="4207"/> </function> - <function name="VertexAttribs3fvNV" offset="assign"> + <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="3"/> <glx rop="4208"/> </function> - <function name="VertexAttribs4fvNV" offset="assign"> + <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="4"/> <glx rop="4209"/> </function> - <function name="VertexAttribs1dvNV" offset="assign"> + <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n"/> <glx rop="4210" doubles_in_order="true"/> </function> - <function name="VertexAttribs2dvNV" offset="assign"> + <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="2"/> <glx rop="4211" doubles_in_order="true"/> </function> - <function name="VertexAttribs3dvNV" offset="assign"> + <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="3"/> <glx rop="4212" doubles_in_order="true"/> </function> - <function name="VertexAttribs4dvNV" offset="assign"> + <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="4"/> <glx rop="4213" doubles_in_order="true"/> </function> - <function name="VertexAttribs4ubvNV" offset="assign"> + <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLubyte *" count="n" count_scale="4"/> @@ -11863,22 +12170,22 @@ <size name="GetTexEnviv" mode="get"/> <size name="GetTexEnvfv" mode="get"/> </enum> - <function name="TexBumpParameterfvATI" offset="assign"> + <function name="TexBumpParameterfvATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="const GLfloat *" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="TexBumpParameterivATI" offset="assign"> + <function name="TexBumpParameterivATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="const GLint *" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetTexBumpParameterfvATI" offset="assign"> + <function name="GetTexBumpParameterfvATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat *" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetTexBumpParameterivATI" offset="assign"> + <function name="GetTexBumpParameterivATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint *" variable_param="pname"/> <glx ignore="true"/> @@ -11997,45 +12304,45 @@ redudndant garbage. There are a lot of enums with the value 0x00000001. --> - <function name="GenFragmentShadersATI" offset="assign"> + <function name="GenFragmentShadersATI" offset="assign" deprecated="3.1"> <return type="GLuint"/> <param name="range" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BindFragmentShaderATI" offset="assign"> + <function name="BindFragmentShaderATI" offset="assign" deprecated="3.1"> <param name="id" type="GLuint"/> <glx ignore="true"/> </function> - <function name="DeleteFragmentShaderATI" offset="assign"> + <function name="DeleteFragmentShaderATI" offset="assign" deprecated="3.1"> <param name="id" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BeginFragmentShaderATI" offset="assign"> + <function name="BeginFragmentShaderATI" offset="assign" deprecated="3.1"> <glx ignore="true"/> </function> - <function name="EndFragmentShaderATI" offset="assign"> + <function name="EndFragmentShaderATI" offset="assign" deprecated="3.1"> <glx ignore="true"/> </function> - <function name="PassTexCoordATI" offset="assign"> + <function name="PassTexCoordATI" offset="assign" deprecated="3.1"> <param name="dst" type="GLuint"/> <param name="coord" type="GLuint"/> <param name="swizzle" type="GLenum"/> <glx ignore="true"/> </function> - <function name="SampleMapATI" offset="assign"> + <function name="SampleMapATI" offset="assign" deprecated="3.1"> <param name="dst" type="GLuint"/> <param name="interp" type="GLuint"/> <param name="swizzle" type="GLenum"/> <glx ignore="true"/> </function> - <function name="ColorFragmentOp1ATI" offset="assign"> + <function name="ColorFragmentOp1ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMask" type="GLuint"/> @@ -12046,7 +12353,7 @@ <glx ignore="true"/> </function> - <function name="ColorFragmentOp2ATI" offset="assign"> + <function name="ColorFragmentOp2ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMask" type="GLuint"/> @@ -12060,7 +12367,7 @@ <glx ignore="true"/> </function> - <function name="ColorFragmentOp3ATI" offset="assign"> + <function name="ColorFragmentOp3ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMask" type="GLuint"/> @@ -12077,7 +12384,7 @@ <glx ignore="true"/> </function> - <function name="AlphaFragmentOp1ATI" offset="assign"> + <function name="AlphaFragmentOp1ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMod" type="GLuint"/> @@ -12087,7 +12394,7 @@ <glx ignore="true"/> </function> - <function name="AlphaFragmentOp2ATI" offset="assign"> + <function name="AlphaFragmentOp2ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMod" type="GLuint"/> @@ -12100,7 +12407,7 @@ <glx ignore="true"/> </function> - <function name="AlphaFragmentOp3ATI" offset="assign"> + <function name="AlphaFragmentOp3ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMod" type="GLuint"/> @@ -12116,7 +12423,8 @@ <glx ignore="true"/> </function> - <function name="SetFragmentShaderConstantATI" offset="assign"> + <function name="SetFragmentShaderConstantATI" offset="assign" + deprecated="3.1"> <param name="dst" type="GLuint"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> @@ -12134,7 +12442,7 @@ <enum name="QUAD_MESH_SUN" value="0x8614"/> <enum name="TRIANGLE_MESH_SUN" value="0x8615"/> - <function name="DrawMeshArraysSUN"> + <function name="DrawMeshArraysSUN" exec="skip"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> @@ -12190,13 +12498,13 @@ <size name="Get" mode="get"/> </enum> - <function name="PointParameteriNV" offset="assign"> + <function name="PointParameteriNV" offset="assign" mesa_name="-NV"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="4221"/> </function> - <function name="PointParameterivNV" offset="assign"> + <function name="PointParameterivNV" offset="assign" mesa_name="-NV"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4222"/> @@ -12218,7 +12526,8 @@ <size name="Get" mode="get"/> </enum> - <function name="ActiveStencilFaceEXT" offset="assign" static_dispatch="false"> + <function name="ActiveStencilFaceEXT" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="face" type="GLenum"/> <glx rop="4220"/> </function> @@ -12258,7 +12567,9 @@ <enum name="MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV" value="0x8868"/> <enum name="PROGRAM_ERROR_STRING_NV" value="0x8874"/> - <function name="ProgramNamedParameter4fNV" offset="assign" vectorequiv="ProgramNamedParameter4fvNV"> + <function name="ProgramNamedParameter4fNV" offset="assign" + vectorequiv="ProgramNamedParameter4fvNV" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12268,7 +12579,9 @@ <param name="w" type="GLfloat"/> </function> - <function name="ProgramNamedParameter4dNV" offset="assign" vectorequiv="ProgramNamedParameter4dvNV"> + <function name="ProgramNamedParameter4dNV" offset="assign" + vectorequiv="ProgramNamedParameter4dvNV" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12278,7 +12591,8 @@ <param name="w" type="GLdouble"/> </function> - <function name="ProgramNamedParameter4fvNV" offset="assign"> + <function name="ProgramNamedParameter4fvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12286,7 +12600,8 @@ <glx rop="4218"/> </function> - <function name="ProgramNamedParameter4dvNV" offset="assign"> + <function name="ProgramNamedParameter4dvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12294,7 +12609,8 @@ <glx rop="4219"/> </function> - <function name="GetProgramNamedParameterfvNV" offset="assign"> + <function name="GetProgramNamedParameterfvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12302,7 +12618,8 @@ <glx vendorpriv="1310" always_array="true"/> </function> - <function name="GetProgramNamedParameterdvNV" offset="assign"> + <function name="GetProgramNamedParameterdvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12452,12 +12769,14 @@ <enum name="BUFFER_FLUSHING_UNMAP_APPLE" count="1" value="0x8A13"> <size name="GetBufferParameteriv" mode="get"/> </enum> - <function name="BufferParameteriAPPLE" offset="assign" static_dispatch="false"> + <function name="BufferParameteriAPPLE" offset="assign" + static_dispatch="false" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="FlushMappedBufferRangeAPPLE" offset="assign" static_dispatch="false"> + <function name="FlushMappedBufferRangeAPPLE" offset="assign" + static_dispatch="false" exec="skip"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="size" type="GLsizeiptr"/> @@ -12503,12 +12822,12 @@ <enum name="TEXTURE_RANGE_POINTER_APPLE" count="1" value="0x85B8"> <size name="GetTexParameterPointervAPPLE" mode="get"/> </enum> - <function name="TextureRangeAPPLE"> + <function name="TextureRangeAPPLE" exec="skip"> <param name="target" type="GLenum"/> <param name="length" type="GLsizei"/> <param name="pointer" type="GLvoid *"/> </function> - <function name="GetTexParameterPointervAPPLE"> + <function name="GetTexParameterPointervAPPLE" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **"/> @@ -12553,7 +12872,8 @@ <param name="zfail" type="GLenum"/> <param name="zpass" type="GLenum"/> </function> - <function name="StencilFuncSeparateATI" offset="assign" static_dispatch="false"> + <function name="StencilFuncSeparateATI" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="frontfunc" type="GLenum"/> <param name="backfunc" type="GLenum"/> <param name="ref" type="GLint"/> @@ -12563,14 +12883,16 @@ </category> <category name="GL_EXT_gpu_program_parameters"> - <function name="ProgramEnvParameters4fvEXT" offset="assign" static_dispatch="false"> + <function name="ProgramEnvParameters4fvEXT" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="params" type="const GLfloat *"/> </function> - <function name="ProgramLocalParameters4fvEXT" offset="assign" static_dispatch="false"> + <function name="ProgramLocalParameters4fvEXT" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="count" type="GLsizei"/> @@ -12613,17 +12935,17 @@ <enum name="DEBUG_OBJECT_MESA" value="0x8759"/> <enum name="DEBUG_PRINT_MESA" value="0x875A"/> <enum name="DEBUG_ASSERT_MESA" value="0x875B"/> - <function name="CreateDebugObjectMESA"> + <function name="CreateDebugObjectMESA" exec="skip"> <return type="GLhandleARB"/> <glx ignore="true"/> </function> - <function name="ClearDebugLogMESA"> + <function name="ClearDebugLogMESA" exec="skip"> <param name="obj" type="GLhandleARB"/> <param name="logType" type="GLenum"/> <param name="shaderType" type="GLenum"/> <glx ignore="true"/> </function> - <function name="GetDebugLogMESA"> + <function name="GetDebugLogMESA" exec="skip"> <param name="obj" type="GLhandleARB"/> <param name="logType" type="GLenum"/> <param name="shaderType" type="GLenum"/> @@ -12632,7 +12954,7 @@ <param name="debugLog" type="GLcharARB *" output="true"/> <glx ignore="true"/> </function> - <function name="GetDebugLogLengthMESA"> + <function name="GetDebugLogLengthMESA" exec="skip"> <return type="GLsizei"/> <param name="obj" type="GLhandleARB"/> <param name="logType" type="GLenum"/> @@ -12667,14 +12989,14 @@ </category> <category name="GL_SGIX_igloo_interface"> - <function name="IglooInterfaceSGIX"> + <function name="IglooInterfaceSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLvoid *"/> </function> </category> <category name="GL_SGIX_polynomial_ffd"> - <function name="DeformationMap3dSGIX"> + <function name="DeformationMap3dSGIX" exec="skip"> <param name="target" type="GLenum"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -12691,7 +13013,7 @@ <param name="points" type="const GLdouble *"/> </function> - <function name="DeformationMap3fSGIX"> + <function name="DeformationMap3fSGIX" exec="skip"> <param name="target" type="GLenum"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -12708,11 +13030,11 @@ <param name="points" type="const GLfloat *"/> </function> - <function name="DeformSGIX"> + <function name="DeformSGIX" exec="skip"> <param name="mask" type="GLenum"/> </function> - <function name="LoadIdentityDeformationMapSGIX"> + <function name="LoadIdentityDeformationMapSGIX" exec="skip"> <param name="mask" type="GLenum"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py index 019687912..47f8dd5b9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_XML.py +++ b/mesalib/src/mapi/glapi/gen/gl_XML.py @@ -594,6 +594,46 @@ class gl_parameter(object): return self.type_expr.format_string() +# Regular expression used to parse "mesa_name" attributes. A +# mesa_name attribute describes how to adjust a GL function name +# suffix to obtain the name of the function in Mesa that implements +# the functionality. The attribute string consists of a part preceded +# by a "-", indicating the suffix to remove, and a part preceded by a +# "+" indicating the suffix to add. Either part is optional. +# +# For example: +# +# <function name="EnableIndexedEXT" mesa_name="-EXT">...</function> +# <function name="IsProgramNV" mesa_name="-NV+ARB">...</function> +# +# means that EnableIndexedEXT is implemented by a Mesa function called +# _mesa_EnableIndexed, and IsProgramNV is implemented by a Mesa function +# called _mesa_IsProgramARB. +# +# Note: the prefix "_mesa_" is handled separately, by the "exec" +# attribute. +name_modification_regexp = re.compile( + r'^(-(?P<minus>[a-zA-Z0-9_]+))?(\+(?P<plus>[a-zA-Z0-9_]+))?$') + + +# Interpret a "mesa_name" attribute (see above) to determine the +# appropriate suffix for the Mesa function implementing a piece of GL +# functionality, and return the properly suffixed name. +def interpret_name_modification(name, mod): + m = name_modification_regexp.match(mod) + if m is None: + raise Exception('Unintelligible mesa_name property: {0!r}'.format(mod)) + new_name = name + if m.group('minus'): + if not new_name.endswith(m.group('minus')): + raise Exception( + 'Cannot subtract suffix {0!r} from function {1}'.format( + m.group('minus'), name)) + new_name = new_name[:-len(m.group('minus'))] + if m.group('plus'): + new_name += m.group('plus') + return new_name + class gl_function( gl_item ): def __init__(self, element, context): @@ -606,6 +646,10 @@ class gl_function( gl_item ): self.offset = -1 self.initialized = 0 self.images = [] + self.exec_flavor = 'mesa' + self.desktop = True + self.deprecated = None + self.mesa_name = None # self.entry_point_api_map[name][api] is a decimal value # indicating the earliest version of the given API in which @@ -613,10 +657,18 @@ class gl_function( gl_item ): # the first level of the map; the second level of the map only # lists APIs which contain the entry point in at least one # version. For example, - # self.entry_point_gles_map['ClipPlanex'] == { 'es1': + # self.entry_point_api_map['ClipPlanex'] == { 'es1': # Decimal('1.1') }. self.entry_point_api_map = {} + # self.api_map[api] is a decimal value indicating the earliest + # version of the given API in which ANY alias for the function + # exists. The map only lists APIs which contain the function + # in at least one version. For example, for the ClipPlanex + # function, self.entry_point_api_map == { 'es1': + # Decimal('1.1') }. + self.api_map = {} + self.assign_offset = 0 self.static_entry_points = [] @@ -651,15 +703,30 @@ class gl_function( gl_item ): version_str = element.nsProp(api, None) assert version_str is not None if version_str != 'none': - self.entry_point_api_map[name][api] = Decimal(version_str) + version_decimal = Decimal(version_str) + self.entry_point_api_map[name][api] = version_decimal + if api not in self.api_map or \ + version_decimal < self.api_map[api]: + self.api_map[api] = version_decimal + + exec_flavor = element.nsProp('exec', None) + if exec_flavor: + self.exec_flavor = exec_flavor + + deprecated = element.nsProp('deprecated', None) + if deprecated != 'none': + self.deprecated = Decimal(deprecated) + + if not is_attr_true(element, 'desktop'): + self.desktop = False if alias: true_name = alias else: true_name = name - # Only try to set the offset when a non-alias - # entry-point is being processes. + # Only try to set the offset and mesa_name when a + # non-alias entry-point is being processed. offset = element.nsProp( "offset", None ) if offset: @@ -671,6 +738,12 @@ class gl_function( gl_item ): if offset == "assign": self.assign_offset = 1 + mesa_name = element.nsProp('mesa_name', None) + if mesa_name is None: + self.mesa_name = name + else: + self.mesa_name = interpret_name_modification(name, mesa_name) + if not self.name: self.name = true_name diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml index 7495a2e56..205f74fa9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml @@ -19,13 +19,13 @@ <type name="clampx" size="4" /> <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> @@ -33,12 +33,12 @@ </function> <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="depth" type="GLclampx"/> </function> <function name="Color4x" alias="Color4xOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> @@ -46,23 +46,25 @@ </function> <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0"> + <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0" + desktop="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0"> + <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0" + desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="Frustumx" alias="FrustumxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -72,62 +74,62 @@ </function> <function name="LightModelx" alias="LightModelxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="LightModelxv" alias="LightModelxvOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="Lightx" alias="LightxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="Lightxv" alias="LightxvOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="width" type="GLfixed"/> </function> <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="Materialx" alias="MaterialxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -136,14 +138,14 @@ </function> <function name="Normal3x" alias="Normal3xOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> <function name="Orthox" alias="OrthoxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -153,18 +155,18 @@ </function> <function name="PointSizex" alias="PointSizexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="size" type="GLfixed"/> </function> <function name="PolygonOffsetx" alias="PolygonOffsetxOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> <function name="Rotatex" alias="RotatexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> @@ -172,41 +174,41 @@ </function> <function name="SampleCoveragex" alias="SampleCoveragexOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> <function name="Scalex" alias="ScalexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="TexParameterx" alias="TexParameterxOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="Translatex" alias="TranslatexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -214,7 +216,7 @@ <!-- from GL_OES_single_precision --> <function name="Frustumf" alias="FrustumfOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -224,7 +226,7 @@ </function> <function name="Orthof" alias="OrthofOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -237,7 +239,7 @@ <category name="es1.1"> <!-- from GL_OES_fixed_point --> <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> @@ -249,53 +251,53 @@ </function> <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetMaterialxv" alias="GetMaterialxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexParameterxv" alias="GetTexParameterxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="PointParameterx" alias="PointParameterxOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="PointParameterxv" alias="PointParameterxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> <function name="TexParameterxv" alias="TexParameterxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> @@ -303,7 +305,7 @@ <!-- from GL_OES_single_precision --> <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py new file mode 100644 index 000000000..adfa5957e --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py @@ -0,0 +1,222 @@ +#!/usr/bin/env python + +# Copyright (C) 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# This script generates the file api_exec.c, which contains +# _mesa_create_exec_table(). It is responsible for populating all +# entries in the "exec" dispatch table that aren't dynamic. + +import collections +import license +import gl_XML +import sys, getopt + + +exec_flavor_map = { + 'check': '_check_', + 'dynamic': None, + 'es': '_es_', + 'loopback': 'loopback_', + 'mesa': '_mesa_', + 'skip': None, + } + + +header = """/** + * \\file api_exec.c + * Initialize dispatch table. + */ + + +#include "main/mfeatures.h" +#include "main/accum.h" +#include "main/api_loopback.h" +#include "main/api_exec.h" +#include "main/arbprogram.h" +#include "main/atifragshader.h" +#include "main/attrib.h" +#include "main/blend.h" +#include "main/bufferobj.h" +#include "main/arrayobj.h" +#include "main/buffers.h" +#include "main/clear.h" +#include "main/clip.h" +#include "main/colortab.h" +#include "main/condrender.h" +#include "main/context.h" +#include "main/convolve.h" +#include "main/depth.h" +#include "main/dlist.h" +#include "main/drawpix.h" +#include "main/drawtex.h" +#include "main/rastpos.h" +#include "main/enable.h" +#include "main/errors.h" +#include "main/es1_conversion.h" +#include "main/eval.h" +#include "main/get.h" +#include "main/feedback.h" +#include "main/fog.h" +#include "main/fbobject.h" +#include "main/framebuffer.h" +#include "main/hint.h" +#include "main/histogram.h" +#include "main/imports.h" +#include "main/light.h" +#include "main/lines.h" +#include "main/matrix.h" +#include "main/multisample.h" +#include "main/pixel.h" +#include "main/pixelstore.h" +#include "main/points.h" +#include "main/polygon.h" +#include "main/querymatrix.h" +#include "main/queryobj.h" +#include "main/readpix.h" +#include "main/samplerobj.h" +#include "main/scissor.h" +#include "main/stencil.h" +#include "main/texenv.h" +#include "main/texgetimage.h" +#include "main/teximage.h" +#include "main/texgen.h" +#include "main/texobj.h" +#include "main/texparam.h" +#include "main/texstate.h" +#include "main/texstorage.h" +#include "main/texturebarrier.h" +#include "main/transformfeedback.h" +#include "main/mtypes.h" +#include "main/varray.h" +#include "main/viewport.h" +#include "main/shaderapi.h" +#include "main/uniforms.h" +#include "main/syncobj.h" +#include "main/dispatch.h" + + +/** + * Initialize a dispatch table with pointers to Mesa's immediate-mode + * commands. + * + * Pointers to glBegin()/glEnd() object commands and a few others + * are provided via the GLvertexformat interface. + * + * \param ctx GL context to which \c exec belongs. + * \param exec dispatch table. + */ +struct _glapi_table * +_mesa_create_exec_table(struct gl_context *ctx) +{ + struct _glapi_table *exec; + + exec = _mesa_alloc_dispatch_table(_gloffset_COUNT); + if (exec == NULL) + return NULL; + +""" + + +footer = """ + return exec; +} +""" + + +class PrintCode(gl_XML.gl_print_base): + + def __init__(self): + gl_XML.gl_print_base.__init__(self) + + self.name = 'gl_genexec.py' + self.license = license.bsd_license_template % ( + 'Copyright (C) 2012 Intel Corporation', + 'Intel Corporation') + + def printRealHeader(self): + print header + + def printRealFooter(self): + print footer + + def printBody(self, api): + # Collect SET_* calls by the condition under which they should + # be called. + settings_by_condition = collections.defaultdict(lambda: []) + for f in api.functionIterateAll(): + if f.exec_flavor not in exec_flavor_map: + raise Exception( + 'Unrecognized exec flavor {0!r}'.format(f.exec_flavor)) + condition_parts = [] + if f.desktop: + if f.deprecated: + condition_parts.append('ctx->API == API_OPENGL') + else: + condition_parts.append('_mesa_is_desktop_gl(ctx)') + if 'es1' in f.api_map: + condition_parts.append('ctx->API == API_OPENGLES') + if 'es2' in f.api_map: + if f.api_map['es2'] == 3: + condition_parts.append('_mesa_is_gles3(ctx)') + else: + condition_parts.append('ctx->API == API_OPENGLES2') + if not condition_parts: + # This function does not exist in any API. + continue + condition = ' || '.join(condition_parts) + prefix = exec_flavor_map[f.exec_flavor] + if prefix is None: + # This function is not implemented, or is dispatched + # dynamically. + continue + settings_by_condition[condition].append( + 'SET_{0}(exec, {1}{2});'.format(f.name, prefix, f.mesa_name)) + # Print out an if statement for each unique condition, with + # the SET_* calls nested inside it. + for condition in sorted(settings_by_condition.keys()): + print ' if ({0}) {{'.format(condition) + for setting in sorted(settings_by_condition[condition]): + print ' {0}'.format(setting) + print ' }' + + +def show_usage(): + print "Usage: %s [-f input_file_name]" % sys.argv[0] + sys.exit(1) + + +if __name__ == '__main__': + file_name = "gl_and_es_API.xml" + + try: + (args, trail) = getopt.getopt(sys.argv[1:], "m:f:") + except Exception,e: + show_usage() + + for (arg,val) in args: + if arg == "-f": + file_name = val + + printer = PrintCode() + + api = gl_XML.parse_GL_API(file_name) + printer.Print(api) diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk index ffa36db4d..ce6d65bbd 100644 --- a/mesalib/src/mesa/Android.gen.mk +++ b/mesalib/src/mesa/Android.gen.mk @@ -32,6 +32,7 @@ intermediates := $(call local-intermediates-dir) # This is the list of auto-generated files: sources and headers sources := \ main/enums.c \ + main/api_exec.c \ program/program_parse.tab.c \ program/lex.yy.c \ main/dispatch.h \ @@ -123,6 +124,12 @@ $(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(intermediates)/main/enums.c: $(dispatch_deps) $(call es-gen) +$(intermediates)/main/api_exec.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_genexec.py +$(intermediates)/main/api_exec.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml + +$(intermediates)/main/api_exec.c: $(dispatch_deps) + $(call es-gen) + GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py GET_HASH_GEN_FLAGS := $(patsubst %,-a %,$(MESA_ENABLED_APIS)) diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 53e5ee8c2..11e034f84 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -441,6 +441,14 @@ env.CodeGenerate( command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) +# The api_exec.c file is generated from the GL/ES API.xml file +env.CodeGenerate( + target = 'main/api_exec.c', + script = GLAPI + 'gen/gl_genexec.py', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' + ) + # We also depend on the auto-generated GL API headers env.Depends(mesa_sources, glapi_headers) diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 24d8d485a..1f2a8a696 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -292,7 +292,6 @@ struct gen_mipmap_state GLuint FBO; GLuint Sampler; GLuint ShaderProg; - GLuint IntegerShaderProg; struct glsl_sampler sampler_1d; struct glsl_sampler sampler_2d; struct glsl_sampler sampler_3d; @@ -3047,27 +3046,6 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, }; struct glsl_sampler *sampler; const char *vs_source; - - static const char *vs_int_source = - "#version 130\n" - "in vec2 position;\n" - "in vec3 textureCoords;\n" - "out vec3 texCoords;\n" - "void main()\n" - "{\n" - " texCoords = textureCoords;\n" - " gl_Position = gl_Vertex;\n" - "}\n"; - static const char *fs_int_source = - "#version 130\n" - "uniform isampler2D tex2d;\n" - "in vec3 texCoords;\n" - "out ivec4 out_color;\n" - "\n" - "void main()\n" - "{\n" - " out_color = texture(tex2d, texCoords.xy);\n" - "}\n"; char *fs_source; GLuint vs, fs; void *mem_ctx; @@ -3162,26 +3140,6 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, link_program_with_debug(ctx, mipmap->ShaderProg); sampler->shader_prog = mipmap->ShaderProg; ralloc_free(mem_ctx); - - if ((_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) || - _mesa_is_gles3(ctx)){ - vs = compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_int_source); - fs = compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_int_source); - - mipmap->IntegerShaderProg = _mesa_CreateProgramObjectARB(); - _mesa_AttachShader(mipmap->IntegerShaderProg, fs); - _mesa_DeleteObjectARB(fs); - _mesa_AttachShader(mipmap->IntegerShaderProg, vs); - _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(mipmap->IntegerShaderProg, 0, "position"); - _mesa_BindAttribLocationARB(mipmap->IntegerShaderProg, 1, "texcoords"); - - /* Note that user-defined out attributes get automatically assigned - * locations starting from 0, so we don't need to explicitly - * BindFragDataLocation to 0. - */ - link_program_with_debug(ctx, mipmap->IntegerShaderProg); - } } @@ -3209,11 +3167,6 @@ meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx, mipmap->sampler_cubemap.shader_prog = 0; mipmap->sampler_1d_array.shader_prog = 0; mipmap->sampler_2d_array.shader_prog = 0; - - if (mipmap->IntegerShaderProg) { - _mesa_DeleteObjectARB(mipmap->IntegerShaderProg); - mipmap->IntegerShaderProg = 0; - } } @@ -3266,11 +3219,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, */ if (use_glsl_version) { setup_glsl_generate_mipmap(ctx, mipmap, target); - - if (texObj->_IsIntegerFormat) - _mesa_UseProgramObjectARB(mipmap->IntegerShaderProg); - else - _mesa_UseProgramObjectARB(mipmap->ShaderProg); + _mesa_UseProgramObjectARB(mipmap->ShaderProg); } else { setup_ff_generate_mipmap(ctx, mipmap); @@ -3294,15 +3243,9 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_GenSamplers(1, &mipmap->Sampler); _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler); - if (use_glsl_version && texObj->_IsIntegerFormat) - _mesa_SamplerParameteri(mipmap->Sampler, - GL_TEXTURE_MIN_FILTER, - GL_NEAREST_MIPMAP_NEAREST); - else - _mesa_SamplerParameteri(mipmap->Sampler, - GL_TEXTURE_MIN_FILTER, - GL_LINEAR_MIPMAP_LINEAR); - + _mesa_SamplerParameteri(mipmap->Sampler, + GL_TEXTURE_MIN_FILTER, + GL_LINEAR_MIPMAP_LINEAR); _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); diff --git a/mesalib/src/mesa/main/.gitignore b/mesalib/src/mesa/main/.gitignore index 12c88372a..b1b83f102 100644 --- a/mesalib/src/mesa/main/.gitignore +++ b/mesalib/src/mesa/main/.gitignore @@ -1,3 +1,4 @@ +api_exec.c
dispatch.h
enums.c
get_es1.c
diff --git a/mesalib/src/mesa/main/accum.c b/mesalib/src/mesa/main/accum.c index e2d7726b5..6416ee860 100644 --- a/mesalib/src/mesa/main/accum.c +++ b/mesalib/src/mesa/main/accum.c @@ -55,7 +55,7 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Accum( GLenum op, GLfloat value ) { GET_CURRENT_CONTEXT(ctx); @@ -106,14 +106,6 @@ _mesa_Accum( GLenum op, GLfloat value ) } -void -_mesa_init_accum_dispatch(struct _glapi_table *disp) -{ - SET_Accum(disp, _mesa_Accum); - SET_ClearAccum(disp, _mesa_ClearAccum); -} - - /** * Clear the accumulation buffer by mapping the renderbuffer and * writing the clear color to it. Called by the driver's implementation diff --git a/mesalib/src/mesa/main/accum.h b/mesalib/src/mesa/main/accum.h index 594a7687d..00c24b2db 100644 --- a/mesalib/src/mesa/main/accum.h +++ b/mesalib/src/mesa/main/accum.h @@ -46,9 +46,8 @@ struct gl_renderbuffer; extern void GLAPIENTRY _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ); - -extern void -_mesa_init_accum_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_Accum( GLenum op, GLfloat value ); extern void _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value); diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c deleted file mode 100644 index bc5f71f0d..000000000 --- a/mesalib/src/mesa/main/api_exec.c +++ /dev/null @@ -1,935 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 7.1 - * - * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -/** - * \file api_exec.c - * Initialize dispatch table with the immidiate mode functions. - */ - - -#include "mfeatures.h" -#include "accum.h" -#include "api_loopback.h" -#include "api_exec.h" -#include "arbprogram.h" -#include "atifragshader.h" -#include "attrib.h" -#include "blend.h" -#include "bufferobj.h" -#include "arrayobj.h" -#include "buffers.h" -#include "clear.h" -#include "clip.h" -#include "colortab.h" -#include "condrender.h" -#include "context.h" -#include "convolve.h" -#include "depth.h" -#include "dlist.h" -#include "drawpix.h" -#include "drawtex.h" -#include "rastpos.h" -#include "enable.h" -#include "errors.h" -#include "es1_conversion.h" -#include "eval.h" -#include "get.h" -#include "feedback.h" -#include "fog.h" -#include "fbobject.h" -#include "framebuffer.h" -#include "hint.h" -#include "histogram.h" -#include "imports.h" -#include "light.h" -#include "lines.h" -#include "matrix.h" -#include "multisample.h" -#include "pixel.h" -#include "pixelstore.h" -#include "points.h" -#include "polygon.h" -#include "querymatrix.h" -#include "queryobj.h" -#include "readpix.h" -#include "samplerobj.h" -#include "scissor.h" -#include "stencil.h" -#include "texenv.h" -#include "texgetimage.h" -#include "teximage.h" -#include "texgen.h" -#include "texobj.h" -#include "texparam.h" -#include "texstate.h" -#include "texstorage.h" -#include "texturebarrier.h" -#include "transformfeedback.h" -#include "mtypes.h" -#include "varray.h" -#include "viewport.h" -#include "shaderapi.h" -#include "uniforms.h" -#include "syncobj.h" -#include "main/dispatch.h" - - -/** - * Initialize a dispatch table with pointers to Mesa's immediate-mode - * commands. - * - * Pointers to glBegin()/glEnd() object commands and a few others - * are provided via the GLvertexformat interface. - * - * \param ctx GL context to which \c exec belongs. - * \param exec dispatch table. - */ -struct _glapi_table * -_mesa_create_exec_table(struct gl_context *ctx) -{ - struct _glapi_table *exec; - - exec = _mesa_alloc_dispatch_table(_gloffset_COUNT); - if (exec == NULL) - return NULL; - - _mesa_loopback_init_api_table(ctx, exec); - - /* load the dispatch slots we understand */ - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_AlphaFunc(exec, _mesa_AlphaFunc); - } - - SET_BlendFunc(exec, _mesa_BlendFunc); - SET_Clear(exec, _mesa_Clear); - SET_ClearColor(exec, _mesa_ClearColor); - SET_ClearStencil(exec, _mesa_ClearStencil); - SET_ColorMask(exec, _mesa_ColorMask); - SET_CullFace(exec, _mesa_CullFace); - SET_Disable(exec, _mesa_Disable); - if (ctx->API == API_OPENGL || ctx->API == API_OPENGL_CORE) - SET_DrawBuffer(exec, _mesa_DrawBuffer); - if (ctx->API != API_OPENGLES) { - SET_ReadBuffer(exec, _mesa_ReadBuffer); - } - SET_Enable(exec, _mesa_Enable); - SET_Finish(exec, _mesa_Finish); - SET_Flush(exec, _mesa_Flush); - SET_FrontFace(exec, _mesa_FrontFace); - if (ctx->API == API_OPENGL) { - SET_Frustum(exec, _mesa_Frustum); - } - SET_GetError(exec, _mesa_GetError); - SET_GetFloatv(exec, _mesa_GetFloatv); - SET_GetString(exec, _mesa_GetString); - if (ctx->API == API_OPENGL) { - SET_LineStipple(exec, _mesa_LineStipple); - } - SET_LineWidth(exec, _mesa_LineWidth); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_LoadIdentity(exec, _mesa_LoadIdentity); - SET_LoadMatrixf(exec, _mesa_LoadMatrixf); - } - if (ctx->API != API_OPENGLES2) { - SET_LogicOp(exec, _mesa_LogicOp); - } - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_MatrixMode(exec, _mesa_MatrixMode); - SET_MultMatrixf(exec, _mesa_MultMatrixf); - } - if (ctx->API == API_OPENGL) { - SET_Ortho(exec, _mesa_Ortho); - } - SET_PixelStorei(exec, _mesa_PixelStorei); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_PopMatrix(exec, _mesa_PopMatrix); - SET_PushMatrix(exec, _mesa_PushMatrix); - SET_Rotatef(exec, _mesa_Rotatef); - SET_Scalef(exec, _mesa_Scalef); - } - SET_Scissor(exec, _mesa_Scissor); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_ShadeModel(exec, _mesa_ShadeModel); - } - SET_StencilFunc(exec, _mesa_StencilFunc); - SET_StencilMask(exec, _mesa_StencilMask); - SET_StencilOp(exec, _mesa_StencilOp); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_TexEnvfv(exec, _mesa_TexEnvfv); - SET_TexEnvi(exec, _mesa_TexEnvi); - } - SET_TexImage2D(exec, _mesa_TexImage2D); - SET_TexParameteri(exec, _mesa_TexParameteri); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_Translatef(exec, _mesa_Translatef); - } - SET_Viewport(exec, _mesa_Viewport); - - if (ctx->API == API_OPENGL) { - _mesa_init_accum_dispatch(exec); - _mesa_init_dlist_dispatch(exec); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_ClearDepth(exec, _mesa_ClearDepth); - } - - if (ctx->API == API_OPENGL) { - SET_ClearIndex(exec, _mesa_ClearIndex); - SET_ClipPlane(exec, _mesa_ClipPlane); - SET_ColorMaterial(exec, _mesa_ColorMaterial); - } - SET_DepthFunc(exec, _mesa_DepthFunc); - SET_DepthMask(exec, _mesa_DepthMask); - - if (_mesa_is_desktop_gl(ctx)) { - SET_DepthRange(exec, _mesa_DepthRange); - } - - if (ctx->API == API_OPENGL) { - _mesa_init_drawpix_dispatch(exec); - } - if (ctx->API == API_OPENGL) { - _mesa_init_feedback_dispatch(exec); - } - - if (ctx->API == API_OPENGL) { - SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT); - SET_Fogi(exec, _mesa_Fogi); - SET_Fogiv(exec, _mesa_Fogiv); - SET_GetClipPlane(exec, _mesa_GetClipPlane); - } - if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) { - SET_Fogf(exec, _mesa_Fogf); - SET_Fogfv(exec, _mesa_Fogfv); - } - SET_GetBooleanv(exec, _mesa_GetBooleanv); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetDoublev(exec, _mesa_GetDoublev); - } - SET_GetIntegerv(exec, _mesa_GetIntegerv); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_GetLightfv(exec, _mesa_GetLightfv); - SET_GetMaterialfv(exec, _mesa_GetMaterialfv); - SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv); - SET_GetTexEnviv(exec, _mesa_GetTexEnviv); - } - if (ctx->API == API_OPENGL) { - SET_GetLightiv(exec, _mesa_GetLightiv); - SET_GetMaterialiv(exec, _mesa_GetMaterialiv); - SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv); - SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv); - } - SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv); - SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetTexImage(exec, _mesa_GetTexImage); - } - SET_Hint(exec, _mesa_Hint); - if (ctx->API == API_OPENGL) { - SET_IndexMask(exec, _mesa_IndexMask); - } - SET_IsEnabled(exec, _mesa_IsEnabled); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_LightModelf(exec, _mesa_LightModelf); - SET_LightModelfv(exec, _mesa_LightModelfv); - SET_Lightf(exec, _mesa_Lightf); - SET_Lightfv(exec, _mesa_Lightfv); - } - if (ctx->API == API_OPENGL) { - SET_LightModeli(exec, _mesa_LightModeli); - SET_LightModeliv(exec, _mesa_LightModeliv); - SET_Lighti(exec, _mesa_Lighti); - SET_Lightiv(exec, _mesa_Lightiv); - SET_LoadMatrixd(exec, _mesa_LoadMatrixd); - } - - if (ctx->API == API_OPENGL) { - _mesa_init_eval_dispatch(exec); - SET_MultMatrixd(exec, _mesa_MultMatrixd); - _mesa_init_pixel_dispatch(exec); - } - - if (ctx->API != API_OPENGLES2) { - SET_PointSize(exec, _mesa_PointSize); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_PixelStoref(exec, _mesa_PixelStoref); - SET_PolygonMode(exec, _mesa_PolygonMode); - } - - SET_PolygonOffset(exec, _mesa_PolygonOffset); - if (ctx->API == API_OPENGL) { - SET_PolygonStipple(exec, _mesa_PolygonStipple); - _mesa_init_attrib_dispatch(exec); - _mesa_init_rastpos_dispatch(exec); - } - - SET_ReadPixels(exec, _mesa_ReadPixels); - if (ctx->API == API_OPENGL) { - SET_Rotated(exec, _mesa_Rotated); - SET_Scaled(exec, _mesa_Scaled); - SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT); - } - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_TexEnvf(exec, _mesa_TexEnvf); - SET_TexEnviv(exec, _mesa_TexEnviv); - } - - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - _mesa_init_texgen_dispatch(ctx, exec); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_TexImage1D(exec, _mesa_TexImage1D); - } - SET_TexParameterf(exec, _mesa_TexParameterf); - SET_TexParameterfv(exec, _mesa_TexParameterfv); - SET_TexParameteriv(exec, _mesa_TexParameteriv); - if (ctx->API == API_OPENGL) { - SET_Translated(exec, _mesa_Translated); - } - - /* 1.1 */ - SET_BindTexture(exec, _mesa_BindTexture); - SET_DeleteTextures(exec, _mesa_DeleteTextures); - SET_GenTextures(exec, _mesa_GenTextures); - if (ctx->API == API_OPENGL) { - SET_AreTexturesResident(exec, _mesa_AreTexturesResident); - } - if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) { - SET_ColorPointer(exec, _mesa_ColorPointer); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D); - SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D); - SET_TexSubImage1D(exec, _mesa_TexSubImage1D); - } - - SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D); - SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D); - SET_TexSubImage2D(exec, _mesa_TexSubImage2D); - - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_DisableClientState(exec, _mesa_DisableClientState); - SET_EnableClientState(exec, _mesa_EnableClientState); - } - if (ctx->API == API_OPENGL) { - SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer); - SET_IndexPointer(exec, _mesa_IndexPointer); - SET_InterleavedArrays(exec, _mesa_InterleavedArrays); - } - if (ctx->API != API_OPENGLES2) { - /* Note glGetPointerv is deprecated in GL CORE 3.1 through 4.2, but - * was re-added in GL CORE 4.3. We will just keep the function - * around in all GL CORE contexts. - */ - SET_GetPointerv(exec, _mesa_GetPointerv); - } - SET_IsTexture(exec, _mesa_IsTexture); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_NormalPointer(exec, _mesa_NormalPointer); - SET_TexCoordPointer(exec, _mesa_TexCoordPointer); - SET_VertexPointer(exec, _mesa_VertexPointer); - } - if (ctx->API == API_OPENGL) { - SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures); - } - - /* 1.2 */ - if (ctx->API != API_OPENGLES) { - SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D); - SET_TexImage3D(exec, _mesa_TexImage3D); - SET_TexSubImage3D(exec, _mesa_TexSubImage3D); - } - - /* OpenGL 1.2 GL_ARB_imaging */ - if (ctx->API != API_OPENGLES) { - SET_BlendColor(exec, _mesa_BlendColor); - } - SET_BlendEquation(exec, _mesa_BlendEquation); - SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT); - - if (ctx->API == API_OPENGL) { - _mesa_init_colortable_dispatch(exec); - _mesa_init_convolve_dispatch(exec); - _mesa_init_histogram_dispatch(exec); - } - - /* OpenGL 2.0 */ - if (ctx->API != API_OPENGLES) { - SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate); - SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate); - SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate); - } - - _mesa_init_shader_dispatch(ctx, exec); - _mesa_init_shader_uniform_dispatch(ctx, exec); - - /* 2. GL_EXT_blend_color */ -#if 0 -/* SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */ -#endif - - /* 3. GL_EXT_polygon_offset */ - if (ctx->API == API_OPENGL) { - SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT); - } - - /* 6. GL_EXT_texture3d */ -#if 0 -/* SET_CopyTexSubImage3DEXT(exec, _mesa_CopyTexSubImage3D); */ -/* SET_TexImage3DEXT(exec, _mesa_TexImage3DEXT); */ -/* SET_TexSubImage3DEXT(exec, _mesa_TexSubImage3D); */ -#endif - - /* 11. GL_EXT_histogram */ -#if 0 - if (ctx->API == API_OPENGL) { - SET_GetHistogramEXT(exec, _mesa_GetHistogram); - SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv); - SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv); - SET_GetMinmaxEXT(exec, _mesa_GetMinmax); - SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv); - SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv); - } -#endif - - /* 14. SGI_color_table */ -#if 0 - if (ctx->API == API_OPENGL) { - SET_ColorTableSGI(exec, _mesa_ColorTable); - SET_ColorSubTableSGI(exec, _mesa_ColorSubTable); - SET_GetColorTableSGI(exec, _mesa_GetColorTable); - SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv); - } -#endif - - /* 30. GL_EXT_vertex_array */ - if (ctx->API == API_OPENGL) { - SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT); - SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT); - SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT); - SET_NormalPointerEXT(exec, _mesa_NormalPointerEXT); - SET_TexCoordPointerEXT(exec, _mesa_TexCoordPointerEXT); - SET_VertexPointerEXT(exec, _mesa_VertexPointerEXT); - } - - /* 37. GL_EXT_blend_minmax */ -#if 0 - SET_BlendEquationEXT(exec, _mesa_BlendEquationEXT); -#endif - - /* 54. GL_EXT_point_parameters */ - if (ctx->API != API_OPENGLES2) { - SET_PointParameterfEXT(exec, _mesa_PointParameterf); - SET_PointParameterfvEXT(exec, _mesa_PointParameterfv); - } - - /* 95. GL_ARB_ES2_compatibility */ - SET_ClearDepthf(exec, _mesa_ClearDepthf); - SET_DepthRangef(exec, _mesa_DepthRangef); - - /* 97. GL_EXT_compiled_vertex_array */ - if (ctx->API == API_OPENGL) { - SET_LockArraysEXT(exec, _mesa_LockArraysEXT); - SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT); - } - - /* 148. GL_EXT_multi_draw_arrays */ - SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT); - - /* 173. GL_INGR_blend_func_separate */ - SET_BlendFuncSeparateEXT(exec, _mesa_BlendFuncSeparateEXT); - - /* 196. GL_MESA_resize_buffers */ - if (_mesa_is_desktop_gl(ctx)) { - SET_ResizeBuffersMESA(exec, _mesa_ResizeBuffersMESA); - } - - /* 197. GL_MESA_window_pos */ - /* part of _mesa_init_rastpos_dispatch(exec); */ - - /* 200. GL_IBM_multimode_draw_arrays */ - if (_mesa_is_desktop_gl(ctx)) { - SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM); - SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM); - } - - /* 233. GL_NV_vertex_program */ - if (ctx->API == API_OPENGL) { - SET_BindProgramNV(exec, _mesa_BindProgram); - SET_DeleteProgramsNV(exec, _mesa_DeletePrograms); - SET_GenProgramsNV(exec, _mesa_GenPrograms); - SET_IsProgramNV(exec, _mesa_IsProgramARB); - /* glVertexAttrib*NV functions handled in api_loopback.c */ - } - - /* 273. GL_APPLE_vertex_array_object */ - if (ctx->API == API_OPENGL) { - SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE); - SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE); - } - /* Reused by ARB_vertex_array_object / OES_vertex_array_object */ - if (ctx->API != API_OPENGLES) { - SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE); - SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE); - } - - /* 262. GL_NV_point_sprite */ - if (_mesa_is_desktop_gl(ctx)) { - SET_PointParameteriNV(exec, _mesa_PointParameteri); - SET_PointParameterivNV(exec, _mesa_PointParameteriv); - } - - /* 268. GL_EXT_stencil_two_side */ - if (ctx->API == API_OPENGL) { - SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT); - } - - /* 285. GL_NV_primitive_restart */ - if (_mesa_is_desktop_gl(ctx)) { - SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex); - } - - /* ???. GL_EXT_depth_bounds_test */ - if (_mesa_is_desktop_gl(ctx)) { - SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT); - } - - /* 352. GL_EXT_transform_feedback */ - /* ARB 93. GL_ARB_transform_feedback2 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_transform_feedback_dispatch(ctx, exec); - } - - /* 364. GL_EXT_provoking_vertex */ - if (_mesa_is_desktop_gl(ctx)) { - SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT); - } - - /* ARB 1. GL_ARB_multitexture */ - SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB); - } - - /* ARB 3. GL_ARB_transpose_matrix */ - if (ctx->API == API_OPENGL) { - SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB); - SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB); - SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB); - SET_MultTransposeMatrixfARB(exec, _mesa_MultTransposeMatrixfARB); - } - - /* ARB 5. GL_ARB_multisample */ - SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB); - - /* ARB 12. GL_ARB_texture_compression */ - if (_mesa_is_desktop_gl(ctx)) { - SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB); - SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB); - SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB); - } - - if (ctx->API != API_OPENGLES) { - SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB); - } - SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB); - if (ctx->API != API_OPENGLES) { - SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB); - } - SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB); - - /* ARB 104. GL_ARB_robustness */ - if (_mesa_is_desktop_gl(ctx)) { - SET_GetnCompressedTexImageARB(exec, _mesa_GetnCompressedTexImageARB); - } - - /* ARB 14. GL_ARB_point_parameters */ - /* reuse EXT_point_parameters functions */ - - /* ARB 26. GL_ARB_vertex_program */ - /* ARB 27. GL_ARB_fragment_program */ - /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */ - /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */ - /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */ - /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */ - /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */ - /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */ - /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */ - /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */ - /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */ - /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */ - /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */ - /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */ - /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */ - /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */ - /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */ - /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */ - /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */ - /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */ - /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */ - /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */ - /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */ - /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */ - /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */ - /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */ - /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */ - /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */ - /* glVertexAttrib4bvARB handled in api_loopback.c */ - /* glVertexAttrib4ivARB handled in api_loopback.c */ - /* glVertexAttrib4ubvARB handled in api_loopback.c */ - /* glVertexAttrib4usvARB handled in api_loopback.c */ - /* glVertexAttrib4uivARB handled in api_loopback.c */ - /* glVertexAttrib4NbvARB handled in api_loopback.c */ - /* glVertexAttrib4NsvARB handled in api_loopback.c */ - /* glVertexAttrib4NivARB handled in api_loopback.c */ - /* glVertexAttrib4NusvARB handled in api_loopback.c */ - /* glVertexAttrib4NuivARB handled in api_loopback.c */ - if (ctx->API != API_OPENGLES) { - SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB); - SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB); - SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB); - } - if (_mesa_is_desktop_gl(ctx)) { - /* glBindProgramARB aliases glBindProgramNV */ - /* glDeleteProgramsARB aliases glDeleteProgramsNV */ - /* glGenProgramsARB aliases glGenProgramsNV */ - /* glIsProgramARB aliases glIsProgramNV */ - SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB); - } - if (ctx->API == API_OPENGL) { - SET_ProgramStringARB(exec, _mesa_ProgramStringARB); - } - - if (ctx->API != API_OPENGLES) { - SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB); - SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB); - SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervARB); - } - if (ctx->API == API_OPENGL) { - SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); - SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB); - SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB); - SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB); - SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB); - SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB); - SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB); - SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB); - SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB); - SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB); - SET_GetProgramivARB(exec, _mesa_GetProgramivARB); - SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB); - SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB); - SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB); - } - - /* ARB 28. GL_ARB_vertex_buffer_object */ - _mesa_init_bufferobj_dispatch(ctx, exec); - - /* ARB 29. GL_ARB_occlusion_query */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_queryobj_dispatch(ctx, exec); - } - - /* ARB 37. GL_ARB_draw_buffers */ - if (ctx->API != API_OPENGLES) { - SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB); - } - - /* ARB 66. GL_ARB_sync */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_sync_dispatch(exec); - } - - /* ARB 104. GL_ARB_debug_output */ - if (_mesa_is_desktop_gl(ctx)) { - _mesa_init_errors_dispatch(exec); - } - - /* ARB 105. GL_ARB_robustness */ - if (_mesa_is_desktop_gl(ctx)) { - SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB); - SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB); - SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB); - SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB); - } - - /* GL_ATI_fragment_shader */ - if (ctx->API == API_OPENGL) { - _mesa_init_ati_fragment_shader_dispatch(exec); - } - - /* GL_ATI_envmap_bumpmap */ - if (ctx->API == API_OPENGL) { - SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI); - SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI); - SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI); - SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI); - } - - SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT); - SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT); - SET_DeleteRenderbuffersEXT(exec, _mesa_DeleteRenderbuffersEXT); - SET_GenRenderbuffersEXT(exec, _mesa_GenRenderbuffersEXT); - SET_RenderbufferStorageEXT(exec, _mesa_RenderbufferStorageEXT); - SET_GetRenderbufferParameterivEXT(exec, _mesa_GetRenderbufferParameterivEXT); - SET_IsFramebufferEXT(exec, _mesa_IsFramebufferEXT); - SET_BindFramebufferEXT(exec, _mesa_BindFramebufferEXT); - SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT); - SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT); - SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT); - if (_mesa_is_desktop_gl(ctx)) { - SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT); - } - SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT); - if (ctx->API != API_OPENGLES) { - SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT); - } - SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT); - SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT); - SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT); - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT); - } - - /* GL_EXT_gpu_program_parameters */ - if (ctx->API == API_OPENGL) { - SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT); - SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT); - } - - /* GL_MESA_texture_array / GL_EXT_texture_array */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT); - } - - /* GL_ATI_separate_stencil */ - if (ctx->API == API_OPENGL) { - SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI); - } - - /* The ARB_fbo functions are the union of - * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array - */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample); - } - - /* GL_ARB_map_buffer_range / GL_EXT_map_buffer_range */ - SET_MapBufferRange(exec, _mesa_MapBufferRange); - SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange); - - /* GL_ARB_copy_buffer */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData); - } - - /* GL_ARB_vertex_array_object / GL_OES_vertex_array_object */ - if (ctx->API != API_OPENGLES) { - SET_BindVertexArray(exec, _mesa_BindVertexArray); - SET_GenVertexArrays(exec, _mesa_GenVertexArrays); - } - - /* GL_EXT_draw_buffers2 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed); - SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv); - SET_EnableIndexedEXT(exec, _mesa_EnableIndexed); - SET_DisableIndexedEXT(exec, _mesa_DisableIndexed); - SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed); - } - - /* GL_NV_conditional_render */ - if (_mesa_is_desktop_gl(ctx)) { - SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender); - SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender); - } - - SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES); - SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES); - - if (_mesa_is_desktop_gl(ctx)) { - SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE); - SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE); - SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_ClampColorARB(exec, _mesa_ClampColorARB); - } - - /* GL_EXT_texture_integer */ - if (_mesa_is_desktop_gl(ctx)) { - SET_ClearColorIiEXT(exec, _mesa_ClearColorIiEXT); - SET_ClearColorIuiEXT(exec, _mesa_ClearColorIuiEXT); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_GetTexParameterIivEXT(exec, _mesa_GetTexParameterIiv); - SET_GetTexParameterIuivEXT(exec, _mesa_GetTexParameterIuiv); - SET_TexParameterIivEXT(exec, _mesa_TexParameterIiv); - SET_TexParameterIuivEXT(exec, _mesa_TexParameterIuiv); - } - - /* GL_EXT_gpu_shader4 / OpenGL 3.0 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_GetVertexAttribIivEXT(exec, _mesa_GetVertexAttribIiv); - SET_GetVertexAttribIuivEXT(exec, _mesa_GetVertexAttribIuiv); - SET_VertexAttribIPointerEXT(exec, _mesa_VertexAttribIPointer); - } - - /* GL 3.0 (functions not covered by other extensions) */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_ClearBufferiv(exec, _mesa_ClearBufferiv); - SET_ClearBufferuiv(exec, _mesa_ClearBufferuiv); - SET_ClearBufferfv(exec, _mesa_ClearBufferfv); - SET_ClearBufferfi(exec, _mesa_ClearBufferfi); - SET_GetStringi(exec, _mesa_GetStringi); - } - - /* GL_ARB_instanced_arrays */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor); - } - - /* GL_ARB_draw_buffer_blend */ - if (_mesa_is_desktop_gl(ctx)) { - SET_BlendFunciARB(exec, _mesa_BlendFunci); - SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei); - SET_BlendEquationiARB(exec, _mesa_BlendEquationi); - SET_BlendEquationSeparateiARB(exec, _mesa_BlendEquationSeparatei); - } - - /* GL_NV_texture_barrier */ - if (_mesa_is_desktop_gl(ctx)) { - SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV); - } - - /* GL_ARB_texture_buffer_object */ - if (_mesa_is_desktop_gl(ctx)) { - SET_TexBufferARB(exec, _mesa_TexBuffer); - } - - /* GL_ARB_texture_storage */ - if (_mesa_is_desktop_gl(ctx)) { - SET_TexStorage1D(exec, _mesa_TexStorage1D); - SET_TextureStorage1DEXT(exec, _mesa_TextureStorage1DEXT); - } - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_TexStorage2D(exec, _mesa_TexStorage2D); - SET_TexStorage3D(exec, _mesa_TexStorage3D); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_TextureStorage2DEXT(exec, _mesa_TextureStorage2DEXT); - SET_TextureStorage3DEXT(exec, _mesa_TextureStorage3DEXT); - } - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_sampler_object_dispatch(ctx, exec); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_InvalidateTexSubImage(exec, _mesa_InvalidateTexSubImage); - SET_InvalidateTexImage(exec, _mesa_InvalidateTexImage); - } - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_InvalidateSubFramebuffer(exec, _mesa_InvalidateSubFramebuffer); - SET_InvalidateFramebuffer(exec, _mesa_InvalidateFramebuffer); - } - -#if FEATURE_ES1 - if (ctx->API == API_OPENGLES) { - SET_AlphaFuncxOES(exec, _es_AlphaFuncx); - SET_ClearColorxOES(exec, _es_ClearColorx); - SET_ClearDepthxOES(exec, _es_ClearDepthx); - SET_ClipPlanefOES(exec, _es_ClipPlanef); - SET_ClipPlanexOES(exec, _es_ClipPlanex); - SET_Color4xOES(exec, _es_Color4x); - SET_DepthRangexOES(exec, _es_DepthRangex); - SET_DrawTexfOES(exec, _mesa_DrawTexf); - SET_DrawTexfvOES(exec, _mesa_DrawTexfv); - SET_DrawTexiOES(exec, _mesa_DrawTexi); - SET_DrawTexivOES(exec, _mesa_DrawTexiv); - SET_DrawTexsOES(exec, _mesa_DrawTexs); - SET_DrawTexsvOES(exec, _mesa_DrawTexsv); - SET_DrawTexxOES(exec, _es_DrawTexxOES); - SET_DrawTexxvOES(exec, _es_DrawTexxvOES); - SET_FogxOES(exec, _es_Fogx); - SET_FogxvOES(exec, _es_Fogxv); - SET_FrustumfOES(exec, _es_Frustumf); - SET_FrustumxOES(exec, _es_Frustumx); - SET_GetClipPlanefOES(exec, _es_GetClipPlanef); - SET_GetClipPlanexOES(exec, _es_GetClipPlanex); - SET_GetFixedvOES(exec, _mesa_GetFixedv); - SET_GetLightxvOES(exec, _es_GetLightxv); - SET_GetMaterialxvOES(exec, _es_GetMaterialxv); - SET_GetTexEnvxvOES(exec, _es_GetTexEnvxv); - SET_GetTexGenxvOES(exec, _check_GetTexGenxvOES); - SET_GetTexParameterxvOES(exec, _es_GetTexParameterxv); - SET_LightModelxOES(exec, _es_LightModelx); - SET_LightModelxvOES(exec, _es_LightModelxv); - SET_LightxOES(exec, _es_Lightx); - SET_LightxvOES(exec, _es_Lightxv); - SET_LineWidthxOES(exec, _es_LineWidthx); - SET_LoadMatrixxOES(exec, _es_LoadMatrixx); - SET_MaterialxOES(exec, _es_Materialx); - SET_MaterialxvOES(exec, _es_Materialxv); - SET_MultMatrixxOES(exec, _es_MultMatrixx); - SET_MultiTexCoord4xOES(exec, _es_MultiTexCoord4x); - SET_Normal3xOES(exec, _es_Normal3x); - SET_OrthofOES(exec, _es_Orthof); - SET_OrthoxOES(exec, _es_Orthox); - SET_PointParameterxOES(exec, _es_PointParameterx); - SET_PointParameterxvOES(exec, _es_PointParameterxv); - SET_PointSizePointerOES(exec, _mesa_PointSizePointer); - SET_PointSizexOES(exec, _es_PointSizex); - SET_PolygonOffsetxOES(exec, _es_PolygonOffsetx); - SET_QueryMatrixxOES(exec, _es_QueryMatrixxOES); - SET_RotatexOES(exec, _es_Rotatex); - SET_SampleCoveragexOES(exec, _es_SampleCoveragex); - SET_ScalexOES(exec, _es_Scalex); - SET_TexEnvxOES(exec, _es_TexEnvx); - SET_TexEnvxvOES(exec, _es_TexEnvxv); - SET_TexGenxOES(exec, _check_TexGenxOES); - SET_TexGenxvOES(exec, _check_TexGenxvOES); - SET_TexParameterxOES(exec, _es_TexParameterx); - SET_TexParameterxvOES(exec, _es_TexParameterxv); - SET_TranslatexOES(exec, _es_Translatex); - } -#endif - - return exec; -} diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c index 2d35f17ad..331553086 100644 --- a/mesalib/src/mesa/main/api_loopback.c +++ b/mesalib/src/mesa/main/api_loopback.c @@ -87,7 +87,7 @@ #define ATTRIBI_4UI(index,x,y,z,w) CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w)) -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) { COLORF( BYTE_TO_FLOAT(red), @@ -96,41 +96,41 @@ loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3i_f( GLint red, GLint green, GLint blue ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), 1.0); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), SHORT_TO_FLOAT(blue), 1.0); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), @@ -138,48 +138,48 @@ loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3bv_f( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3dv_f( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3iv_f( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3sv_f( const GLshort *v ) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3uiv_f( const GLuint *v ) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3usv_f( const GLushort *v ) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3ubv_f( const GLubyte *v ) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -187,7 +187,7 @@ loopback_Color3ubv_f( const GLubyte *v ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ) { @@ -195,21 +195,21 @@ loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, BYTE_TO_FLOAT(blue), BYTE_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, GLshort alpha ) { @@ -217,21 +217,21 @@ loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, SHORT_TO_FLOAT(blue), SHORT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), @@ -239,7 +239,7 @@ loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4iv_f( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), @@ -247,21 +247,21 @@ loopback_Color4iv_f( const GLint *v ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4bv_f( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4dv_f( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4sv_f( const GLshort *v) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), @@ -269,21 +269,21 @@ loopback_Color4sv_f( const GLshort *v) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4uiv_f( const GLuint *v) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4usv_f( const GLushort *v) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4ubv_f( const GLubyte *v) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -291,565 +291,565 @@ loopback_Color4ubv_f( const GLubyte *v) } -static void GLAPIENTRY +void GLAPIENTRY loopback_FogCoorddEXT( GLdouble d ) { FOGCOORDF( (GLfloat) d ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_FogCoorddvEXT( const GLdouble *v ) { FOGCOORDF( (GLfloat) *v ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexd( GLdouble c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexi( GLint c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexs( GLshort c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexub( GLubyte c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexdv( const GLdouble *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexiv( const GLint *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexsv( const GLshort *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexubv( const GLubyte *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EdgeFlagv(const GLboolean *flag) { CALL_EdgeFlag(GET_DISPATCH(), (*flag)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ) { NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ) { NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3i( GLint nx, GLint ny, GLint nz ) { NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ) { NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3bv( const GLbyte *v ) { NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3dv( const GLdouble *v ) { NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3iv( const GLint *v ) { NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3sv( const GLshort *v ) { NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1d( GLdouble s ) { TEXCOORD1((GLfloat) s); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1i( GLint s ) { TEXCOORD1((GLfloat) s); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1s( GLshort s ) { TEXCOORD1((GLfloat) s); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2d( GLdouble s, GLdouble t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2s( GLshort s, GLshort t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2i( GLint s, GLint t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3i( GLint s, GLint t, GLint r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1dv( const GLdouble *v ) { TEXCOORD1((GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1iv( const GLint *v ) { TEXCOORD1((GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1sv( const GLshort *v ) { TEXCOORD1((GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2dv( const GLdouble *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2iv( const GLint *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2sv( const GLshort *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3dv( const GLdouble *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3iv( const GLint *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3sv( const GLshort *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4dv( const GLdouble *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4iv( const GLint *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4sv( const GLshort *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2d( GLdouble x, GLdouble y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2i( GLint x, GLint y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2s( GLshort x, GLshort y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3i( GLint x, GLint y, GLint z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3s( GLshort x, GLshort y, GLshort z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2dv( const GLdouble *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2iv( const GLint *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2sv( const GLshort *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3dv( const GLdouble *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3iv( const GLint *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3sv( const GLshort *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4dv( const GLdouble *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4iv( const GLint *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4sv( const GLshort *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1dARB(GLenum target, GLdouble s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1iARB(GLenum target, GLint s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1sARB(GLenum target, GLshort s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord2dv( const GLdouble *u ) { EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord2fv( const GLfloat *u ) { EVALCOORD2( u[0], u[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord2d( GLdouble u, GLdouble v ) { EVALCOORD2( (GLfloat) u, (GLfloat) v ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord1dv( const GLdouble *u ) { EVALCOORD1( (GLfloat) *u ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord1fv( const GLfloat *u ) { EVALCOORD1( (GLfloat) *u ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord1d( GLdouble u ) { EVALCOORD1( (GLfloat) u ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) { GLfloat fparam[4]; @@ -857,14 +857,14 @@ loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) MATERIALFV( face, pname, fparam ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Materiali(GLenum face, GLenum pname, GLint param ) { GLfloat p = (GLfloat) param; MATERIALFV(face, pname, &p); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) { GLfloat fparam[4]; @@ -894,49 +894,49 @@ loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectdv(const GLdouble *v1, const GLdouble *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectfv(const GLfloat *v1, const GLfloat *v2) { RECTF(v1[0], v1[1], v2[0], v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectiv(const GLint *v1, const GLint *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectsv(const GLshort *v1, const GLshort *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) { SECONDARYCOLORF( BYTE_TO_FLOAT(red), @@ -944,13 +944,13 @@ loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) BYTE_TO_FLOAT(blue) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ) { SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) { SECONDARYCOLORF( INT_TO_FLOAT(red), @@ -958,7 +958,7 @@ loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) INT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) { SECONDARYCOLORF(SHORT_TO_FLOAT(red), @@ -966,7 +966,7 @@ loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) SHORT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) { SECONDARYCOLORF(UINT_TO_FLOAT(red), @@ -974,7 +974,7 @@ loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) UINT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) { SECONDARYCOLORF(USHORT_TO_FLOAT(red), @@ -982,7 +982,7 @@ loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) USHORT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(red), @@ -990,7 +990,7 @@ loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) UBYTE_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) { SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]), @@ -998,12 +998,12 @@ loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) BYTE_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3dvEXT_f( const GLdouble *v ) { SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3ivEXT_f( const GLint *v ) { SECONDARYCOLORF(INT_TO_FLOAT(v[0]), @@ -1011,7 +1011,7 @@ loopback_SecondaryColor3ivEXT_f( const GLint *v ) INT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3svEXT_f( const GLshort *v ) { SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]), @@ -1019,7 +1019,7 @@ loopback_SecondaryColor3svEXT_f( const GLshort *v ) SHORT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3uivEXT_f( const GLuint *v ) { SECONDARYCOLORF(UINT_TO_FLOAT(v[0]), @@ -1027,7 +1027,7 @@ loopback_SecondaryColor3uivEXT_f( const GLuint *v ) UINT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3usvEXT_f( const GLushort *v ) { SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]), @@ -1035,7 +1035,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v ) USHORT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]), @@ -1050,111 +1050,111 @@ loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) * Note that attribute indexes DO alias conventional vertex attributes. */ -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1sNV(GLuint index, GLshort x) { ATTRIB1NV(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dNV(GLuint index, GLdouble x) { ATTRIB1NV(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y) { ATTRIB2NV(index, (GLfloat) x, y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y) { ATTRIB2NV(index, (GLfloat) x, (GLfloat) y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1svNV(GLuint index, const GLshort *v) { ATTRIB1NV(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v) { ATTRIB1NV(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2svNV(GLuint index, const GLshort *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3svNV(GLuint index, const GLshort *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4svNV(GLuint index, const GLshort *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) { ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -1162,7 +1162,7 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1170,7 +1170,7 @@ loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib1svNV(index + i, v + i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1178,7 +1178,7 @@ loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB1NV(index + i, v[i]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1186,7 +1186,7 @@ loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib1dvNV(index + i, v + i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1194,7 +1194,7 @@ loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib2svNV(index + i, v + 2 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1202,7 +1202,7 @@ loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB2NV(index + i, v[2 * i], v[2 * i + 1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1210,7 +1210,7 @@ loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib2dvNV(index + i, v + 2 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1218,7 +1218,7 @@ loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib3svNV(index + i, v + 3 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1226,7 +1226,7 @@ loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB3NV(index + i, v[3 * i], v[3 * i + 1], v[3 * i + 2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1234,7 +1234,7 @@ loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib3dvNV(index + i, v + 3 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1242,7 +1242,7 @@ loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib4svNV(index + i, v + 4 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1250,7 +1250,7 @@ loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB4NV(index + i, v[4 * i], v[4 * i + 1], v[4 * i + 2], v[4 * i + 3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1258,7 +1258,7 @@ loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib4dvNV(index + i, v + 4 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) { GLint i; @@ -1273,176 +1273,176 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) * Note that attribute indexes do NOT alias conventional attributes. */ -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1sARB(GLuint index, GLshort x) { ATTRIB1ARB(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dARB(GLuint index, GLdouble x) { ATTRIB1ARB(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y) { ATTRIB2ARB(index, (GLfloat) x, y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y) { ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1svARB(GLuint index, const GLshort *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2svARB(GLuint index, const GLshort *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3svARB(GLuint index, const GLshort *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4svARB(GLuint index, const GLshort *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ivARB(GLuint index, const GLint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v) { ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NivARB(GLuint index, const GLint * v) { ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v) { ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) { ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), @@ -1456,37 +1456,37 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) * Note that attribute indexes do NOT alias conventional attributes. */ -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI1iv(GLuint index, const GLint *v) { ATTRIBI_1I(index, v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI1uiv(GLuint index, const GLuint *v) { ATTRIBI_1UI(index, v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4bv(GLuint index, const GLbyte *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4sv(GLuint index, const GLshort *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4usv(GLuint index, const GLushort *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); diff --git a/mesalib/src/mesa/main/api_loopback.h b/mesalib/src/mesa/main/api_loopback.h index 628d4f89e..879ad8995 100644 --- a/mesalib/src/mesa/main/api_loopback.h +++ b/mesalib/src/mesa/main/api_loopback.h @@ -29,6 +29,14 @@ #include "main/compiler.h" #include "main/mfeatures.h" +#include "main/glheader.h" // ? +#include "main/macros.h" // ? +#include "main/mtypes.h" // ? +#include "glapi/glapi.h" // ? +#include "glapi/glthread.h" // ? +#include "main/dispatch.h" // ? +#include "main/mfeatures.h" // ? +#include "main/context.h" // ? struct _glapi_table; struct gl_context; @@ -36,5 +44,434 @@ struct gl_context; extern void _mesa_loopback_init_api_table(const struct gl_context *ctx, struct _glapi_table *dest); +void GLAPIENTRY +loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ); +void GLAPIENTRY +loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ); +void GLAPIENTRY +loopback_Color3i_f( GLint red, GLint green, GLint blue ); +void GLAPIENTRY +loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ); +void GLAPIENTRY +loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ); +void GLAPIENTRY +loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ); +void GLAPIENTRY +loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ); +void GLAPIENTRY +loopback_Color3bv_f( const GLbyte *v ); +void GLAPIENTRY +loopback_Color3dv_f( const GLdouble *v ); +void GLAPIENTRY +loopback_Color3iv_f( const GLint *v ); +void GLAPIENTRY +loopback_Color3sv_f( const GLshort *v ); +void GLAPIENTRY +loopback_Color3uiv_f( const GLuint *v ); +void GLAPIENTRY +loopback_Color3usv_f( const GLushort *v ); +void GLAPIENTRY +loopback_Color3ubv_f( const GLubyte *v ); +void GLAPIENTRY +loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, + GLbyte alpha ); +void GLAPIENTRY +loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, + GLdouble alpha ); +void GLAPIENTRY +loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ); +void GLAPIENTRY +loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, + GLshort alpha ); +void GLAPIENTRY +loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ); +void GLAPIENTRY +loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, + GLushort alpha ); +void GLAPIENTRY +loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ); +void GLAPIENTRY +loopback_Color4iv_f( const GLint *v ); +void GLAPIENTRY +loopback_Color4bv_f( const GLbyte *v ); +void GLAPIENTRY +loopback_Color4dv_f( const GLdouble *v ); +void GLAPIENTRY +loopback_Color4sv_f( const GLshort *v); +void GLAPIENTRY +loopback_Color4uiv_f( const GLuint *v); +void GLAPIENTRY +loopback_Color4usv_f( const GLushort *v); +void GLAPIENTRY +loopback_Color4ubv_f( const GLubyte *v); +void GLAPIENTRY +loopback_FogCoorddEXT( GLdouble d ); +void GLAPIENTRY +loopback_FogCoorddvEXT( const GLdouble *v ); +void GLAPIENTRY +loopback_Indexd( GLdouble c ); +void GLAPIENTRY +loopback_Indexi( GLint c ); +void GLAPIENTRY +loopback_Indexs( GLshort c ); +void GLAPIENTRY +loopback_Indexub( GLubyte c ); +void GLAPIENTRY +loopback_Indexdv( const GLdouble *c ); +void GLAPIENTRY +loopback_Indexiv( const GLint *c ); +void GLAPIENTRY +loopback_Indexsv( const GLshort *c ); +void GLAPIENTRY +loopback_Indexubv( const GLubyte *c ); +void GLAPIENTRY +loopback_EdgeFlagv(const GLboolean *flag); +void GLAPIENTRY +loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ); +void GLAPIENTRY +loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ); +void GLAPIENTRY +loopback_Normal3i( GLint nx, GLint ny, GLint nz ); +void GLAPIENTRY +loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ); +void GLAPIENTRY +loopback_Normal3bv( const GLbyte *v ); +void GLAPIENTRY +loopback_Normal3dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Normal3iv( const GLint *v ); +void GLAPIENTRY +loopback_Normal3sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord1d( GLdouble s ); +void GLAPIENTRY +loopback_TexCoord1i( GLint s ); +void GLAPIENTRY +loopback_TexCoord1s( GLshort s ); +void GLAPIENTRY +loopback_TexCoord2d( GLdouble s, GLdouble t ); +void GLAPIENTRY +loopback_TexCoord2s( GLshort s, GLshort t ); +void GLAPIENTRY +loopback_TexCoord2i( GLint s, GLint t ); +void GLAPIENTRY +loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ); +void GLAPIENTRY +loopback_TexCoord3i( GLint s, GLint t, GLint r ); +void GLAPIENTRY +loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ); +void GLAPIENTRY +loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); +void GLAPIENTRY +loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ); +void GLAPIENTRY +loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); +void GLAPIENTRY +loopback_TexCoord1dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord1iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord1sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord2dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord2iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord2sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord3dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord3iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord3sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord4dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord4iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord4sv( const GLshort *v ); +void GLAPIENTRY +loopback_Vertex2d( GLdouble x, GLdouble y ); +void GLAPIENTRY +loopback_Vertex2i( GLint x, GLint y ); +void GLAPIENTRY +loopback_Vertex2s( GLshort x, GLshort y ); +void GLAPIENTRY +loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ); +void GLAPIENTRY +loopback_Vertex3i( GLint x, GLint y, GLint z ); +void GLAPIENTRY +loopback_Vertex3s( GLshort x, GLshort y, GLshort z ); +void GLAPIENTRY +loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +void GLAPIENTRY +loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ); +void GLAPIENTRY +loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); +void GLAPIENTRY +loopback_Vertex2dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Vertex2iv( const GLint *v ); +void GLAPIENTRY +loopback_Vertex2sv( const GLshort *v ); +void GLAPIENTRY +loopback_Vertex3dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Vertex3iv( const GLint *v ); +void GLAPIENTRY +loopback_Vertex3sv( const GLshort *v ); +void GLAPIENTRY +loopback_Vertex4dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Vertex4iv( const GLint *v ); +void GLAPIENTRY +loopback_Vertex4sv( const GLshort *v ); +void GLAPIENTRY +loopback_MultiTexCoord1dARB(GLenum target, GLdouble s); +void GLAPIENTRY +loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord1iARB(GLenum target, GLint s); +void GLAPIENTRY +loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord1sARB(GLenum target, GLshort s); +void GLAPIENTRY +loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t); +void GLAPIENTRY +loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t); +void GLAPIENTRY +loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t); +void GLAPIENTRY +loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r); +void GLAPIENTRY +loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r); +void GLAPIENTRY +loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r); +void GLAPIENTRY +loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, + GLdouble q); +void GLAPIENTRY +loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q); +void GLAPIENTRY +loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, + GLshort q); +void GLAPIENTRY +loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_EvalCoord2dv( const GLdouble *u ); +void GLAPIENTRY +loopback_EvalCoord2fv( const GLfloat *u ); +void GLAPIENTRY +loopback_EvalCoord2d( GLdouble u, GLdouble v ); +void GLAPIENTRY +loopback_EvalCoord1dv( const GLdouble *u ); +void GLAPIENTRY +loopback_EvalCoord1fv( const GLfloat *u ); +void GLAPIENTRY +loopback_EvalCoord1d( GLdouble u ); +void GLAPIENTRY +loopback_Materialf( GLenum face, GLenum pname, GLfloat param ); +void GLAPIENTRY +loopback_Materiali(GLenum face, GLenum pname, GLint param ); +void GLAPIENTRY +loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ); +void GLAPIENTRY +loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); +void GLAPIENTRY +loopback_Rectdv(const GLdouble *v1, const GLdouble *v2); +void GLAPIENTRY +loopback_Rectfv(const GLfloat *v1, const GLfloat *v2); +void GLAPIENTRY +loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2); +void GLAPIENTRY +loopback_Rectiv(const GLint *v1, const GLint *v2); +void GLAPIENTRY +loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2); +void GLAPIENTRY +loopback_Rectsv(const GLshort *v1, const GLshort *v2); +void GLAPIENTRY +loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ); +void GLAPIENTRY +loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ); +void GLAPIENTRY +loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ); +void GLAPIENTRY +loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ); +void GLAPIENTRY +loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ); +void GLAPIENTRY +loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ); +void GLAPIENTRY +loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ); +void GLAPIENTRY +loopback_SecondaryColor3bvEXT_f( const GLbyte *v ); +void GLAPIENTRY +loopback_SecondaryColor3dvEXT_f( const GLdouble *v ); +void GLAPIENTRY +loopback_SecondaryColor3ivEXT_f( const GLint *v ); +void GLAPIENTRY +loopback_SecondaryColor3svEXT_f( const GLshort *v ); +void GLAPIENTRY +loopback_SecondaryColor3uivEXT_f( const GLuint *v ); +void GLAPIENTRY +loopback_SecondaryColor3usvEXT_f( const GLushort *v ); +void GLAPIENTRY +loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ); +void GLAPIENTRY +loopback_VertexAttrib1sNV(GLuint index, GLshort x); +void GLAPIENTRY +loopback_VertexAttrib1dNV(GLuint index, GLdouble x); +void GLAPIENTRY +loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y); +void GLAPIENTRY +loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y); +void GLAPIENTRY +loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, + GLshort w); +void GLAPIENTRY +loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, + GLdouble w); +void GLAPIENTRY +loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, + GLubyte w); +void GLAPIENTRY +loopback_VertexAttrib1svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib2svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib3svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v); +void GLAPIENTRY +loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v); +void GLAPIENTRY +loopback_VertexAttrib1sARB(GLuint index, GLshort x); +void GLAPIENTRY +loopback_VertexAttrib1dARB(GLuint index, GLdouble x); +void GLAPIENTRY +loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y); +void GLAPIENTRY +loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y); +void GLAPIENTRY +loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, + GLshort w); +void GLAPIENTRY +loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, + GLdouble w); +void GLAPIENTRY +loopback_VertexAttrib1svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib2svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib3svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v); +void GLAPIENTRY +loopback_VertexAttrib4ivARB(GLuint index, const GLint * v); +void GLAPIENTRY +loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v); +void GLAPIENTRY +loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v); +void GLAPIENTRY +loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v); +void GLAPIENTRY +loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v); +void GLAPIENTRY +loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v); +void GLAPIENTRY +loopback_VertexAttrib4NivARB(GLuint index, const GLint * v); +void GLAPIENTRY +loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, + GLubyte w); +void GLAPIENTRY +loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v); +void GLAPIENTRY +loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v); +void GLAPIENTRY +loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v); +void GLAPIENTRY +loopback_VertexAttribI1iv(GLuint index, const GLint *v); +void GLAPIENTRY +loopback_VertexAttribI1uiv(GLuint index, const GLuint *v); +void GLAPIENTRY +loopback_VertexAttribI4bv(GLuint index, const GLbyte *v); +void GLAPIENTRY +loopback_VertexAttribI4sv(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v); +void GLAPIENTRY +loopback_VertexAttribI4usv(GLuint index, const GLushort *v); + #endif /* API_LOOPBACK_H */ diff --git a/mesalib/src/mesa/main/atifragshader.c b/mesalib/src/mesa/main/atifragshader.c index 32ddfb8bb..2a0790862 100644 --- a/mesalib/src/mesa/main/atifragshader.c +++ b/mesalib/src/mesa/main/atifragshader.c @@ -37,26 +37,6 @@ static struct ati_fragment_shader DummyShader; -void -_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp) -{ - SET_GenFragmentShadersATI(disp, _mesa_GenFragmentShadersATI); - SET_BindFragmentShaderATI(disp, _mesa_BindFragmentShaderATI); - SET_DeleteFragmentShaderATI(disp, _mesa_DeleteFragmentShaderATI); - SET_BeginFragmentShaderATI(disp, _mesa_BeginFragmentShaderATI); - SET_EndFragmentShaderATI(disp, _mesa_EndFragmentShaderATI); - SET_PassTexCoordATI(disp, _mesa_PassTexCoordATI); - SET_SampleMapATI(disp, _mesa_SampleMapATI); - SET_ColorFragmentOp1ATI(disp, _mesa_ColorFragmentOp1ATI); - SET_ColorFragmentOp2ATI(disp, _mesa_ColorFragmentOp2ATI); - SET_ColorFragmentOp3ATI(disp, _mesa_ColorFragmentOp3ATI); - SET_AlphaFragmentOp1ATI(disp, _mesa_AlphaFragmentOp1ATI); - SET_AlphaFragmentOp2ATI(disp, _mesa_AlphaFragmentOp2ATI); - SET_AlphaFragmentOp3ATI(disp, _mesa_AlphaFragmentOp3ATI); - SET_SetFragmentShaderConstantATI(disp, _mesa_SetFragmentShaderConstantATI); -} - - /** * Allocate and initialize a new ATI fragment shader object. */ diff --git a/mesalib/src/mesa/main/atifragshader.h b/mesalib/src/mesa/main/atifragshader.h index f5af5f15f..c47a7d56e 100644 --- a/mesalib/src/mesa/main/atifragshader.h +++ b/mesalib/src/mesa/main/atifragshader.h @@ -63,9 +63,6 @@ struct atifs_setupinst }; -extern void -_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp); - extern struct ati_fragment_shader * _mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id); diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 48df7f16b..05db35b8e 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1584,16 +1584,6 @@ _mesa_PopClientAttrib(void) } -void -_mesa_init_attrib_dispatch(struct _glapi_table *disp) -{ - SET_PopAttrib(disp, _mesa_PopAttrib); - SET_PushAttrib(disp, _mesa_PushAttrib); - SET_PopClientAttrib(disp, _mesa_PopClientAttrib); - SET_PushClientAttrib(disp, _mesa_PushClientAttrib); -} - - /** * Free any attribute state data that might be attached to the context. */ diff --git a/mesalib/src/mesa/main/attrib.h b/mesalib/src/mesa/main/attrib.h index f75c3c5ce..1ecf3a591 100644 --- a/mesalib/src/mesa/main/attrib.h +++ b/mesalib/src/mesa/main/attrib.h @@ -45,9 +45,6 @@ _mesa_PushClientAttrib( GLbitfield mask ); extern void GLAPIENTRY _mesa_PopClientAttrib( void ); -extern void -_mesa_init_attrib_dispatch(struct _glapi_table *disp); - extern void _mesa_init_attrib( struct gl_context *ctx ); diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index 9697919fa..9dba99daf 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -2246,7 +2246,7 @@ _mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length) { @@ -2305,7 +2305,7 @@ _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset, return; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_InvalidateBufferData(GLuint buffer) { GET_CURRENT_CONTEXT(ctx); @@ -2337,34 +2337,3 @@ _mesa_InvalidateBufferData(GLuint buffer) */ return; } - -void -_mesa_init_bufferobj_dispatch(struct gl_context *ctx, struct _glapi_table *disp) -{ - SET_BindBufferARB(disp, _mesa_BindBufferARB); - SET_BufferDataARB(disp, _mesa_BufferDataARB); - SET_BufferSubDataARB(disp, _mesa_BufferSubDataARB); - SET_DeleteBuffersARB(disp, _mesa_DeleteBuffersARB); - SET_GenBuffersARB(disp, _mesa_GenBuffersARB); - SET_GetBufferParameterivARB(disp, _mesa_GetBufferParameterivARB); - /* TODO: add GetBufferParameteri64v for desktop GL and GLES3 once tests - * exist for it. - */ - SET_GetBufferPointervARB(disp, _mesa_GetBufferPointervARB); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetBufferSubDataARB(disp, _mesa_GetBufferSubDataARB); - } - SET_IsBufferARB(disp, _mesa_IsBufferARB); - SET_MapBufferARB(disp, _mesa_MapBufferARB); - SET_UnmapBufferARB(disp, _mesa_UnmapBufferARB); - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange); - SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_InvalidateBufferData(disp, _mesa_InvalidateBufferData); - SET_InvalidateBufferSubData(disp, _mesa_InvalidateBufferSubData); - } -} diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h index 4f1e61b63..4d5446ac0 100644 --- a/mesalib/src/mesa/main/bufferobj.h +++ b/mesalib/src/mesa/main/bufferobj.h @@ -100,72 +100,56 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver); * API functions */ -extern void GLAPIENTRY +void GLAPIENTRY _mesa_BindBufferARB(GLenum target, GLuint buffer); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GenBuffersARB(GLsizei n, GLuint * buffer); - -extern GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsBufferARB(GLuint buffer); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); - -extern void * GLAPIENTRY +void * GLAPIENTRY _mesa_MapBufferARB(GLenum target, GLenum access); - -extern GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_UnmapBufferARB(GLenum target); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); - -extern void * GLAPIENTRY +void * GLAPIENTRY _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length); - -extern GLenum GLAPIENTRY +GLenum GLAPIENTRY _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option); - -extern GLenum GLAPIENTRY +GLenum GLAPIENTRY _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option); - -extern void GLAPIENTRY -_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params); - void GLAPIENTRY -_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer); - +_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, + GLint* params); void GLAPIENTRY _mesa_BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); +void GLAPIENTRY +_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer); +void GLAPIENTRY +_mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset, + GLsizeiptr length); +void GLAPIENTRY +_mesa_InvalidateBufferData(GLuint buffer); -extern void -_mesa_init_bufferobj_dispatch(struct gl_context *ctx, - struct _glapi_table *disp); #endif diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c index 5799c01f6..f1b3e585a 100644 --- a/mesalib/src/mesa/main/colortab.c +++ b/mesalib/src/mesa/main/colortab.c @@ -63,7 +63,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start, -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) { @@ -74,7 +74,7 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat, -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width) { @@ -85,7 +85,7 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start, -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data ) { @@ -95,7 +95,7 @@ _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTable( GLenum target, GLenum format, GLenum type, GLvoid *data ) { @@ -105,7 +105,7 @@ _mesa_GetColorTable( GLenum target, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) { /* no extensions use this function */ @@ -116,7 +116,7 @@ _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) -static void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) { /* no extensions use this function */ @@ -127,7 +127,7 @@ _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); @@ -137,28 +137,10 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)"); } - - -void -_mesa_init_colortable_dispatch(struct _glapi_table *disp) -{ - SET_ColorSubTable(disp, _mesa_ColorSubTable); - SET_ColorTable(disp, _mesa_ColorTable); - SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv); - SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv); - SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable); - SET_CopyColorTable(disp, _mesa_CopyColorTable); - SET_GetColorTable(disp, _mesa_GetColorTable); - SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv); - - /* GL_ARB_robustness */ - SET_GetnColorTableARB(disp, _mesa_GetnColorTableARB); -} diff --git a/mesalib/src/mesa/main/colortab.h b/mesalib/src/mesa/main/colortab.h index 7b8df38a1..f25fbe8a5 100644 --- a/mesalib/src/mesa/main/colortab.h +++ b/mesalib/src/mesa/main/colortab.h @@ -33,18 +33,35 @@ struct _glapi_table; -extern void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table ); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_ColorSubTable( GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *table ); - -extern void -_mesa_init_colortable_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_CopyColorTable(GLenum target, GLenum internalformat, + GLint x, GLint y, GLsizei width); +void GLAPIENTRY +_mesa_CopyColorSubTable(GLenum target, GLsizei start, + GLint x, GLint y, GLsizei width); +void GLAPIENTRY +_mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, + GLsizei bufSize, GLvoid *data ); +void GLAPIENTRY +_mesa_GetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *data ); +void GLAPIENTRY +_mesa_ColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params); +void GLAPIENTRY +_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ); +void GLAPIENTRY +_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ); #endif /* COLORTAB_H */ diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index a4dedeea2..0508378b7 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -706,9 +706,9 @@ check_context_limits(struct gl_context *ctx) assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS); /* Max texture size should be <= max viewport size (render to texture) */ - assert((1 << (ctx->Const.MaxTextureLevels - 1)) + assert((1U << (ctx->Const.MaxTextureLevels - 1)) <= ctx->Const.MaxViewportWidth); - assert((1 << (ctx->Const.MaxTextureLevels - 1)) + assert((1U << (ctx->Const.MaxTextureLevels - 1)) <= ctx->Const.MaxViewportHeight); assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS); diff --git a/mesalib/src/mesa/main/convolve.c b/mesalib/src/mesa/main/convolve.c index cac8a9979..dfc1b9465 100644 --- a/mesalib/src/mesa/main/convolve.c +++ b/mesalib/src/mesa/main/convolve.c @@ -41,7 +41,7 @@ #include "main/dispatch.h" -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image) { GET_CURRENT_CONTEXT(ctx); @@ -49,7 +49,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D"); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image) { GET_CURRENT_CONTEXT(ctx); @@ -58,7 +58,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param) { GET_CURRENT_CONTEXT(ctx); @@ -67,7 +67,7 @@ _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -76,7 +76,7 @@ _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param) { GET_CURRENT_CONTEXT(ctx); @@ -85,7 +85,7 @@ _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -94,7 +94,7 @@ _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width) { GET_CURRENT_CONTEXT(ctx); @@ -103,7 +103,7 @@ _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi } -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); @@ -112,7 +112,7 @@ _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnConvolutionFilterARB(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image) { @@ -122,7 +122,7 @@ _mesa_GetnConvolutionFilterARB(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image) { @@ -130,7 +130,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -139,7 +139,7 @@ _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -148,7 +148,7 @@ _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, @@ -160,7 +160,7 @@ _mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span) { @@ -169,32 +169,10 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column) { GET_CURRENT_CONTEXT(ctx); _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D"); } - -void -_mesa_init_convolve_dispatch(struct _glapi_table *disp) -{ - SET_ConvolutionFilter1D(disp, _mesa_ConvolutionFilter1D); - SET_ConvolutionFilter2D(disp, _mesa_ConvolutionFilter2D); - SET_ConvolutionParameterf(disp, _mesa_ConvolutionParameterf); - SET_ConvolutionParameterfv(disp, _mesa_ConvolutionParameterfv); - SET_ConvolutionParameteri(disp, _mesa_ConvolutionParameteri); - SET_ConvolutionParameteriv(disp, _mesa_ConvolutionParameteriv); - SET_CopyConvolutionFilter1D(disp, _mesa_CopyConvolutionFilter1D); - SET_CopyConvolutionFilter2D(disp, _mesa_CopyConvolutionFilter2D); - SET_GetConvolutionFilter(disp, _mesa_GetConvolutionFilter); - SET_GetConvolutionParameterfv(disp, _mesa_GetConvolutionParameterfv); - SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv); - SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D); - SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter); - - /* GL_ARB_robustness */ - SET_GetnConvolutionFilterARB(disp, _mesa_GetnConvolutionFilterARB); - SET_GetnSeparableFilterARB(disp, _mesa_GetnSeparableFilterARB); -} diff --git a/mesalib/src/mesa/main/convolve.h b/mesalib/src/mesa/main/convolve.h index 2fbe3c7f5..812debd61 100644 --- a/mesalib/src/mesa/main/convolve.h +++ b/mesalib/src/mesa/main/convolve.h @@ -33,7 +33,49 @@ struct _glapi_table; -extern void -_mesa_init_convolve_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, + GLenum format, GLenum type, const GLvoid *image); +void GLAPIENTRY +_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, + GLsizei height, GLenum format, GLenum type, + const GLvoid *image); +void GLAPIENTRY +_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, + const GLfloat *params); +void GLAPIENTRY +_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param); +void GLAPIENTRY +_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, + GLint y, GLsizei width); +void GLAPIENTRY +_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, + GLint y, GLsizei width, GLsizei height); +void GLAPIENTRY +_mesa_GetnConvolutionFilterARB(GLenum target, GLenum format, GLenum type, + GLsizei bufSize, GLvoid *image); +void GLAPIENTRY +_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, + GLvoid *image); +void GLAPIENTRY +_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type, + GLsizei rowBufSize, GLvoid *row, + GLsizei columnBufSize, GLvoid *column, + GLvoid *span); +void GLAPIENTRY +_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, + GLvoid *row, GLvoid *column, GLvoid *span); +void GLAPIENTRY +_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, + GLsizei height, GLenum format, GLenum type, + const GLvoid *row, const GLvoid *column); #endif /* CONVOLVE_H */ diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index c15043694..8bbead7c4 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -8580,7 +8580,7 @@ execute_list(struct gl_context *ctx, GLuint list) /** * Test if a display list number is valid. */ -static GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsList(GLuint list) { GET_CURRENT_CONTEXT(ctx); @@ -8593,7 +8593,7 @@ _mesa_IsList(GLuint list) /** * Delete a sequence of consecutive display lists. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteLists(GLuint list, GLsizei range) { GET_CURRENT_CONTEXT(ctx); @@ -8615,7 +8615,7 @@ _mesa_DeleteLists(GLuint list, GLsizei range) * Return a display list number, n, such that lists n through n+range-1 * are free. */ -static GLuint GLAPIENTRY +GLuint GLAPIENTRY _mesa_GenLists(GLsizei range) { GET_CURRENT_CONTEXT(ctx); @@ -8655,7 +8655,7 @@ _mesa_GenLists(GLsizei range) /** * Begin a new display list. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_NewList(GLuint name, GLenum mode) { GET_CURRENT_CONTEXT(ctx); @@ -8705,7 +8705,7 @@ _mesa_NewList(GLuint name, GLenum mode) /** * End definition of current display list. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_EndList(void) { GET_CURRENT_CONTEXT(ctx); @@ -8841,7 +8841,7 @@ _mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists) /** * Set the offset added to list numbers in glCallLists. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_ListBase(GLuint base) { GET_CURRENT_CONTEXT(ctx); @@ -10633,20 +10633,6 @@ _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, } -void _mesa_init_dlist_dispatch(struct _glapi_table *disp) -{ - SET_CallList(disp, _mesa_CallList); - SET_CallLists(disp, _mesa_CallLists); - - SET_DeleteLists(disp, _mesa_DeleteLists); - SET_EndList(disp, _mesa_EndList); - SET_GenLists(disp, _mesa_GenLists); - SET_IsList(disp, _mesa_IsList); - SET_ListBase(disp, _mesa_ListBase); - SET_NewList(disp, _mesa_NewList); -} - - /** * Initialize display list state for given context. */ diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h index 137245161..9d4fc6899 100644 --- a/mesalib/src/mesa/main/dlist.h +++ b/mesalib/src/mesa/main/dlist.h @@ -43,9 +43,22 @@ (vfmt)->CallLists = impl ## CallLists; \ } while (0) -extern void GLAPIENTRY _mesa_CallList( GLuint list ); - -extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); +GLboolean GLAPIENTRY +_mesa_IsList(GLuint list); +void GLAPIENTRY +_mesa_DeleteLists(GLuint list, GLsizei range); +GLuint GLAPIENTRY +_mesa_GenLists(GLsizei range); +void GLAPIENTRY +_mesa_NewList(GLuint name, GLenum mode); +void GLAPIENTRY +_mesa_EndList(void); +void GLAPIENTRY +_mesa_CallList( GLuint list ); +void GLAPIENTRY +_mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); +void GLAPIENTRY +_mesa_ListBase(GLuint base); extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s ); @@ -66,8 +79,6 @@ extern struct _glapi_table *_mesa_create_save_table(const struct gl_context *); extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); - extern void _mesa_init_display_list( struct gl_context * ctx ); extern void _mesa_free_display_list_data(struct gl_context *ctx); diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c index 8836e0a0e..3d25ae52b 100644 --- a/mesalib/src/mesa/main/drawpix.c +++ b/mesalib/src/mesa/main/drawpix.c @@ -42,7 +42,7 @@ /* * Execute glDrawPixels */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_DrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels ) { @@ -186,7 +186,7 @@ end: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLenum type ) { @@ -291,7 +291,7 @@ end: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Bitmap( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap ) @@ -365,12 +365,3 @@ _mesa_Bitmap( GLsizei width, GLsizei height, _mesa_flush(ctx); } } - - -void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp) -{ - SET_Bitmap(disp, _mesa_Bitmap); - SET_CopyPixels(disp, _mesa_CopyPixels); - SET_DrawPixels(disp, _mesa_DrawPixels); -} diff --git a/mesalib/src/mesa/main/drawpix.h b/mesalib/src/mesa/main/drawpix.h index 971d258f1..087b3a8c9 100644 --- a/mesalib/src/mesa/main/drawpix.h +++ b/mesalib/src/mesa/main/drawpix.h @@ -32,8 +32,16 @@ struct _glapi_table; -extern void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_DrawPixels( GLsizei width, GLsizei height, + GLenum format, GLenum type, const GLvoid *pixels ); +void GLAPIENTRY +_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height, + GLenum type ); +void GLAPIENTRY +_mesa_Bitmap( GLsizei width, GLsizei height, + GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, + const GLubyte *bitmap ); #endif /* DRAWPIX_H */ diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index 796b6beff..b692f3189 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -477,7 +477,7 @@ error: return GL_FALSE; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, GLenum severity, GLint length, const GLcharARB* buf) @@ -501,7 +501,7 @@ _mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, _mesa_log_msg(ctx, source, type, id, severity, length, buf); } -static GLuint GLAPIENTRY +GLuint GLAPIENTRY _mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum* sources, GLenum* types, GLenum* ids, GLenum* severities, GLsizei* lengths, GLcharARB* messageLog) @@ -672,7 +672,7 @@ control_app_messages(struct gl_context *ctx, GLenum esource, GLenum etype, control_app_messages_by_group(ctx, source, type, severity, enabled); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled) @@ -717,7 +717,7 @@ _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const GLvoid *userParam) { GET_CURRENT_CONTEXT(ctx); diff --git a/mesalib/src/mesa/main/errors.h b/mesalib/src/mesa/main/errors.h index b4490fac9..c41d36811 100644 --- a/mesalib/src/mesa/main/errors.h +++ b/mesalib/src/mesa/main/errors.h @@ -71,6 +71,22 @@ _mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLI extern void _mesa_shader_debug( struct gl_context *ctx, GLenum type, GLuint id, const char *msg, int len ); +void GLAPIENTRY +_mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, + GLenum severity, GLint length, + const GLcharARB* buf); +GLuint GLAPIENTRY +_mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum* sources, + GLenum* types, GLenum* ids, GLenum* severities, + GLsizei* lengths, GLcharARB* messageLog); +void GLAPIENTRY +_mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, + GLsizei count, const GLuint *ids, + GLboolean enabled); +void GLAPIENTRY +_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, + const GLvoid *userParam); + #ifdef __cplusplus } #endif diff --git a/mesalib/src/mesa/main/es1_conversion.c b/mesalib/src/mesa/main/es1_conversion.c index 758fb1a66..993147c47 100644 --- a/mesalib/src/mesa/main/es1_conversion.c +++ b/mesalib/src/mesa/main/es1_conversion.c @@ -1,8 +1,6 @@ #include <stdbool.h> #include "main/mfeatures.h" -#if FEATURE_ES1 - #include "api_loopback.h" #include "api_exec.h" #include "blend.h" @@ -938,5 +936,3 @@ _es_Translatex(GLfixed x, GLfixed y, GLfixed z) (GLfloat) (y / 65536.0f), (GLfloat) (z / 65536.0f)); } - -#endif /* FEATURE_ES1 */ diff --git a/mesalib/src/mesa/main/eval.c b/mesalib/src/mesa/main/eval.c index d6e45d6e8..59627cc43 100644 --- a/mesalib/src/mesa/main/eval.c +++ b/mesalib/src/mesa/main/eval.c @@ -368,7 +368,7 @@ map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points ) { @@ -376,7 +376,7 @@ _mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points ) { @@ -467,7 +467,7 @@ map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map2f( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, @@ -478,7 +478,7 @@ _mesa_Map2f( GLenum target, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map2d( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, @@ -490,7 +490,7 @@ _mesa_Map2d( GLenum target, -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMapdvARB( GLenum target, GLenum query, GLsizei bufSize, GLdouble *v ) { GET_CURRENT_CONTEXT(ctx); @@ -576,13 +576,13 @@ overflow: " but %d bytes are required)", bufSize, numBytes ); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v ) { _mesa_GetnMapdvARB(target, query, INT_MAX, v); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMapfvARB( GLenum target, GLenum query, GLsizei bufSize, GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); @@ -669,14 +669,14 @@ overflow: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v ) { _mesa_GetnMapfvARB(target, query, INT_MAX, v); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMapivARB( GLenum target, GLenum query, GLsizei bufSize, GLint *v ) { GET_CURRENT_CONTEXT(ctx); @@ -763,14 +763,14 @@ overflow: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMapiv( GLenum target, GLenum query, GLint *v ) { _mesa_GetnMapivARB(target, query, INT_MAX, v); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ) { GET_CURRENT_CONTEXT(ctx); @@ -788,14 +788,14 @@ _mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 ) { _mesa_MapGrid1f( un, (GLfloat) u1, (GLfloat) u2 ); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 ) { @@ -823,7 +823,7 @@ _mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 ) { @@ -848,28 +848,6 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp, } -void -_mesa_init_eval_dispatch(struct _glapi_table *disp) -{ - SET_GetMapdv(disp, _mesa_GetMapdv); - SET_GetMapfv(disp, _mesa_GetMapfv); - SET_GetMapiv(disp, _mesa_GetMapiv); - SET_Map1d(disp, _mesa_Map1d); - SET_Map1f(disp, _mesa_Map1f); - SET_Map2d(disp, _mesa_Map2d); - SET_Map2f(disp, _mesa_Map2f); - SET_MapGrid1d(disp, _mesa_MapGrid1d); - SET_MapGrid1f(disp, _mesa_MapGrid1f); - SET_MapGrid2d(disp, _mesa_MapGrid2d); - SET_MapGrid2f(disp, _mesa_MapGrid2f); - - /* GL_ARB_robustness */ - SET_GetnMapdvARB(disp, _mesa_GetnMapdvARB); - SET_GetnMapfvARB(disp, _mesa_GetnMapfvARB); - SET_GetnMapivARB(disp, _mesa_GetnMapivARB); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/mesalib/src/mesa/main/eval.h b/mesalib/src/mesa/main/eval.h index 0649de052..1b6c704ca 100644 --- a/mesalib/src/mesa/main/eval.h +++ b/mesalib/src/mesa/main/eval.h @@ -78,11 +78,47 @@ extern void _mesa_install_eval_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void -_mesa_init_eval_dispatch(struct _glapi_table *disp); - extern void _mesa_init_eval( struct gl_context *ctx ); extern void _mesa_free_eval_data( struct gl_context *ctx ); +void GLAPIENTRY +_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, + GLint order, const GLfloat *points ); +void GLAPIENTRY +_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, + GLint order, const GLdouble *points ); +void GLAPIENTRY +_mesa_Map2f( GLenum target, + GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, + GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, + const GLfloat *points); +void GLAPIENTRY +_mesa_Map2d( GLenum target, + GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, + GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, + const GLdouble *points ); +void GLAPIENTRY +_mesa_GetnMapdvARB( GLenum target, GLenum query, GLsizei bufSize, + GLdouble *v ); +void GLAPIENTRY +_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v ); +void GLAPIENTRY +_mesa_GetnMapfvARB( GLenum target, GLenum query, GLsizei bufSize, GLfloat *v ); +void GLAPIENTRY +_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v ); +void GLAPIENTRY +_mesa_GetnMapivARB( GLenum target, GLenum query, GLsizei bufSize, GLint *v ); +void GLAPIENTRY +_mesa_GetMapiv( GLenum target, GLenum query, GLint *v ); +void GLAPIENTRY +_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ); +void GLAPIENTRY +_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 ); +void GLAPIENTRY +_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, + GLint vn, GLfloat v1, GLfloat v2 ); +void GLAPIENTRY +_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, + GLint vn, GLdouble v1, GLdouble v2 ); #endif /* EVAL_H */ diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index fc5681ccc..0758d5557 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -2059,7 +2059,8 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, } else if ((texObj->Target == GL_TEXTURE_1D_ARRAY_EXT) || (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT)) { - if (zoffset < 0 || zoffset >= ctx->Const.MaxArrayTextureLayers) { + if (zoffset < 0 || + zoffset >= (GLint) ctx->Const.MaxArrayTextureLayers) { _mesa_error(ctx, GL_INVALID_VALUE, "glFramebufferTexture%sEXT(layer)", caller); return; @@ -2637,6 +2638,15 @@ _mesa_GenerateMipmapEXT(GLenum target) return; } + if (_mesa_is_enum_format_integer(srcImage->InternalFormat) || + _mesa_is_depthstencil_format(srcImage->InternalFormat) || + _mesa_is_stencil_format(srcImage->InternalFormat)) { + _mesa_unlock_texture(ctx, texObj); + _mesa_error(ctx, GL_INVALID_OPERATION, + "glGenerateMipmap(invalid internal format)"); + return; + } + if (target == GL_TEXTURE_CUBE_MAP) { GLuint face; for (face = 0; face < 6; face++) @@ -3142,7 +3152,7 @@ invalidate_framebuffer_storage(GLenum target, GLsizei numAttachments, case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT15: { - const int k = attachments[i] - GL_COLOR_ATTACHMENT0; + unsigned k = attachments[i] - GL_COLOR_ATTACHMENT0; if (k >= ctx->Const.MaxColorAttachments) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(attachment >= max. color attachments)", name); diff --git a/mesalib/src/mesa/main/feedback.c b/mesalib/src/mesa/main/feedback.c index f45b823b1..128a12622 100644 --- a/mesalib/src/mesa/main/feedback.c +++ b/mesalib/src/mesa/main/feedback.c @@ -47,7 +47,7 @@ -static void GLAPIENTRY +void GLAPIENTRY _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) { GET_CURRENT_CONTEXT(ctx); @@ -96,7 +96,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PassThrough( GLfloat token ) { GET_CURRENT_CONTEXT(ctx); @@ -159,7 +159,7 @@ _mesa_feedback_vertex(struct gl_context *ctx, * Verifies we're not in selection mode, flushes the vertices and initialize * the fields in __struct gl_contextRec::Select with the given buffer. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_SelectBuffer( GLsizei size, GLuint *buffer ) { GET_CURRENT_CONTEXT(ctx); @@ -271,7 +271,7 @@ write_hit_record(struct gl_context *ctx) * the hit record data in gl_selection. Marks new render mode in * __struct gl_contextRec::NewState. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_InitNames( void ) { GET_CURRENT_CONTEXT(ctx); @@ -302,7 +302,7 @@ _mesa_InitNames( void ) * * sa __struct gl_contextRec::Select. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_LoadName( GLuint name ) { GET_CURRENT_CONTEXT(ctx); @@ -341,7 +341,7 @@ _mesa_LoadName( GLuint name ) * * sa __struct gl_contextRec::Select. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_PushName( GLuint name ) { GET_CURRENT_CONTEXT(ctx); @@ -372,7 +372,7 @@ _mesa_PushName( GLuint name ) * * sa __struct gl_contextRec::Select. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_PopName( void ) { GET_CURRENT_CONTEXT(ctx); @@ -494,20 +494,6 @@ _mesa_RenderMode( GLenum mode ) /*@}*/ -void -_mesa_init_feedback_dispatch(struct _glapi_table *disp) -{ - SET_InitNames(disp, _mesa_InitNames); - SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer); - SET_LoadName(disp, _mesa_LoadName); - SET_PassThrough(disp, _mesa_PassThrough); - SET_PopName(disp, _mesa_PopName); - SET_PushName(disp, _mesa_PushName); - SET_SelectBuffer(disp, _mesa_SelectBuffer); - SET_RenderMode(disp, _mesa_RenderMode); -} - - /**********************************************************************/ /** \name Initialization */ /*@{*/ diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h index cc4cf15a8..a697dc0d2 100644 --- a/mesalib/src/mesa/main/feedback.h +++ b/mesalib/src/mesa/main/feedback.h @@ -31,7 +31,21 @@ #include "main/mtypes.h" -extern GLint GLAPIENTRY +void GLAPIENTRY +_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ); +void GLAPIENTRY +_mesa_PassThrough( GLfloat token ); +void GLAPIENTRY +_mesa_SelectBuffer( GLsizei size, GLuint *buffer ); +void GLAPIENTRY +_mesa_InitNames( void ); +void GLAPIENTRY +_mesa_LoadName( GLuint name ); +void GLAPIENTRY +_mesa_PushName( GLuint name ); +void GLAPIENTRY +_mesa_PopName( void ); +GLint GLAPIENTRY _mesa_RenderMode( GLenum mode ); extern void @@ -56,10 +70,6 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z ); extern void -_mesa_init_feedback_dispatch(struct _glapi_table *disp); - - -extern void _mesa_init_feedback( struct gl_context *ctx ); #endif /* FEEDBACK_H */ diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c index efdca015e..4cdec2166 100644 --- a/mesalib/src/mesa/main/ffvertex_prog.c +++ b/mesalib/src/mesa/main/ffvertex_prog.c @@ -160,6 +160,8 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) key->need_eye_coords = ctx->_NeedEyeCoords; + /* Make sure fp->Base.InputsRead fits in a 12-bit field */ + assert(fp->Base.InputsRead < (1 << 12)); key->fragprog_inputs_read = fp->Base.InputsRead; key->varying_vp_inputs = ctx->varying_vp_inputs; diff --git a/mesalib/src/mesa/main/format_pack.c b/mesalib/src/mesa/main/format_pack.c index be6c026e8..051fb40b9 100644 --- a/mesalib/src/mesa/main/format_pack.c +++ b/mesalib/src/mesa/main/format_pack.c @@ -2248,7 +2248,7 @@ pack_uint_z_Z32_FLOAT(const GLuint *src, void *dst) { GLuint *d = ((GLuint *) dst); const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; - *d = *src * scale; + *d = (GLuint) (*src * scale); assert(*d >= 0.0f); assert(*d <= 1.0f); } @@ -2258,7 +2258,7 @@ pack_uint_z_Z32_FLOAT_X24S8(const GLuint *src, void *dst) { GLfloat *d = ((GLfloat *) dst); const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; - *d = *src * scale; + *d = (GLfloat) (*src * scale); assert(*d >= 0.0f); assert(*d <= 1.0f); } @@ -2473,7 +2473,7 @@ _mesa_pack_uint_z_row(gl_format format, GLuint n, const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; GLuint i; for (i = 0; i < n; i++) { - d[i] = src[i] * scale; + d[i] = (GLuint) (src[i] * scale); assert(d[i] >= 0.0f); assert(d[i] <= 1.0f); } @@ -2485,7 +2485,7 @@ _mesa_pack_uint_z_row(gl_format format, GLuint n, const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; GLuint i; for (i = 0; i < n; i++) { - d[i].z = src[i] * scale; + d[i].z = (GLfloat) (src[i] * scale); assert(d[i].z >= 0.0f); assert(d[i].z <= 1.0f); } @@ -2570,9 +2570,9 @@ _mesa_pack_uint_24_8_depth_stencil_row(gl_format format, GLuint n, { const GLdouble scale = 1.0 / (GLdouble) 0xffffff; struct z32f_x24s8 *d = (struct z32f_x24s8 *) dst; - GLint i; + GLuint i; for (i = 0; i < n; i++) { - GLfloat z = (src[i] >> 8) * scale; + GLfloat z = (GLfloat) ((src[i] >> 8) * scale); d[i].z = z; d[i].x24s8 = src[i]; } @@ -2599,10 +2599,10 @@ _mesa_pack_colormask(gl_format format, const GLubyte colorMask[4], void *dst) switch (_mesa_get_format_datatype(format)) { case GL_UNSIGNED_NORMALIZED: /* simple: 1.0 will convert to ~0 in the right bit positions */ - maskColor[0] = colorMask[0] ? 1.0 : 0.0; - maskColor[1] = colorMask[1] ? 1.0 : 0.0; - maskColor[2] = colorMask[2] ? 1.0 : 0.0; - maskColor[3] = colorMask[3] ? 1.0 : 0.0; + maskColor[0] = colorMask[0] ? 1.0f : 0.0f; + maskColor[1] = colorMask[1] ? 1.0f : 0.0f; + maskColor[2] = colorMask[2] ? 1.0f : 0.0f; + maskColor[3] = colorMask[3] ? 1.0f : 0.0f; _mesa_pack_float_rgba_row(format, 1, (const GLfloat (*)[4]) maskColor, dst); break; diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index c34d873f2..afae08932 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -1480,7 +1480,7 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params) } static enum value_type -find_value_indexed(const char *func, GLenum pname, int index, union value *v) +find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) { GET_CURRENT_CONTEXT(ctx); @@ -1686,7 +1686,6 @@ _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params ) } } -#if FEATURE_ES1 void GLAPIENTRY _mesa_GetFixedv(GLenum pname, GLfixed *params) { @@ -1772,4 +1771,3 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params) break; } } -#endif diff --git a/mesalib/src/mesa/main/histogram.c b/mesalib/src/mesa/main/histogram.c index d3dc7ddc4..fe454bcfb 100644 --- a/mesalib/src/mesa/main/histogram.c +++ b/mesalib/src/mesa/main/histogram.c @@ -37,11 +37,7 @@ */ -/* this is defined below */ -static void GLAPIENTRY _mesa_ResetMinmax(GLenum target); - - -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values) { @@ -51,7 +47,7 @@ _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values) { @@ -59,7 +55,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values) { @@ -69,7 +65,7 @@ _mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values) { @@ -77,7 +73,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -86,7 +82,7 @@ _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -95,7 +91,7 @@ _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -104,7 +100,7 @@ _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -113,7 +109,7 @@ _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink) { GET_CURRENT_CONTEXT(ctx); @@ -122,7 +118,7 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) { GET_CURRENT_CONTEXT(ctx); @@ -131,7 +127,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ResetHistogram(GLenum target) { GET_CURRENT_CONTEXT(ctx); @@ -140,30 +136,10 @@ _mesa_ResetHistogram(GLenum target) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ResetMinmax(GLenum target) { GET_CURRENT_CONTEXT(ctx); _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax"); } - - -void -_mesa_init_histogram_dispatch(struct _glapi_table *disp) -{ - SET_GetHistogram(disp, _mesa_GetHistogram); - SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv); - SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv); - SET_GetMinmax(disp, _mesa_GetMinmax); - SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv); - SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv); - SET_Histogram(disp, _mesa_Histogram); - SET_Minmax(disp, _mesa_Minmax); - SET_ResetHistogram(disp, _mesa_ResetHistogram); - SET_ResetMinmax(disp, _mesa_ResetMinmax); - - /* GL_ARB_robustness */ - SET_GetnHistogramARB(disp, _mesa_GetnHistogramARB); - SET_GetnMinmaxARB(disp, _mesa_GetnMinmaxARB); -} diff --git a/mesalib/src/mesa/main/histogram.h b/mesalib/src/mesa/main/histogram.h index a9c312152..06781e732 100644 --- a/mesalib/src/mesa/main/histogram.h +++ b/mesalib/src/mesa/main/histogram.h @@ -41,7 +41,35 @@ struct _glapi_table; -extern void -_mesa_init_histogram_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, + GLenum type, GLsizei bufSize, GLvoid *values); +void GLAPIENTRY +_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, + GLvoid *values); +void GLAPIENTRY +_mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format, + GLenum type, GLsizei bufSize, GLvoid *values); +void GLAPIENTRY +_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, + GLvoid *values); +void GLAPIENTRY +_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, + GLboolean sink); +void GLAPIENTRY +_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink); +void GLAPIENTRY +_mesa_ResetHistogram(GLenum target); +void GLAPIENTRY +_mesa_ResetMinmax(GLenum target); + #endif /* HISTOGRAM_H */ diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index a78d67966..40ba75785 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -81,7 +81,7 @@ extern "C" { * these casts generate warnings. * The following union typedef is used to solve that. */ -typedef union { GLfloat f; GLint i; } fi_type; +typedef union { GLfloat f; GLint i; GLuint u; } fi_type; diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h index 7b7fd1b6d..14a5d5fe1 100644 --- a/mesalib/src/mesa/main/macros.h +++ b/mesalib/src/mesa/main/macros.h @@ -171,6 +171,20 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256]; ub = ((GLubyte) F_TO_I((f) * 255.0F)) #endif +static inline GLfloat INT_AS_FLT(GLint i) +{ + fi_type tmp; + tmp.i = i; + return tmp.f; +} + +static inline GLfloat UINT_AS_FLT(GLuint u) +{ + fi_type tmp; + tmp.u = u; + return tmp.f; +} + /*@}*/ @@ -573,6 +587,31 @@ do { \ /*@}*/ +/** Copy \p sz elements into a homegeneous (4-element) vector, giving + * default values to the remaining components. + * The default values are chosen based on \p type. + */ +static inline void +COPY_CLEAN_4V_TYPE_AS_FLOAT(GLfloat dst[4], int sz, const GLfloat src[4], + GLenum type) +{ + switch (type) { + case GL_FLOAT: + ASSIGN_4V(dst, 0, 0, 0, 1); + break; + case GL_INT: + ASSIGN_4V(dst, INT_AS_FLT(0), INT_AS_FLT(0), + INT_AS_FLT(0), INT_AS_FLT(1)); + break; + case GL_UNSIGNED_INT: + ASSIGN_4V(dst, UINT_AS_FLT(0), UINT_AS_FLT(0), + UINT_AS_FLT(0), UINT_AS_FLT(1)); + break; + default: + ASSERT(0); + } + COPY_SZ_4V(dst, sz, src); +} /** \name Linear interpolation functions */ /*@{*/ diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c index 28c4e2b49..3c5968c85 100644 --- a/mesalib/src/mesa/main/matrix.c +++ b/mesalib/src/mesa/main/matrix.c @@ -746,7 +746,7 @@ void _mesa_free_matrix_data( struct gl_context *ctx ) */ void _mesa_init_transform( struct gl_context *ctx ) { - GLint i; + GLuint i; /* Transformation group */ ctx->Transform.MatrixMode = GL_MODELVIEW; diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c index f926c56a4..9940eda52 100644 --- a/mesalib/src/mesa/main/pixel.c +++ b/mesalib/src/mesa/main/pixel.c @@ -44,7 +44,7 @@ /***** glPixelZoom *****/ /**********************************************************************/ -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor ) { GET_CURRENT_CONTEXT(ctx); @@ -177,7 +177,7 @@ validate_pbo_access(struct gl_context *ctx, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ) { GET_CURRENT_CONTEXT(ctx); @@ -219,7 +219,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ) { GLfloat fvalues[MAX_PIXEL_MAP_TABLE]; @@ -275,7 +275,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ) { GLfloat fvalues[MAX_PIXEL_MAP_TABLE]; @@ -331,7 +331,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ) { GET_CURRENT_CONTEXT(ctx); @@ -376,13 +376,13 @@ _mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetPixelMapfv( GLenum map, GLfloat *values ) { _mesa_GetnPixelMapfvARB(map, INT_MAX, values); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ) { GET_CURRENT_CONTEXT(ctx); @@ -427,13 +427,13 @@ _mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetPixelMapuiv( GLenum map, GLuint *values ) { _mesa_GetnPixelMapuivARB(map, INT_MAX, values); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ) { GET_CURRENT_CONTEXT(ctx); @@ -486,7 +486,7 @@ _mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetPixelMapusv( GLenum map, GLushort *values ) { _mesa_GetnPixelMapusvARB(map, INT_MAX, values); @@ -600,7 +600,7 @@ _mesa_PixelTransferf( GLenum pname, GLfloat param ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelTransferi( GLenum pname, GLint param ) { _mesa_PixelTransferf( pname, (GLfloat) param ); @@ -647,26 +647,6 @@ void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state ) } -void -_mesa_init_pixel_dispatch(struct _glapi_table *disp) -{ - SET_GetPixelMapfv(disp, _mesa_GetPixelMapfv); - SET_GetPixelMapuiv(disp, _mesa_GetPixelMapuiv); - SET_GetPixelMapusv(disp, _mesa_GetPixelMapusv); - SET_PixelMapfv(disp, _mesa_PixelMapfv); - SET_PixelMapuiv(disp, _mesa_PixelMapuiv); - SET_PixelMapusv(disp, _mesa_PixelMapusv); - SET_PixelTransferf(disp, _mesa_PixelTransferf); - SET_PixelTransferi(disp, _mesa_PixelTransferi); - SET_PixelZoom(disp, _mesa_PixelZoom); - - /* GL_ARB_robustness */ - SET_GetnPixelMapfvARB(disp, _mesa_GetnPixelMapfvARB); - SET_GetnPixelMapuivARB(disp, _mesa_GetnPixelMapuivARB); - SET_GetnPixelMapusvARB(disp, _mesa_GetnPixelMapusvARB); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/mesalib/src/mesa/main/pixel.h b/mesalib/src/mesa/main/pixel.h index bfd76d934..433208cb6 100644 --- a/mesalib/src/mesa/main/pixel.h +++ b/mesalib/src/mesa/main/pixel.h @@ -41,15 +41,34 @@ struct _glapi_table; struct gl_context; -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor ); +void GLAPIENTRY +_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ); +void GLAPIENTRY +_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ); +void GLAPIENTRY +_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ); +void GLAPIENTRY +_mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ); +void GLAPIENTRY +_mesa_GetPixelMapfv( GLenum map, GLfloat *values ); +void GLAPIENTRY +_mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ); +void GLAPIENTRY +_mesa_GetPixelMapuiv( GLenum map, GLuint *values ); +void GLAPIENTRY +_mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ); +void GLAPIENTRY +_mesa_GetPixelMapusv( GLenum map, GLushort *values ); +void GLAPIENTRY _mesa_PixelTransferf(GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_PixelTransferi( GLenum pname, GLint param ); extern void _mesa_update_pixel( struct gl_context *ctx, GLuint newstate ); -extern void -_mesa_init_pixel_dispatch( struct _glapi_table * disp ); - extern void _mesa_init_pixel( struct gl_context * ctx ); diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index 8bfd964ea..cb441e6fe 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -168,7 +168,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GenQueriesARB(GLsizei n, GLuint *ids) { GLuint first; @@ -207,7 +207,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) { GLint i; @@ -243,7 +243,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) } -static GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsQueryARB(GLuint id) { GET_CURRENT_CONTEXT(ctx); @@ -279,7 +279,7 @@ query_error_check_index(struct gl_context *ctx, GLenum target, GLuint index) return GL_TRUE; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) { struct gl_query_object *q, **bindpt; @@ -356,7 +356,7 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_EndQueryIndexed(GLenum target, GLuint index) { struct gl_query_object *q, **bindpt; @@ -402,19 +402,19 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index) ctx->Driver.EndQuery(ctx, q); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_BeginQueryARB(GLenum target, GLuint id) { _mesa_BeginQueryIndexed(target, 0, id); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_EndQueryARB(GLenum target) { _mesa_EndQueryIndexed(target, 0); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_QueryCounter(GLuint id, GLenum target) { struct gl_query_object *q; @@ -471,7 +471,7 @@ _mesa_QueryCounter(GLuint id, GLenum target) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params) { @@ -546,13 +546,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params) { _mesa_GetQueryIndexediv(target, 0, pname, params); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) { struct gl_query_object *q = NULL; @@ -603,7 +603,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) { struct gl_query_object *q = NULL; @@ -657,7 +657,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) /** * New with GL_EXT_timer_query */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) { struct gl_query_object *q = NULL; @@ -698,7 +698,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) /** * New with GL_EXT_timer_query */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params) { struct gl_query_object *q = NULL; diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index 1e35185c7..f9e916cda 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -53,5 +53,34 @@ _mesa_init_queryobj(struct gl_context *ctx); extern void _mesa_free_queryobj_data(struct gl_context *ctx); +void GLAPIENTRY +_mesa_GenQueriesARB(GLsizei n, GLuint *ids); +void GLAPIENTRY +_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids); +GLboolean GLAPIENTRY +_mesa_IsQueryARB(GLuint id); +void GLAPIENTRY +_mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id); +void GLAPIENTRY +_mesa_EndQueryIndexed(GLenum target, GLuint index); +void GLAPIENTRY +_mesa_BeginQueryARB(GLenum target, GLuint id); +void GLAPIENTRY +_mesa_EndQueryARB(GLenum target); +void GLAPIENTRY +_mesa_QueryCounter(GLuint id, GLenum target); +void GLAPIENTRY +_mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, + GLint *params); +void GLAPIENTRY +_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params); +void GLAPIENTRY +_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params); +void GLAPIENTRY +_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params); #endif /* QUERYOBJ_H */ diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c index ab8e2c1a3..0ea95b594 100644 --- a/mesalib/src/mesa/main/rastpos.c +++ b/mesalib/src/mesa/main/rastpos.c @@ -63,147 +63,147 @@ rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2d(GLdouble x, GLdouble y) { rasterpos((GLfloat)x, (GLfloat)y, (GLfloat)0.0, (GLfloat)1.0); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2f(GLfloat x, GLfloat y) { rasterpos(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2i(GLint x, GLint y) { rasterpos((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2s(GLshort x, GLshort y) { rasterpos(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) { rasterpos(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3i(GLint x, GLint y, GLint z) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3s(GLshort x, GLshort y, GLshort z) { rasterpos(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { rasterpos(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) { rasterpos(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2dv(const GLdouble *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2fv(const GLfloat *v) { rasterpos(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2iv(const GLint *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2sv(const GLshort *v) { rasterpos(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3dv(const GLdouble *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3fv(const GLfloat *v) { rasterpos(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3iv(const GLint *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3sv(const GLshort *v) { rasterpos(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4dv(const GLdouble *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4fv(const GLfloat *v) { rasterpos(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4iv(const GLint *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4sv(const GLshort *v) { rasterpos(v[0], v[1], v[2], v[3]); @@ -288,147 +288,147 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2dMESA(GLdouble x, GLdouble y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2fMESA(GLfloat x, GLfloat y) { window_pos4f(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2iMESA(GLint x, GLint y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2sMESA(GLshort x, GLshort y) { window_pos4f(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z) { window_pos4f(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3iMESA(GLint x, GLint y, GLint z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z) { window_pos4f(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { window_pos4f(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w) { window_pos4f(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2dvMESA(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2fvMESA(const GLfloat *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2ivMESA(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2svMESA(const GLshort *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3dvMESA(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3fvMESA(const GLfloat *v) { window_pos4f(v[0], v[1], v[2], 1.0); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3ivMESA(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3svMESA(const GLshort *v) { window_pos4f(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4dvMESA(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4fvMESA(const GLfloat *v) { window_pos4f(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4ivMESA(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4svMESA(const GLshort *v) { window_pos4f(v[0], v[1], v[2], v[3]); @@ -474,62 +474,6 @@ void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) #endif -void -_mesa_init_rastpos_dispatch(struct _glapi_table *disp) -{ - SET_RasterPos2f(disp, _mesa_RasterPos2f); - SET_RasterPos2fv(disp, _mesa_RasterPos2fv); - SET_RasterPos2i(disp, _mesa_RasterPos2i); - SET_RasterPos2iv(disp, _mesa_RasterPos2iv); - SET_RasterPos2d(disp, _mesa_RasterPos2d); - SET_RasterPos2dv(disp, _mesa_RasterPos2dv); - SET_RasterPos2s(disp, _mesa_RasterPos2s); - SET_RasterPos2sv(disp, _mesa_RasterPos2sv); - SET_RasterPos3d(disp, _mesa_RasterPos3d); - SET_RasterPos3dv(disp, _mesa_RasterPos3dv); - SET_RasterPos3f(disp, _mesa_RasterPos3f); - SET_RasterPos3fv(disp, _mesa_RasterPos3fv); - SET_RasterPos3i(disp, _mesa_RasterPos3i); - SET_RasterPos3iv(disp, _mesa_RasterPos3iv); - SET_RasterPos3s(disp, _mesa_RasterPos3s); - SET_RasterPos3sv(disp, _mesa_RasterPos3sv); - SET_RasterPos4d(disp, _mesa_RasterPos4d); - SET_RasterPos4dv(disp, _mesa_RasterPos4dv); - SET_RasterPos4f(disp, _mesa_RasterPos4f); - SET_RasterPos4fv(disp, _mesa_RasterPos4fv); - SET_RasterPos4i(disp, _mesa_RasterPos4i); - SET_RasterPos4iv(disp, _mesa_RasterPos4iv); - SET_RasterPos4s(disp, _mesa_RasterPos4s); - SET_RasterPos4sv(disp, _mesa_RasterPos4sv); - - /* 197. GL_MESA_window_pos */ - SET_WindowPos2dMESA(disp, _mesa_WindowPos2dMESA); - SET_WindowPos2dvMESA(disp, _mesa_WindowPos2dvMESA); - SET_WindowPos2fMESA(disp, _mesa_WindowPos2fMESA); - SET_WindowPos2fvMESA(disp, _mesa_WindowPos2fvMESA); - SET_WindowPos2iMESA(disp, _mesa_WindowPos2iMESA); - SET_WindowPos2ivMESA(disp, _mesa_WindowPos2ivMESA); - SET_WindowPos2sMESA(disp, _mesa_WindowPos2sMESA); - SET_WindowPos2svMESA(disp, _mesa_WindowPos2svMESA); - SET_WindowPos3dMESA(disp, _mesa_WindowPos3dMESA); - SET_WindowPos3dvMESA(disp, _mesa_WindowPos3dvMESA); - SET_WindowPos3fMESA(disp, _mesa_WindowPos3fMESA); - SET_WindowPos3fvMESA(disp, _mesa_WindowPos3fvMESA); - SET_WindowPos3iMESA(disp, _mesa_WindowPos3iMESA); - SET_WindowPos3ivMESA(disp, _mesa_WindowPos3ivMESA); - SET_WindowPos3sMESA(disp, _mesa_WindowPos3sMESA); - SET_WindowPos3svMESA(disp, _mesa_WindowPos3svMESA); - SET_WindowPos4dMESA(disp, _mesa_WindowPos4dMESA); - SET_WindowPos4dvMESA(disp, _mesa_WindowPos4dvMESA); - SET_WindowPos4fMESA(disp, _mesa_WindowPos4fMESA); - SET_WindowPos4fvMESA(disp, _mesa_WindowPos4fvMESA); - SET_WindowPos4iMESA(disp, _mesa_WindowPos4iMESA); - SET_WindowPos4ivMESA(disp, _mesa_WindowPos4ivMESA); - SET_WindowPos4sMESA(disp, _mesa_WindowPos4sMESA); - SET_WindowPos4svMESA(disp, _mesa_WindowPos4svMESA); -} - - /**********************************************************************/ /** \name Initialization */ /**********************************************************************/ diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h index 9bb04cc9c..90351e86b 100644 --- a/mesalib/src/mesa/main/rastpos.h +++ b/mesalib/src/mesa/main/rastpos.h @@ -38,12 +38,107 @@ struct _glapi_table; struct gl_context; -extern void -_mesa_init_rastpos_dispatch(struct _glapi_table *disp); - extern void _mesa_init_rastpos(struct gl_context *ctx); +void GLAPIENTRY +_mesa_RasterPos2d(GLdouble x, GLdouble y); +void GLAPIENTRY +_mesa_RasterPos2f(GLfloat x, GLfloat y); +void GLAPIENTRY +_mesa_RasterPos2i(GLint x, GLint y); +void GLAPIENTRY +_mesa_RasterPos2s(GLshort x, GLshort y); +void GLAPIENTRY +_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z); +void GLAPIENTRY +_mesa_RasterPos3i(GLint x, GLint y, GLint z); +void GLAPIENTRY +_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w); +void GLAPIENTRY +_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +void GLAPIENTRY +_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w); +void GLAPIENTRY +_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w); +void GLAPIENTRY +_mesa_RasterPos2dv(const GLdouble *v); +void GLAPIENTRY +_mesa_RasterPos2fv(const GLfloat *v); +void GLAPIENTRY +_mesa_RasterPos2iv(const GLint *v); +void GLAPIENTRY +_mesa_RasterPos2sv(const GLshort *v); +void GLAPIENTRY +_mesa_RasterPos3dv(const GLdouble *v); +void GLAPIENTRY +_mesa_RasterPos3fv(const GLfloat *v); +void GLAPIENTRY +_mesa_RasterPos3iv(const GLint *v); +void GLAPIENTRY +_mesa_RasterPos3sv(const GLshort *v); +void GLAPIENTRY +_mesa_RasterPos4dv(const GLdouble *v); +void GLAPIENTRY +_mesa_RasterPos4fv(const GLfloat *v); +void GLAPIENTRY +_mesa_RasterPos4iv(const GLint *v); +void GLAPIENTRY +_mesa_RasterPos4sv(const GLshort *v); +void GLAPIENTRY +_mesa_WindowPos2dMESA(GLdouble x, GLdouble y); +void GLAPIENTRY +_mesa_WindowPos2fMESA(GLfloat x, GLfloat y); +void GLAPIENTRY +_mesa_WindowPos2iMESA(GLint x, GLint y); +void GLAPIENTRY +_mesa_WindowPos2sMESA(GLshort x, GLshort y); +void GLAPIENTRY +_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z); +void GLAPIENTRY +_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z); +void GLAPIENTRY +_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w); +void GLAPIENTRY +_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +void GLAPIENTRY +_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w); +void GLAPIENTRY +_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w); +void GLAPIENTRY +_mesa_WindowPos2dvMESA(const GLdouble *v); +void GLAPIENTRY +_mesa_WindowPos2fvMESA(const GLfloat *v); +void GLAPIENTRY +_mesa_WindowPos2ivMESA(const GLint *v); +void GLAPIENTRY +_mesa_WindowPos2svMESA(const GLshort *v); +void GLAPIENTRY +_mesa_WindowPos3dvMESA(const GLdouble *v); +void GLAPIENTRY +_mesa_WindowPos3fvMESA(const GLfloat *v); +void GLAPIENTRY +_mesa_WindowPos3ivMESA(const GLint *v); +void GLAPIENTRY +_mesa_WindowPos3svMESA(const GLshort *v); +void GLAPIENTRY +_mesa_WindowPos4dvMESA(const GLdouble *v); +void GLAPIENTRY +_mesa_WindowPos4fvMESA(const GLfloat *v); +void GLAPIENTRY +_mesa_WindowPos4ivMESA(const GLint *v); +void GLAPIENTRY +_mesa_WindowPos4svMESA(const GLshort *v); + + /*@}*/ #endif /* RASTPOS_H */ diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c index 09cbd2939..3c3bfffd4 100644 --- a/mesalib/src/mesa/main/samplerobj.c +++ b/mesalib/src/mesa/main/samplerobj.c @@ -224,7 +224,7 @@ _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers) } -static GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsSampler(GLuint sampler) { struct gl_sampler_object *sampObj; @@ -684,7 +684,7 @@ _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) { struct gl_sampler_object *sampObj; @@ -770,7 +770,7 @@ _mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params) { struct gl_sampler_object *sampObj; @@ -862,7 +862,7 @@ _mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params) { struct gl_sampler_object *sampObj; @@ -949,7 +949,7 @@ _mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params) { struct gl_sampler_object *sampObj; @@ -1035,7 +1035,7 @@ _mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params) { struct gl_sampler_object *sampObj; @@ -1121,7 +1121,7 @@ _mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) { struct gl_sampler_object *sampObj; @@ -1199,7 +1199,7 @@ invalid_pname: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params) { struct gl_sampler_object *sampObj; @@ -1277,7 +1277,7 @@ invalid_pname: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params) { struct gl_sampler_object *sampObj; @@ -1356,7 +1356,7 @@ invalid_pname: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params) { struct gl_sampler_object *sampObj; diff --git a/mesalib/src/mesa/main/samplerobj.h b/mesalib/src/mesa/main/samplerobj.h index bea4c2232..ecff032c9 100644 --- a/mesalib/src/mesa/main/samplerobj.h +++ b/mesalib/src/mesa/main/samplerobj.h @@ -80,16 +80,33 @@ extern void _mesa_init_sampler_object_dispatch(const struct gl_context *ctx, struct _glapi_table *disp); -extern void GLAPIENTRY -_mesa_BindSampler(GLuint unit, GLuint sampler); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GenSamplers(GLsizei count, GLuint *samplers); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers); - -extern void GLAPIENTRY +GLboolean GLAPIENTRY +_mesa_IsSampler(GLuint sampler); +void GLAPIENTRY +_mesa_BindSampler(GLuint unit, GLuint sampler); +void GLAPIENTRY _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param); +void GLAPIENTRY +_mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params); +void GLAPIENTRY +_mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params); +void GLAPIENTRY +_mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params); #endif /* SAMPLEROBJ_H */ diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c index c5a878644..7c9c2a760 100644 --- a/mesalib/src/mesa/main/texgen.c +++ b/mesalib/src/mesa/main/texgen.c @@ -186,7 +186,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ) { GLfloat p[4]; @@ -203,7 +203,7 @@ _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ) { GLfloat p[4]; @@ -212,7 +212,6 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ) _mesa_TexGenfv( coord, pname, p ); } -#if FEATURE_ES1 void GLAPIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params) @@ -250,9 +249,8 @@ _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params) _mesa_TexGenfv(GL_R, pname, params); } -#endif -static void GLAPIENTRY +void GLAPIENTRY _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ) { GLfloat p[4]; @@ -290,7 +288,7 @@ _mesa_TexGeni( GLenum coord, GLenum pname, GLint param ) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params ) { struct gl_texture_unit *texUnit; @@ -423,20 +421,3 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ) _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" ); } } - - -void -_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp) -{ - SET_GetTexGenfv(disp, _mesa_GetTexGenfv); - SET_GetTexGeniv(disp, _mesa_GetTexGeniv); - SET_TexGenf(disp, _mesa_TexGenf); - SET_TexGenfv(disp, _mesa_TexGenfv); - SET_TexGeni(disp, _mesa_TexGeni); - SET_TexGeniv(disp, _mesa_TexGeniv); - if (ctx->API == API_OPENGL) { - SET_GetTexGendv(disp, _mesa_GetTexGendv); - SET_TexGend(disp, _mesa_TexGend); - SET_TexGendv(disp, _mesa_TexGendv); - } -} diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h index 03dd49c61..97563a0f0 100644 --- a/mesalib/src/mesa/main/texgen.h +++ b/mesalib/src/mesa/main/texgen.h @@ -34,24 +34,25 @@ struct _glapi_table; -extern void GLAPIENTRY +void GLAPIENTRY _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); - -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ); +void GLAPIENTRY +_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ); +void GLAPIENTRY +_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ); +void GLAPIENTRY _mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param ); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_TexGeni( GLenum coord, GLenum pname, GLint param ); - -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params ); +void GLAPIENTRY _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ); -extern void -_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp); - extern void GLAPIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params); diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index a3720699d..554c68b71 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -892,7 +892,7 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, if (!_mesa_is_bufferobj(ctx->Pack.BufferObj)) { /* do bounds checking on writing to client memory */ - if (clientMemSize < compressedSize) { + if (clientMemSize < (GLsizei) compressedSize) { _mesa_error(ctx, GL_INVALID_OPERATION, "glGetnCompressedTexImageARB(out of bounds access:" " bufSize (%d) is too small)", clientMemSize); diff --git a/mesalib/src/mesa/main/texstorage.c b/mesalib/src/mesa/main/texstorage.c index 283aefad3..968f6f904 100644 --- a/mesalib/src/mesa/main/texstorage.c +++ b/mesalib/src/mesa/main/texstorage.c @@ -292,7 +292,7 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target, /* check levels against width/height/depth */ maxDim = MAX3(width, height, depth); - if (levels > _mesa_logbase2(maxDim) + 1) { + if (levels > (GLint) _mesa_logbase2(maxDim) + 1) { _mesa_error(ctx, GL_INVALID_OPERATION, "glTexStorage%uD(too many levels for max texture dimension)", dims); diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c index 1afc0dccb..52cb065c2 100644 --- a/mesalib/src/mesa/main/transformfeedback.c +++ b/mesalib/src/mesa/main/transformfeedback.c @@ -245,28 +245,6 @@ _mesa_init_transform_feedback_functions(struct dd_function_table *driver) } -void -_mesa_init_transform_feedback_dispatch(const struct gl_context *ctx, - struct _glapi_table *disp) -{ - /* EXT_transform_feedback */ - SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback); - SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback); - if (_mesa_is_desktop_gl(ctx)) { - SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT); - } - SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings); - SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying); - /* ARB_transform_feedback2 */ - SET_BindTransformFeedback(disp, _mesa_BindTransformFeedback); - SET_DeleteTransformFeedbacks(disp, _mesa_DeleteTransformFeedbacks); - SET_GenTransformFeedbacks(disp, _mesa_GenTransformFeedbacks); - SET_IsTransformFeedback(disp, _mesa_IsTransformFeedback); - SET_PauseTransformFeedback(disp, _mesa_PauseTransformFeedback); - SET_ResumeTransformFeedback(disp, _mesa_ResumeTransformFeedback); -} - - /** ** Begin API functions **/ @@ -599,7 +577,7 @@ _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, } /* free existing varyings, if any */ - for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) { + for (i = 0; i < (GLint) shProg->TransformFeedback.NumVarying; i++) { free(shProg->TransformFeedback.VaryingNames[i]); } free(shProg->TransformFeedback.VaryingNames); @@ -614,7 +592,7 @@ _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, } /* Save the new names and the count */ - for (i = 0; i < (GLuint) count; i++) { + for (i = 0; i < count; i++) { shProg->TransformFeedback.VaryingNames[i] = _mesa_strdup(varyings[i]); } shProg->TransformFeedback.NumVarying = count; diff --git a/mesalib/src/mesa/main/transformfeedback.h b/mesalib/src/mesa/main/transformfeedback.h index 6ff9c50b4..dec11ffa0 100644 --- a/mesalib/src/mesa/main/transformfeedback.h +++ b/mesalib/src/mesa/main/transformfeedback.h @@ -46,10 +46,6 @@ _mesa_validate_transform_feedback_buffers(struct gl_context *ctx); extern void _mesa_init_transform_feedback_functions(struct dd_function_table *driver); -extern void -_mesa_init_transform_feedback_dispatch(const struct gl_context *ctx, - struct _glapi_table *disp); - /*** GL_EXT_transform_feedback ***/ diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index 861601efd..2b7a564f0 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/src/mesa/main/uniforms.c @@ -535,7 +535,7 @@ _mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name) return _mesa_uniform_merge_location_offset(index, offset); } -static GLuint GLAPIENTRY +GLuint GLAPIENTRY _mesa_GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName) { @@ -561,7 +561,7 @@ _mesa_GetUniformBlockIndex(GLuint program, return GL_INVALID_INDEX; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar * const *uniformNames, @@ -594,7 +594,7 @@ _mesa_GetUniformIndices(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding) @@ -644,7 +644,7 @@ _mesa_UniformBlockBinding(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, @@ -720,7 +720,7 @@ _mesa_GetActiveUniformBlockiv(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, @@ -762,7 +762,7 @@ _mesa_GetActiveUniformBlockName(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName) @@ -799,80 +799,3 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, shProg->UniformStorage[uniformIndex].name); } } - -/** - * Plug in shader uniform-related functions into API dispatch table. - */ -void -_mesa_init_shader_uniform_dispatch(const struct gl_context *ctx, - struct _glapi_table *exec) -{ -#if FEATURE_GL - if (ctx->API != API_OPENGLES) { - SET_Uniform1fARB(exec, _mesa_Uniform1fARB); - SET_Uniform2fARB(exec, _mesa_Uniform2fARB); - SET_Uniform3fARB(exec, _mesa_Uniform3fARB); - SET_Uniform4fARB(exec, _mesa_Uniform4fARB); - SET_Uniform1iARB(exec, _mesa_Uniform1iARB); - SET_Uniform2iARB(exec, _mesa_Uniform2iARB); - SET_Uniform3iARB(exec, _mesa_Uniform3iARB); - SET_Uniform4iARB(exec, _mesa_Uniform4iARB); - SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB); - SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB); - SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB); - SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB); - SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB); - SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB); - SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB); - SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB); - SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB); - SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB); - SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB); - - SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB); - SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB); - SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB); - SET_GetUniformivARB(exec, _mesa_GetUniformivARB); - } - - /* OpenGL 2.1 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv); - SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv); - SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv); - SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv); - SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv); - SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv); - - /* OpenGL 3.0 */ - SET_Uniform1uiEXT(exec, _mesa_Uniform1ui); - SET_Uniform2uiEXT(exec, _mesa_Uniform2ui); - SET_Uniform3uiEXT(exec, _mesa_Uniform3ui); - SET_Uniform4uiEXT(exec, _mesa_Uniform4ui); - SET_Uniform1uivEXT(exec, _mesa_Uniform1uiv); - SET_Uniform2uivEXT(exec, _mesa_Uniform2uiv); - SET_Uniform3uivEXT(exec, _mesa_Uniform3uiv); - SET_Uniform4uivEXT(exec, _mesa_Uniform4uiv); - SET_GetUniformuivEXT(exec, _mesa_GetUniformuiv); - - /* GL_ARB_uniform_buffer_object / GL 3.1 */ - SET_GetUniformBlockIndex(exec, _mesa_GetUniformBlockIndex); - SET_GetUniformIndices(exec, _mesa_GetUniformIndices); - SET_GetActiveUniformsiv(exec, _mesa_GetActiveUniformsiv); - SET_GetActiveUniformBlockiv(exec, _mesa_GetActiveUniformBlockiv); - SET_GetActiveUniformBlockName(exec, _mesa_GetActiveUniformBlockName); - SET_UniformBlockBinding(exec, _mesa_UniformBlockBinding); - } - - if (_mesa_is_desktop_gl(ctx)) { - /* GL_ARB_robustness */ - SET_GetnUniformfvARB(exec, _mesa_GetnUniformfvARB); - SET_GetnUniformivARB(exec, _mesa_GetnUniformivARB); - SET_GetnUniformuivARB(exec, _mesa_GetnUniformuivARB); - SET_GetnUniformdvARB(exec, _mesa_GetnUniformdvARB); - - /* GL_ARB_uniform_buffer_object / GL 3.1 */ - SET_GetActiveUniformName(exec, _mesa_GetActiveUniformName); - } -#endif /* FEATURE_GL */ -} diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index 3fe7d4402..076bde3c8 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -38,151 +38,135 @@ extern "C" { struct gl_program; struct _glapi_table; -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1fARB(GLint, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2fARB(GLint, GLfloat, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1iARB(GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2iARB(GLint, GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3iARB(GLint, GLint, GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1ui(GLint location, GLuint v0); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value); - - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - - -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); +void GLAPIENTRY +_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *); +void GLAPIENTRY +_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); +void GLAPIENTRY +_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *); +void GLAPIENTRY +_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *); +void GLAPIENTRY +_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params); +void GLAPIENTRY +_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); +void GLAPIENTRY +_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); +GLint GLAPIENTRY +_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *); +GLuint GLAPIENTRY +_mesa_GetUniformBlockIndex(GLuint program, + const GLchar *uniformBlockName); +void GLAPIENTRY +_mesa_GetUniformIndices(GLuint program, + GLsizei uniformCount, + const GLchar * const *uniformNames, + GLuint *uniformIndices); +void GLAPIENTRY +_mesa_UniformBlockBinding(GLuint program, + GLuint uniformBlockIndex, + GLuint uniformBlockBinding); +void GLAPIENTRY +_mesa_GetActiveUniformBlockiv(GLuint program, + GLuint uniformBlockIndex, + GLenum pname, + GLint *params); +void GLAPIENTRY +_mesa_GetActiveUniformBlockName(GLuint program, + GLuint uniformBlockIndex, + GLsizei bufSize, + GLsizei *length, + GLchar *uniformBlockName); +void GLAPIENTRY +_mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, + GLsizei bufSize, GLsizei *length, + GLchar *uniformName); +void GLAPIENTRY _mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); - -extern void GLAPIENTRY -_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *); - -extern void GLAPIENTRY -_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetUniformivARB(GLhandleARB, GLint, GLint *); -extern void GLAPIENTRY -_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); - -extern void GLAPIENTRY -_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *); - -extern void GLAPIENTRY -_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *); - -extern void GLAPIENTRY -_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); - -extern void GLAPIENTRY -_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); - -extern GLint GLAPIENTRY -_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *); - unsigned _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg, const GLchar *name, unsigned *offset); @@ -226,10 +210,6 @@ extern bool _mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg, char *errMsg, size_t errMsgLength); -extern void -_mesa_init_shader_uniform_dispatch(const struct gl_context *ctx, - struct _glapi_table *exec); - extern const struct gl_program_parameter * get_uniform_parameter(struct gl_shader_program *shProg, GLint index); diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index b4b58db6d..cfb24f318 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -9,7 +9,7 @@ MAIN_ES_FILES = \ MAIN_FILES = \ $(SRCDIR)main/api_arrayelt.c \ - $(SRCDIR)main/api_exec.c \ + $(BUILDDIR)main/api_exec.c \ $(SRCDIR)main/api_loopback.c \ $(SRCDIR)main/api_validate.c \ $(SRCDIR)main/accum.c \ diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 882fb372b..adee00bd2 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -750,7 +750,7 @@ st_MapRenderbuffer(struct gl_context *ctx, usage, x, y2, w, h, &strb->transfer); if (map) { if (invert) { - *rowStrideOut = -strb->transfer->stride; + *rowStrideOut = -(int) strb->transfer->stride; map += (h - 1) * strb->transfer->stride; } else { diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 14b72dc80..a70a08bf3 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -285,7 +285,7 @@ public: st_src_reg return_reg; }; -class glsl_to_tgsi_visitor : public ir_visitor { +struct glsl_to_tgsi_visitor : public ir_visitor { public: glsl_to_tgsi_visitor(); ~glsl_to_tgsi_visitor(); diff --git a/mesalib/src/mesa/swrast/s_zoom.c b/mesalib/src/mesa/swrast/s_zoom.c index 24bfa22bf..828374f68 100644 --- a/mesalib/src/mesa/swrast/s_zoom.c +++ b/mesalib/src/mesa/swrast/s_zoom.c @@ -234,7 +234,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span, for (i = 0; i < zoomedWidth; i++) { GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x; ASSERT(j >= 0); - ASSERT(j < span->end); + ASSERT(j < (GLint) span->end); COPY_4V(zoomed.array->attribs[FRAG_ATTRIB_COL0][i], rgba[j]); } } @@ -272,7 +272,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span, for (i = 0; i < zoomedWidth; i++) { GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x; ASSERT(j >= 0); - ASSERT(j < span->end); + ASSERT(j < (GLint) span->end); zoomed.array->attribs[FRAG_ATTRIB_COL0][i][0] = rgb[j][0]; zoomed.array->attribs[FRAG_ATTRIB_COL0][i][1] = rgb[j][1]; zoomed.array->attribs[FRAG_ATTRIB_COL0][i][2] = rgb[j][2]; diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c index 6a3c9662e..0631eb183 100644 --- a/mesalib/src/mesa/tnl/t_draw.c +++ b/mesalib/src/mesa/tnl/t_draw.c @@ -141,7 +141,8 @@ convert_fixed_to_float(const struct gl_client_array *input, const GLubyte *ptr, GLfloat *fptr, GLuint count) { - GLuint i, j; + GLuint i; + GLint j; const GLint size = input->Size; if (input->Normalized) { diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h index e0584973f..04930b971 100644 --- a/mesalib/src/mesa/vbo/vbo.h +++ b/mesalib/src/mesa/vbo/vbo.h @@ -50,7 +50,7 @@ struct _mesa_prim { GLuint start; GLuint count; GLint basevertex; - GLsizei num_instances; + GLuint num_instances; GLuint base_instance; }; diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h index 884844535..6bc53bab3 100644 --- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h +++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h @@ -26,38 +26,46 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ /* float */ -#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 ) -#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 ) -#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 ) -#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define ATTR1FV( A, V ) ATTR( A, 1, GL_FLOAT, (V)[0], 0, 0, 1 ) +#define ATTR2FV( A, V ) ATTR( A, 2, GL_FLOAT, (V)[0], (V)[1], 0, 1 ) +#define ATTR3FV( A, V ) ATTR( A, 3, GL_FLOAT, (V)[0], (V)[1], (V)[2], 1 ) +#define ATTR4FV( A, V ) ATTR( A, 4, GL_FLOAT, (V)[0], (V)[1], (V)[2], (V)[3] ) -#define ATTR1F( A, X ) ATTR( A, 1, X, 0, 0, 1 ) -#define ATTR2F( A, X, Y ) ATTR( A, 2, X, Y, 0, 1 ) -#define ATTR3F( A, X, Y, Z ) ATTR( A, 3, X, Y, Z, 1 ) -#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W ) +#define ATTR1F( A, X ) ATTR( A, 1, GL_FLOAT, X, 0, 0, 1 ) +#define ATTR2F( A, X, Y ) ATTR( A, 2, GL_FLOAT, X, Y, 0, 1 ) +#define ATTR3F( A, X, Y, Z ) ATTR( A, 3, GL_FLOAT, X, Y, Z, 1 ) +#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, GL_FLOAT, X, Y, Z, W ) /* int */ -#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 ) -#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 ) -#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define ATTRI( A, N, X, Y, Z, W) ATTR( A, N, GL_INT, \ + INT_AS_FLT(X), INT_AS_FLT(Y), \ + INT_AS_FLT(Z), INT_AS_FLT(W) ) -#define ATTR1I( A, X ) ATTR( A, 1, X, 0, 0, 1 ) -#define ATTR2I( A, X, Y ) ATTR( A, 2, X, Y, 0, 1 ) -#define ATTR3I( A, X, Y, Z ) ATTR( A, 3, X, Y, Z, 1 ) -#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W ) +#define ATTR2IV( A, V ) ATTRI( A, 2, (V)[0], (V)[1], 0, 1 ) +#define ATTR3IV( A, V ) ATTRI( A, 3, (V)[0], (V)[1], (V)[2], 1 ) +#define ATTR4IV( A, V ) ATTRI( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) + +#define ATTR1I( A, X ) ATTRI( A, 1, X, 0, 0, 1 ) +#define ATTR2I( A, X, Y ) ATTRI( A, 2, X, Y, 0, 1 ) +#define ATTR3I( A, X, Y, Z ) ATTRI( A, 3, X, Y, Z, 1 ) +#define ATTR4I( A, X, Y, Z, W ) ATTRI( A, 4, X, Y, Z, W ) /* uint */ -#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 ) -#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 ) -#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define ATTRUI( A, N, X, Y, Z, W) ATTR( A, N, GL_UNSIGNED_INT, \ + UINT_AS_FLT(X), UINT_AS_FLT(Y), \ + UINT_AS_FLT(Z), UINT_AS_FLT(W) ) + +#define ATTR2UIV( A, V ) ATTRUI( A, 2, (V)[0], (V)[1], 0, 1 ) +#define ATTR3UIV( A, V ) ATTRUI( A, 3, (V)[0], (V)[1], (V)[2], 1 ) +#define ATTR4UIV( A, V ) ATTRUI( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) -#define ATTR1UI( A, X ) ATTR( A, 1, X, 0, 0, 1 ) -#define ATTR2UI( A, X, Y ) ATTR( A, 2, X, Y, 0, 1 ) -#define ATTR3UI( A, X, Y, Z ) ATTR( A, 3, X, Y, Z, 1 ) -#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W ) +#define ATTR1UI( A, X ) ATTRUI( A, 1, X, 0, 0, 1 ) +#define ATTR2UI( A, X, Y ) ATTRUI( A, 2, X, Y, 0, 1 ) +#define ATTR3UI( A, X, Y, Z ) ATTRUI( A, 3, X, Y, Z, 1 ) +#define ATTR4UI( A, X, Y, Z, W ) ATTRUI( A, 4, X, Y, Z, W ) -#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define MAT_ATTR( A, N, V ) ATTR( A, N, GL_FLOAT, (V)[0], (V)[1], (V)[2], (V)[3] ) static inline float conv_ui10_to_norm_float(unsigned ui10) { @@ -69,20 +77,20 @@ static inline float conv_ui2_to_norm_float(unsigned ui2) return ui2 / 3.0f; } -#define ATTRUI10_1( A, UI ) ATTR( A, 1, (UI) & 0x3ff, 0, 0, 1 ) -#define ATTRUI10_2( A, UI ) ATTR( A, 2, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 ) -#define ATTRUI10_3( A, UI ) ATTR( A, 3, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 ) -#define ATTRUI10_4( A, UI ) ATTR( A, 4, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 ) +#define ATTRUI10_1( A, UI ) ATTR( A, 1, GL_FLOAT, (UI) & 0x3ff, 0, 0, 1 ) +#define ATTRUI10_2( A, UI ) ATTR( A, 2, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 ) +#define ATTRUI10_3( A, UI ) ATTR( A, 3, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 ) +#define ATTRUI10_4( A, UI ) ATTR( A, 4, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 ) -#define ATTRUI10N_1( A, UI ) ATTR( A, 1, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 ) -#define ATTRUI10N_2( A, UI ) ATTR( A, 2, \ +#define ATTRUI10N_1( A, UI ) ATTR( A, 1, GL_FLOAT, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 ) +#define ATTRUI10N_2( A, UI ) ATTR( A, 2, GL_FLOAT, \ conv_ui10_to_norm_float((UI) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), 0, 1 ) -#define ATTRUI10N_3( A, UI ) ATTR( A, 3, \ +#define ATTRUI10N_3( A, UI ) ATTR( A, 3, GL_FLOAT, \ conv_ui10_to_norm_float((UI) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), 1 ) -#define ATTRUI10N_4( A, UI ) ATTR( A, 4, \ +#define ATTRUI10N_4( A, UI ) ATTR( A, 4, GL_FLOAT, \ conv_ui10_to_norm_float((UI) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), \ @@ -119,30 +127,30 @@ static inline float conv_i2_to_norm_float(int i2) return (float)val.x; } -#define ATTRI10_1( A, I10 ) ATTR( A, 1, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 ) -#define ATTRI10_2( A, I10 ) ATTR( A, 2, \ +#define ATTRI10_1( A, I10 ) ATTR( A, 1, GL_FLOAT, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 ) +#define ATTRI10_2( A, I10 ) ATTR( A, 2, GL_FLOAT, \ conv_i10_to_i((I10) & 0x3ff), \ conv_i10_to_i(((I10) >> 10) & 0x3ff), 0, 1 ) -#define ATTRI10_3( A, I10 ) ATTR( A, 3, \ +#define ATTRI10_3( A, I10 ) ATTR( A, 3, GL_FLOAT, \ conv_i10_to_i((I10) & 0x3ff), \ conv_i10_to_i(((I10) >> 10) & 0x3ff), \ conv_i10_to_i(((I10) >> 20) & 0x3ff), 1 ) -#define ATTRI10_4( A, I10 ) ATTR( A, 4, \ +#define ATTRI10_4( A, I10 ) ATTR( A, 4, GL_FLOAT, \ conv_i10_to_i((I10) & 0x3ff), \ conv_i10_to_i(((I10) >> 10) & 0x3ff), \ conv_i10_to_i(((I10) >> 20) & 0x3ff), \ conv_i2_to_i(((I10) >> 30) & 0x3)) -#define ATTRI10N_1( A, I10 ) ATTR( A, 1, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 ) -#define ATTRI10N_2( A, I10 ) ATTR( A, 2, \ +#define ATTRI10N_1( A, I10 ) ATTR( A, 1, GL_FLOAT, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 ) +#define ATTRI10N_2( A, I10 ) ATTR( A, 2, GL_FLOAT, \ conv_i10_to_norm_float((I10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), 0, 1 ) -#define ATTRI10N_3( A, I10 ) ATTR( A, 3, \ +#define ATTRI10N_3( A, I10 ) ATTR( A, 3, GL_FLOAT, \ conv_i10_to_norm_float((I10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), 1 ) -#define ATTRI10N_4( A, I10 ) ATTR( A, 4, \ +#define ATTRI10N_4( A, I10 ) ATTR( A, 4, GL_FLOAT, \ conv_i10_to_norm_float((I10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), \ diff --git a/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h index c896f1196..1ff6ec000 100644 --- a/mesalib/src/mesa/vbo/vbo_context.h +++ b/mesalib/src/mesa/vbo/vbo_context.h @@ -147,4 +147,47 @@ vbo_draw_method(struct vbo_context *vbo, enum draw_method method) } } +/** + * Return if format is integer. The immediate mode commands only emit floats + * for non-integer types, thus everything else is integer. + */ +static inline GLboolean +vbo_attrtype_to_integer_flag(GLenum format) +{ + switch (format) { + case GL_FLOAT: + return GL_FALSE; + case GL_INT: + case GL_UNSIGNED_INT: + return GL_TRUE; + default: + ASSERT(0); + return GL_FALSE; + } +} + + +/** + * Return default component values for the given format. + * The return type is an array of floats, because that's how we declare + * the vertex storage despite the fact we sometimes store integers in there. + */ +static inline const GLfloat * +vbo_get_default_vals_as_float(GLenum format) +{ + static const GLfloat default_float[4] = { 0, 0, 0, 1 }; + static const GLint default_int[4] = { 0, 0, 0, 1 }; + + switch (format) { + case GL_FLOAT: + return default_float; + case GL_INT: + case GL_UNSIGNED_INT: + return (const GLfloat*)default_int; + default: + ASSERT(0); + return NULL; + } +} + #endif diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h index ef57a8199..96cf4c82b 100644 --- a/mesalib/src/mesa/vbo/vbo_exec.h +++ b/mesalib/src/mesa/vbo/vbo_exec.h @@ -101,6 +101,7 @@ struct vbo_exec_context struct vbo_exec_copied_vtx copied; GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLubyte active_sz[VBO_ATTRIB_MAX]; GLfloat *attrptr[VBO_ATTRIB_MAX]; diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index 2ddb71588..75e549fc4 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -157,11 +157,13 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec ) GLfloat *current = (GLfloat *)vbo->currval[i].Ptr; GLfloat tmp[4]; - COPY_CLEAN_4V(tmp, - exec->vtx.attrsz[i], - exec->vtx.attrptr[i]); + COPY_CLEAN_4V_TYPE_AS_FLOAT(tmp, + exec->vtx.attrsz[i], + exec->vtx.attrptr[i], + exec->vtx.attrtype[i]); - if (memcmp(current, tmp, sizeof(tmp)) != 0) { + if (exec->vtx.attrtype[i] != vbo->currval[i].Type || + memcmp(current, tmp, sizeof(tmp)) != 0) { memcpy(current, tmp, sizeof(tmp)); /* Given that we explicitly state size here, there is no need @@ -170,8 +172,10 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec ) * directly. */ vbo->currval[i].Size = exec->vtx.attrsz[i]; - assert(vbo->currval[i].Type == GL_FLOAT); vbo->currval[i]._ElementSize = vbo->currval[i].Size * sizeof(GLfloat); + vbo->currval[i].Type = exec->vtx.attrtype[i]; + vbo->currval[i].Integer = + vbo_attrtype_to_integer_flag(exec->vtx.attrtype[i]); /* This triggers rather too much recalculation of Mesa state * that doesn't get used (eg light positions). @@ -324,7 +328,9 @@ vbo_exec_wrap_upgrade_vertex(struct vbo_exec_context *exec, if (j == attr) { if (oldSize) { GLfloat tmp[4]; - COPY_CLEAN_4V(tmp, oldSize, data + old_offset); + COPY_CLEAN_4V_TYPE_AS_FLOAT(tmp, oldSize, + data + old_offset, + exec->vtx.attrtype[j]); COPY_SZ_4V(dest + new_offset, newSize, tmp); } else { GLfloat *current = (GLfloat *)vbo->currval[j].Ptr; @@ -365,8 +371,9 @@ vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint newSize) vbo_exec_wrap_upgrade_vertex( exec, attr, newSize ); } else if (newSize < exec->vtx.active_sz[attr]) { - static const GLfloat id[4] = { 0, 0, 0, 1 }; GLuint i; + const GLfloat *id = + vbo_get_default_vals_as_float(exec->vtx.attrtype[attr]); /* New size is smaller - just need to fill in some * zeros. Don't need to flush or wrap. @@ -390,7 +397,7 @@ vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint newSize) * This macro is used to implement all the glVertex, glColor, glTexCoord, * glVertexAttrib, etc functions. */ -#define ATTR( A, N, V0, V1, V2, V3 ) \ +#define ATTR( A, N, T, V0, V1, V2, V3 ) \ do { \ struct vbo_exec_context *exec = &vbo_context(ctx)->exec; \ \ @@ -406,6 +413,7 @@ do { \ if (N>1) dest[1] = V1; \ if (N>2) dest[2] = V2; \ if (N>3) dest[3] = V3; \ + exec->vtx.attrtype[A] = T; \ } \ \ if ((A) == 0) { \ @@ -1119,6 +1127,8 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec ) for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) { ASSERT(i < Elements(exec->vtx.attrsz)); exec->vtx.attrsz[i] = 0; + ASSERT(i < Elements(exec->vtx.attrtype)); + exec->vtx.attrtype[i] = GL_FLOAT; ASSERT(i < Elements(exec->vtx.active_sz)); exec->vtx.active_sz[i] = 0; } @@ -1255,6 +1265,7 @@ static void reset_attrfv( struct vbo_exec_context *exec ) for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) { exec->vtx.attrsz[i] = 0; + exec->vtx.attrtype[i] = GL_FLOAT; exec->vtx.active_sz[i] = 0; } @@ -1309,7 +1320,7 @@ VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); if (index < MAX_VERTEX_GENERIC_ATTRIBS) - ATTR(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w); + ATTR(VBO_ATTRIB_GENERIC0 + index, 4, GL_FLOAT, x, y, z, w); else ERROR(GL_INVALID_VALUE); } diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c index d857ac3e5..4b2c5298d 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_array.c +++ b/mesalib/src/mesa/vbo/vbo_exec_array.c @@ -779,7 +779,7 @@ vbo_validated_drawrangeelements(struct gl_context *ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, - GLint basevertex, GLint numInstances, + GLint basevertex, GLuint numInstances, GLuint baseInstance) { struct vbo_context *vbo = vbo_context(ctx); diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c index 817af4dd5..9529ce069 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_draw.c +++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c @@ -207,9 +207,6 @@ vbo_exec_bind_arrays( struct gl_context *ctx ) assert(0); } - /* Make all active attributes (including edgeflag) available as - * arrays of floats. - */ for (attr = 0; attr < VERT_ATTRIB_MAX ; attr++) { const GLuint src = map[attr]; @@ -235,7 +232,9 @@ vbo_exec_bind_arrays( struct gl_context *ctx ) arrays[attr].Size = exec->vtx.attrsz[src]; arrays[attr].StrideB = exec->vtx.vertex_size * sizeof(GLfloat); arrays[attr].Stride = exec->vtx.vertex_size * sizeof(GLfloat); - arrays[attr].Type = GL_FLOAT; + arrays[attr].Type = exec->vtx.attrtype[src]; + arrays[attr].Integer = + vbo_attrtype_to_integer_flag(exec->vtx.attrtype[src]); arrays[attr].Format = GL_RGBA; arrays[attr].Enabled = 1; arrays[attr]._ElementSize = arrays[attr].Size * sizeof(GLfloat); diff --git a/mesalib/src/mesa/vbo/vbo_save.h b/mesalib/src/mesa/vbo/vbo_save.h index f33669670..750117b12 100644 --- a/mesalib/src/mesa/vbo/vbo_save.h +++ b/mesalib/src/mesa/vbo/vbo_save.h @@ -63,6 +63,7 @@ struct vbo_save_copied_vtx { */ struct vbo_save_vertex_list { GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLuint vertex_size; /* Copy of the final vertex from node->vertex_store->bufferobj. @@ -127,6 +128,7 @@ struct vbo_save_context { const struct gl_client_array *inputs[VBO_ATTRIB_MAX]; GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLubyte active_sz[VBO_ATTRIB_MAX]; GLuint vertex_size; diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c index 89f09a8d8..75b8ca338 100644 --- a/mesalib/src/mesa/vbo/vbo_save_api.c +++ b/mesalib/src/mesa/vbo/vbo_save_api.c @@ -324,6 +324,7 @@ _save_compile_vertex_list(struct gl_context *ctx) /* Duplicate our template, increment refcounts to the storage structs: */ memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz)); + memcpy(node->attrtype, save->attrtype, sizeof(node->attrtype)); node->vertex_size = save->vertex_size; node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); @@ -510,7 +511,8 @@ _save_copy_to_current(struct gl_context *ctx) for (i = VBO_ATTRIB_POS + 1; i < VBO_ATTRIB_MAX; i++) { if (save->attrsz[i]) { save->currentsz[i][0] = save->attrsz[i]; - COPY_CLEAN_4V(save->current[i], save->attrsz[i], save->attrptr[i]); + COPY_CLEAN_4V_TYPE_AS_FLOAT(save->current[i], save->attrsz[i], + save->attrptr[i], save->attrtype[i]); } } } @@ -612,7 +614,8 @@ _save_upgrade_vertex(struct gl_context *ctx, GLuint attr, GLuint newsz) if (save->attrsz[j]) { if (j == attr) { if (oldsz) { - COPY_CLEAN_4V(dest, oldsz, data); + COPY_CLEAN_4V_TYPE_AS_FLOAT(dest, oldsz, data, + save->attrtype[j]); data += oldsz; dest += newsz; } @@ -649,8 +652,8 @@ save_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint sz) _save_upgrade_vertex(ctx, attr, sz); } else if (sz < save->active_sz[attr]) { - static GLfloat id[4] = { 0, 0, 0, 1 }; GLuint i; + const GLfloat *id = vbo_get_default_vals_as_float(save->attrtype[attr]); /* New size is equal or smaller - just need to fill in some * zeros. @@ -688,7 +691,7 @@ _save_reset_vertex(struct gl_context *ctx) * 3f version won't otherwise set color[3] to 1.0 -- this is the job * of the chooser function when switching between Color4f and Color3f. */ -#define ATTR(A, N, V0, V1, V2, V3) \ +#define ATTR(A, N, T, V0, V1, V2, V3) \ do { \ struct vbo_save_context *save = &vbo_context(ctx)->save; \ \ @@ -701,6 +704,7 @@ do { \ if (N>1) dest[1] = V1; \ if (N>2) dest[2] = V2; \ if (N>3) dest[3] = V3; \ + save->attrtype[A] = T; \ } \ \ if ((A) == 0) { \ diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c index 09b8b8ab2..efb386e5c 100644 --- a/mesalib/src/mesa/vbo/vbo_save_draw.c +++ b/mesalib/src/mesa/vbo/vbo_save_draw.c @@ -79,16 +79,20 @@ _playback_copy_to_current(struct gl_context *ctx, GLfloat *current = (GLfloat *)vbo->currval[i].Ptr; GLfloat tmp[4]; - COPY_CLEAN_4V(tmp, - node->attrsz[i], - data); + COPY_CLEAN_4V_TYPE_AS_FLOAT(tmp, + node->attrsz[i], + data, + node->attrtype[i]); - if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) { + if (node->attrtype[i] != vbo->currval[i].Type || + memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) { memcpy(current, tmp, 4 * sizeof(GLfloat)); vbo->currval[i].Size = node->attrsz[i]; - assert(vbo->currval[i].Type == GL_FLOAT); vbo->currval[i]._ElementSize = vbo->currval[i].Size * sizeof(GLfloat); + vbo->currval[i].Type = node->attrtype[i]; + vbo->currval[i].Integer = + vbo_attrtype_to_integer_flag(node->attrtype[i]); if (i >= VBO_ATTRIB_FIRST_MATERIAL && i <= VBO_ATTRIB_LAST_MATERIAL) @@ -134,9 +138,11 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, const GLuint *map; GLuint attr; GLubyte node_attrsz[VBO_ATTRIB_MAX]; /* copy of node->attrsz[] */ + GLenum node_attrtype[VBO_ATTRIB_MAX]; /* copy of node->attrtype[] */ GLbitfield64 varying_inputs = 0x0; memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz)); + memcpy(node_attrtype, node->attrtype, sizeof(node->attrtype)); /* Install the default (ie Current) attributes first, then overlay * all active ones. @@ -170,6 +176,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) { save->inputs[VERT_ATTRIB_GENERIC0] = save->inputs[0]; node_attrsz[VERT_ATTRIB_GENERIC0] = node_attrsz[0]; + node_attrtype[VERT_ATTRIB_GENERIC0] = node_attrtype[0]; node_attrsz[0] = 0; } break; @@ -188,7 +195,9 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, arrays[attr].Size = node_attrsz[src]; arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat); arrays[attr].Stride = node->vertex_size * sizeof(GLfloat); - arrays[attr].Type = GL_FLOAT; + arrays[attr].Type = node_attrtype[src]; + arrays[attr].Integer = + vbo_attrtype_to_integer_flag(node_attrtype[src]); arrays[attr].Format = GL_RGBA; arrays[attr].Enabled = 1; arrays[attr]._ElementSize = arrays[attr].Size * sizeof(GLfloat); diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 0511d3c10..4f592b660 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -45,19 +45,23 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\dispatch.h \
..\..\..\src\mesa\main\glapitable.h \
..\..\..\src\mesa\main\enums.c \
+ ..\..\..\src\mesa\main\api_exec.c \
..\..\..\src\mesa\main\get_hash.h
all: Release\swrast_dri.dll Debug\swrast_dri.dll
..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
- cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -m remap_table > ..\..\..\mesa\main\dispatch.h
+ cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h
..\..\..\src\mesa\main\glapitable.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
- cd ..\..\..\src\mapi\glapi\gen & python gl_table.py > ..\..\..\mesa\main\glapitable.h
+ cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml > ..\..\..\mesa\main\glapitable.h
..\..\..\src\mesa\main\enums.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
cd ..\..\..\src\mapi\glapi\gen & python gl_enums.py -f gl_and_es_API.xml > ..\..\..\mesa\main\enums.c
+..\..\..\src\mesa\main\api_exec.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
+ cd ..\..\..\src\mapi\glapi\gen & python gl_genexec.py -f gl_and_es_API.xml > ..\..\..\mesa\main\api_exec.c
+
API_DEFINES=-DFEATURE_GL=1
GET_HASH_GEN = ..\..\..\src\mesa\main\get_hash_generator.py
GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, $(patsubst -DFEATURE_%=0,,$(API_DEFINES)))
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index f9b8adbbd..59bed9019 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -193,7 +193,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\errors.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 0105596e4..2010982ca 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -698,6 +698,12 @@ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|