mesa: remove all GL func forward declarations because they are autogenerated
authorMarek Olšák <marek.olsak@amd.com>
Tue, 7 Dec 2021 21:48:11 +0000 (16:48 -0500)
committerMarek Olšák <marek.olsak@amd.com>
Tue, 14 Dec 2021 17:28:58 +0000 (12:28 -0500)
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14000>

171 files changed:
src/mesa/main/accum.c
src/mesa/main/accum.h
src/mesa/main/api_arrayelt.c
src/mesa/main/api_arrayelt.h
src/mesa/main/arbprogram.c
src/mesa/main/arbprogram.h [deleted file]
src/mesa/main/arrayobj.c
src/mesa/main/arrayobj.h
src/mesa/main/atifragshader.c
src/mesa/main/atifragshader.h
src/mesa/main/attrib.c
src/mesa/main/attrib.h
src/mesa/main/barrier.c
src/mesa/main/barrier.h [deleted file]
src/mesa/main/bbox.c
src/mesa/main/bbox.h
src/mesa/main/blend.c
src/mesa/main/blend.h
src/mesa/main/blit.c
src/mesa/main/blit.h
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/buffers.h
src/mesa/main/clear.c
src/mesa/main/clear.h [deleted file]
src/mesa/main/clip.c
src/mesa/main/clip.h
src/mesa/main/colortab.c
src/mesa/main/colortab.h [deleted file]
src/mesa/main/compute.c
src/mesa/main/compute.h [deleted file]
src/mesa/main/condrender.c
src/mesa/main/condrender.h
src/mesa/main/conservativeraster.c
src/mesa/main/conservativeraster.h
src/mesa/main/context.c
src/mesa/main/context.h
src/mesa/main/convolve.c
src/mesa/main/convolve.h [deleted file]
src/mesa/main/copyimage.c
src/mesa/main/copyimage.h [deleted file]
src/mesa/main/debug.c
src/mesa/main/debug_output.c
src/mesa/main/debug_output.h
src/mesa/main/depth.c
src/mesa/main/depth.h
src/mesa/main/dlist.c
src/mesa/main/dlist.h
src/mesa/main/draw.c
src/mesa/main/draw.h
src/mesa/main/drawpix.c
src/mesa/main/drawpix.h [deleted file]
src/mesa/main/drawtex.c
src/mesa/main/drawtex.h [deleted file]
src/mesa/main/enable.c
src/mesa/main/enable.h
src/mesa/main/errors.c
src/mesa/main/errors.h
src/mesa/main/es1_conversion.c
src/mesa/main/es1_conversion.h [deleted file]
src/mesa/main/eval.c
src/mesa/main/eval.h
src/mesa/main/externalobjects.c
src/mesa/main/externalobjects.h
src/mesa/main/fbobject.c
src/mesa/main/fbobject.h
src/mesa/main/feedback.c
src/mesa/main/feedback.h
src/mesa/main/fog.c
src/mesa/main/fog.h
src/mesa/main/formatquery.c
src/mesa/main/formatquery.h
src/mesa/main/genmipmap.c
src/mesa/main/genmipmap.h
src/mesa/main/get.c
src/mesa/main/get.h
src/mesa/main/getstring.c
src/mesa/main/glspirv.c
src/mesa/main/glspirv.h
src/mesa/main/glthread_shaderobj.c
src/mesa/main/hint.c
src/mesa/main/hint.h
src/mesa/main/histogram.c
src/mesa/main/histogram.h [deleted file]
src/mesa/main/light.c
src/mesa/main/light.h
src/mesa/main/lines.c
src/mesa/main/lines.h
src/mesa/main/matrix.c
src/mesa/main/matrix.h
src/mesa/main/multisample.c
src/mesa/main/multisample.h
src/mesa/main/objectlabel.c
src/mesa/main/objectlabel.h [deleted file]
src/mesa/main/objectpurge.c
src/mesa/main/objectpurge.h [deleted file]
src/mesa/main/performance_monitor.c
src/mesa/main/performance_monitor.h
src/mesa/main/performance_query.c
src/mesa/main/performance_query.h
src/mesa/main/pipelineobj.c
src/mesa/main/pipelineobj.h
src/mesa/main/pixel.c
src/mesa/main/pixel.h
src/mesa/main/pixelstore.c
src/mesa/main/pixelstore.h
src/mesa/main/points.c
src/mesa/main/points.h
src/mesa/main/polygon.c
src/mesa/main/polygon.h
src/mesa/main/program_resource.c
src/mesa/main/program_resource.h [deleted file]
src/mesa/main/querymatrix.c
src/mesa/main/querymatrix.h [deleted file]
src/mesa/main/queryobj.c
src/mesa/main/queryobj.h
src/mesa/main/rastpos.c
src/mesa/main/rastpos.h
src/mesa/main/readpix.c
src/mesa/main/readpix.h
src/mesa/main/robustness.c
src/mesa/main/samplerobj.c
src/mesa/main/samplerobj.h
src/mesa/main/scissor.c
src/mesa/main/scissor.h
src/mesa/main/shader_query.cpp
src/mesa/main/shaderapi.c
src/mesa/main/shaderapi.h
src/mesa/main/shaderimage.c
src/mesa/main/shaderimage.h
src/mesa/main/stencil.c
src/mesa/main/stencil.h
src/mesa/main/syncobj.c
src/mesa/main/syncobj.h
src/mesa/main/texcompress_cpal.c
src/mesa/main/texenv.c
src/mesa/main/texenv.h [deleted file]
src/mesa/main/texgen.c
src/mesa/main/texgen.h [deleted file]
src/mesa/main/texgetimage.c
src/mesa/main/texgetimage.h
src/mesa/main/teximage.c
src/mesa/main/teximage.h
src/mesa/main/texobj.c
src/mesa/main/texobj.h
src/mesa/main/texparam.c
src/mesa/main/texparam.h
src/mesa/main/texstate.c
src/mesa/main/texstate.h
src/mesa/main/texstorage.c
src/mesa/main/texstorage.h
src/mesa/main/texturebindless.c
src/mesa/main/texturebindless.h
src/mesa/main/textureview.c
src/mesa/main/textureview.h
src/mesa/main/transformfeedback.c
src/mesa/main/transformfeedback.h
src/mesa/main/uniforms.c
src/mesa/main/uniforms.h
src/mesa/main/varray.c
src/mesa/main/varray.h
src/mesa/main/vdpau.c
src/mesa/main/vdpau.h [deleted file]
src/mesa/main/viewport.c
src/mesa/main/viewport.h
src/mesa/meson.build
src/mesa/state_tracker/st_copytex.c
src/mesa/vbo/vbo.h
src/mesa/vbo/vbo_noop.c
src/mesa/vbo/vbo_save_api.c

index ac06603..32ff132 100644 (file)
@@ -33,6 +33,7 @@
 #include "macros.h"
 #include "state.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_fbo.h"
 
index fe253a2..b5c83ef 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-void GLAPIENTRY
-_mesa_Accum( GLenum op, GLfloat value );
-
 extern void
 _mesa_clear_accum_buffer(struct gl_context *ctx);
 
index b2d7d3e..2f0c388 100644 (file)
@@ -44,6 +44,7 @@
 #include "mtypes.h"
 #include "main/dispatch.h"
 #include "varray.h"
+#include "api_exec_decl.h"
 
 typedef void (GLAPIENTRY *attrib_func)( GLuint indx, const void *data );
 
index a86eac5..41f72a2 100644 (file)
@@ -33,6 +33,5 @@
 struct _glapi_table;
 
 extern void _mesa_array_element(struct gl_context *ctx, GLint elt);
-extern void GLAPIENTRY _mesa_ArrayElement( GLint elt );
 
 #endif /* API_ARRAYELT_H */
index c39a1f1..be42cea 100644 (file)
 
 #include "main/macros.h"
 #include "main/mtypes.h"
-#include "main/arbprogram.h"
 #include "main/shaderapi.h"
 #include "main/state.h"
 #include "program/arbprogparse.h"
 #include "program/program.h"
 #include "program/prog_print.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_program.h"
 
diff --git a/src/mesa/main/arbprogram.h b/src/mesa/main/arbprogram.h
deleted file mode 100644 (file)
index d7fa15b..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2006  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
- * 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.
- */
-
-
-#ifndef ARBPROGRAM_H
-#define ARBPROGRAM_H
-
-
-#include "glheader.h"
-
-
-extern void GLAPIENTRY
-_mesa_BindProgramARB(GLenum target, GLuint id);
-
-extern void GLAPIENTRY
-_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids);
-
-extern void GLAPIENTRY
-_mesa_GenProgramsARB(GLsizei n, GLuint *ids);
-
-
-extern GLboolean GLAPIENTRY
-_mesa_IsProgramARB(GLuint id);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
-                       const GLvoid *string);
-
-extern void GLAPIENTRY
-_mesa_NamedProgramStringEXT(GLuint program, GLenum target, GLenum format,
-                            GLsizei len, const GLvoid *string);
-
-extern void GLAPIENTRY
-_mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
-                               GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
-                                const GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
-                               GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
-                                const GLfloat *params);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
-                                const GLfloat *params);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index,
-                                 GLdouble x, GLdouble y,
-                                 GLdouble z, GLdouble w);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
-                                  const GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
-                                 GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-
-extern void GLAPIENTRY
-_mesa_NamedProgramLocalParameter4fvEXT(GLuint program, GLenum target,
-                                       GLuint index, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_NamedProgramLocalParameter4dEXT(GLuint program, GLenum target,
-                                       GLuint index, GLdouble x, GLdouble y,
-                                       GLdouble z, GLdouble w);
-
-extern void GLAPIENTRY
-_mesa_NamedProgramLocalParameter4dvEXT(GLuint program, GLenum target,
-                                       GLuint index, const GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_NamedProgramLocalParameter4fEXT(GLuint program, GLenum target,
-                                       GLuint index, GLfloat x, GLfloat y,
-                                       GLfloat z, GLfloat w);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
-                                  const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_ProgramLocalParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
-                                  const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_NamedProgramLocalParameters4fvEXT(GLuint program, GLenum target, GLuint index,
-                                        GLsizei count, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
-                                  GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, 
-                                  GLfloat *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
-                                    GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetNamedProgramLocalParameterdvEXT(GLuint program, GLenum target,
-                                         GLuint index, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index,
-                                    GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetNamedProgramLocalParameterfvEXT(GLuint program, GLenum target,
-                                         GLuint index, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetNamedProgramivEXT(GLuint program, GLenum target, GLenum pname,
-                           GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string);
-
-extern void GLAPIENTRY
-_mesa_GetNamedProgramStringEXT(GLuint program, GLenum target,
-                               GLenum pname, GLvoid *string);
-
-#endif
index 7bd6256..df2a790 100644 (file)
@@ -56,6 +56,7 @@
 #include "util/u_atomic.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_bufferobjects.h"
 
index 5267820..80e24ca 100644 (file)
@@ -343,40 +343,6 @@ _mesa_draw_edge_flag_array_enabled(const struct gl_context *ctx)
 }
 
 
-/*
- * API functions
- */
-
-
-void GLAPIENTRY
-_mesa_BindVertexArray_no_error(GLuint id);
-
-void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
-
-void GLAPIENTRY
-_mesa_DeleteVertexArrays_no_error(GLsizei n, const GLuint *ids);
-
-void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
-
-void GLAPIENTRY
-_mesa_GenVertexArrays_no_error(GLsizei n, GLuint *arrays);
-
-void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
-
-void GLAPIENTRY
-_mesa_CreateVertexArrays_no_error(GLsizei n, GLuint *arrays);
-
-void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays);
-
-GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
-
-void GLAPIENTRY
-_mesa_VertexArrayElementBuffer_no_error(GLuint vaobj, GLuint buffer);
-
-void GLAPIENTRY _mesa_VertexArrayElementBuffer(GLuint vaobj, GLuint buffer);
-
-void GLAPIENTRY _mesa_GetVertexArrayiv(GLuint vaobj, GLenum pname, GLint *param);
-
 #ifdef __cplusplus
 }
 #endif
index e5d23f0..7bbddcb 100644 (file)
@@ -32,6 +32,7 @@
 #include "program/program.h"
 #include "program/prog_instruction.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_program.h"
 
index 0e32795..5eff6a7 100644 (file)
@@ -69,58 +69,4 @@ extern void
 _mesa_delete_ati_fragment_shader(struct gl_context *ctx,
                                  struct ati_fragment_shader *s);
 
-
-extern GLuint GLAPIENTRY _mesa_GenFragmentShadersATI(GLuint range);
-
-extern void GLAPIENTRY _mesa_BindFragmentShaderATI(GLuint id);
-
-extern void GLAPIENTRY _mesa_DeleteFragmentShaderATI(GLuint id);
-
-extern void GLAPIENTRY _mesa_BeginFragmentShaderATI(void);
-
-extern void GLAPIENTRY _mesa_EndFragmentShaderATI(void);
-
-extern void GLAPIENTRY
-_mesa_PassTexCoordATI(GLuint dst, GLuint coord, GLenum swizzle);
-
-extern void GLAPIENTRY
-_mesa_SampleMapATI(GLuint dst, GLuint interp, GLenum swizzle);
-
-extern void GLAPIENTRY
-_mesa_ColorFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMask,
-                         GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-                         GLuint arg1Mod);
-
-extern void GLAPIENTRY
-_mesa_ColorFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMask,
-                         GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-                         GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,
-                         GLuint arg2Mod);
-
-extern void GLAPIENTRY
-_mesa_ColorFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMask,
-                         GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-                         GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,
-                         GLuint arg2Mod, GLuint arg3, GLuint arg3Rep,
-                         GLuint arg3Mod);
-
-extern void GLAPIENTRY
-_mesa_AlphaFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-                         GLuint arg1Rep, GLuint arg1Mod);
-
-extern void GLAPIENTRY
-_mesa_AlphaFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-                         GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-                         GLuint arg2Rep, GLuint arg2Mod);
-
-extern void GLAPIENTRY
-_mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-                         GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-                         GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,
-                         GLuint arg3Rep, GLuint arg3Mod);
-
-extern void GLAPIENTRY
-_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
-
-
 #endif /* ATIFRAGSHADER_H */
index 0c147b2..6c93ef2 100644 (file)
@@ -31,7 +31,6 @@
 #include "blend.h"
 #include "buffers.h"
 #include "bufferobj.h"
-#include "clear.h"
 #include "context.h"
 #include "depth.h"
 #include "enable.h"
@@ -49,8 +48,6 @@
 #include "shared.h"
 #include "scissor.h"
 #include "stencil.h"
-#include "texenv.h"
-#include "texgen.h"
 #include "texobj.h"
 #include "texparam.h"
 #include "texstate.h"
@@ -61,6 +58,7 @@
 #include "hash.h"
 #include <stdbool.h>
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_cb_viewport.h"
index 9095130..61b5975 100644 (file)
 struct _glapi_table;
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_PushAttrib( GLbitfield mask );
-
-extern void GLAPIENTRY
-_mesa_PopAttrib( void );
-
-extern void GLAPIENTRY
-_mesa_PushClientAttrib( GLbitfield mask );
-
-extern void GLAPIENTRY
-_mesa_PopClientAttrib( void );
-
-extern void GLAPIENTRY
-_mesa_ClientAttribDefaultEXT( GLbitfield mask );
-
-extern void GLAPIENTRY
-_mesa_PushClientAttribDefaultEXT( GLbitfield mask );
-
 extern void 
 _mesa_init_attrib( struct gl_context *ctx );
 
index 39e8d6e..5b49b03 100644 (file)
@@ -29,7 +29,7 @@
  */
 
 #include "context.h"
-#include "barrier.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texturebarrier.h"
 
diff --git a/src/mesa/main/barrier.h b/src/mesa/main/barrier.h
deleted file mode 100644 (file)
index a3becae..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2011 Marek Olšák <maraeo@gmail.com>
- *
- * 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.
- */
-
-/**
- * \file barrier.h
- * GL_NV_texture_barrier and friends.
- *
- * \author Marek Olšák <maraeo@gmail.com>
- */
-
-#ifndef BARRIER_H
-#define BARRIER_H
-
-#include "glheader.h"
-
-struct dd_function_table;
-
-extern void GLAPIENTRY
-_mesa_TextureBarrierNV(void);
-
-void GLAPIENTRY
-_mesa_MemoryBarrier(GLbitfield barriers);
-
-void GLAPIENTRY
-_mesa_MemoryBarrierByRegion_no_error(GLbitfield barriers);
-
-void GLAPIENTRY
-_mesa_MemoryBarrierByRegion(GLbitfield barriers);
-
-void GLAPIENTRY
-_mesa_BlendBarrier(void);
-
-void GLAPIENTRY
-_mesa_FramebufferFetchBarrierEXT(void);
-
-#endif /* BARRIER_H */
index 2184330..72fce30 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "bbox.h"
 #include "context.h"
+#include "api_exec_decl.h"
 
 void GLAPIENTRY
 _mesa_PrimitiveBoundingBox(
index d00f87e..84b9313 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_PrimitiveBoundingBox(
-      GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW,
-      GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-
 extern void
 _mesa_init_bbox(struct gl_context *ctx);
 
index 8274c69..8d85ef0 100644 (file)
@@ -37,6 +37,7 @@
 #include "macros.h"
 #include "mtypes.h"
 #include "state.h"
+#include "api_exec_decl.h"
 
 
 
index a7db98e..0bf670b 100644 (file)
 struct gl_context;
 struct gl_framebuffer;
 
-
-extern void GLAPIENTRY
-_mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
-
-extern void GLAPIENTRY
-_mesa_BlendFunc_no_error(GLenum sfactor, GLenum dfactor);
-
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
-                            GLenum sfactorA, GLenum dfactorA );
-
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparate_no_error(GLenum sfactorRGB, GLenum dfactorRGB,
-                                 GLenum sfactorA, GLenum dfactorA);
-
-extern void GLAPIENTRY
-_mesa_BlendFunciARB_no_error(GLuint buf, GLenum sfactor, GLenum dfactor);
-extern void GLAPIENTRY
-_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor);
-
-
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparateiARB_no_error(GLuint buf, GLenum sfactorRGB,
-                                     GLenum dfactorRGB, GLenum sfactorA,
-                                     GLenum dfactorA);
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
-                         GLenum sfactorA, GLenum dfactorA);
-
-
-extern void GLAPIENTRY
-_mesa_BlendEquation( GLenum mode );
-
-
-void GLAPIENTRY
-_mesa_BlendEquationiARB_no_error(GLuint buf, GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_BlendEquationiARB(GLuint buf, GLenum mode);
-
-
-void GLAPIENTRY
-_mesa_BlendEquationSeparate_no_error(GLenum modeRGB, GLenum modeA);
-
-extern void GLAPIENTRY
-_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA );
-
-
-extern void GLAPIENTRY
-_mesa_BlendEquationSeparateiARB_no_error(GLuint buf, GLenum modeRGB,
-                                         GLenum modeA);
-extern void GLAPIENTRY
-_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA);
-
-
-extern void GLAPIENTRY
-_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-
-
-extern void GLAPIENTRY
-_mesa_AlphaFunc( GLenum func, GLclampf ref );
-
-
-extern void GLAPIENTRY
-_mesa_LogicOp( GLenum opcode );
-
-
-extern void GLAPIENTRY
-_mesa_LogicOp_no_error(GLenum opcode);
-
-
-extern void GLAPIENTRY
-_mesa_IndexMask( GLuint mask );
-
-extern void GLAPIENTRY
-_mesa_ColorMask( GLboolean red, GLboolean green,
-                 GLboolean blue, GLboolean alpha );
-
-extern void GLAPIENTRY
-_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
-                        GLboolean blue, GLboolean alpha );
-
-
-extern void GLAPIENTRY
-_mesa_ClampColor(GLenum target, GLenum clamp);
-
 extern GLboolean
 _mesa_get_clamp_fragment_color(const struct gl_context *ctx,
                                const struct gl_framebuffer *drawFb);
index 8f05d34..902504e 100644 (file)
@@ -39,6 +39,7 @@
 #include "mtypes.h"
 #include "macros.h"
 #include "state.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_blit.h"
 
index 39021e7..55ff24a 100644 (file)
@@ -34,31 +34,4 @@ _mesa_regions_overlap(int srcX0, int srcY0,
                       int dstX0, int dstY0,
                       int dstX1, int dstY1);
 
-void GLAPIENTRY
-_mesa_BlitFramebuffer_no_error(GLint srcX0, GLint srcY0, GLint srcX1,
-                               GLint srcY1, GLint dstX0, GLint dstY0,
-                               GLint dstX1, GLint dstY1,
-                               GLbitfield mask, GLenum filter);
-
-extern void GLAPIENTRY
-_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                         GLbitfield mask, GLenum filter);
-
-void GLAPIENTRY
-_mesa_BlitNamedFramebuffer_no_error(GLuint readFramebuffer,
-                                    GLuint drawFramebuffer,
-                                    GLint srcX0, GLint srcY0,
-                                    GLint srcX1, GLint srcY1,
-                                    GLint dstX0, GLint dstY0,
-                                    GLint dstX1, GLint dstY1,
-                                    GLbitfield mask, GLenum filter);
-
-extern void GLAPIENTRY
-_mesa_BlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer,
-                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                           GLbitfield mask, GLenum filter);
-
-
 #endif /* BLIT_H */
index 0a3b1bb..5a086ac 100644 (file)
@@ -47,6 +47,7 @@
 #include "varray.h"
 #include "util/u_atomic.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 #include "util/set.h"
 
 #include "state_tracker/st_cb_bufferobjects.h"
index 46f6aae..66b954a 100644 (file)
@@ -157,322 +157,8 @@ _mesa_ClearBufferSubData_sw(struct gl_context *ctx,
                             GLsizeiptr clearValueSize,
                             struct gl_buffer_object *bufObj);
 
-/*
- * API functions
- */
-void GLAPIENTRY
-_mesa_BindBuffer_no_error(GLenum target, GLuint buffer);
-
-void GLAPIENTRY
-_mesa_BindBuffer(GLenum target, GLuint buffer);
-
 void
 _mesa_InternalBindElementBuffer(struct gl_context *ctx,
                                 struct gl_buffer_object *buf);
 
-void GLAPIENTRY
-_mesa_DeleteBuffers_no_error(GLsizei n, const GLuint * buffer);
-
-void GLAPIENTRY
-_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer);
-
-void GLAPIENTRY
-_mesa_GenBuffers_no_error(GLsizei n, GLuint *buffers);
-
-void GLAPIENTRY
-_mesa_GenBuffers(GLsizei n, GLuint *buffers);
-
-void GLAPIENTRY
-_mesa_CreateBuffers_no_error(GLsizei n, GLuint *buffers);
-
-void GLAPIENTRY
-_mesa_CreateBuffers(GLsizei n, GLuint *buffers);
-
-GLboolean GLAPIENTRY
-_mesa_IsBuffer(GLuint buffer);
-
-void GLAPIENTRY
-_mesa_BufferStorage_no_error(GLenum target, GLsizeiptr size,
-                             const GLvoid *data, GLbitfield flags);
-void GLAPIENTRY
-_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
-                    GLbitfield flags);
-void GLAPIENTRY
-_mesa_NamedBufferStorageEXT(GLuint buffer, GLsizeiptr size,
-                            const GLvoid *data, GLbitfield flags);
-void GLAPIENTRY
-_mesa_BufferStorageMemEXT(GLenum target, GLsizeiptr size,
-                          GLuint memory, GLuint64 offset);
-void GLAPIENTRY
-_mesa_BufferStorageMemEXT_no_error(GLenum target, GLsizeiptr size,
-                                   GLuint memory, GLuint64 offset);
-void GLAPIENTRY
-_mesa_NamedBufferStorage_no_error(GLuint buffer, GLsizeiptr size,
-                                  const GLvoid *data, GLbitfield flags);
-void GLAPIENTRY
-_mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
-                         GLbitfield flags);
-void GLAPIENTRY
-_mesa_NamedBufferStorageMemEXT(GLuint buffer, GLsizeiptr size,
-                               GLuint memory, GLuint64 offset);
-void GLAPIENTRY
-_mesa_NamedBufferStorageMemEXT_no_error(GLuint buffer, GLsizeiptr size,
-                                        GLuint memory, GLuint64 offset);
-
-void GLAPIENTRY
-_mesa_BufferData_no_error(GLenum target, GLsizeiptr size,
-                          const GLvoid *data, GLenum usage);
-
-void GLAPIENTRY
-_mesa_BufferData(GLenum target, GLsizeiptr size,
-                 const GLvoid *data, GLenum usage);
-
-void GLAPIENTRY
-_mesa_NamedBufferData_no_error(GLuint buffer, GLsizeiptr size,
-                               const GLvoid *data, GLenum usage);
-
-void GLAPIENTRY
-_mesa_NamedBufferData(GLuint buffer, GLsizeiptr size,
-                      const GLvoid *data, GLenum usage);
-void GLAPIENTRY
-_mesa_NamedBufferDataEXT(GLuint buffer, GLsizeiptr size,
-                         const GLvoid *data, GLenum usage);
-
-void GLAPIENTRY
-_mesa_BufferSubData_no_error(GLenum target, GLintptr offset,
-                             GLsizeiptr size, const GLvoid *data);
-void GLAPIENTRY
-_mesa_BufferSubData(GLenum target, GLintptr offset,
-                    GLsizeiptr size, const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_NamedBufferSubData_no_error(GLuint buffer, GLintptr offset,
-                                  GLsizeiptr size, const GLvoid *data);
-void GLAPIENTRY
-_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,
-                         GLsizeiptr size, const GLvoid *data);
-void GLAPIENTRY
-_mesa_NamedBufferSubDataEXT(GLuint buffer, GLintptr offset,
-                            GLsizeiptr size, const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_GetBufferSubData(GLenum target, GLintptr offset,
-                       GLsizeiptr size, GLvoid *data);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
-                            GLsizeiptr size, GLvoid *data);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferSubDataEXT(GLuint buffer, GLintptr offset,
-                               GLsizeiptr size, GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearBufferData_no_error(GLenum target, GLenum internalformat,
-                               GLenum format, GLenum type, const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearBufferData(GLenum target, GLenum internalformat,
-                      GLenum format, GLenum type,
-                      const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearNamedBufferData_no_error(GLuint buffer, GLenum internalformat,
-                                    GLenum format, GLenum type,
-                                    const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearNamedBufferData(GLuint buffer, GLenum internalformat,
-                           GLenum format, GLenum type,
-                           const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearNamedBufferDataEXT(GLuint buffer, GLenum internalformat,
-                              GLenum format, GLenum type,
-                              const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearBufferSubData_no_error(GLenum target, GLenum internalformat,
-                                  GLintptr offset, GLsizeiptr size,
-                                  GLenum format, GLenum type,
-                                  const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
-                         GLintptr offset, GLsizeiptr size,
-                         GLenum format, GLenum type,
-                         const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearNamedBufferSubData_no_error(GLuint buffer, GLenum internalformat,
-                                       GLintptr offset, GLsizeiptr size,
-                                       GLenum format, GLenum type,
-                                       const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
-                              GLintptr offset, GLsizeiptr size,
-                              GLenum format, GLenum type,
-                              const GLvoid *data);
-
-void GLAPIENTRY
-_mesa_ClearNamedBufferSubDataEXT(GLuint buffer, GLenum internalformat,
-                                 GLintptr offset, GLsizeiptr size,
-                                 GLenum format, GLenum type,
-                                 const GLvoid *data);
-
-GLboolean GLAPIENTRY
-_mesa_UnmapBuffer_no_error(GLenum target);
-GLboolean GLAPIENTRY
-_mesa_UnmapBuffer(GLenum target);
-
-GLboolean GLAPIENTRY
-_mesa_UnmapNamedBufferEXT_no_error(GLuint buffer);
-GLboolean GLAPIENTRY
-_mesa_UnmapNamedBufferEXT(GLuint buffer);
-
-void GLAPIENTRY
-_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
-
-void GLAPIENTRY
-_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferParameteriv(GLuint buffer, GLenum pname, GLint *params);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferParameterivEXT(GLuint buffer, GLenum pname, GLint *params);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferParameteri64v(GLuint buffer, GLenum pname,
-                                  GLint64 *params);
-
-void GLAPIENTRY
-_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferPointerv(GLuint buffer, GLenum pname, GLvoid **params);
-
-void GLAPIENTRY
-_mesa_GetNamedBufferPointervEXT(GLuint buffer, GLenum pname, GLvoid **params);
-
-void GLAPIENTRY
-_mesa_CopyBufferSubData_no_error(GLenum readTarget, GLenum writeTarget,
-                                 GLintptr readOffset, GLintptr writeOffset,
-                                 GLsizeiptr size);
-void GLAPIENTRY
-_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
-                        GLintptr readOffset, GLintptr writeOffset,
-                        GLsizeiptr size);
-
-void GLAPIENTRY
-_mesa_NamedCopyBufferSubDataEXT(GLuint readBuffer, GLuint writeBuffer,
-                                GLintptr readOffset, GLintptr writeOffset,
-                                GLsizeiptr size);
-
-void GLAPIENTRY
-_mesa_CopyNamedBufferSubData_no_error(GLuint readBuffer, GLuint writeBuffer,
-                                      GLintptr readOffset,
-                                      GLintptr writeOffset, GLsizeiptr size);
-void GLAPIENTRY
-_mesa_CopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer,
-                             GLintptr readOffset, GLintptr writeOffset,
-                             GLsizeiptr size);
-void GLAPIENTRY
-_mesa_InternalBufferSubDataCopyMESA(GLintptr srcBuffer, GLuint srcOffset,
-                                    GLuint dstTargetOrName, GLintptr dstOffset,
-                                    GLsizeiptr size, GLboolean named,
-                                    GLboolean ext_dsa);
-
-void * GLAPIENTRY
-_mesa_MapBufferRange_no_error(GLenum target, GLintptr offset,
-                              GLsizeiptr length, GLbitfield access);
-void * GLAPIENTRY
-_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
-                     GLbitfield access);
-
-void * GLAPIENTRY
-_mesa_MapNamedBufferRange_no_error(GLuint buffer, GLintptr offset,
-                                   GLsizeiptr length, GLbitfield access);
-void * GLAPIENTRY
-_mesa_MapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length,
-                          GLbitfield access);
-void * GLAPIENTRY
-_mesa_MapNamedBufferRangeEXT(GLuint buffer, GLintptr offset,
-                             GLsizeiptr length, GLbitfield access);
-
-void * GLAPIENTRY
-_mesa_MapBuffer_no_error(GLenum target, GLenum access);
-void * GLAPIENTRY
-_mesa_MapBuffer(GLenum target, GLenum access);
-
-void * GLAPIENTRY
-_mesa_MapNamedBuffer_no_error(GLuint buffer, GLenum access);
-void * GLAPIENTRY
-_mesa_MapNamedBuffer(GLuint buffer, GLenum access);
-void * GLAPIENTRY
-_mesa_MapNamedBufferEXT(GLuint buffer, GLenum access);
-
-void GLAPIENTRY
-_mesa_FlushMappedBufferRange_no_error(GLenum target, GLintptr offset,
-                                      GLsizeiptr length);
-void GLAPIENTRY
-_mesa_FlushMappedBufferRange(GLenum target,
-                             GLintptr offset, GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_FlushMappedNamedBufferRange_no_error(GLuint buffer, GLintptr offset,
-                                           GLsizeiptr length);
-void GLAPIENTRY
-_mesa_FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset,
-                                  GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_FlushMappedNamedBufferRangeEXT(GLuint buffer, GLintptr offset,
-                                     GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_BindBufferRange_no_error(GLenum target, GLuint index, GLuint buffer,
-                               GLintptr offset, GLsizeiptr size);
-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_BindBuffersRange(GLenum target, GLuint first, GLsizei count,
-                       const GLuint *buffers,
-                       const GLintptr *offsets, const GLsizeiptr *sizes);
-void GLAPIENTRY
-_mesa_BindBuffersBase(GLenum target, GLuint first, GLsizei count,
-                      const GLuint *buffers);
-
-void GLAPIENTRY
-_mesa_InvalidateBufferSubData_no_error(GLuint buffer, GLintptr offset,
-                                       GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset,
-                              GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_InvalidateBufferData_no_error(GLuint buffer);
-
-void GLAPIENTRY
-_mesa_InvalidateBufferData(GLuint buffer);
-
-void GLAPIENTRY
-_mesa_BufferPageCommitmentARB(GLenum target, GLintptr offset, GLsizeiptr size,
-                              GLboolean commit);
-
-void GLAPIENTRY
-_mesa_NamedBufferPageCommitmentARB(GLuint buffer, GLintptr offset,
-                                   GLsizeiptr size, GLboolean commit);
-
-void GLAPIENTRY
-_mesa_NamedBufferPageCommitmentEXT(GLuint buffer, GLintptr offset,
-                                   GLsizeiptr size, GLboolean commit);
-
 #endif
index 15abcdc..d3afd18 100644 (file)
@@ -39,6 +39,7 @@
 #include "mtypes.h"
 #include "util/bitscan.h"
 #include "util/u_math.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_fbo.h"
 
index 28e26b5..1e65f9c 100644 (file)
@@ -40,32 +40,6 @@ struct gl_context;
 struct gl_framebuffer;
 
 
-void GLAPIENTRY
-_mesa_DrawBuffer_no_error(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_DrawBuffer( GLenum mode );
-
-void GLAPIENTRY
-_mesa_NamedFramebufferDrawBuffer_no_error(GLuint framebuffer, GLenum buf);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferDrawBuffer(GLuint framebuffer, GLenum buf);
-
-void GLAPIENTRY
-_mesa_DrawBuffers_no_error(GLsizei n, const GLenum *buffers);
-
-extern void GLAPIENTRY
-_mesa_DrawBuffers(GLsizei n, const GLenum *buffers);
-
-void GLAPIENTRY
-_mesa_NamedFramebufferDrawBuffers_no_error(GLuint framebuffer, GLsizei n,
-                                           const GLenum *bufs);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferDrawBuffers(GLuint framebuffer, GLsizei n,
-                                  const GLenum *bufs);
-
 extern void
 _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                   GLuint n, const GLenum16 *buffers,
@@ -82,25 +56,4 @@ extern GLenum
 _mesa_back_to_front_if_single_buffered(const struct gl_framebuffer *fb,
                                        GLenum buffer);
 
-void GLAPIENTRY
-_mesa_ReadBuffer_no_error(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_ReadBuffer( GLenum mode );
-
-void GLAPIENTRY
-_mesa_NamedFramebufferReadBuffer_no_error(GLuint framebuffer, GLenum src);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferReadBuffer(GLuint framebuffer, GLenum src);
-
-extern void GLAPIENTRY
-_mesa_FramebufferDrawBufferEXT(GLuint framebuffer, GLenum buf);
-
-extern void GLAPIENTRY
-_mesa_FramebufferReadBufferEXT(GLuint framebuffer, GLenum buf);
-
-extern void GLAPIENTRY
-_mesa_FramebufferDrawBuffersEXT(GLuint framebuffer, GLsizei n,
-                                const GLenum *bufs);
 #endif
index de9002e..447170f 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "glformats.h"
 #include "glheader.h"
-#include "clear.h"
 #include "context.h"
 #include "enums.h"
 #include "fbobject.h"
@@ -40,6 +39,7 @@
 #include "macros.h"
 #include "mtypes.h"
 #include "state.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_clear.h"
 
diff --git a/src/mesa/main/clear.h b/src/mesa/main/clear.h
deleted file mode 100644 (file)
index 151905c..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2007  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
- * 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.
- */
-
-
-#ifndef CLEAR_H
-#define CLEAR_H
-
-
-#include "glheader.h"
-
-
-extern void GLAPIENTRY
-_mesa_ClearIndex( GLfloat c );
-
-extern void GLAPIENTRY
-_mesa_ClearColor( GLclampf red, GLclampf green,
-                  GLclampf blue, GLclampf alpha );
-
-extern void GLAPIENTRY
-_mesa_ClearColorIiEXT(GLint r, GLint g, GLint b, GLint a);
-
-extern void GLAPIENTRY
-_mesa_ClearColorIuiEXT(GLuint r, GLuint g, GLuint b, GLuint a);
-
-void GLAPIENTRY
-_mesa_Clear_no_error(GLbitfield mask);
-
-extern void GLAPIENTRY
-_mesa_Clear( GLbitfield mask );
-
-void GLAPIENTRY
-_mesa_ClearBufferiv_no_error(GLenum buffer, GLint drawbuffer,
-                             const GLint *value);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value);
-
-extern void GLAPIENTRY
-_mesa_ClearNamedFramebufferiv(GLuint framebuffer, GLenum buffer,
-                              GLint drawbuffer, const GLint *value);
-
-void GLAPIENTRY
-_mesa_ClearBufferuiv_no_error(GLenum buffer, GLint drawbuffer,
-                              const GLuint *value);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value);
-
-extern void GLAPIENTRY
-_mesa_ClearNamedFramebufferuiv(GLuint framebuffer, GLenum buffer,
-                               GLint drawbuffer, const GLuint *value);
-
-void GLAPIENTRY
-_mesa_ClearBufferfv_no_error(GLenum buffer, GLint drawbuffer,
-                             const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_ClearNamedFramebufferfv(GLuint framebuffer, GLenum buffer,
-                              GLint drawbuffer, const GLfloat *value);
-
-void GLAPIENTRY
-_mesa_ClearBufferfi_no_error(GLenum buffer, GLint drawbuffer,
-                             GLfloat depth, GLint stencil);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,
-                    GLfloat depth, GLint stencil);
-
-extern void GLAPIENTRY
-_mesa_ClearNamedFramebufferfi(GLuint framebuffer, GLenum buffer,
-                              GLint drawbuffer, GLfloat depth, GLint stencil);
-
-#endif
index a6d14fc..5b76867 100644 (file)
@@ -30,6 +30,7 @@
 #include "mtypes.h"
 
 #include "math/m_matrix.h"
+#include "api_exec_decl.h"
 
 
 /**
index 7c46a6a..1dce604 100644 (file)
@@ -38,10 +38,4 @@ struct gl_context;
 extern void
 _mesa_update_clip_plane(struct gl_context *ctx, GLuint plane);
 
-extern void GLAPIENTRY 
-_mesa_ClipPlane( GLenum plane, const GLdouble *equation );
-
-extern void GLAPIENTRY 
-_mesa_GetClipPlane( GLenum plane, GLdouble *equation );
-
 #endif
index e8df73a..71044b9 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "glheader.h"
 #include "bufferobj.h"
-#include "colortab.h"
 #include "context.h"
 #include "image.h"
 #include "macros.h"
@@ -35,6 +34,7 @@
 #include "state.h"
 #include "teximage.h"
 #include "texstate.h"
+#include "api_exec_decl.h"
 
 
 void GLAPIENTRY
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
deleted file mode 100644 (file)
index e1165d7..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2006  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
- * 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.
- */
-
-
-#ifndef COLORTAB_H
-#define COLORTAB_H
-
-#include "glheader.h"
-
-struct _glapi_table;
-
-void GLAPIENTRY
-_mesa_ColorTable( GLenum target, GLenum internalformat,
-                  GLsizei width, GLenum format, GLenum type,
-                  const GLvoid *table );
-void GLAPIENTRY
-_mesa_ColorSubTable( GLenum target, GLsizei start,
-                     GLsizei count, GLenum format, GLenum type,
-                     const GLvoid *table );
-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 */
index 43952c9..9e3f86b 100644 (file)
@@ -23,8 +23,8 @@
 
 #include "glheader.h"
 #include "bufferobj.h"
-#include "compute.h"
 #include "context.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_compute.h"
 
diff --git a/src/mesa/main/compute.h b/src/mesa/main/compute.h
deleted file mode 100644 (file)
index bfb3223..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2014 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.
- */
-
-#ifndef COMPUTE_H
-#define COMPUTE_H
-
-
-#include "glheader.h"
-
-extern void GLAPIENTRY
-_mesa_DispatchCompute_no_error(GLuint num_groups_x, GLuint num_groups_y,
-                               GLuint num_groups_z);
-extern void GLAPIENTRY
-_mesa_DispatchCompute(GLuint num_groups_x,
-                      GLuint num_groups_y,
-                      GLuint num_groups_z);
-
-extern void GLAPIENTRY
-_mesa_DispatchComputeIndirect_no_error(GLintptr indirect);
-extern void GLAPIENTRY
-_mesa_DispatchComputeIndirect(GLintptr indirect);
-
-extern void GLAPIENTRY
-_mesa_DispatchComputeGroupSizeARB_no_error(GLuint num_groups_x,
-                                           GLuint num_groups_y,
-                                           GLuint num_groups_z,
-                                           GLuint group_size_x,
-                                           GLuint group_size_y,
-                                           GLuint group_size_z);
-extern void GLAPIENTRY
-_mesa_DispatchComputeGroupSizeARB(GLuint num_groups_x, GLuint num_groups_y,
-                                  GLuint num_groups_z, GLuint group_size_x,
-                                  GLuint group_size_y, GLuint group_size_z);
-
-#endif
index 2671a2d..a119359 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "state_tracker/st_cb_queryobj.h"
 #include "state_tracker/st_cb_condrender.h"
+#include "api_exec_decl.h"
 
 static ALWAYS_INLINE void
 begin_conditional_render(struct gl_context *ctx, GLuint queryId, GLenum mode,
index e767251..0a8d0be 100644 (file)
 #include "glheader.h"
 #include "context.h"
 
-
-void GLAPIENTRY
-_mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_BeginConditionalRender(GLuint queryId, GLenum mode);
-
-void APIENTRY
-_mesa_EndConditionalRender_no_error(void);
-
-extern void APIENTRY
-_mesa_EndConditionalRender(void);
-
 extern GLboolean
 _mesa_check_conditional_render(struct gl_context *ctx);
 
-
 #endif /* CONDRENDER_H */
index b912b55..24d6132 100644 (file)
@@ -31,6 +31,7 @@
 #include "conservativeraster.h"
 #include "context.h"
 #include "enums.h"
+#include "api_exec_decl.h"
 
 static ALWAYS_INLINE void
 conservative_raster_parameter(GLenum pname, GLfloat param,
index 1865cfc..a727896 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_ConservativeRasterParameteriNV_no_error(GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_ConservativeRasterParameteriNV(GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_ConservativeRasterParameterfNV_no_error(GLenum pname, GLfloat param);
-
-extern void GLAPIENTRY
-_mesa_ConservativeRasterParameterfNV(GLenum pname, GLfloat param);
-
 extern void
 _mesa_init_conservative_raster(struct gl_context *ctx);
 
index 38fcf57..93d7458 100644 (file)
 #include "compiler/glsl/glsl_parser_extras.h"
 #include <stdbool.h>
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_cb_flush.h"
index 42e4094..3a27a21 100644 (file)
@@ -146,12 +146,6 @@ _mesa_set_context_lost_dispatch(struct gl_context *ctx);
 extern void
 _mesa_flush(struct gl_context *ctx);
 
-extern void GLAPIENTRY
-_mesa_Finish( void );
-
-extern void GLAPIENTRY
-_mesa_Flush( void );
-
 /*@}*/
 
 
index e2c355c..ed44260 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "glheader.h"
 #include "context.h"
-#include "convolve.h"
+#include "api_exec_decl.h"
 
 
 void GLAPIENTRY
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
deleted file mode 100644 (file)
index e696ce4..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2001  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
- * 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.
- */
-
-
-#ifndef CONVOLVE_H
-#define CONVOLVE_H
-
-
-#include "glheader.h"
-
-struct _glapi_table;
-
-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 */
index 1e30a84..bde5753 100644 (file)
 #include "glheader.h"
 #include "errors.h"
 #include "enums.h"
-#include "copyimage.h"
 #include "teximage.h"
 #include "texobj.h"
 #include "fbobject.h"
 #include "textureview.h"
 #include "glformats.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_copyimage.h"
 
diff --git a/src/mesa/main/copyimage.h b/src/mesa/main/copyimage.h
deleted file mode 100644 (file)
index 09f6dca..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2014 Intel Corporation.  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
- * 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.
- *
- * Authors:
- *    Jason Ekstrand <jason.ekstrand@intel.com>
- */
-
-
-#ifndef COPYIMAGE_H
-#define COPYIMAGE_H
-
-#include "glheader.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void GLAPIENTRY
-_mesa_CopyImageSubData_no_error(GLuint srcName, GLenum srcTarget, GLint srcLevel,
-                                GLint srcX, GLint srcY, GLint srcZ,
-                                GLuint destName, GLenum destTarget, GLint destLevel,
-                                GLint destX, GLint destY, GLint destZ,
-                                GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-
-extern void GLAPIENTRY
-_mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
-                       GLint srcX, GLint srcY, GLint srcZ,
-                       GLuint destName, GLenum destTarget, GLint destLevel,
-                       GLint destX, GLint destY, GLint destZ,
-                       GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-
-void GLAPIENTRY
-_mesa_CopyImageSubDataNV_no_error(GLuint srcName, GLenum srcTarget, GLint srcLevel,
-                                GLint srcX, GLint srcY, GLint srcZ,
-                                GLuint destName, GLenum destTarget, GLint destLevel,
-                                GLint destX, GLint destY, GLint destZ,
-                                GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-
-extern void GLAPIENTRY
-_mesa_CopyImageSubDataNV(GLuint srcName, GLenum srcTarget, GLint srcLevel,
-                       GLint srcX, GLint srcY, GLint srcZ,
-                       GLuint destName, GLenum destTarget, GLint destLevel,
-                       GLint destX, GLint destY, GLint destZ,
-                       GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* COPYIMAGE_H */
index 525d250..43a68d1 100644 (file)
@@ -37,6 +37,7 @@
 #include "pixelstore.h"
 #include "readpix.h"
 #include "texobj.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_cb_readpixels.h"
index d47756c..693aeb4 100644 (file)
@@ -35,6 +35,7 @@
 #include "util/hash_table.h"
 #include "util/list.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 
 static GLuint PrevDynamicID = 0;
index e467b08..94e3bd0 100644 (file)
@@ -69,36 +69,6 @@ _mesa_debug_is_message_enabled(const struct gl_debug_state *debug,
                                GLuint id,
                                enum mesa_debug_severity severity);
 
-void GLAPIENTRY
-_mesa_DebugMessageInsert(GLenum source, GLenum type, GLuint id,
-                         GLenum severity, GLint length,
-                         const GLchar* buf);
-
-GLuint GLAPIENTRY
-_mesa_GetDebugMessageLog(GLuint count, GLsizei logSize, GLenum* sources,
-                         GLenum* types, GLenum* ids, GLenum* severities,
-                         GLsizei* lengths, GLchar* messageLog);
-
-void GLAPIENTRY
-_mesa_DebugMessageControl(GLenum source, GLenum type, GLenum severity,
-                          GLsizei count, const GLuint *ids,
-                          GLboolean enabled);
-
-void GLAPIENTRY
-_mesa_DebugMessageCallback(GLDEBUGPROC callback,
-                           const void *userParam);
-
-void GLAPIENTRY
-_mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length,
-                     const GLchar *message);
-
-void GLAPIENTRY
-_mesa_PopDebugGroup(void);
-
-void GLAPIENTRY
-_mesa_StringMarkerGREMEDY(GLsizei len, const GLvoid *string);
-
-
 #ifdef __cplusplus
 }
 #endif
index 31eb8a8..950d971 100644 (file)
@@ -31,6 +31,7 @@
 #include "macros.h"
 #include "mtypes.h"
 #include "state.h"
+#include "api_exec_decl.h"
 
 
 /**********************************************************************/
index 478249f..67e406e 100644 (file)
 
 struct gl_context;
 
-
-extern void GLAPIENTRY
-_mesa_ClearDepth( GLclampd depth );
-
-extern void GLAPIENTRY
-_mesa_ClearDepthf( GLclampf depth );
-
-void GLAPIENTRY
-_mesa_DepthFunc_no_error(GLenum func);
-
-extern void GLAPIENTRY
-_mesa_DepthFunc(GLenum func);
-
-extern void GLAPIENTRY
-_mesa_DepthMask( GLboolean flag );
-
-extern void GLAPIENTRY
-_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );
-
 extern void 
 _mesa_init_depth( struct gl_context * ctx );
 
index cd8e922..4459faa 100644 (file)
@@ -49,6 +49,7 @@
 #include "vbo/vbo_save.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_cb_bitmap.h"
index 04c54d1..ac9f804 100644 (file)
@@ -107,31 +107,6 @@ void
 _mesa_delete_bitmap_atlas(struct gl_context *ctx,
                           struct gl_bitmap_atlas *atlas);
 
-
-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);
-
 struct gl_display_list *
 _mesa_lookup_list(struct gl_context *ctx, GLuint list, bool locked);
 
index c96f988..71b72dc 100644 (file)
@@ -41,6 +41,7 @@
 #include "macros.h"
 #include "transformfeedback.h"
 #include "pipe/p_state.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_draw.h"
 
index e720cfc..7a59964 100644 (file)
@@ -101,168 +101,6 @@ _mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
                                      const unsigned char *mode,
                                      unsigned num_draws);
 
-void GLAPIENTRY
-_mesa_EvalMesh1(GLenum mode, GLint i1, GLint i2);
-
-void GLAPIENTRY
-_mesa_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-
-void GLAPIENTRY
-_mesa_DrawElementsInstancedARB(GLenum mode, GLsizei count, GLenum type,
-                               const GLvoid * indices, GLsizei numInstances);
-
-void GLAPIENTRY
-_mesa_DrawArraysInstancedBaseInstance(GLenum mode, GLint first,
-                                      GLsizei count, GLsizei numInstances,
-                                      GLuint baseInstance);
-
-void GLAPIENTRY
-_mesa_DrawElementsInstancedBaseVertex(GLenum mode, GLsizei count,
-                                      GLenum type, const GLvoid * indices,
-                                      GLsizei numInstances,
-                                      GLint basevertex);
-
-void GLAPIENTRY
-_mesa_DrawElementsInstancedBaseInstance(GLenum mode, GLsizei count,
-                                        GLenum type,
-                                        const GLvoid *indices,
-                                        GLsizei numInstances,
-                                        GLuint baseInstance);
-
-void GLAPIENTRY
-_mesa_DrawTransformFeedbackStream(GLenum mode, GLuint name, GLuint stream);
-
-void GLAPIENTRY
-_mesa_DrawTransformFeedbackInstanced(GLenum mode, GLuint name,
-                                     GLsizei primcount);
-
-void GLAPIENTRY
-_mesa_DrawTransformFeedbackStreamInstanced(GLenum mode, GLuint name,
-                                           GLuint stream,
-                                           GLsizei primcount);
-
-void GLAPIENTRY
-_mesa_DrawArraysIndirect(GLenum mode, const GLvoid *indirect);
-
-void GLAPIENTRY
-_mesa_DrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect);
-
-void GLAPIENTRY
-_mesa_MultiDrawArraysIndirect(GLenum mode, const GLvoid *indirect,
-                              GLsizei primcount, GLsizei stride);
-
-void GLAPIENTRY
-_mesa_MultiDrawElementsIndirect(GLenum mode, GLenum type,
-                                const GLvoid *indirect,
-                                GLsizei primcount, GLsizei stride);
-
-void GLAPIENTRY
-_mesa_MultiDrawArraysIndirectCountARB(GLenum mode, GLintptr indirect,
-                                      GLintptr drawcount_offset,
-                                      GLsizei maxdrawcount, GLsizei stride);
-
-void GLAPIENTRY
-_mesa_MultiDrawElementsIndirectCountARB(GLenum mode, GLenum type,
-                                        GLintptr indirect,
-                                        GLintptr drawcount_offset,
-                                        GLsizei maxdrawcount, GLsizei stride);
-
-void GLAPIENTRY
-_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count);
-
-
-void GLAPIENTRY
-_mesa_DrawArraysInstancedARB(GLenum mode, GLint first, GLsizei count,
-                             GLsizei primcount);
-
-void GLAPIENTRY
-_mesa_DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
-                                                  GLsizei count,
-                                                  GLenum type,
-                                                  const GLvoid *indices,
-                                                  GLsizei numInstances,
-                                                  GLint basevertex,
-                                                  GLuint baseInstance);
-
-void GLAPIENTRY
-_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
-                   const GLvoid *indices);
-
-
-void GLAPIENTRY
-_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
-                        GLenum type, const GLvoid *indices);
-
-
-void GLAPIENTRY
-_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-                             const GLvoid *indices, GLint basevertex);
-
-
-void GLAPIENTRY
-_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
-                                  GLsizei count, GLenum type,
-                                  const GLvoid *indices,
-                                  GLint basevertex);
-
-
-void GLAPIENTRY
-_mesa_DrawTransformFeedback(GLenum mode, GLuint name);
-
-
-
-void GLAPIENTRY
-_mesa_MultiDrawArrays(GLenum mode, const GLint *first,
-                      const GLsizei *count, GLsizei primcount);
-
-
-void GLAPIENTRY
-_mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
-                           const GLvoid *const *indices, GLsizei primcount);
-
-
-void GLAPIENTRY
-_mesa_MultiDrawElementsBaseVertex(GLenum mode,
-                                  const GLsizei *count, GLenum type,
-                                  const GLvoid * const * indices, GLsizei primcount,
-                                  const GLint *basevertex);
-
-
-void GLAPIENTRY
-_mesa_MultiModeDrawArraysIBM(const GLenum * mode, const GLint * first,
-                             const GLsizei * count,
-                             GLsizei primcount, GLint modestride);
-
-
-void GLAPIENTRY
-_mesa_MultiModeDrawElementsIBM(const GLenum * mode, const GLsizei * count,
-                               GLenum type, const GLvoid * const * indices,
-                               GLsizei primcount, GLint modestride);
-
-void GLAPIENTRY
-_mesa_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-
-void GLAPIENTRY
-_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-
-void GLAPIENTRY
-_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2);
-
-void GLAPIENTRY
-_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2);
-
-void GLAPIENTRY
-_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
-
-void GLAPIENTRY
-_mesa_Rectiv(const GLint *v1, const GLint *v2);
-
-void GLAPIENTRY
-_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-
-void GLAPIENTRY
-_mesa_Rectsv(const GLshort *v1, const GLshort *v2);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
index bcd81d2..15c60f2 100644 (file)
@@ -26,7 +26,6 @@
 #include "draw_validate.h"
 #include "bufferobj.h"
 #include "context.h"
-#include "drawpix.h"
 #include "enums.h"
 #include "feedback.h"
 #include "framebuffer.h"
@@ -38,6 +37,7 @@
 #include "fbobject.h"
 #include "util/u_math.h"
 #include "util/rounding.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_bitmap.h"
 #include "state_tracker/st_cb_drawpixels.h"
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
deleted file mode 100644 (file)
index 181c05c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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
- * 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.
- */
-
-#ifndef DRAWPIX_H
-#define DRAWPIX_H
-
-
-#include "glheader.h"
-
-
-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 */
index 129dab5..6e3fc87 100644 (file)
  */
 
 #include "main/errors.h"
-#include "main/drawtex.h"
 #include "main/state.h"
 
 #include "main/mtypes.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_drawtex.h"
 
diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h
deleted file mode 100644 (file)
index dc41db0..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- *
- * 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.
- */
-
-#ifndef DRAWTEX_H
-#define DRAWTEX_H
-
-
-#include "glheader.h"
-
-
-extern void GLAPIENTRY
-_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexfvOES(const GLfloat *coords);
-
-extern void GLAPIENTRY
-_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexivOES(const GLint *coords);
-
-extern void GLAPIENTRY
-_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexsvOES(const GLshort *coords);
-
-#endif /* DRAWTEX_H */
index ba9c882..b39d19f 100644 (file)
@@ -43,6 +43,7 @@
 #include "state.h"
 #include "texstate.h"
 #include "varray.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_context.h"
 
index 78e3170..29a7731 100644 (file)
@@ -43,51 +43,13 @@ _mesa_update_derived_primitive_restart_state(struct gl_context *ctx);
 extern void
 _mesa_set_enable( struct gl_context* ctx, GLenum cap, GLboolean state );
 
-extern void GLAPIENTRY
-_mesa_Disable( GLenum cap );
-
-extern void GLAPIENTRY
-_mesa_Enable( GLenum cap );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsEnabled( GLenum cap );
-
 extern void
 _mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state);
 
-extern void GLAPIENTRY
-_mesa_Disablei( GLenum cap, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_Enablei( GLenum cap, GLuint index );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsEnabledi( GLenum cap, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_EnableClientState( GLenum cap );
-
-extern void GLAPIENTRY
-_mesa_EnableClientStateiEXT( GLenum cap, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_EnableVertexArrayEXT( GLuint vaobj, GLenum cap );
-
-extern void GLAPIENTRY
-_mesa_DisableClientState( GLenum cap );
-
-extern void GLAPIENTRY
-_mesa_DisableClientStateiEXT( GLenum cap, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_DisableVertexArrayEXT( GLuint vaobj, GLenum cap );
-
 extern void
 _mesa_set_multisample(struct gl_context *ctx, GLboolean state);
 
 extern void
 _mesa_set_framebuffer_srgb(struct gl_context *ctx, GLboolean state);
 
-
-
 #endif
index bbdfd62..b1836ba 100644 (file)
@@ -36,6 +36,7 @@
 #include "context.h"
 #include "debug_output.h"
 #include "detect_os.h"
+#include "api_exec_decl.h"
 
 #if DETECT_OS_ANDROID
 #  include <log/log.h>
index 9549093..5bed45c 100644 (file)
@@ -109,9 +109,6 @@ _mesa_gl_debug(struct gl_context *ctx,
    }                                                                      \
 } while (0)
 
-void GLAPIENTRY
-_mesa_InternalSetError(GLenum error);
-
 #ifdef __cplusplus
 }
 #endif
index 94ddd2e..6ddd27c 100644 (file)
@@ -3,7 +3,6 @@
 
 #include "context.h"
 #include "blend.h"
-#include "clear.h"
 #include "clip.h"
 #include "context.h"
 #include "depth.h"
 #include "points.h"
 #include "polygon.h"
 #include "readpix.h"
-#include "texenv.h"
-#include "texgen.h"
-#include "texobj.h"
 #include "texparam.h"
 #include "mtypes.h"
 #include "viewport.h"
-#include "main/drawtex.h"
 #include "vbo/vbo.h"
-
-#include "main/es1_conversion.h"
+#include "api_exec_decl.h"
 
 void GL_APIENTRY
 _mesa_AlphaFuncx(GLenum func, GLclampx ref)
diff --git a/src/mesa/main/es1_conversion.h b/src/mesa/main/es1_conversion.h
deleted file mode 100644 (file)
index 640150d..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2008 VMware, Inc.
- * 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
- * VMWARE 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.
- */
-
-#ifndef ES1_CONVERSION_H
-#define ES1_CONVERSION_H
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY GLAPIENTRY
-#endif
-
-void GL_APIENTRY
-_mesa_AlphaFuncx(GLenum func, GLclampx ref);
-
-void GL_APIENTRY
-_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-
-void GL_APIENTRY
-_mesa_ClearDepthx(GLclampx depth);
-
-void GL_APIENTRY
-_mesa_ClipPlanef(GLenum plane, const GLfloat *equation);
-
-void GL_APIENTRY
-_mesa_ClipPlanex(GLenum plane, const GLfixed *equation);
-
-void GL_APIENTRY
-_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-
-void GL_APIENTRY
-_mesa_DepthRangex(GLclampx zNear, GLclampx zFar);
-
-void GL_APIENTRY
-_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
-
-void GL_APIENTRY
-_mesa_DrawTexxvOES(const GLfixed *coords);
-
-void GL_APIENTRY
-_mesa_Fogx(GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_Fogxv(GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
-             GLfloat zNear, GLfloat zFar);
-
-void GL_APIENTRY
-_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
-             GLfixed zNear, GLfixed zFar);
-
-void GL_APIENTRY
-_mesa_GetClipPlanef(GLenum plane, GLfloat *equation);
-
-void GL_APIENTRY
-_mesa_GetClipPlanex(GLenum plane, GLfixed *equation);
-
-void GL_APIENTRY
-_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
-
-void GL_APIENTRY
-_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
-
-void GL_APIENTRY
-_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
-
-void GL_APIENTRY
-_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
-
-void GL_APIENTRY
-_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
-
-void GL_APIENTRY
-_mesa_LightModelx(GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_LightModelxv(GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_Lightx(GLenum light, GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_LineWidthx(GLfixed width);
-
-void GL_APIENTRY
-_mesa_LoadMatrixx(const GLfixed *m);
-
-void GL_APIENTRY
-_mesa_Materialx(GLenum face, GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_MultMatrixx(const GLfixed *m);
-
-void GL_APIENTRY
-_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-
-void GL_APIENTRY
-_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
-
-void GL_APIENTRY
-_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
-           GLfloat zNear, GLfloat zFar);
-
-void GL_APIENTRY
-_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
-           GLfixed zNear, GLfixed zFar);
-
-void GL_APIENTRY
-_mesa_PointParameterx(GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_PointParameterxv(GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_PointSizex(GLfixed size);
-
-void GL_APIENTRY
-_mesa_PolygonOffsetx(GLfixed factor, GLfixed units);
-
-void GL_APIENTRY
-_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-
-void GL_APIENTRY
-_mesa_SampleCoveragex(GLclampx value, GLboolean invert);
-
-void GL_APIENTRY
-_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z);
-
-void GL_APIENTRY
-_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param);
-
-void GL_APIENTRY
-_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
-
-void GL_APIENTRY
-_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z);
-
-#endif /* ES1_CONVERSION_H */
index e67004f..dd8af52 100644 (file)
@@ -43,6 +43,7 @@
 #include "macros.h"
 #include "mtypes.h"
 #include "main/dispatch.h"
+#include "api_exec_decl.h"
 
 
 /*
index 3a12e76..2b317d7 100644 (file)
@@ -65,44 +65,4 @@ extern GLfloat *_mesa_copy_map_points2d(GLenum target,
 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 */
index 85ff125..ebacb05 100644 (file)
@@ -35,6 +35,8 @@
 
 #include "state_tracker/st_cb_memoryobjects.h"
 #include "state_tracker/st_cb_semaphoreobjects.h"
+#include "api_exec_decl.h"
+
 /**
  * Delete a memory object.
  * Not removed from hash table here.
index 462b088..aec42c5 100644 (file)
@@ -93,165 +93,4 @@ extern void
 _mesa_delete_semaphore_object(struct gl_context *ctx,
                               struct gl_semaphore_object *semObj);
 
-extern void GLAPIENTRY
-_mesa_DeleteMemoryObjectsEXT(GLsizei n, const GLuint *memoryObjects);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsMemoryObjectEXT(GLuint memoryObject);
-
-extern void GLAPIENTRY
-_mesa_CreateMemoryObjectsEXT(GLsizei n, GLuint *memoryObjects);
-
-extern void GLAPIENTRY
-_mesa_MemoryObjectParameterivEXT(GLuint memoryObject,
-                                 GLenum pname,
-                                 const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetMemoryObjectParameterivEXT(GLuint memoryObject,
-                                    GLenum pname,
-                                    GLint *params);
-
-extern void GLAPIENTRY
-_mesa_TexStorageMem2DEXT(GLenum target,
-                         GLsizei levels,
-                         GLenum internalFormat,
-                         GLsizei width,
-                         GLsizei height,
-                         GLuint memory,
-                         GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TexStorageMem2DMultisampleEXT(GLenum target,
-                                    GLsizei samples,
-                                    GLenum internalFormat,
-                                    GLsizei width,
-                                    GLsizei height,
-                                    GLboolean fixedSampleLocations,
-                                    GLuint memory,
-                                    GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TexStorageMem3DEXT(GLenum target,
-                         GLsizei levels,
-                         GLenum internalFormat,
-                         GLsizei width,
-                         GLsizei height,
-                         GLsizei depth,
-                         GLuint memory,
-                         GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TexStorageMem3DMultisampleEXT(GLenum target,
-                                    GLsizei samples,
-                                    GLenum internalFormat,
-                                    GLsizei width,
-                                    GLsizei height,
-                                    GLsizei depth,
-                                    GLboolean fixedSampleLocations,
-                                    GLuint memory,
-                                    GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TextureStorageMem2DEXT(GLuint texture,
-                             GLsizei levels,
-                             GLenum internalFormat,
-                             GLsizei width,
-                             GLsizei height,
-                             GLuint memory,
-                             GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TextureStorageMem2DMultisampleEXT(GLuint texture,
-                                        GLsizei samples,
-                                        GLenum internalFormat,
-                                        GLsizei width,
-                                        GLsizei height,
-                                        GLboolean fixedSampleLocations,
-                                        GLuint memory,
-                                        GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TextureStorageMem3DEXT(GLuint texture,
-                             GLsizei levels,
-                             GLenum internalFormat,
-                             GLsizei width,
-                             GLsizei height,
-                             GLsizei depth,
-                             GLuint memory,
-                             GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TextureStorageMem3DMultisampleEXT(GLuint texture,
-                                        GLsizei samples,
-                                        GLenum internalFormat,
-                                        GLsizei width,
-                                        GLsizei height,
-                                        GLsizei depth,
-                                        GLboolean fixedSampleLocations,
-                                        GLuint memory,
-                                        GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TexStorageMem1DEXT(GLenum target,
-                         GLsizei levels,
-                         GLenum internalFormat,
-                         GLsizei width,
-                         GLuint memory,
-                         GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_TextureStorageMem1DEXT(GLuint texture,
-                             GLsizei levels,
-                             GLenum internalFormat,
-                             GLsizei width,
-                             GLuint memory,
-                             GLuint64 offset);
-
-extern void GLAPIENTRY
-_mesa_GenSemaphoresEXT(GLsizei n, GLuint *semaphores);
-
-extern void GLAPIENTRY
-_mesa_DeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsSemaphoreEXT(GLuint semaphore);
-
-extern void GLAPIENTRY
-_mesa_SemaphoreParameterui64vEXT(GLuint semaphore,
-                                 GLenum pname,
-                                 const GLuint64 *params);
-
-extern void GLAPIENTRY
-_mesa_GetSemaphoreParameterui64vEXT(GLuint semaphore,
-                                    GLenum pname,
-                                    GLuint64 *params);
-
-extern void GLAPIENTRY
-_mesa_WaitSemaphoreEXT(GLuint semaphore,
-                       GLuint numBufferBarriers,
-                       const GLuint *buffers,
-                       GLuint numTextureBarriers,
-                       const GLuint *textures,
-                       const GLenum *srcLayouts);
-
-extern void GLAPIENTRY
-_mesa_SignalSemaphoreEXT(GLuint semaphore,
-                         GLuint numBufferBarriers,
-                         const GLuint *buffers,
-                         GLuint numTextureBarriers,
-                         const GLuint *textures,
-                         const GLenum *dstLayouts);
-
-extern void GLAPIENTRY
-_mesa_ImportMemoryFdEXT(GLuint memory,
-                        GLuint64 size,
-                        GLenum handleType,
-                        GLint fd);
-
-extern void GLAPIENTRY
-_mesa_ImportSemaphoreFdEXT(GLuint semaphore,
-                           GLenum handleType,
-                           GLint fd);
-
 #endif
index 2125893..a4026bd 100644 (file)
@@ -50,6 +50,7 @@
 #include "state.h"
 #include "teximage.h"
 #include "texobj.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_fbo.h"
 #include "state_tracker/st_cb_eglimage.h"
index 04f7f45..2ca9a85 100644 (file)
@@ -136,308 +136,4 @@ _mesa_bind_framebuffers(struct gl_context *ctx,
                         struct gl_framebuffer *newDrawFb,
                         struct gl_framebuffer *newReadFb);
 
-extern GLboolean GLAPIENTRY
-_mesa_IsRenderbuffer(GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
-
-void GLAPIENTRY
-_mesa_GenRenderbuffers_no_error(GLsizei n, GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers);
-
-void GLAPIENTRY
-_mesa_CreateRenderbuffers_no_error(GLsizei n, GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_CreateRenderbuffers(GLsizei n, GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorage(GLenum target, GLenum internalformat,
-                             GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
-                                     GLenum internalformat,
-                                     GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorageMultisampleAdvancedAMD(
-      GLenum target, GLsizei samples, GLsizei storageSamples,
-      GLenum internalFormat, GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_NamedRenderbufferStorage(GLuint renderbuffer, GLenum internalformat,
-                               GLsizei width, GLsizei height);
-extern void GLAPIENTRY
-_mesa_NamedRenderbufferStorageEXT(GLuint renderbuffer, GLenum internalformat,
-                                  GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_NamedRenderbufferStorageMultisample(GLuint renderbuffer, GLsizei samples,
-                                          GLenum internalformat,
-                                          GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_NamedRenderbufferStorageMultisampleEXT(GLuint renderbuffer, GLsizei samples,
-                                             GLenum internalformat,
-                                             GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_NamedRenderbufferStorageMultisampleAdvancedAMD(
-      GLuint renderbuffer, GLsizei samples, GLsizei storageSamples,
-      GLenum internalformat, GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
-
-extern void GLAPIENTRY
-_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname,
-                                    GLint *params);
-
-void GLAPIENTRY
-_mesa_GetNamedRenderbufferParameteriv(GLuint renderbuffer, GLenum pname,
-                                      GLint *params);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsFramebuffer(GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_BindFramebuffer(GLenum target, GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers);
-
-extern void GLAPIENTRY
-_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers);
-
-extern void GLAPIENTRY
-_mesa_CreateFramebuffers(GLsizei n, GLuint *framebuffers);
-
-GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatus_no_error(GLenum target);
-
-extern GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatus(GLenum target);
-
-extern GLenum GLAPIENTRY
-_mesa_CheckNamedFramebufferStatus(GLuint framebuffer, GLenum target);
-
-extern GLenum GLAPIENTRY
-_mesa_CheckNamedFramebufferStatusEXT(GLuint framebuffer, GLenum target);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment,
-                                    GLenum textarget, GLuint texture,
-                                    GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture2D_no_error(GLenum target, GLenum attachment,
-                                    GLenum textarget, GLuint texture,
-                                    GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-void GLAPIENTRY
-_mesa_FramebufferTexture2DMultisampleEXT(GLenum target, GLenum attachment,
-                                         GLenum textarget, GLuint texture,
-                                         GLint level, GLsizei samples);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture3D_no_error(GLenum target, GLenum attachment,
-                                    GLenum textarget, GLuint texture,
-                                    GLint level, GLint layer);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture,
-                              GLint level, GLint layer);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureLayer_no_error(GLenum target, GLenum attachment,
-                                       GLuint texture, GLint level,
-                                       GLint layer);
-extern void GLAPIENTRY
-_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
-                                 GLuint texture, GLint level, GLint layer);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTextureLayer_no_error(GLuint framebuffer,
-                                            GLenum attachment,
-                                            GLuint texture, GLint level,
-                                            GLint layer);
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment,
-                                   GLuint texture, GLint level, GLint layer);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture_no_error(GLenum target, GLenum attachment,
-                                  GLuint texture, GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture(GLenum target, GLenum attachment,
-                         GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture_no_error(GLuint framebuffer, GLenum attachment,
-                                       GLuint texture, GLint level);
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment,
-                              GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferRenderbufferEXT(GLuint framebuffer, GLenum attachment,
-                                      GLenum renderbuffertarget,
-                                      GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture1DEXT(GLuint framebuffer, GLenum attachment,
-                                   GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture2DEXT(GLuint framebuffer, GLenum attachment,
-                                   GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture3DEXT(GLuint framebuffer, GLenum attachment,
-                                   GLenum textarget, GLuint texture,
-                                   GLint level, GLint zoffset);
-
-void GLAPIENTRY
-_mesa_FramebufferRenderbuffer_no_error(GLenum target, GLenum attachment,
-                                       GLenum renderbuffertarget,
-                                       GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
-                                 GLenum renderbuffertarget,
-                                 GLuint renderbuffer);
-
-void GLAPIENTRY
-_mesa_NamedFramebufferRenderbuffer_no_error(GLuint framebuffer,
-                                            GLenum attachment,
-                                            GLenum renderbuffertarget,
-                                            GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferRenderbuffer(GLuint framebuffer, GLenum attachment,
-                                   GLenum renderbuffertarget,
-                                   GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
-                                          GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetNamedFramebufferAttachmentParameteriv(GLuint framebuffer,
-                                               GLenum attachment,
-                                               GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetNamedFramebufferAttachmentParameterivEXT(GLuint framebuffer,
-                                                  GLenum attachment,
-                                                  GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferParameteri(GLuint framebuffer, GLenum pname,
-                                 GLint param);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferParameteriEXT(GLuint framebuffer, GLenum pname,
-                                    GLint param);
-
-extern void GLAPIENTRY
-_mesa_GetNamedRenderbufferParameterivEXT(GLuint renderbuffer, GLenum pname,
-                                         GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetFramebufferParameterivEXT(GLuint framebuffer, GLenum pname,
-                                   GLint *param);
-
-extern void GLAPIENTRY
-_mesa_GetNamedFramebufferParameteriv(GLuint framebuffer, GLenum pname,
-                                     GLint *param);
-
-extern void GLAPIENTRY
-_mesa_GetNamedFramebufferParameterivEXT(GLuint framebuffer, GLenum pname,
-                                        GLint *param);
-
-void GLAPIENTRY
-_mesa_InvalidateSubFramebuffer_no_error(GLenum target, GLsizei numAttachments,
-                                        const GLenum *attachments, GLint x,
-                                        GLint y, GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
-                               const GLenum *attachments, GLint x, GLint y,
-                               GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_InvalidateNamedFramebufferSubData(GLuint framebuffer,
-                                        GLsizei numAttachments,
-                                        const GLenum *attachments,
-                                        GLint x, GLint y,
-                                        GLsizei width, GLsizei height);
-void GLAPIENTRY
-_mesa_InvalidateFramebuffer_no_error(GLenum target, GLsizei numAttachments,
-                                     const GLenum *attachments);
-
-extern void GLAPIENTRY
-_mesa_InvalidateFramebuffer(GLenum target, GLsizei numAttachments,
-                            const GLenum *attachments);
-
-extern void GLAPIENTRY
-_mesa_InvalidateNamedFramebufferData(GLuint framebuffer,
-                                     GLsizei numAttachments,
-                                     const GLenum *attachments);
-
-extern void GLAPIENTRY
-_mesa_DiscardFramebufferEXT(GLenum target, GLsizei numAttachments,
-                            const GLenum *attachments);
-
-extern void GLAPIENTRY
-_mesa_FramebufferParameteri(GLenum target, GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_FramebufferParameteriMESA(GLenum target, GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetFramebufferParameterivMESA(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_FramebufferSampleLocationsfvARB(GLenum target, GLuint start,
-                                      GLsizei count, const GLfloat *v);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferSampleLocationsfvARB(GLuint framebuffer, GLuint start,
-                                           GLsizei count, const GLfloat *v);
-
-extern void GLAPIENTRY
-_mesa_FramebufferSampleLocationsfvARB_no_error(GLenum target, GLuint start,
-                                               GLsizei count, const GLfloat *v);
-
-extern void GLAPIENTRY
-_mesa_NamedFramebufferSampleLocationsfvARB_no_error(GLuint framebuffer,
-                                                    GLuint start, GLsizei count,
-                                                    const GLfloat *v);
-
-extern void GLAPIENTRY
-_mesa_EvaluateDepthValuesARB(void);
-
 #endif /* FBOBJECT_H */
index eda6521..8daa85e 100644 (file)
@@ -35,6 +35,7 @@
 #include "feedback.h"
 #include "macros.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_feedback.h"
 
index 08bc762..0d8646b 100644 (file)
 #ifndef FEEDBACK_H
 #define FEEDBACK_H
 
-
 #include "main/mtypes.h"
 
-
-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
 _mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat win[4],
index 8ad4199..33e0dde 100644 (file)
@@ -28,7 +28,7 @@
 #include "fog.h"
 #include "macros.h"
 #include "mtypes.h"
-
+#include "api_exec_decl.h"
 
 
 void GLAPIENTRY
index 1467663..057f618 100644 (file)
 
 struct gl_context;
 
-
-extern void GLAPIENTRY
-_mesa_Fogf(GLenum pname, GLfloat param);
-
-extern void GLAPIENTRY
-_mesa_Fogi(GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_Fogfv(GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_Fogiv(GLenum pname, const GLint *params );
-
 extern void _mesa_init_fog( struct gl_context * ctx );
 
 #endif
index b86fd19..355aa05 100644 (file)
@@ -36,6 +36,7 @@
 #include "shaderimage.h"
 #include "texcompress.h"
 #include "textureview.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_format.h"
 
index f23fafd..e64af1b 100644 (file)
@@ -35,12 +35,4 @@ _mesa_query_internal_format_default(struct gl_context *ctx, GLenum target,
                                     GLenum internalFormat, GLenum pname,
                                     GLint *params);
 
-extern void GLAPIENTRY
-_mesa_GetInternalformativ(GLenum target, GLenum internalformat,
-                          GLenum pname, GLsizei bufSize, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetInternalformati64v(GLenum target, GLenum internalformat,
-                            GLenum pname, GLsizei bufSize, GLint64 *params);
-
 #endif /* FORMATQUERY_H */
index 1775793..d86fd43 100644 (file)
@@ -37,6 +37,7 @@
 #include "teximage.h"
 #include "texobj.h"
 #include "hash.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_gen_mipmap.h"
 
index c661f21..05e9318 100644 (file)
@@ -35,22 +35,4 @@ bool
 _mesa_is_valid_generate_texture_mipmap_internalformat(struct gl_context *ctx,
                                                       GLenum internalformat);
 
-void GLAPIENTRY
-_mesa_GenerateMipmap_no_error(GLenum target);
-
-extern void GLAPIENTRY
-_mesa_GenerateMipmap(GLenum target);
-
-void GLAPIENTRY
-_mesa_GenerateTextureMipmap_no_error(GLuint texture);
-
-extern void GLAPIENTRY
-_mesa_GenerateTextureMipmap(GLuint texture);
-
-extern void GLAPIENTRY
-_mesa_GenerateTextureMipmapEXT(GLuint texture, GLenum target);
-
-extern void GLAPIENTRY
-_mesa_GenerateMultiTexMipmapEXT(GLenum texunit, GLenum target);
-
 #endif /* GENMIPMAP_H */
index 0138da5..fe3b131 100644 (file)
@@ -46,6 +46,7 @@
 #include "state_tracker/st_cb_queryobj.h"
 #include "state_tracker/st_cb_msaa.h"
 #include "state_tracker/st_context.h"
+#include "api_exec_decl.h"
 
 /* This is a table driven implemetation of the glGet*v() functions.
  * The basic idea is that most getters just look up an int somewhere
index de9b2a2..6866c2c 100644 (file)
 
 #include "glheader.h"
 
-
-extern void GLAPIENTRY
-_mesa_GetBooleanv( GLenum pname, GLboolean *params );
-
-extern void GLAPIENTRY
-_mesa_GetDoublev( GLenum pname, GLdouble *params );
-
-extern void GLAPIENTRY
-_mesa_GetFloatv( GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetIntegerv( GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetInteger64v( GLenum pname, GLint64 *params );
-
-extern void GLAPIENTRY
-_mesa_GetFixedv(GLenum pname, GLfixed *params);
-
-extern void GLAPIENTRY
-_mesa_GetUnsignedBytevEXT(GLenum pname, GLubyte *data);
-
-extern void GLAPIENTRY
-_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params );
-
-extern void GLAPIENTRY
-_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params );
-
-extern void GLAPIENTRY
-_mesa_GetPointerv( GLenum pname, GLvoid **params );
-
-extern void GLAPIENTRY
-_mesa_GetPointerIndexedvEXT( GLenum pname, GLuint index, GLvoid **params );
-
-extern void GLAPIENTRY
-_mesa_GetFloati_v(GLenum target, GLuint index, GLfloat *data);
-
-extern void GLAPIENTRY
-_mesa_GetDoublei_v(GLenum target, GLuint index, GLdouble *data);
-
-extern void GLAPIENTRY
-_mesa_GetUnsignedBytei_vEXT(GLenum target, GLuint index, GLubyte *data);
-
-extern const GLubyte * GLAPIENTRY
-_mesa_GetString( GLenum name );
-
-extern const GLubyte * GLAPIENTRY
-_mesa_GetStringi(GLenum name, GLuint index);
-
-extern GLenum GLAPIENTRY
-_mesa_GetError( void );
-
-/* GL_ARB_robustness */
-extern GLenum GLAPIENTRY
-_mesa_GetGraphicsResetStatusARB( void );
-
 struct gl_vertex_array_object;
 
 extern void
index 87af36d..a09c467 100644 (file)
@@ -36,6 +36,8 @@
 #include "spirv_extensions.h"
 
 #include "state_tracker/st_cb_strings.h"
+#include "api_exec_decl.h"
+
 /**
  * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.
  */
index c7d3c41..a90c5e1 100644 (file)
@@ -32,6 +32,7 @@
 #include "program/program.h"
 
 #include "util/u_atomic.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_program.h"
 
index 8025c17..8ed6af3 100644 (file)
@@ -90,20 +90,6 @@ _mesa_spirv_to_nir(struct gl_context *ctx,
                    gl_shader_stage stage,
                    const nir_shader_compiler_options *options);
 
-/**
- * \name API functions
- */
-/*@{*/
-
-void GLAPIENTRY
-_mesa_SpecializeShaderARB(GLuint shader,
-                          const GLchar *pEntryPoint,
-                          GLuint numSpecializationConstants,
-                          const GLuint *pConstantIndex,
-                          const GLuint *pConstantValue);
-
-/*@}*/
-
 #ifdef __cplusplus
 }
 #endif
index c25eb4e..3fd5bbd 100644 (file)
@@ -24,6 +24,7 @@
 #include "glthread_marshal.h"
 #include "dispatch.h"
 #include "uniforms.h"
+#include "api_exec_decl.h"
 
 struct marshal_cmd_ShaderSource
 {
index 8307fe7..648a524 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "mtypes.h"
 #include "state_tracker/st_cb_program.h"
+#include "api_exec_decl.h"
 
 
 void GLAPIENTRY
index 2d7c710..fff30cf 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_Hint( GLenum target, GLenum mode );
-
-/* GL_KHR_parallel_shader_compile */
-extern void GLAPIENTRY
-_mesa_MaxShaderCompilerThreadsKHR(GLuint count);
-
 extern void 
 _mesa_init_hint( struct gl_context * ctx );
 
index 5696f54..b971a55 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "glheader.h"
 #include "context.h"
-#include "histogram.h"
+#include "api_exec_decl.h"
 
 
 /**********************************************************************
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
deleted file mode 100644 (file)
index 47a2bf0..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * \file histogram.h
- * Histogram.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2003  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
- * 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.
- */
-
-
-#ifndef HISTOGRAM_H
-#define HISTOGRAM_H
-
-#include "glheader.h"
-
-
-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 */
index 03ec731..9ce69e7 100644 (file)
@@ -33,6 +33,7 @@
 #include "mtypes.h"
 #include "math/m_matrix.h"
 #include "util/bitscan.h"
+#include "api_exec_decl.h"
 
 
 void GLAPIENTRY
index 68e4f9b..8fb40c4 100644 (file)
@@ -35,53 +35,6 @@ struct gl_context;
 struct gl_light;
 struct gl_material;
 
-extern void GLAPIENTRY
-_mesa_ShadeModel( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_ProvokingVertex(GLenum mode);
-
-
-extern void GLAPIENTRY
-_mesa_ColorMaterial( GLenum face, GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_Lightf( GLenum light, GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_Lighti( GLenum light, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_LightModelf( GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_LightModelfv( GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_LightModeli( GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_LightModeliv( GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
-
-
 extern GLuint _mesa_material_bitmask( struct gl_context *ctx,
                                       GLenum face, GLenum pname,
                                       GLuint legal,
index f45a7f5..a4ec44b 100644 (file)
@@ -28,6 +28,7 @@
 #include "lines.h"
 #include "macros.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 
 /**
index 78a405c..f1608b0 100644 (file)
 
 struct gl_context;
 
-void GLAPIENTRY
-_mesa_LineWidth_no_error(GLfloat width);
-
-extern void GLAPIENTRY
-_mesa_LineWidth( GLfloat width );
-
-extern void GLAPIENTRY
-_mesa_LineStipple( GLint factor, GLushort pattern );
-
 extern void
 _mesa_init_line( struct gl_context * ctx );
 
index 41c504f..ca30ede 100644 (file)
@@ -44,6 +44,7 @@
 #include "mtypes.h"
 #include "math/m_matrix.h"
 #include "util/bitscan.h"
+#include "api_exec_decl.h"
 
 
 static struct gl_matrix_stack *
index a09b08b..ceaba87 100644 (file)
@@ -40,129 +40,6 @@ extern void
 _mesa_load_matrix(struct gl_context *ctx, struct gl_matrix_stack *s,
                   const GLfloat *m);
 
-extern void GLAPIENTRY
-_mesa_Frustum( GLdouble left, GLdouble right,
-               GLdouble bottom, GLdouble top,
-               GLdouble nearval, GLdouble farval );
-
-extern void GLAPIENTRY
-_mesa_Ortho( GLdouble left, GLdouble right,
-             GLdouble bottom, GLdouble top,
-             GLdouble nearval, GLdouble farval );
-
-extern void GLAPIENTRY
-_mesa_PushMatrix( void );
-
-extern void GLAPIENTRY
-_mesa_PopMatrix( void );
-
-extern void GLAPIENTRY
-_mesa_LoadIdentity( void );
-
-extern void GLAPIENTRY
-_mesa_LoadMatrixf( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_LoadMatrixd( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixMode( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_MultMatrixf( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_MultMatrixd( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixf( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixd( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MultTransposeMatrixf( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_MultTransposeMatrixd( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixLoadfEXT( GLenum matrixMode, const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixLoaddEXT( GLenum matrixMode, const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixMultfEXT( GLenum matrixMode, const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixMultdEXT( GLenum matrixMode, const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixLoadIdentityEXT( GLenum matrixMode );
-
-extern void GLAPIENTRY
-_mesa_MatrixRotatefEXT( GLenum matrixMode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_MatrixRotatedEXT( GLenum matrixMode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_MatrixScalefEXT( GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_MatrixScaledEXT( GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_MatrixTranslatefEXT( GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_MatrixTranslatedEXT( GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_MatrixOrthoEXT( GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t,
-      GLdouble n, GLdouble f );
-
-extern void GLAPIENTRY
-_mesa_MatrixFrustumEXT( GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t,
-      GLdouble n, GLdouble f );
-
-extern void GLAPIENTRY
-_mesa_MatrixPushEXT( GLenum matrixMode );
-
-extern void GLAPIENTRY
-_mesa_MatrixPopEXT( GLenum matrixMode );
-
-extern void GLAPIENTRY
-_mesa_MatrixLoadTransposefEXT( GLenum matrixMode, const GLfloat* m );
-
-extern void GLAPIENTRY
-_mesa_MatrixLoadTransposedEXT( GLenum matrixMode, const GLdouble* m );
-
-extern void GLAPIENTRY
-_mesa_MatrixMultTransposefEXT( GLenum matrixMode, const GLfloat* m );
-
-extern void GLAPIENTRY
-_mesa_MatrixMultTransposedEXT( GLenum matrixMode, const GLdouble* m );
-
 extern void 
 _mesa_init_matrix( struct gl_context * ctx );
 
index 0dbf374..3c88e2b 100644 (file)
@@ -31,6 +31,7 @@
 #include "main/fbobject.h"
 #include "main/glformats.h"
 #include "main/state.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_format.h"
 #include "state_tracker/st_cb_msaa.h"
index 9cd4724..c370307 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_SampleCoverage(GLclampf value, GLboolean invert);
-
-
 extern void
 _mesa_init_multisample(struct gl_context *ctx);
 
-
-extern void GLAPIENTRY
-_mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat* val);
-
-void GLAPIENTRY
-_mesa_SampleMaski_no_error(GLuint index, GLbitfield mask);
-
-extern void GLAPIENTRY
-_mesa_SampleMaski(GLuint index, GLbitfield mask);
-
-void GLAPIENTRY
-_mesa_MinSampleShading_no_error(GLclampf value);
-
-extern void GLAPIENTRY
-_mesa_MinSampleShading(GLclampf value);
-
 extern GLenum
 _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
                          GLenum internalFormat, GLsizei samples,
                          GLsizei storageSamples);
 
-extern void GLAPIENTRY
-_mesa_AlphaToCoverageDitherControlNV_no_error(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_AlphaToCoverageDitherControlNV(GLenum mode);
-
 #endif
index 92a1a79..ed9dfd4 100644 (file)
@@ -29,7 +29,6 @@
 #include "dlist.h"
 #include "enums.h"
 #include "fbobject.h"
-#include "objectlabel.h"
 #include "pipelineobj.h"
 #include "queryobj.h"
 #include "samplerobj.h"
@@ -37,6 +36,7 @@
 #include "syncobj.h"
 #include "texobj.h"
 #include "transformfeedback.h"
+#include "api_exec_decl.h"
 
 
 /**
diff --git a/src/mesa/main/objectlabel.h b/src/mesa/main/objectlabel.h
deleted file mode 100644 (file)
index f57d5f7..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2013  Timothy Arceri   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
- * 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.
- */
-
-
-/**
- * \file objectlabel.h
- * Mesa object label functions.
- *
- * This file provides functions to assign and retrieve object labels.
- */
-
-#ifndef OBJECTLABEL_H
-#define OBJECTLABEL_H
-
-
-#include "glheader.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void GLAPIENTRY
-_mesa_ObjectLabel(GLenum identifier, GLuint name, GLsizei length,
-                  const GLchar *label);
-void GLAPIENTRY
-_mesa_GetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize,
-                     GLsizei *length, GLchar *label);
-void GLAPIENTRY
-_mesa_ObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label);
-void GLAPIENTRY
-_mesa_GetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length,
-                        GLchar *label);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* OBJECTLABEL_H */
index 3d7a562..de6f56c 100644 (file)
@@ -36,9 +36,9 @@
 #include "bufferobj.h"
 #include "fbobject.h"
 #include "mtypes.h"
-#include "objectpurge.h"
 #include "texobj.h"
 #include "teximage.h"
+#include "api_exec_decl.h"
 
 
 static GLenum
diff --git a/src/mesa/main/objectpurge.h b/src/mesa/main/objectpurge.h
deleted file mode 100644 (file)
index f049012..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  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
- * 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.
- */
-
-
-#ifndef OBJECTPURGE_H
-#define OBJECTPURGE_H
-
-
-GLenum GLAPIENTRY
-_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
-
-GLenum GLAPIENTRY
-_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
-
-void GLAPIENTRY
-_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name,
-                                GLenum pname, GLint* params);
-
-
-#endif /* OBJECTPURGE_H */
index da3aedd..2a87547 100644 (file)
@@ -44,6 +44,7 @@
 #include "performance_monitor.h"
 #include "util/bitset.h"
 #include "util/ralloc.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_perfmon.h"
 
index 2ba7032..f005208 100644 (file)
@@ -38,50 +38,6 @@ _mesa_init_performance_monitors(struct gl_context *ctx);
 extern void
 _mesa_free_performance_monitors(struct gl_context *ctx);
 
-extern void GLAPIENTRY
-_mesa_GetPerfMonitorGroupsAMD(GLint *numGroups, GLsizei groupsSize,
-                              GLuint *groups);
-
-extern void GLAPIENTRY
-_mesa_GetPerfMonitorCountersAMD(GLuint group, GLint *numCounters,
-                                GLint *maxActiveCounters,
-                                GLsizei countersSize, GLuint *counters);
-
-extern void GLAPIENTRY
-_mesa_GetPerfMonitorGroupStringAMD(GLuint group, GLsizei bufSize,
-                                   GLsizei *length, GLchar *groupString);
-
-extern void GLAPIENTRY
-_mesa_GetPerfMonitorCounterStringAMD(GLuint group, GLuint counter,
-                                     GLsizei bufSize, GLsizei *length,
-                                     GLchar *counterString);
-
-extern void GLAPIENTRY
-_mesa_GetPerfMonitorCounterInfoAMD(GLuint group, GLuint counter, GLenum pname,
-                                   GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_GenPerfMonitorsAMD(GLsizei n, GLuint *monitors);
-
-extern void GLAPIENTRY
-_mesa_DeletePerfMonitorsAMD(GLsizei n, GLuint *monitors);
-
-extern void GLAPIENTRY
-_mesa_SelectPerfMonitorCountersAMD(GLuint monitor, GLboolean enable,
-                                   GLuint group, GLint numCounters,
-                                   GLuint *counterList);
-
-extern void GLAPIENTRY
-_mesa_BeginPerfMonitorAMD(GLuint monitor);
-
-extern void GLAPIENTRY
-_mesa_EndPerfMonitorAMD(GLuint monitor);
-
-extern void GLAPIENTRY
-_mesa_GetPerfMonitorCounterDataAMD(GLuint monitor, GLenum pname,
-                                   GLsizei dataSize, GLuint *data,
-                                   GLint *bytesWritten);
-
 unsigned
 _mesa_perf_monitor_counter_size(const struct gl_perf_monitor_counter *);
 
index b44f7f9..9a9f609 100644 (file)
@@ -35,6 +35,7 @@
 #include "mtypes.h"
 #include "performance_query.h"
 #include "util/ralloc.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_perfquery.h"
 #include "state_tracker/st_cb_flush.h"
index 7848664..593ee96 100644 (file)
@@ -37,43 +37,4 @@ _mesa_init_performance_queries(struct gl_context *ctx);
 extern void
 _mesa_free_performance_queries(struct gl_context *ctx);
 
-extern void GLAPIENTRY
-_mesa_GetFirstPerfQueryIdINTEL(GLuint *queryId);
-
-extern void GLAPIENTRY
-_mesa_GetNextPerfQueryIdINTEL(GLuint queryId, GLuint *nextQueryId);
-
-extern void GLAPIENTRY
-_mesa_GetPerfQueryIdByNameINTEL(char *queryName, GLuint *queryId);
-
-extern void GLAPIENTRY
-_mesa_GetPerfQueryInfoINTEL(GLuint queryId,
-                            GLuint queryNameLength, char *queryName,
-                            GLuint *dataSize, GLuint *noCounters,
-                            GLuint *noActiveInstances,
-                            GLuint *capsMask);
-
-extern void GLAPIENTRY
-_mesa_GetPerfCounterInfoINTEL(GLuint queryId, GLuint counterId,
-                              GLuint counterNameLength, char *counterName,
-                              GLuint counterDescLength, char *counterDesc,
-                              GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum,
-                              GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-
-extern void GLAPIENTRY
-_mesa_CreatePerfQueryINTEL(GLuint queryId, GLuint *queryHandle);
-
-extern void GLAPIENTRY
-_mesa_DeletePerfQueryINTEL(GLuint queryHandle);
-
-extern void GLAPIENTRY
-_mesa_BeginPerfQueryINTEL(GLuint queryHandle);
-
-extern void GLAPIENTRY
-_mesa_EndPerfQueryINTEL(GLuint queryHandle);
-
-extern void GLAPIENTRY
-_mesa_GetPerfQueryDataINTEL(GLuint queryHandle, GLuint flags,
-                            GLsizei dataSize, void *data, GLuint *bytesWritten);
-
 #endif
index f0ca929..8004869 100644 (file)
@@ -50,6 +50,7 @@
 #include "program/prog_parameter.h"
 #include "util/ralloc.h"
 #include "util/bitscan.h"
+#include "api_exec_decl.h"
 
 /**
  * Delete a pipeline object.
index 8cc5954..f821fa6 100644 (file)
@@ -70,51 +70,6 @@ extern GLboolean
 _mesa_validate_program_pipeline(struct gl_context * ctx,
                                 struct gl_pipeline_object *pipe);
 
-
-void GLAPIENTRY
-_mesa_UseProgramStages_no_error(GLuint pipeline, GLbitfield stages,
-                                GLuint prog);
-extern void GLAPIENTRY
-_mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program);
-
-void GLAPIENTRY
-_mesa_ActiveShaderProgram_no_error(GLuint pipeline, GLuint program);
-extern void GLAPIENTRY
-_mesa_ActiveShaderProgram(GLuint pipeline, GLuint program);
-
-void GLAPIENTRY
-_mesa_BindProgramPipeline_no_error(GLuint pipeline);
-extern void GLAPIENTRY
-_mesa_BindProgramPipeline(GLuint pipeline);
-
-extern void GLAPIENTRY
-_mesa_DeleteProgramPipelines(GLsizei n, const GLuint *pipelines);
-
-void GLAPIENTRY
-_mesa_GenProgramPipelines_no_error(GLsizei n, GLuint *pipelines);
-
-extern void GLAPIENTRY
-_mesa_GenProgramPipelines(GLsizei n, GLuint *pipelines);
-
-void GLAPIENTRY
-_mesa_CreateProgramPipelines_no_error(GLsizei n, GLuint *pipelines);
-
-void GLAPIENTRY
-_mesa_CreateProgramPipelines(GLsizei n, GLuint *pipelines);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsProgramPipeline(GLuint pipeline);
-
-extern void GLAPIENTRY
-_mesa_GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_ValidateProgramPipeline(GLuint pipeline);
-
-extern void GLAPIENTRY
-_mesa_GetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize,
-                                GLsizei *length, GLchar *infoLog);
-
 #ifdef __cplusplus
 }
 #endif
index 9553b44..9154e71 100644 (file)
@@ -36,6 +36,7 @@
 #include "pixel.h"
 #include "pbo.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 
 /**********************************************************************/
index 17e7376..e6fb4eb 100644 (file)
 
 struct gl_context;
 
-
-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 );
 
index d1d1f03..b16881d 100644 (file)
@@ -34,6 +34,7 @@
 #include "pixelstore.h"
 #include "mtypes.h"
 #include "util/rounding.h"
+#include "api_exec_decl.h"
 
 
 static ALWAYS_INLINE void
index d21c6fe..e8e633a 100644 (file)
 
 struct gl_context;
 
-
-extern void GLAPIENTRY
-_mesa_PixelStorei( GLenum pname, GLint param );
-
-
-extern void GLAPIENTRY
-_mesa_PixelStoref( GLenum pname, GLfloat param );
-
-
-extern void GLAPIENTRY
-_mesa_PixelStorei_no_error(GLenum pname, GLint param);
-
-
-extern void GLAPIENTRY
-_mesa_PixelStoref_no_error(GLenum pname, GLfloat param);
-
-
 extern void
 _mesa_init_pixelstore( struct gl_context *ctx );
 
index b05519c..b76c90d 100644 (file)
@@ -33,6 +33,7 @@
 #include "macros.h"
 #include "points.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 
 /**
index c2b67a3..6c8b5f6 100644 (file)
 
 struct gl_context;
 
-
-void GLAPIENTRY
-_mesa_PointSize_no_error(GLfloat size);
-
-extern void GLAPIENTRY
-_mesa_PointSize( GLfloat size );
-
-extern void GLAPIENTRY
-_mesa_PointParameteri( GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_PointParameteriv( GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_PointParameterf( GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_PointParameterfv( GLenum pname, const GLfloat *params );
-
 extern void 
 _mesa_init_point( struct gl_context * ctx );
 
index f16a36b..8414c3a 100644 (file)
@@ -38,6 +38,7 @@
 #include "pbo.h"
 #include "polygon.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 
 /**
index a7e383d..8e1f428 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_GetnPolygonStippleARB( GLsizei bufSize, GLubyte *dest );
-
-void GLAPIENTRY
-_mesa_CullFace_no_error(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_CullFace(GLenum mode);
-
-void GLAPIENTRY
-_mesa_FrontFace_no_error(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_FrontFace(GLenum mode);
-
-void GLAPIENTRY
-_mesa_PolygonMode_no_error(GLenum face, GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_PolygonMode( GLenum face, GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_PolygonOffset( GLfloat factor, GLfloat units );
-
-extern void GLAPIENTRY
-_mesa_PolygonOffsetClampEXT( GLfloat factor, GLfloat units, GLfloat clamp );
-
-extern void GLAPIENTRY
-_mesa_PolygonStipple( const GLubyte *mask );
-
-extern void GLAPIENTRY
-_mesa_GetPolygonStipple( GLubyte *mask );
-
 extern void
 _mesa_polygon_offset_clamp(struct gl_context *ctx,
                            GLfloat factor, GLfloat units, GLfloat clamp);
index 5ddacc7..43df4e8 100644 (file)
@@ -29,8 +29,8 @@
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/context.h"
-#include "program_resource.h"
 #include "compiler/glsl/ir_uniform.h"
+#include "api_exec_decl.h"
 
 static bool
 supported_interface_enum(struct gl_context *ctx, GLenum iface)
diff --git a/src/mesa/main/program_resource.h b/src/mesa/main/program_resource.h
deleted file mode 100644 (file)
index 326ae1f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2015 Intel Corporation.  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
- * 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.
- *
- */
-
-#ifndef PROGRAM_RESOURCE_H
-#define PROGRAM_RESOURCE_H
-
-#include "glheader.h"
-
-extern void GLAPIENTRY
-_mesa_GetProgramInterfaceiv(GLuint program, GLenum programInterface,
-                            GLenum pname, GLint *params);
-
-extern GLuint GLAPIENTRY
-_mesa_GetProgramResourceIndex(GLuint program, GLenum programInterface,
-                              const GLchar *name);
-
-extern void GLAPIENTRY
-_mesa_GetProgramResourceName(GLuint program, GLenum programInterface,
-                             GLuint index, GLsizei bufSize, GLsizei *length,
-                             GLchar *name);
-
-extern void GLAPIENTRY
-_mesa_GetProgramResourceiv(GLuint program, GLenum programInterface,
-                           GLuint index, GLsizei propCount,
-                           const GLenum *props, GLsizei bufSize,
-                           GLsizei *length, GLint *params);
-
-extern GLint GLAPIENTRY
-_mesa_GetProgramResourceLocation(GLuint program, GLenum programInterface,
-                                 const GLchar *name);
-
-extern GLint GLAPIENTRY
-_mesa_GetProgramResourceLocationIndex(GLuint program, GLenum programInterface,
-                                      const GLchar *name);
-
-#endif
index b80bae6..83485f2 100644 (file)
@@ -15,9 +15,9 @@
 #include <stdlib.h>
 #include "c99_math.h"
 #include "glheader.h"
-#include "querymatrix.h"
 #include "main/get.h"
 #include "util/macros.h"
+#include "api_exec_decl.h"
 
 
 /**
@@ -40,7 +40,7 @@
 
 
 GLbitfield GLAPIENTRY
-_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+_mesa_QueryMatrixxOES(GLfixed *mantissa, GLint *exponent)
 {
    GLfloat matrix[16];
    GLint tmp;
diff --git a/src/mesa/main/querymatrix.h b/src/mesa/main/querymatrix.h
deleted file mode 100644 (file)
index 6492189..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 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.
- */
-
-#ifndef QUERYMATRIX_H
-#define QUERYMATRIX_H
-
-
-#include "glheader.h"
-
-
-/*
- * API functions
- */
-
-extern GLbitfield GLAPIENTRY
-_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
-
-#endif
index 6766063..4072fb1 100644 (file)
@@ -34,6 +34,7 @@
 #include "util/u_memory.h"
 
 #include "state_tracker/st_cb_queryobj.h"
+#include "api_exec_decl.h"
 
 static struct gl_query_object **
 get_pipe_stats_binding_point(struct gl_context *ctx,
index 92426a0..7461f04 100644 (file)
@@ -44,48 +44,4 @@ _mesa_init_queryobj(struct gl_context *ctx);
 extern void
 _mesa_free_queryobj_data(struct gl_context *ctx);
 
-void GLAPIENTRY
-_mesa_GenQueries(GLsizei n, GLuint *ids);
-void GLAPIENTRY
-_mesa_CreateQueries(GLenum target, GLsizei n, GLuint *ids);
-void GLAPIENTRY
-_mesa_DeleteQueries(GLsizei n, const GLuint *ids);
-GLboolean GLAPIENTRY
-_mesa_IsQuery(GLuint id);
-void GLAPIENTRY
-_mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id);
-void GLAPIENTRY
-_mesa_EndQueryIndexed(GLenum target, GLuint index);
-void GLAPIENTRY
-_mesa_BeginQuery(GLenum target, GLuint id);
-void GLAPIENTRY
-_mesa_EndQuery(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_GetQueryiv(GLenum target, GLenum pname, GLint *params);
-void GLAPIENTRY
-_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params);
-void GLAPIENTRY
-_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
-void GLAPIENTRY
-_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params);
-void GLAPIENTRY
-_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params);
-void GLAPIENTRY
-_mesa_GetQueryBufferObjectiv(GLuint id, GLuint buffer, GLenum pname,
-                             GLintptr offset);
-void GLAPIENTRY
-_mesa_GetQueryBufferObjectuiv(GLuint id, GLuint buffer, GLenum pname,
-                              GLintptr offset);
-void GLAPIENTRY
-_mesa_GetQueryBufferObjecti64v(GLuint id, GLuint buffer, GLenum pname,
-                               GLintptr offset);
-void GLAPIENTRY
-_mesa_GetQueryBufferObjectui64v(GLuint id, GLuint buffer, GLenum pname,
-                                GLintptr offset);
-
 #endif /* QUERYOBJ_H */
index 9a863a0..8769376 100644 (file)
@@ -40,6 +40,8 @@
 #include "util/bitscan.h"
 
 #include "state_tracker/st_cb_rasterpos.h"
+#include "api_exec_decl.h"
+
 
 /**
  * Clip a point against the view volume.
index 90b8f95..1a10091 100644 (file)
@@ -44,104 +44,4 @@ _mesa_init_rastpos(struct gl_context *ctx);
 void
 _mesa_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]);
 
-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_WindowPos2d(GLdouble x, GLdouble y);
-void GLAPIENTRY
-_mesa_WindowPos2f(GLfloat x, GLfloat y);
-void GLAPIENTRY
-_mesa_WindowPos2i(GLint x, GLint y);
-void GLAPIENTRY
-_mesa_WindowPos2s(GLshort x, GLshort y);
-void GLAPIENTRY
-_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z);
-void GLAPIENTRY
-_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z);
-void GLAPIENTRY
-_mesa_WindowPos3i(GLint x, GLint y, GLint z);
-void GLAPIENTRY
-_mesa_WindowPos3s(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_WindowPos2dv(const GLdouble *v);
-void GLAPIENTRY
-_mesa_WindowPos2fv(const GLfloat *v);
-void GLAPIENTRY
-_mesa_WindowPos2iv(const GLint *v);
-void GLAPIENTRY
-_mesa_WindowPos2sv(const GLshort *v);
-void GLAPIENTRY
-_mesa_WindowPos3dv(const GLdouble *v);
-void GLAPIENTRY
-_mesa_WindowPos3fv(const GLfloat *v);
-void GLAPIENTRY
-_mesa_WindowPos3iv(const GLint *v);
-void GLAPIENTRY
-_mesa_WindowPos3sv(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 */
index 324ca9d..fe7486a 100644 (file)
@@ -42,6 +42,7 @@
 #include "fbobject.h"
 #include "format_utils.h"
 #include "pixeltransfer.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_fbo.h"
 #include "state_tracker/st_cb_readpixels.h"
index eff8e02..eb74a6d 100644 (file)
@@ -58,22 +58,4 @@ _mesa_readpixels(struct gl_context *ctx,
                  const struct gl_pixelstore_attrib *packing,
                  GLvoid *pixels);
 
-void GLAPIENTRY
-_mesa_ReadPixels_no_error(GLint x, GLint y, GLsizei width, GLsizei height,
-                          GLenum format, GLenum type, GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-                  GLenum format, GLenum type, GLvoid *pixels );
-
-void GLAPIENTRY
-_mesa_ReadnPixelsARB_no_error(GLint x, GLint y, GLsizei width, GLsizei height,
-                                       GLenum format, GLenum type, GLsizei bufSize,
-                              GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height,
-                     GLenum format, GLenum type, GLsizei bufSize,
-                      GLvoid *pixels );
-
 #endif
index e7d7007..476dc8d 100644 (file)
@@ -28,6 +28,7 @@
 #include "mtypes.h"
 #include "macros.h"
 #include "main/dispatch.h" /* for _gloffset_COUNT */
+#include "api_exec_decl.h"
 
 static void GLAPIENTRY
 _context_lost_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize,
index 556aab6..d59d920 100644 (file)
@@ -39,6 +39,7 @@
 #include "main/samplerobj.h"
 #include "main/texturebindless.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 /* Take advantage of how the enums are defined. */
 const enum pipe_tex_wrap wrap_to_gallium_table[32] = {
index 54b5677..491e43c 100644 (file)
@@ -89,60 +89,6 @@ extern void
 _mesa_bind_sampler(struct gl_context *ctx, GLuint unit,
                    struct gl_sampler_object *sampObj);
 
-void GLAPIENTRY
-_mesa_GenSamplers_no_error(GLsizei count, GLuint *samplers);
-
-void GLAPIENTRY
-_mesa_GenSamplers(GLsizei count, GLuint *samplers);
-
-void GLAPIENTRY
-_mesa_CreateSamplers_no_error(GLsizei count, GLuint *samplers);
-
-void GLAPIENTRY
-_mesa_CreateSamplers(GLsizei count, GLuint *samplers);
-
-void GLAPIENTRY
-_mesa_DeleteSamplers_no_error(GLsizei count, const GLuint *samplers);
-
-void GLAPIENTRY
-_mesa_DeleteSamplers(GLsizei count, const GLuint *samplers);
-
-GLboolean GLAPIENTRY
-_mesa_IsSampler(GLuint sampler);
-
-void GLAPIENTRY
-_mesa_BindSampler_no_error(GLuint unit, GLuint sampler);
-
-void GLAPIENTRY
-_mesa_BindSampler(GLuint unit, GLuint sampler);
-
-void GLAPIENTRY
-_mesa_BindSamplers_no_error(GLuint first, GLsizei count, const GLuint *samplers);
-
-void GLAPIENTRY
-_mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers);
-
-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);
-
 extern const enum pipe_tex_wrap wrap_to_gallium_table[32];
 
 /**
index 3d41b80..5b52978 100644 (file)
@@ -28,6 +28,7 @@
 #include "main/enums.h"
 #include "main/mtypes.h"
 #include "main/scissor.h"
+#include "api_exec_decl.h"
 
 
 /**
index 264873e..df58da9 100644 (file)
 
 struct gl_context;
 
-void GLAPIENTRY
-_mesa_Scissor_no_error(GLint x, GLint y, GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
-
-void GLAPIENTRY
-_mesa_ScissorArrayv_no_error(GLuint first, GLsizei count, const GLint * v);
-
-extern void GLAPIENTRY
-_mesa_ScissorArrayv(GLuint first, GLsizei count, const GLint * v);
-
-void GLAPIENTRY
-_mesa_ScissorIndexed_no_error(GLuint index, GLint left, GLint bottom,
-                              GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_ScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-
-void GLAPIENTRY
-_mesa_ScissorIndexedv_no_error(GLuint index, const GLint * v);
-
-extern void GLAPIENTRY
-_mesa_ScissorIndexedv(GLuint index, const GLint * v);
-
-extern void GLAPIENTRY
-_mesa_WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint *box);
-
 extern void
 _mesa_set_scissor(struct gl_context *ctx, unsigned idx,
                   GLint x, GLint y, GLsizei width, GLsizei height);
index cba84c6..bf9a1a8 100644 (file)
@@ -39,6 +39,7 @@
 #include "compiler/glsl/string_to_uint_map.h"
 #include "util/mesa-sha1.h"
 #include "c99_alloca.h"
+#include "api_exec_decl.h"
 
 static GLint
 program_resource_location(struct gl_program_resource *res,
index 3aa1d99..f6dfeb0 100644 (file)
@@ -65,6 +65,7 @@
 #include "util/simple_list.h"
 #include "util/u_process.h"
 #include "util/u_string.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_program.h"
 
index d7d3f94..6c1600e 100644 (file)
@@ -81,185 +81,6 @@ extern void
 _mesa_shader_write_subroutine_indices(struct gl_context *ctx,
                                       gl_shader_stage stage);
 
-void GLAPIENTRY
-_mesa_AttachObjectARB_no_error(GLhandleARB, GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
-
-extern void  GLAPIENTRY
-_mesa_CompileShader(GLuint);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_CreateProgramObjectARB(void);
-
-GLhandleARB GLAPIENTRY
-_mesa_CreateShaderObjectARB_no_error(GLenum type);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_CreateShaderObjectARB(GLenum type);
-
-extern void GLAPIENTRY
-_mesa_DeleteObjectARB(GLhandleARB obj);
-
-void GLAPIENTRY
-_mesa_DetachObjectARB_no_error(GLhandleARB, GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_DetachObjectARB(GLhandleARB, GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_GetAttachedObjectsARB(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-
-extern GLint GLAPIENTRY
-_mesa_GetFragDataLocation(GLuint program, const GLchar *name);
-
-extern GLint GLAPIENTRY
-_mesa_GetFragDataIndex(GLuint program, const GLchar *name);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_GetHandleARB(GLenum pname);
-
-extern void GLAPIENTRY
-_mesa_GetInfoLogARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterfvARB(GLhandleARB, GLenum, GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);
-
-extern void GLAPIENTRY
-_mesa_GetShaderSource(GLuint, GLsizei, GLsizei *, GLchar *);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsProgram(GLuint name);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsShader(GLuint name);
-
-void GLAPIENTRY
-_mesa_LinkProgram_no_error(GLuint programObj);
-
-extern void GLAPIENTRY
-_mesa_LinkProgram(GLuint programObj);
-
-void GLAPIENTRY
-_mesa_ShaderSource_no_error(GLuint, GLsizei, const GLchar* const *,
-                            const GLint *);
-
-extern void GLAPIENTRY
-_mesa_ShaderSource(GLuint, GLsizei, const GLchar* const *, const GLint *);
-
-void GLAPIENTRY
-_mesa_UseProgram_no_error(GLuint);
-extern void GLAPIENTRY
-_mesa_UseProgram(GLuint);
-
-extern void GLAPIENTRY
-_mesa_ValidateProgram(GLuint);
-
-
-void GLAPIENTRY
-_mesa_BindAttribLocation_no_error(GLuint program, GLuint, const GLchar *);
-
-extern void GLAPIENTRY
-_mesa_BindAttribLocation(GLuint program, GLuint, const GLchar *);
-
-extern void GLAPIENTRY
-_mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,
-                           const GLchar *name);
-
-extern void GLAPIENTRY
-_mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
-                                  GLuint index, const GLchar *name);
-
-extern void GLAPIENTRY
-_mesa_BindFragDataLocation_no_error(GLuint program, GLuint colorNumber,
-                                    const GLchar *name);
-
-extern void GLAPIENTRY
-_mesa_BindFragDataLocationIndexed_no_error(GLuint program, GLuint colorNumber,
-                                           GLuint index, const GLchar *name);
-
-extern void GLAPIENTRY
-_mesa_GetActiveAttrib(GLuint, GLuint, GLsizei, GLsizei *, GLint *,
-                         GLenum *, GLchar *);
-
-extern GLint GLAPIENTRY
-_mesa_GetAttribLocation(GLuint, const GLchar *);
-
-void GLAPIENTRY
-_mesa_AttachShader_no_error(GLuint program, GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_AttachShader(GLuint program, GLuint shader);
-
-GLuint GLAPIENTRY
-_mesa_CreateShader_no_error(GLenum);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateShader(GLenum);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateProgram(void);
-
-extern void GLAPIENTRY
-_mesa_DeleteProgram(GLuint program);
-
-extern void GLAPIENTRY
-_mesa_DeleteShader(GLuint shader);
-
-void GLAPIENTRY
-_mesa_DetachShader_no_error(GLuint program, GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_DetachShader(GLuint program, GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
-                         GLsizei *count, GLuint *obj);
-
-extern void GLAPIENTRY
-_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
-                        GLsizei *length, GLchar *infoLog);
-
-extern void GLAPIENTRY
-_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
-                       GLsizei *length, GLchar *infoLog);
-
-
-extern void GLAPIENTRY
-_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
-                               GLint *range, GLint *precision);
-
-extern void GLAPIENTRY
-_mesa_ReleaseShaderCompiler(void);
-
-extern void GLAPIENTRY
-_mesa_ShaderBinary(GLint n, const GLuint *shaders, GLenum binaryformat,
-                   const void* binary, GLint length);
-
-extern void GLAPIENTRY
-_mesa_GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length,
-                       GLenum *binaryFormat, GLvoid *binary);
-
-extern void GLAPIENTRY
-_mesa_ProgramBinary(GLuint program, GLenum binaryFormat,
-                    const GLvoid *binary, GLsizei length);
-
-void GLAPIENTRY
-_mesa_ProgramParameteri_no_error(GLuint program, GLenum pname, GLint value);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameteri(GLuint program, GLenum pname, GLint value);
-
 void
 _mesa_use_program(struct gl_context *ctx, gl_shader_stage stage,
                   struct gl_shader_program *shProg, struct gl_program *prog,
@@ -273,11 +94,6 @@ extern bool
 _mesa_validate_shader_target(const struct gl_context *ctx, GLenum type);
 
 
-/* GL_ARB_separate_shader_objects */
-extern GLuint GLAPIENTRY
-_mesa_CreateShaderProgramv(GLenum type, GLsizei count,
-                           const GLchar* const *strings);
-
 /* GL_ARB_program_resource_query */
 extern const char*
 _mesa_program_resource_name(struct gl_program_resource *res);
@@ -348,77 +164,11 @@ _mesa_program_resource_hash_destroy(struct gl_shader_program *shProg);
 extern void
 _mesa_create_program_resource_hash(struct gl_shader_program *shProg);
 
-/* GL_ARB_tessellation_shader */
-void GLAPIENTRY
-_mesa_PatchParameteri_no_error(GLenum pname, GLint value);
-
-extern void GLAPIENTRY
-_mesa_PatchParameteri(GLenum pname, GLint value);
-
-extern void GLAPIENTRY
-_mesa_PatchParameterfv(GLenum pname, const GLfloat *values);
-
 /* GL_ARB_shader_subroutine */
 void
 _mesa_program_init_subroutine_defaults(struct gl_context *ctx,
                                        struct gl_program *prog);
 
-extern GLint GLAPIENTRY
-_mesa_GetSubroutineUniformLocation(GLuint program, GLenum shadertype,
-                                   const GLchar *name);
-
-extern GLuint GLAPIENTRY
-_mesa_GetSubroutineIndex(GLuint program, GLenum shadertype,
-                         const GLchar *name);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetActiveSubroutineUniformiv(GLuint program, GLenum shadertype,
-                                   GLuint index, GLenum pname, GLint *values);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetActiveSubroutineUniformName(GLuint program, GLenum shadertype,
-                                     GLuint index, GLsizei bufsize,
-                                     GLsizei *length, GLchar *name);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetActiveSubroutineName(GLuint program, GLenum shadertype,
-                              GLuint index, GLsizei bufsize,
-                              GLsizei *length, GLchar *name);
-
-extern GLvoid GLAPIENTRY
-_mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count,
-                            const GLuint *indices);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetUniformSubroutineuiv(GLenum shadertype, GLint location,
-                              GLuint *params);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetProgramStageiv(GLuint program, GLenum shadertype,
-                        GLenum pname, GLint *values);
-
-extern GLvoid GLAPIENTRY
-_mesa_NamedStringARB(GLenum type, GLint namelen, const GLchar *name,
-                     GLint stringlen, const GLchar *string);
-
-extern GLvoid GLAPIENTRY
-_mesa_DeleteNamedStringARB(GLint namelen, const GLchar *name);
-
-extern GLvoid GLAPIENTRY
-_mesa_CompileShaderIncludeARB(GLuint shader, GLsizei count,
-                              const GLchar* const *path, const GLint *length);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsNamedStringARB(GLint namelen, const GLchar *name);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetNamedStringARB(GLint namelen, const GLchar *name, GLsizei bufSize,
-                        GLint *stringlen, GLchar *string);
-
-extern GLvoid GLAPIENTRY
-_mesa_GetNamedStringivARB(GLint namelen, const GLchar *name,
-                          GLenum pname, GLint *params);
-
 GLcharARB *
 _mesa_read_shader_source(const gl_shader_stage stage, const char *source,
                          const uint8_t sha1[SHA1_DIGEST_LENGTH]);
index b3b020e..a4acd3d 100644 (file)
@@ -35,6 +35,7 @@
 #include "texobj.h"
 #include "teximage.h"
 #include "enums.h"
+#include "api_exec_decl.h"
 
 mesa_format
 _mesa_get_shader_image_format(GLenum format)
index d43578b..032efea 100644 (file)
@@ -82,28 +82,6 @@ _mesa_free_image_textures(struct gl_context *ctx);
 GLboolean
 _mesa_is_image_unit_valid(struct gl_context *ctx, struct gl_image_unit *u);
 
-void GLAPIENTRY
-_mesa_BindImageTexture_no_error(GLuint unit, GLuint texture, GLint level,
-                                GLboolean layered, GLint layer, GLenum access,
-                                GLenum format);
-
-void GLAPIENTRY
-_mesa_BindImageTexture(GLuint unit, GLuint texture, GLint level,
-                       GLboolean layered, GLint layer, GLenum access,
-                       GLenum format);
-
-void GLAPIENTRY
-_mesa_BindImageTextureEXT(GLuint unit, GLuint texture, GLint level,
-                          GLboolean layered, GLint layer, GLenum access,
-                          GLint format);
-
-void GLAPIENTRY
-_mesa_BindImageTextures_no_error(GLuint first, GLsizei count,
-                                 const GLuint *textures);
-
-void GLAPIENTRY
-_mesa_BindImageTextures(GLuint first, GLsizei count, const GLuint *textures);
-
 #ifdef __cplusplus
 }
 #endif
index 5cec498..1cc61bd 100644 (file)
@@ -53,6 +53,7 @@
 #include "macros.h"
 #include "stencil.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 
 static GLboolean
index dc371ec..db5c032 100644 (file)
 
 struct gl_context;
 
-extern void GLAPIENTRY
-_mesa_ClearStencil( GLint s );
-
-
-void GLAPIENTRY
-_mesa_StencilFunc_no_error(GLenum func, GLint ref, GLuint mask);
-
-extern void GLAPIENTRY
-_mesa_StencilFunc(GLenum func, GLint ref, GLuint mask);
-
-
-extern void GLAPIENTRY
-_mesa_StencilMask( GLuint mask );
-
-void GLAPIENTRY
-_mesa_StencilOp_no_error(GLenum fail, GLenum zfail, GLenum zpass);
-
-extern void GLAPIENTRY
-_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass);
-
-
-extern void GLAPIENTRY
-_mesa_ActiveStencilFaceEXT(GLenum face);
-
-void GLAPIENTRY
-_mesa_StencilOpSeparate_no_error(GLenum face, GLenum fail, GLenum zfail,
-                                 GLenum zpass);
-
-extern void GLAPIENTRY
-_mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-
-
-void GLAPIENTRY
-_mesa_StencilFuncSeparate_no_error(GLenum face, GLenum func, GLint ref,
-                                   GLuint mask);
-
-extern void GLAPIENTRY
-_mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
-
-
-extern void GLAPIENTRY
-_mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-
-void GLAPIENTRY
-_mesa_StencilMaskSeparate_no_error(GLenum face, GLuint mask);
-
-extern void GLAPIENTRY
-_mesa_StencilMaskSeparate(GLenum face, GLuint mask);
-
 extern void 
 _mesa_init_stencil( struct gl_context * ctx );
 
index cadaeb3..2c45ef6 100644 (file)
@@ -69,6 +69,7 @@
 #include "syncobj.h"
 
 #include "state_tracker/st_cb_syncobj.h"
+#include "api_exec_decl.h"
 
 /**
  * Allocate/init the context state related to sync objects.
index e5fe418..5a3526e 100644 (file)
@@ -51,35 +51,4 @@ extern void
 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj,
                         int amount);
 
-extern GLboolean GLAPIENTRY
-_mesa_IsSync(GLsync sync);
-
-void GLAPIENTRY
-_mesa_DeleteSync_no_error(GLsync sync);
-
-extern void GLAPIENTRY
-_mesa_DeleteSync(GLsync sync);
-
-GLsync GLAPIENTRY
-_mesa_FenceSync_no_error(GLenum condition, GLbitfield flags);
-
-extern GLsync GLAPIENTRY
-_mesa_FenceSync(GLenum condition, GLbitfield flags);
-
-GLenum GLAPIENTRY
-_mesa_ClientWaitSync_no_error(GLsync sync, GLbitfield flags, GLuint64 timeout);
-
-extern GLenum GLAPIENTRY
-_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-
-void GLAPIENTRY
-_mesa_WaitSync_no_error(GLsync sync, GLbitfield flags, GLuint64 timeout);
-
-extern void GLAPIENTRY
-_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-
-extern void GLAPIENTRY
-_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
-               GLint *values);
-
 #endif /* SYNCOBJ_H */
index 76f3cd9..6b10e3d 100644 (file)
@@ -38,6 +38,7 @@
 #include "pixelstore.h"
 #include "texcompress_cpal.h"
 #include "teximage.h"
+#include "api_exec_decl.h"
 
 
 static const struct cpal_format_info {
index a1435aa..1d8d7ac 100644 (file)
@@ -37,8 +37,8 @@
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/state.h"
-#include "main/texenv.h"
 #include "main/texstate.h"
+#include "api_exec_decl.h"
 
 
 #define TE_ERROR(errCode, msg, value)                          \
diff --git a/src/mesa/main/texenv.h b/src/mesa/main/texenv.h
deleted file mode 100644 (file)
index e5f968d..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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
- * 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.
- */
-
-
-#ifndef TEXENV_H
-#define TEXENV_H
-
-
-#include "main/glheader.h"
-
-
-extern void GLAPIENTRY
-_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param );
-
-extern void GLAPIENTRY
-_mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
-
-extern void GLAPIENTRY
-_mesa_MultiTexEnvfEXT( GLenum texunit, GLenum target,
-                       GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_MultiTexEnvfvEXT( GLenum texunit, GLenum target,
-                        GLenum pname, const GLfloat *param );
-
-extern void GLAPIENTRY
-_mesa_MultiTexEnviEXT( GLenum texunit, GLenum target,
-                       GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_MultiTexEnvivEXT( GLenum texunit, GLenum target,
-                        GLenum pname, const GLint *param );
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexEnvivEXT( GLenum texunit, GLenum target,
-                           GLenum pname, GLint *param );
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexEnvfvEXT( GLenum texunit, GLenum target,
-                           GLenum pname, GLfloat *param );
-
-#endif /* TEXENV_H */
index 433d222..2a2ba3b 100644 (file)
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/macros.h"
-#include "main/texgen.h"
+#include "main/texparam.h"
 #include "main/texstate.h"
 #include "math/m_matrix.h"
+#include "main/texobj.h"
+#include "api_exec_decl.h"
 
 
 /**
diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
deleted file mode 100644 (file)
index 3ae5473..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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
- * 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.
- */
-
-
-#ifndef TEXGEN_H
-#define TEXGEN_H
-
-
-#include "glheader.h"
-
-struct _glapi_table;
-
-
-void GLAPIENTRY
-_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
-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 );
-void GLAPIENTRY
-_mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
-void GLAPIENTRY
-_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
-void GLAPIENTRY
-_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
-void GLAPIENTRY
-_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
-
-void GLAPIENTRY
-_mesa_MultiTexGenfvEXT( GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params );
-void GLAPIENTRY
-_mesa_MultiTexGenivEXT(GLenum texunit, GLenum coord, GLenum pname, const GLint *params );
-void GLAPIENTRY
-_mesa_MultiTexGendEXT(GLenum texunit, GLenum coord, GLenum pname, GLdouble param );
-void GLAPIENTRY
-_mesa_MultiTexGendvEXT(GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params );
-void GLAPIENTRY
-_mesa_MultiTexGenfEXT( GLenum texunit, GLenum coord, GLenum pname, GLfloat param );
-void GLAPIENTRY
-_mesa_MultiTexGeniEXT( GLenum texunit, GLenum coord, GLenum pname, GLint param );
-void GLAPIENTRY
-_mesa_GetMultiTexGendvEXT( GLenum texunit, GLenum coord, GLenum pname, GLdouble *params );
-void GLAPIENTRY
-_mesa_GetMultiTexGenfvEXT( GLenum texunit, GLenum coord, GLenum pname, GLfloat *params );
-void GLAPIENTRY
-_mesa_GetMultiTexGenivEXT( GLenum texunit, GLenum coord, GLenum pname, GLint *params );
-
-
-#endif /* TEXGEN_H */
index 08ae1b6..548bba6 100644 (file)
@@ -48,6 +48,7 @@
 #include "texstore.h"
 #include "format_utils.h"
 #include "pixeltransfer.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_cb_bufferobjects.h"
index ab31eaa..5e47650 100644 (file)
@@ -51,56 +51,4 @@ _mesa_get_compressed_texture_image( struct gl_context *ctx,
                                     GLsizei bufSize, GLvoid *pixels,
                                     bool dsa );
 
-
-extern void GLAPIENTRY
-_mesa_GetTexImage( GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels );
-extern void GLAPIENTRY
-_mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format,
-                       GLenum type, GLsizei bufSize, GLvoid *pixels );
-extern void GLAPIENTRY
-_mesa_GetTextureImage(GLuint texture, GLint level, GLenum format,
-                      GLenum type, GLsizei bufSize, GLvoid *pixels);
-extern void GLAPIENTRY
-_mesa_GetTextureImageEXT( GLuint texture, GLenum target, GLint level,
-                          GLenum format, GLenum type, GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexImageEXT(GLenum texunit, GLenum target, GLint level,
-                          GLenum format, GLenum type, GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_GetTextureSubImage(GLuint texture, GLint level,
-                         GLint xoffset, GLint yoffset, GLint zoffset,
-                         GLsizei width, GLsizei height, GLsizei depth,
-                         GLenum format, GLenum type, GLsizei bufSize,
-                         void *pixels);
-
-
-extern void GLAPIENTRY
-_mesa_GetCompressedTexImage(GLenum target, GLint lod, GLvoid *img);
-
-extern void GLAPIENTRY
-_mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,
-                                GLvoid *img);
-
-extern void GLAPIENTRY
-_mesa_GetCompressedTextureImage(GLuint texture, GLint level, GLsizei bufSize,
-                                GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_GetCompressedTextureImageEXT(GLuint texture, GLenum target, GLint level,
-                                   GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_GetCompressedMultiTexImageEXT(GLenum texunit, GLenum target, GLint level,
-                                    GLvoid *pixels);
-
-extern void APIENTRY
-_mesa_GetCompressedTextureSubImage(GLuint texture, GLint level,
-                                   GLint xoffset, GLint yoffset,
-                                   GLint zoffset, GLsizei width,
-                                   GLsizei height, GLsizei depth,
-                                   GLsizei bufSize, void *pixels);
-
 #endif /* TEXGETIMAGE_H */
index dffae30..226b14c 100644 (file)
@@ -56,6 +56,7 @@
 #include "glformats.h"
 #include "texstore.h"
 #include "pbo.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_format.h"
@@ -3350,17 +3351,6 @@ _mesa_MultiTexImage3DEXT(GLenum texunit, GLenum target, GLint level,
 
 
 void GLAPIENTRY
-_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLint border, GLenum format, GLenum type,
-                     const GLvoid *pixels )
-{
-   _mesa_TexImage3D(target, level, (GLint) internalFormat, width, height,
-                    depth, border, format, type, pixels);
-}
-
-
-void GLAPIENTRY
 _mesa_TexImage1D_no_error(GLenum target, GLint level, GLint internalFormat,
                           GLsizei width, GLint border, GLenum format,
                           GLenum type, const GLvoid *pixels)
index f9e5042..95f53be 100644 (file)
@@ -252,611 +252,6 @@ _mesa_is_cube_map_texture(GLenum target);
 
 /*@}*/
 
-
-/** \name API entry point functions */
-/*@{*/
-
-extern void GLAPIENTRY
-_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,
-                  GLsizei width, GLint border,
-                  GLenum format, GLenum type, const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TextureImage1DEXT( GLuint texture, GLenum target, GLint level,
-                         GLint internalformat, GLsizei width, GLint border,
-                         GLenum format, GLenum type, const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_MultiTexImage1DEXT( GLenum texture, GLenum target, GLint level,
-                          GLint internalformat, GLsizei width, GLint border,
-                          GLenum format, GLenum type, const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,
-                  GLsizei width, GLsizei height, GLint border,
-                  GLenum format, GLenum type, const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TextureImage2DEXT( GLuint texture, GLenum target, GLint level,
-                         GLint internalformat, GLsizei width, GLsizei height,
-                         GLint border, GLenum format, GLenum type,
-                         const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_MultiTexImage2DEXT(GLenum texture, GLenum target, GLint level,
-                         GLint internalFormat, GLsizei width, GLsizei height,
-                         GLint border, GLenum format, GLenum type,
-                         const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,
-                  GLsizei width, GLsizei height, GLsizei depth, GLint border,
-                  GLenum format, GLenum type, const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TextureImage3DEXT( GLuint texture, GLenum target, GLint level,
-                         GLint internalformat, GLsizei width, GLsizei height,
-                         GLsizei depth, GLint border, GLenum format,
-                         GLenum type, const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLint border, GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_MultiTexImage3DEXT(GLenum texture, GLenum target, GLint level,
-                         GLint internalFormat, GLsizei width, GLsizei height,
-                         GLsizei depth, GLint border, GLenum format, GLenum type,
-                         const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_TexImage1D_no_error(GLenum target, GLint level, GLint internalformat,
-                          GLsizei width, GLint border,
-                          GLenum format, GLenum type, const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TexImage2D_no_error(GLenum target, GLint level, GLint internalformat,
-                          GLsizei width, GLsizei height, GLint border,
-                          GLenum format, GLenum type, const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TexImage3D_no_error(GLenum target, GLint level, GLint internalformat,
-                          GLsizei width, GLsizei height, GLsizei depth,
-                          GLint border, GLenum format, GLenum type,
-                          const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_EGLImageTargetTexture2DOES( GLenum target, GLeglImageOES image );
-
-extern void GLAPIENTRY
-_mesa_EGLImageTargetTexStorageEXT(GLenum target, GLeglImageOES image,
-                                  const GLint *attrib_list);
-extern void GLAPIENTRY
-_mesa_EGLImageTargetTextureStorageEXT(GLuint texture, GLeglImageOES image,
-                                      const GLint *attrib_list);
-void GLAPIENTRY
-_mesa_TexSubImage1D_no_error(GLenum target, GLint level, GLint xoffset,
-                             GLsizei width,
-                             GLenum format, GLenum type,
-                             const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
-                     GLsizei width,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-void GLAPIENTRY
-_mesa_TexSubImage2D_no_error(GLenum target, GLint level,
-                             GLint xoffset, GLint yoffset,
-                             GLsizei width, GLsizei height,
-                             GLenum format, GLenum type,
-                             const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TexSubImage2D( GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset,
-                     GLsizei width, GLsizei height,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-void GLAPIENTRY
-_mesa_TexSubImage3D_no_error(GLenum target, GLint level,
-                             GLint xoffset, GLint yoffset, GLint zoffset,
-                             GLsizei width, GLsizei height, GLsizei depth,
-                             GLenum format, GLenum type,
-                             const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TexSubImage3D( GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset, GLint zoffset,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-void GLAPIENTRY
-_mesa_TextureSubImage1D_no_error(GLuint texture, GLint level, GLint xoffset,
-                                 GLsizei width, GLenum format, GLenum type,
-                                 const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
-                        GLsizei width,
-                        GLenum format, GLenum type,
-                        const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TextureSubImage1DEXT(GLuint texture, GLenum target, GLint level,
-                        GLint xoffset, GLsizei width,
-                        GLenum format, GLenum type,
-                        const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_MultiTexSubImage1DEXT(GLenum texunit, GLenum target, GLint level,
-                            GLint xoffset, GLsizei width,
-                            GLenum format, GLenum type,
-                            const GLvoid *pixels);
-
-void GLAPIENTRY
-_mesa_TextureSubImage2DEXT(GLuint texture, GLenum target, GLint level,
-                           GLint xoffset, GLint yoffset, GLsizei width,
-                           GLsizei height, GLenum format, GLenum type,
-                           const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_MultiTexSubImage2DEXT(GLenum texunit, GLenum target, GLint level,
-                            GLint xoffset, GLint yoffset, GLsizei width,
-                            GLsizei height, GLenum format, GLenum type,
-                            const GLvoid *pixels);
-
-void GLAPIENTRY
-_mesa_TextureSubImage2D_no_error(GLuint texture, GLint level, GLint xoffset,
-                                 GLint yoffset, GLsizei width, GLsizei height,
-                                 GLenum format, GLenum type,
-                                 const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TextureSubImage2D(GLuint texture, GLint level,
-                        GLint xoffset, GLint yoffset,
-                        GLsizei width, GLsizei height,
-                        GLenum format, GLenum type,
-                        const GLvoid *pixels);
-
-void GLAPIENTRY
-_mesa_TextureSubImage3D_no_error(GLuint texture, GLint level, GLint xoffset,
-                                 GLint yoffset, GLint zoffset, GLsizei width,
-                                 GLsizei height, GLsizei depth, GLenum format,
-                                 GLenum type, const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TextureSubImage3D(GLuint texture, GLint level,
-                        GLint xoffset, GLint yoffset, GLint zoffset,
-                        GLsizei width, GLsizei height, GLsizei depth,
-                        GLenum format, GLenum type,
-                        const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TextureSubImage3DEXT(GLuint texture, GLenum target,
-                        GLint level, GLint xoffset, GLint yoffset,
-                        GLint zoffset, GLsizei width, GLsizei height,
-                        GLsizei depth, GLenum format, GLenum type,
-                        const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_MultiTexSubImage3DEXT(GLenum texunit, GLenum target,
-                            GLint level, GLint xoffset, GLint yoffset,
-                            GLint zoffset, GLsizei width, GLsizei height,
-                            GLsizei depth, GLenum format, GLenum type,
-                            const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat,
-                     GLint x, GLint y, GLsizei width, GLint border);
-
-extern void GLAPIENTRY
-_mesa_CopyMultiTexImage1DEXT(GLenum texunit, GLenum target, GLint level,
-                             GLenum internalformat, GLint x, GLint y,
-                             GLsizei width, GLint border);
-
-extern void GLAPIENTRY
-_mesa_CopyTexImage2D( GLenum target, GLint level,
-                      GLenum internalformat, GLint x, GLint y,
-                      GLsizei width, GLsizei height, GLint border );
-
-extern void GLAPIENTRY
-_mesa_CopyMultiTexImage2DEXT(GLenum texunit, GLenum target, GLint level,
-                             GLenum internalformat, GLint x, GLint y,
-                             GLsizei width, GLsizei hright, GLint border);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureImage1DEXT( GLuint texture, GLenum target, GLint level,
-                             GLenum internalformat, GLint x, GLint y,
-                             GLsizei width, GLint border);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureImage2DEXT( GLuint texture, GLenum target, GLint level,
-                             GLenum internalformat, GLint x, GLint y,
-                             GLsizei width, GLsizei height, GLint border );
-
-extern void GLAPIENTRY
-_mesa_CopyTexImage1D_no_error(GLenum target, GLint level, GLenum internalformat,
-                              GLint x, GLint y, GLsizei width, GLint border);
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexImage2D_no_error(GLenum target, GLint level, GLenum internalformat,
-                              GLint x, GLint y, GLsizei width, GLsizei height,
-                              GLint border );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
-                         GLint x, GLint y, GLsizei width );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage2D( GLenum target, GLint level,
-                         GLint xoffset, GLint yoffset,
-                         GLint x, GLint y, GLsizei width, GLsizei height );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage3D( GLenum target, GLint level,
-                         GLint xoffset, GLint yoffset, GLint zoffset,
-                         GLint x, GLint y, GLsizei width, GLsizei height );
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage1D(GLuint texture, GLint level,
-                            GLint xoffset, GLint x, GLint y, GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage1DEXT(GLuint texture, GLenum target,
-                               GLint level, GLint xoffset, GLint x, GLint y,
-                               GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_CopyMultiTexSubImage1DEXT(GLenum texunit, GLenum target,
-                                GLint level, GLint xoffset, GLint x, GLint y,
-                                GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage2D(GLuint texture, GLint level,
-                            GLint xoffset, GLint yoffset,
-                            GLint x, GLint y,
-                            GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage2DEXT(GLuint texture, GLenum target, GLint level,
-                               GLint xoffset, GLint yoffset,
-                               GLint x, GLint y,
-                               GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyMultiTexSubImage2DEXT(GLenum texunit, GLenum target, GLint level,
-                                GLint xoffset, GLint yoffset,
-                                GLint x, GLint y,
-                                GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage3D(GLuint texture, GLint level,
-                            GLint xoffset, GLint yoffset, GLint zoffset,
-                            GLint x, GLint y,
-                            GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage3DEXT(GLuint texture, GLenum target, GLint level,
-                               GLint xoffset, GLint yoffset, GLint zoffset,
-                               GLint x, GLint y,
-                               GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyMultiTexSubImage3DEXT(GLenum texunit, GLenum target, GLint level,
-                                GLint xoffset, GLint yoffset, GLint zoffset,
-                                GLint x, GLint y,
-                                GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage1D_no_error(GLenum target, GLint level, GLint xoffset,
-                                 GLint x, GLint y, GLsizei width );
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage2D_no_error(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLint x, GLint y, GLsizei width,
-                                 GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage3D_no_error(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLint zoffset, GLint x, GLint y,
-                                 GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage1D_no_error(GLuint texture, GLint level, GLint xoffset,
-                                     GLint x, GLint y, GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage2D_no_error(GLuint texture, GLint level, GLint xoffset,
-                                     GLint yoffset, GLint x, GLint y,
-                                     GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_CopyTextureSubImage3D_no_error(GLuint texture, GLint level, GLint xoffset,
-                                     GLint yoffset, GLint zoffset, GLint x,
-                                     GLint y, GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_ClearTexSubImage( GLuint texture, GLint level,
-                        GLint xoffset, GLint yoffset, GLint zoffset,
-                        GLsizei width, GLsizei height, GLsizei depth,
-                        GLenum format, GLenum type, const void *data );
-
-extern void GLAPIENTRY
-_mesa_ClearTexImage( GLuint texture, GLint level,
-                     GLenum format, GLenum type, const void *data );
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage1D(GLenum target, GLint level,
-                              GLenum internalformat, GLsizei width,
-                              GLint border, GLsizei imageSize,
-                              const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureImage1DEXT(GLuint texture, GLenum target, GLint level,
-                                  GLenum internalFormat, GLsizei width,
-                                  GLint border, GLsizei imageSize,
-                                  const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_CompressedMultiTexImage1DEXT(GLenum texunit, GLenum target, GLint level,
-                                   GLenum internalFormat, GLsizei width,
-                                   GLint border, GLsizei imageSize,
-                                   const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage2D(GLenum target, GLint level,
-                              GLenum internalformat, GLsizei width,
-                              GLsizei height, GLint border, GLsizei imageSize,
-                              const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureImage2DEXT(GLuint texture, GLenum target, GLint level,
-                                  GLenum internalFormat, GLsizei width,
-                                  GLsizei height, GLint border, GLsizei imageSize,
-                                  const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_CompressedMultiTexImage2DEXT(GLenum texunit, GLenum target, GLint level,
-                                   GLenum internalFormat, GLsizei width,
-                                   GLsizei height, GLint border, GLsizei imageSize,
-                                   const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage3D(GLenum target, GLint level,
-                              GLenum internalformat, GLsizei width,
-                              GLsizei height, GLsizei depth, GLint border,
-                              GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureImage3DEXT(GLuint texture, GLenum target, GLint level,
-                                  GLenum internalFormat, GLsizei width,
-                                  GLsizei height, GLsizei depth, GLint border,
-                                  GLsizei imageSize, const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_CompressedMultiTexImage3DEXT(GLenum texunit, GLenum target, GLint level,
-                                   GLenum internalFormat, GLsizei width,
-                                   GLsizei height, GLsizei depth, GLint border,
-                                   GLsizei imageSize, const GLvoid *pixels);
-
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage1D_no_error(GLenum target, GLint level,
-                                    GLenum internalformat, GLsizei width,
-                                    GLint border, GLsizei imageSize,
-                                    const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage2D_no_error(GLenum target, GLint level,
-                                    GLenum internalformat, GLsizei width,
-                                    GLsizei height, GLint border,
-                                    GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage3D_no_error(GLenum target, GLint level,
-                                    GLenum internalformat, GLsizei width,
-                                    GLsizei height, GLsizei depth, GLint border,
-                                    GLsizei imageSize, const GLvoid *data);
-
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1D_no_error(GLenum target, GLint level,
-                                       GLint xoffset, GLsizei width,
-                                       GLenum format, GLsizei imageSize,
-                                       const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
-                                 GLsizei width, GLenum format,
-                                 GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage1D_no_error(GLuint texture, GLint level,
-                                           GLint xoffset, GLsizei width,
-                                           GLenum format, GLsizei imageSize,
-                                           const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
-                                  GLsizei width, GLenum format,
-                                  GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage1DEXT(GLuint texture, GLenum target, GLint level,
-                                     GLint xoffset, GLsizei width, GLenum format,
-                                     GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedMultiTexSubImage1DEXT(GLenum texunit, GLenum target, GLint level,
-                                      GLint xoffset, GLsizei width, GLenum format,
-                                      GLsizei imageSize, const GLvoid *data);
-
-
-void GLAPIENTRY
-_mesa_CompressedTextureSubImage2DEXT(GLuint texture, GLenum target,
-                                     GLint level, GLint xoffset,
-                                     GLint yoffset, GLsizei width,
-                                     GLsizei height, GLenum format,
-                                     GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedMultiTexSubImage2DEXT(GLenum texunit, GLenum target,
-                                      GLint level, GLint xoffset,
-                                      GLint yoffset, GLsizei width,
-                                      GLsizei height, GLenum format,
-                                      GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage3DEXT(GLuint texture, GLenum target,
-                                     GLint level, GLint xoffset,
-                                     GLint yoffset, GLint zoffset,
-                                     GLsizei width, GLsizei height, GLsizei depth,
-                                     GLenum format, GLsizei imageSize,
-                                     const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedMultiTexSubImage3DEXT(GLenum texunit, GLenum target,
-                                      GLint level, GLint xoffset,
-                                      GLint yoffset, GLint zoffset,
-                                      GLsizei width, GLsizei height, GLsizei depth,
-                                      GLenum format, GLsizei imageSize,
-                                      const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2D_no_error(GLenum target, GLint level,
-                                       GLint xoffset, GLint yoffset,
-                                       GLsizei width, GLsizei height,
-                                       GLenum format, GLsizei imageSize,
-                                       const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLsizei width, GLsizei height,
-                                 GLenum format, GLsizei imageSize,
-                                 const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage2D_no_error(GLuint texture, GLint level,
-                                           GLint xoffset, GLint yoffset,
-                                           GLsizei width, GLsizei height,
-                                           GLenum format, GLsizei imageSize,
-                                           const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset,
-                                  GLint yoffset,
-                                  GLsizei width, GLsizei height,
-                                  GLenum format, GLsizei imageSize,
-                                  const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage3D_no_error(GLenum target, GLint level,
-                                       GLint xoffset, GLint yoffset,
-                                       GLint zoffset, GLsizei width,
-                                       GLsizei height, GLsizei depth,
-                                       GLenum format, GLsizei imageSize,
-                                       const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLint zoffset, GLsizei width,
-                                 GLsizei height, GLsizei depth, GLenum format,
-                                 GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage3D_no_error(GLuint texture, GLint level,
-                                           GLint xoffset, GLint yoffset,
-                                           GLint zoffset, GLsizei width,
-                                           GLsizei height, GLsizei depth,
-                                           GLenum format, GLsizei imageSize,
-                                           const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset,
-                                  GLint yoffset, GLint zoffset,
-                                  GLsizei width, GLsizei height,
-                                  GLsizei depth,
-                                  GLenum format, GLsizei imageSize,
-                                  const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
-                     GLintptr offset, GLsizeiptr size);
-
-extern void GLAPIENTRY
-_mesa_TextureBufferRangeEXT(GLuint texture, GLenum target, GLenum internalFormat,
-                            GLuint buffer, GLintptr offset, GLsizeiptr size);
-
-extern void GLAPIENTRY
-_mesa_TextureBuffer(GLuint texture, GLenum internalFormat, GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_TextureBufferEXT(GLuint texture, GLenum target, GLenum internalFormat,
-                       GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_MultiTexBufferEXT(GLenum texunit, GLenum target, GLenum internalFormat,
-                        GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_TextureBufferRange(GLuint texture, GLenum internalFormat, GLuint buffer,
-                         GLintptr offset, GLsizeiptr size);
-
-
-extern void GLAPIENTRY
-_mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
-                            GLenum internalformat, GLsizei width,
-                            GLsizei height, GLboolean fixedsamplelocations);
-
-extern void GLAPIENTRY
-_mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
-                            GLenum internalformat, GLsizei width,
-                            GLsizei height, GLsizei depth,
-                            GLboolean fixedsamplelocations);
-
-extern void GLAPIENTRY
-_mesa_TexStorage2DMultisample(GLenum target, GLsizei samples,
-                              GLenum internalformat, GLsizei width,
-                              GLsizei height, GLboolean fixedsamplelocations);
-
-extern void GLAPIENTRY
-_mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
-                              GLenum internalformat, GLsizei width,
-                              GLsizei height, GLsizei depth,
-                              GLboolean fixedsamplelocations);
-
-void GLAPIENTRY
-_mesa_TextureStorage2DMultisample(GLuint texture, GLsizei samples,
-                                  GLenum internalformat, GLsizei width,
-                                  GLsizei height,
-                                  GLboolean fixedsamplelocations);
-
-void GLAPIENTRY
-_mesa_TextureStorage3DMultisample(GLuint texture, GLsizei samples,
-                                  GLenum internalformat, GLsizei width,
-                                  GLsizei height, GLsizei depth,
-                                  GLboolean fixedsamplelocations);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage2DMultisampleEXT(GLuint texture, GLenum target, GLsizei samples,
-                                     GLenum internalformat, GLsizei width,
-                                     GLsizei height, GLboolean fixedsamplelocations);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage3DMultisampleEXT(GLuint texture, GLenum target, GLsizei samples,
-                                     GLenum internalformat, GLsizei width,
-                                     GLsizei height, GLsizei depth,
-                                     GLboolean fixedsamplelocations);
-
-/*@}*/
-
 #ifdef __cplusplus
 }
 #endif
index dda57b6..87fe6fc 100644 (file)
@@ -45,6 +45,7 @@
 #include "program/prog_instruction.h"
 #include "texturebindless.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 #include "state_tracker/st_format.h"
index c933390..80549ab 100644 (file)
@@ -220,84 +220,6 @@ _mesa_lookup_or_create_texture(struct gl_context *ctx, GLenum target,
 
 /*@}*/
 
-/**
- * \name API functions
- */
-/*@{*/
-
-void GLAPIENTRY
-_mesa_GenTextures_no_error(GLsizei n, GLuint *textures);
-
-extern void GLAPIENTRY
-_mesa_GenTextures(GLsizei n, GLuint *textures);
-
-void GLAPIENTRY
-_mesa_CreateTextures_no_error(GLenum target, GLsizei n, GLuint *textures);
-
-extern void GLAPIENTRY
-_mesa_CreateTextures(GLenum target, GLsizei n, GLuint *textures);
-
-void GLAPIENTRY
-_mesa_DeleteTextures_no_error(GLsizei n, const GLuint *textures);
-
-extern void GLAPIENTRY
-_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
-
-
-void GLAPIENTRY
-_mesa_BindTexture_no_error(GLenum target, GLuint texture);
-
-extern void GLAPIENTRY
-_mesa_BindTexture( GLenum target, GLuint texture );
-
-void GLAPIENTRY
-_mesa_BindMultiTextureEXT(GLenum texunit, GLenum target, GLuint texture);
-
-void GLAPIENTRY
-_mesa_BindTextureUnit_no_error(GLuint unit, GLuint texture);
-
-extern void GLAPIENTRY
-_mesa_BindTextureUnit(GLuint unit, GLuint texture);
-
-void GLAPIENTRY
-_mesa_BindTextures_no_error(GLuint first, GLsizei count,
-                            const GLuint *textures);
-
-extern void GLAPIENTRY
-_mesa_BindTextures( GLuint first, GLsizei count, const GLuint *textures );
-
-
-extern void GLAPIENTRY
-_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
-                          const GLclampf *priorities );
-
-
-extern GLboolean GLAPIENTRY
-_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
-                           GLboolean *residences );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsTexture( GLuint texture );
-
-void GLAPIENTRY
-_mesa_InvalidateTexSubImage_no_error(GLuint texture, GLint level, GLint xoffset,
-                                     GLint yoffset, GLint zoffset,
-                                     GLsizei width, GLsizei height,
-                                     GLsizei depth);
-
-extern void GLAPIENTRY
-_mesa_InvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset,
-                            GLint yoffset, GLint zoffset, GLsizei width,
-                            GLsizei height, GLsizei depth);
-void GLAPIENTRY
-_mesa_InvalidateTexImage_no_error(GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_InvalidateTexImage(GLuint texture, GLint level);
-
-/*@}*/
-
-
 #ifdef __cplusplus
 }
 #endif
index 4cec4ba..6c8605c 100644 (file)
@@ -46,6 +46,7 @@
 #include "main/texstate.h"
 #include "program/prog_instruction.h"
 #include "util/u_math.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 
index d352b56..b86a0ca 100644 (file)
@@ -74,167 +74,4 @@ _mesa_target_allows_setting_sampler_parameters(GLenum target);
 
 /*@}*/
 
-/**
- * \name API functions
- */
-/*@{*/
-
-
-extern void GLAPIENTRY
-_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
-                              GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
-                              GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetTextureLevelParameterfv(GLuint texture, GLint level,
-                                 GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureLevelParameteriv(GLuint texture, GLint level,
-                                 GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureLevelParameterfvEXT(GLuint texture, GLenum target,
-                                    GLint level, GLenum pname,
-                                    GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureLevelParameterivEXT(GLuint texture, GLenum target,
-                                    GLint level, GLenum pname,
-                                    GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexLevelParameterfvEXT(GLenum texunit, GLenum target,
-                                     GLint level, GLenum pname,
-                                     GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexLevelParameterivEXT(GLenum texunit, GLenum target,
-                                     GLint level, GLenum pname,
-                                     GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterfvEXT(GLuint texture, GLenum target, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterfv(GLuint texture, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterivEXT(GLuint texture, GLenum target, GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameteriv(GLuint texture, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterIiv(GLuint texture, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterIivEXT(GLuint texture, GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexParameterIivEXT(GLenum texunit, GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterIuiv(GLuint texture, GLenum pname, GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_GetTextureParameterIuivEXT(GLuint texture, GLenum target, GLenum pname, GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexParameterIuivEXT(GLenum texunit, GLenum target, GLenum pname, GLuint *params);
-
-
-extern void GLAPIENTRY
-_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_TexParameteri( GLenum target, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_TexParameterIiv(GLenum target, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterfvEXT(GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterfv(GLuint texture, GLenum pname, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterfEXT(GLuint texture, GLenum target, GLenum pname, GLfloat param);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterf(GLuint texture, GLenum pname, GLfloat param);
-
-extern void GLAPIENTRY
-_mesa_TextureParameteriEXT(GLuint texture, GLenum target, GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_TextureParameteri(GLuint texture, GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterivEXT(GLuint texture, GLenum target, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameteriv(GLuint texture, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterIiv(GLuint texture, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterIivEXT(GLuint texture, GLenum target, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_MultiTexParameterIivEXT(GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterIuiv(GLuint texture, GLenum pname, const GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_TextureParameterIuivEXT(GLuint texture, GLenum target, GLenum pname, const GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_MultiTexParameterIuivEXT(GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
-
-extern void GLAPIENTRY
-_mesa_MultiTexParameterfEXT(GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-
-extern void GLAPIENTRY
-_mesa_MultiTexParameterfvEXT(GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_MultiTexParameteriEXT(GLenum texunit, GLenum target, GLenum pname, GLint param);
-
-extern void GLAPIENTRY
-_mesa_MultiTexParameterivEXT(GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexParameterfvEXT(GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetMultiTexParameterivEXT(GLenum texunit, GLenum target, GLenum pname, GLint *params);
-
 #endif /* TEXPARAM_H */
index 1d27688..c29143a 100644 (file)
@@ -41,6 +41,7 @@
 #include "state.h"
 #include "util/bitscan.h"
 #include "util/bitset.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 
index bc9a645..da3dd4b 100644 (file)
@@ -86,24 +86,6 @@ extern void
 _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
 
 
-
-/**
- * \name Called from API
- */
-/*@{*/
-
-extern void GLAPIENTRY
-_mesa_ActiveTexture_no_error( GLenum target );
-
-extern void GLAPIENTRY
-_mesa_ActiveTexture( GLenum target );
-
-extern void GLAPIENTRY
-_mesa_ClientActiveTexture( GLenum target );
-
-/*@}*/
-
-
 /**
  * \name Initialization, state maintenance
  */
index af0508d..4970524 100644 (file)
@@ -40,6 +40,7 @@
 #include "mtypes.h"
 #include "glformats.h"
 #include "hash.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 
index 74abf17..3b3b599 100644 (file)
@@ -54,79 +54,6 @@ _mesa_valid_tex_storage_dim(GLsizei width, GLsizei height, GLsizei depth)
 
 /*@}*/
 
-/**
- * \name API functions
- */
-/*@{*/
-
-void GLAPIENTRY
-_mesa_TexStorage1D_no_error(GLenum target, GLsizei levels,
-                            GLenum internalformat, GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat,
-                   GLsizei width);
-
-void GLAPIENTRY
-_mesa_TexStorage2D_no_error(GLenum target, GLsizei levels,
-                            GLenum internalformat, GLsizei width,
-                            GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat,
-                   GLsizei width, GLsizei height);
-
-void GLAPIENTRY
-_mesa_TexStorage3D_no_error(GLenum target, GLsizei levels,
-                            GLenum internalformat, GLsizei width,
-                            GLsizei height, GLsizei depth);
-
-extern void GLAPIENTRY
-_mesa_TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat,
-                   GLsizei width, GLsizei height, GLsizei depth);
-
-void GLAPIENTRY
-_mesa_TextureStorage1D_no_error(GLuint texture, GLsizei levels,
-                                GLenum internalformat, GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat,
-                       GLsizei width);
-
-void GLAPIENTRY
-_mesa_TextureStorage2D_no_error(GLuint texture, GLsizei levels,
-                                GLenum internalformat, GLsizei width,
-                                GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage2D(GLuint texture, GLsizei levels, GLenum internalformat,
-                       GLsizei width, GLsizei height);
-
-void GLAPIENTRY
-_mesa_TextureStorage3D_no_error(GLuint texture, GLsizei levels,
-                                GLenum internalformat, GLsizei width,
-                                GLsizei height, GLsizei depth);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat,
-                       GLsizei width, GLsizei height, GLsizei depth);
-
-
-extern void GLAPIENTRY
-_mesa_TextureStorage1DEXT(GLuint texture, GLenum target, GLsizei levels,
-                          GLenum internalformat,
-                          GLsizei width);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage2DEXT(GLuint texture, GLenum target, GLsizei levels,
-                          GLenum internalformat,
-                          GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_TextureStorage3DEXT(GLuint texture, GLenum target, GLsizei levels,
-                          GLenum internalformat,
-                          GLsizei width, GLsizei height, GLsizei depth);
-
 extern GLboolean
 _mesa_is_legal_tex_storage_format(const struct gl_context *ctx,
                                   GLenum internalformat);
index a762fc1..4710c68 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "util/hash_table.h"
 #include "util/u_memory.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 
index ac97e95..cf8e5bd 100644 (file)
@@ -64,69 +64,6 @@ _mesa_delete_sampler_handles(struct gl_context *ctx,
 
 /*@}*/
 
-/**
- * \name API functions
- */
-/*@{*/
-
-GLuint64 GLAPIENTRY
-_mesa_GetTextureHandleARB_no_error(GLuint texture);
-
-GLuint64 GLAPIENTRY
-_mesa_GetTextureHandleARB(GLuint texture);
-
-GLuint64 GLAPIENTRY
-_mesa_GetTextureSamplerHandleARB_no_error(GLuint texture, GLuint sampler);
-
-GLuint64 GLAPIENTRY
-_mesa_GetTextureSamplerHandleARB(GLuint texture, GLuint sampler);
-
-void GLAPIENTRY
-_mesa_MakeTextureHandleResidentARB_no_error(GLuint64 handle);
-
-void GLAPIENTRY
-_mesa_MakeTextureHandleResidentARB(GLuint64 handle);
-
-void GLAPIENTRY
-_mesa_MakeTextureHandleNonResidentARB_no_error(GLuint64 handle);
-
-void GLAPIENTRY
-_mesa_MakeTextureHandleNonResidentARB(GLuint64 handle);
-
-GLuint64 GLAPIENTRY
-_mesa_GetImageHandleARB_no_error(GLuint texture, GLint level, GLboolean layered,
-                                 GLint layer, GLenum format);
-
-GLuint64 GLAPIENTRY
-_mesa_GetImageHandleARB(GLuint texture, GLint level, GLboolean layered,
-                        GLint layer, GLenum format);
-
-void GLAPIENTRY
-_mesa_MakeImageHandleResidentARB_no_error(GLuint64 handle, GLenum access);
-
-void GLAPIENTRY
-_mesa_MakeImageHandleResidentARB(GLuint64 handle, GLenum access);
-
-void GLAPIENTRY
-_mesa_MakeImageHandleNonResidentARB_no_error(GLuint64 handle);
-
-void GLAPIENTRY
-_mesa_MakeImageHandleNonResidentARB(GLuint64 handle);
-
-GLboolean GLAPIENTRY
-_mesa_IsTextureHandleResidentARB_no_error(GLuint64 handle);
-
-GLboolean GLAPIENTRY
-_mesa_IsTextureHandleResidentARB(GLuint64 handle);
-
-GLboolean GLAPIENTRY
-_mesa_IsImageHandleResidentARB_no_error(GLuint64 handle);
-
-GLboolean GLAPIENTRY
-_mesa_IsImageHandleResidentARB(GLuint64 handle);
-
-/*@}*/
-
 #ifdef __cplusplus
 }
 #endif
index e004510..f6c70ae 100644 (file)
@@ -43,6 +43,7 @@
 #include "textureview.h"
 #include "stdbool.h"
 #include "mtypes.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 
index e2f18ae..6045d6b 100644 (file)
@@ -42,18 +42,6 @@ GLenum
 _mesa_texture_view_lookup_view_class(const struct gl_context *ctx,
                                      GLenum internalformat);
 
-void GLAPIENTRY
-_mesa_TextureView_no_error(GLuint texture, GLenum target, GLuint origtexture,
-                           GLenum internalformat,
-                           GLuint minlevel, GLuint numlevels,
-                           GLuint minlayer, GLuint numlayers);
-
-extern void GLAPIENTRY
-_mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture,
-                  GLenum internalformat,
-                  GLuint minlevel, GLuint numlevels,
-                  GLuint minlayer, GLuint numlayers);
-
 extern void
 _mesa_set_texture_view_state(struct gl_context *ctx,
                              struct gl_texture_object *texObj,
index 57a87f4..60af49f 100644 (file)
@@ -47,6 +47,7 @@
 #include "util/u_memory.h"
 
 #include "state_tracker/st_cb_xformfb.h"
+#include "api_exec_decl.h"
 
 struct using_program_tuple
 {
index 7a2b405..76b874f 100644 (file)
@@ -50,18 +50,6 @@ _mesa_compute_max_transform_feedback_vertices( struct gl_context *ctx,
 
 /*** GL_EXT_transform_feedback ***/
 
-void GLAPIENTRY
-_mesa_BeginTransformFeedback_no_error(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_BeginTransformFeedback(GLenum mode);
-
-void GLAPIENTRY
-_mesa_EndTransformFeedback_no_error(void);
-
-extern void GLAPIENTRY
-_mesa_EndTransformFeedback(void);
-
 extern bool
 _mesa_validate_buffer_range_xfb(struct gl_context *ctx,
                                 struct gl_transform_feedback_object *obj,
@@ -75,31 +63,6 @@ _mesa_bind_buffer_base_transform_feedback(struct gl_context *ctx,
                                          struct gl_buffer_object *bufObj,
                                          bool dsa);
 
-void GLAPIENTRY
-_mesa_BindBufferOffsetEXT_no_error(GLenum target, GLuint index, GLuint buffer,
-                                   GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
-                          GLintptr offset);
-
-void GLAPIENTRY
-_mesa_TransformFeedbackVaryings_no_error(GLuint program, GLsizei count,
-                                         const GLchar *const *varyings,
-                                         GLenum bufferMode);
-
-extern void GLAPIENTRY
-_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
-                                const GLchar * const *varyings,
-                                GLenum bufferMode);
-
-extern void GLAPIENTRY
-_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
-                                  GLsizei bufSize, GLsizei *length,
-                                  GLsizei *size, GLenum *type, GLchar *name);
-
-
-
 /*** GL_ARB_transform_feedback2 ***/
 extern void
 _mesa_init_transform_feedback_object(struct gl_transform_feedback_object *obj,
@@ -113,36 +76,6 @@ _mesa_delete_transform_feedback_object(struct gl_context *ctx,
 struct gl_transform_feedback_object *
 _mesa_lookup_transform_feedback_object(struct gl_context *ctx, GLuint name);
 
-extern void GLAPIENTRY
-_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names);
-
-extern void GLAPIENTRY
-_mesa_CreateTransformFeedbacks(GLsizei n, GLuint *names);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsTransformFeedback(GLuint name);
-
-void GLAPIENTRY
-_mesa_BindTransformFeedback_no_error(GLenum target, GLuint name);
-
-extern void GLAPIENTRY
-_mesa_BindTransformFeedback(GLenum target, GLuint name);
-
-extern void GLAPIENTRY
-_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names);
-
-void GLAPIENTRY
-_mesa_PauseTransformFeedback_no_error(void);
-
-extern void GLAPIENTRY
-_mesa_PauseTransformFeedback(void);
-
-void GLAPIENTRY
-_mesa_ResumeTransformFeedback_no_error(void);
-
-extern void GLAPIENTRY
-_mesa_ResumeTransformFeedback(void);
-
 static inline bool
 _mesa_is_xfb_active_and_unpaused(const struct gl_context *ctx)
 {
@@ -190,24 +123,4 @@ _mesa_bind_buffer_range_xfb(struct gl_context *ctx,
    _mesa_set_transform_feedback_binding(ctx, obj, index, bufObj, offset, size);
 }
 
-/*** GL_ARB_direct_state_access ***/
-
-extern void GLAPIENTRY
-_mesa_TransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_TransformFeedbackBufferRange(GLuint xfb, GLuint index, GLuint buffer,
-                                   GLintptr offset, GLsizeiptr size);
-
-extern void GLAPIENTRY
-_mesa_GetTransformFeedbackiv(GLuint xfb, GLenum pname, GLint *param);
-
-extern void GLAPIENTRY
-_mesa_GetTransformFeedbacki_v(GLuint xfb, GLenum pname, GLuint index,
-                              GLint *param);
-
-extern void GLAPIENTRY
-_mesa_GetTransformFeedbacki64_v(GLuint xfb, GLenum pname, GLuint index,
-                                GLint64 *param);
-
 #endif /* TRANSFORM_FEEDBACK_H */
index ee0209e..f628e06 100644 (file)
@@ -46,6 +46,7 @@
 #include "compiler/glsl_types.h"
 #include "program/program.h"
 #include "util/bitscan.h"
+#include "api_exec_decl.h"
 
 /**
  * Update the vertex/fragment program's TexturesUsed array.
index 0433d6e..827757f 100644 (file)
@@ -39,427 +39,6 @@ extern "C" {
 struct gl_program;
 struct _glapi_table;
 
-void GLAPIENTRY
-_mesa_Uniform1f(GLint, GLfloat);
-void GLAPIENTRY
-_mesa_Uniform2f(GLint, GLfloat, GLfloat);
-void GLAPIENTRY
-_mesa_Uniform3f(GLint, GLfloat, GLfloat, GLfloat);
-void GLAPIENTRY
-_mesa_Uniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-void GLAPIENTRY
-_mesa_Uniform1i(GLint, GLint);
-void GLAPIENTRY
-_mesa_Uniform2i(GLint, GLint, GLint);
-void GLAPIENTRY
-_mesa_Uniform3i(GLint, GLint, GLint, GLint);
-void GLAPIENTRY
-_mesa_Uniform4i(GLint, GLint, GLint, GLint, GLint);
-void GLAPIENTRY
-_mesa_Uniform1fv(GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_Uniform2fv(GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_Uniform3fv(GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_Uniform4fv(GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_Uniform1iv(GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_Uniform2iv(GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_Uniform3iv(GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_Uniform4iv(GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_Uniform1ui(GLint location, GLuint v0);
-void GLAPIENTRY
-_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1);
-void GLAPIENTRY
-_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
-void GLAPIENTRY
-_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void GLAPIENTRY
-_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value);
-void GLAPIENTRY
-_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value);
-void GLAPIENTRY
-_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
-void GLAPIENTRY
-_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
-void GLAPIENTRY
-_mesa_UniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *);
-void GLAPIENTRY
-_mesa_UniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *);
-void GLAPIENTRY
-_mesa_UniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *);
-void GLAPIENTRY
-_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-void GLAPIENTRY
-_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-void GLAPIENTRY
-_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-void GLAPIENTRY
-_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-void GLAPIENTRY
-_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-void GLAPIENTRY
-_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-void GLAPIENTRY
-_mesa_UniformHandleui64ARB(GLint location, GLuint64 value);
-void GLAPIENTRY
-_mesa_UniformHandleui64vARB(GLint location, GLsizei count,
-                            const GLuint64 *value);
-void GLAPIENTRY
-_mesa_ProgramUniformHandleui64ARB(GLuint program, GLint location,
-                                  GLuint64 value);
-void GLAPIENTRY
-_mesa_ProgramUniformHandleui64vARB(GLuint program, GLint location,
-                                   GLsizei count, const GLuint64 *values);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1f(GLuint program, GLint, GLfloat);
-void GLAPIENTRY
-_mesa_ProgramUniform2f(GLuint program, GLint, GLfloat, GLfloat);
-void GLAPIENTRY
-_mesa_ProgramUniform3f(GLuint program, GLint, GLfloat, GLfloat, GLfloat);
-void GLAPIENTRY
-_mesa_ProgramUniform4f(GLuint program, GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-void GLAPIENTRY
-_mesa_ProgramUniform1i(GLuint program, GLint, GLint);
-void GLAPIENTRY
-_mesa_ProgramUniform2i(GLuint program, GLint, GLint, GLint);
-void GLAPIENTRY
-_mesa_ProgramUniform3i(GLuint program, GLint, GLint, GLint, GLint);
-void GLAPIENTRY
-_mesa_ProgramUniform4i(GLuint program, GLint, GLint, GLint, GLint, GLint);
-void GLAPIENTRY
-_mesa_ProgramUniform1fv(GLuint program, GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniform2fv(GLuint program, GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniform3fv(GLuint program, GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniform4fv(GLuint program, GLint, GLsizei, const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniform1iv(GLuint program, GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_ProgramUniform2iv(GLuint program, GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_ProgramUniform3iv(GLuint program, GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_ProgramUniform4iv(GLuint program, GLint, GLsizei, const GLint *);
-void GLAPIENTRY
-_mesa_ProgramUniform1ui(GLuint program, GLint location, GLuint v0);
-void GLAPIENTRY
-_mesa_ProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1);
-void GLAPIENTRY
-_mesa_ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1,
-                        GLuint v2);
-void GLAPIENTRY
-_mesa_ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1,
-                        GLuint v2, GLuint v3);
-void GLAPIENTRY
-_mesa_ProgramUniform1uiv(GLuint program, GLint location, GLsizei count,
-                         const GLuint *value);
-void GLAPIENTRY
-_mesa_ProgramUniform2uiv(GLuint program, GLint location, GLsizei count,
-                         const GLuint *value);
-void GLAPIENTRY
-_mesa_ProgramUniform3uiv(GLuint program, GLint location, GLsizei count,
-                         const GLuint *value);
-void GLAPIENTRY
-_mesa_ProgramUniform4uiv(GLuint program, GLint location, GLsizei count,
-                         const GLuint *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix2fv(GLuint program, GLint, GLsizei, GLboolean,
-                              const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix3fv(GLuint program, GLint, GLsizei, GLboolean,
-                              const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix4fv(GLuint program, GLint, GLsizei, GLboolean,
-                              const GLfloat *);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLfloat *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLfloat *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLfloat *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLfloat *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLfloat *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLfloat *value);
-
-void GLAPIENTRY
-_mesa_GetnUniformfvARB(GLuint, GLint, GLsizei, GLfloat *);
-void GLAPIENTRY
-_mesa_GetUniformfv(GLuint, GLint, GLfloat *);
-void GLAPIENTRY
-_mesa_GetnUniformivARB(GLuint, GLint, GLsizei, GLint *);
-void GLAPIENTRY
-_mesa_GetUniformuiv(GLuint, GLint, GLuint *);
-void GLAPIENTRY
-_mesa_GetnUniformuivARB(GLuint, GLint, GLsizei, GLuint *);
-void GLAPIENTRY
-_mesa_GetUniformuiv(GLuint program, GLint location, GLuint *params);
-void GLAPIENTRY
-_mesa_GetnUniformdvARB(GLuint, GLint, GLsizei, GLdouble *);
-void GLAPIENTRY
-_mesa_GetUniformdv(GLuint, GLint, GLdouble *);
-GLint
-_mesa_GetUniformLocation_impl(GLuint, const GLcharARB *, bool glthread);
-GLint GLAPIENTRY
-_mesa_GetUniformLocation(GLuint, const GLcharARB *);
-GLint GLAPIENTRY
-_mesa_GetUniformLocation_no_error(GLuint, 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_no_error(GLuint program, GLuint uniformBlockIndex,
-                                   GLuint uniformBlockBinding);
-
-void GLAPIENTRY
-_mesa_UniformBlockBinding(GLuint program,
-                         GLuint uniformBlockIndex,
-                         GLuint uniformBlockBinding);
-
-void GLAPIENTRY
-_mesa_ShaderStorageBlockBinding_no_error(GLuint program,
-                                         GLuint shaderStorageBlockIndex,
-                                         GLuint shaderStorageBlockBinding);
-
-void GLAPIENTRY
-_mesa_ShaderStorageBlockBinding(GLuint program,
-                                GLuint shaderStorageBlockIndex,
-                                GLuint shaderStorageBlockBinding);
-void GLAPIENTRY
-_mesa_GetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex,
-                                     GLenum pname, GLint *params);
-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
-_mesa_GetActiveUniform_impl(GLuint, GLuint, GLsizei, GLsizei *,
-                            GLint *, GLenum *, GLcharARB *,
-                            bool glthread);
-void GLAPIENTRY
-_mesa_GetActiveUniform(GLuint, GLuint, GLsizei, GLsizei *,
-                       GLint *, GLenum *, GLcharARB *);
-void GLAPIENTRY
-_mesa_GetActiveUniformsiv(GLuint program,
-                         GLsizei uniformCount,
-                         const GLuint *uniformIndices,
-                         GLenum pname,
-                         GLint *params);
-void GLAPIENTRY
-_mesa_GetUniformiv(GLuint, GLint, GLint *);
-
-void GLAPIENTRY
-_mesa_Uniform1d(GLint, GLdouble);
-void GLAPIENTRY
-_mesa_Uniform2d(GLint, GLdouble, GLdouble);
-void GLAPIENTRY
-_mesa_Uniform3d(GLint, GLdouble, GLdouble, GLdouble);
-void GLAPIENTRY
-_mesa_Uniform4d(GLint, GLdouble, GLdouble, GLdouble, GLdouble);
-
-void GLAPIENTRY
-_mesa_Uniform1dv(GLint, GLsizei, const GLdouble *);
-void GLAPIENTRY
-_mesa_Uniform2dv(GLint, GLsizei, const GLdouble *);
-void GLAPIENTRY
-_mesa_Uniform3dv(GLint, GLsizei, const GLdouble *);
-void GLAPIENTRY
-_mesa_Uniform4dv(GLint, GLsizei, const GLdouble *);
-
-void GLAPIENTRY
-_mesa_GetUniformi64vARB(GLuint, GLint, GLint64 *);
-void GLAPIENTRY
-_mesa_GetUniformui64vARB(GLuint, GLint, GLuint64 *);
-
-void GLAPIENTRY
-_mesa_GetnUniformi64vARB(GLuint, GLint, GLsizei, GLint64 *);
-void GLAPIENTRY
-_mesa_GetnUniformui64vARB(GLuint, GLint, GLsizei, GLuint64 *);
-
-void GLAPIENTRY
-_mesa_UniformMatrix2dv(GLint, GLsizei, GLboolean, const GLdouble *);
-void GLAPIENTRY
-_mesa_UniformMatrix3dv(GLint, GLsizei, GLboolean, const GLdouble *);
-void GLAPIENTRY
-_mesa_UniformMatrix4dv(GLint, GLsizei, GLboolean, const GLdouble *);
-void GLAPIENTRY
-_mesa_UniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLdouble *value);
-void GLAPIENTRY
-_mesa_UniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLdouble *value);
-void GLAPIENTRY
-_mesa_UniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLdouble *value);
-void GLAPIENTRY
-_mesa_UniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLdouble *value);
-void GLAPIENTRY
-_mesa_UniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLdouble *value);
-void GLAPIENTRY
-_mesa_UniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLdouble *value);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1d(GLuint program, GLint, GLdouble);
-void GLAPIENTRY
-_mesa_ProgramUniform2d(GLuint program, GLint, GLdouble, GLdouble);
-void GLAPIENTRY
-_mesa_ProgramUniform3d(GLuint program, GLint, GLdouble, GLdouble, GLdouble);
-void GLAPIENTRY
-_mesa_ProgramUniform4d(GLuint program, GLint, GLdouble, GLdouble, GLdouble, GLdouble);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1dv(GLuint program, GLint, GLsizei, const GLdouble *);
-void GLAPIENTRY
-_mesa_ProgramUniform2dv(GLuint program, GLint, GLsizei, const GLdouble *);
-void GLAPIENTRY
-_mesa_ProgramUniform3dv(GLuint program, GLint, GLsizei, const GLdouble *);
-void GLAPIENTRY
-_mesa_ProgramUniform4dv(GLuint program, GLint, GLsizei, const GLdouble *);
-
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix2dv(GLuint program, GLint, GLsizei, GLboolean,
-                              const GLdouble *);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix3dv(GLuint program, GLint, GLsizei, GLboolean,
-                              const GLdouble *);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix4dv(GLuint program, GLint, GLsizei, GLboolean,
-                              const GLdouble *);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLdouble *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLdouble *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLdouble *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLdouble *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLdouble *value);
-void GLAPIENTRY
-_mesa_ProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count,
-                                GLboolean transpose, const GLdouble *value);
-
-void GLAPIENTRY
-_mesa_Uniform1i64ARB(GLint, GLint64);
-void GLAPIENTRY
-_mesa_Uniform2i64ARB(GLint, GLint64, GLint64);
-void GLAPIENTRY
-_mesa_Uniform3i64ARB(GLint, GLint64, GLint64, GLint64);
-void GLAPIENTRY
-_mesa_Uniform4i64ARB(GLint, GLint64, GLint64, GLint64, GLint64);
-
-void GLAPIENTRY
-_mesa_Uniform1i64vARB(GLint, GLsizei, const GLint64 *);
-void GLAPIENTRY
-_mesa_Uniform2i64vARB(GLint, GLsizei, const GLint64 *);
-void GLAPIENTRY
-_mesa_Uniform3i64vARB(GLint, GLsizei, const GLint64 *);
-void GLAPIENTRY
-_mesa_Uniform4i64vARB(GLint, GLsizei, const GLint64 *);
-
-void GLAPIENTRY
-_mesa_Uniform1ui64ARB(GLint, GLuint64);
-void GLAPIENTRY
-_mesa_Uniform2ui64ARB(GLint, GLuint64, GLuint64);
-void GLAPIENTRY
-_mesa_Uniform3ui64ARB(GLint, GLuint64, GLuint64, GLuint64);
-void GLAPIENTRY
-_mesa_Uniform4ui64ARB(GLint, GLuint64, GLuint64, GLuint64, GLuint64);
-
-void GLAPIENTRY
-_mesa_Uniform1ui64vARB(GLint, GLsizei, const GLuint64 *);
-void GLAPIENTRY
-_mesa_Uniform2ui64vARB(GLint, GLsizei, const GLuint64 *);
-void GLAPIENTRY
-_mesa_Uniform3ui64vARB(GLint, GLsizei, const GLuint64 *);
-void GLAPIENTRY
-_mesa_Uniform4ui64vARB(GLint, GLsizei, const GLuint64 *);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1i64ARB(GLuint, GLint, GLint64);
-void GLAPIENTRY
-_mesa_ProgramUniform2i64ARB(GLuint, GLint, GLint64, GLint64);
-void GLAPIENTRY
-_mesa_ProgramUniform3i64ARB(GLuint, GLint, GLint64, GLint64, GLint64);
-void GLAPIENTRY
-_mesa_ProgramUniform4i64ARB(GLuint, GLint, GLint64, GLint64, GLint64, GLint64);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1i64vARB(GLuint, GLint, GLsizei, const GLint64 *);
-void GLAPIENTRY
-_mesa_ProgramUniform2i64vARB(GLuint, GLint, GLsizei, const GLint64 *);
-void GLAPIENTRY
-_mesa_ProgramUniform3i64vARB(GLuint, GLint, GLsizei, const GLint64 *);
-void GLAPIENTRY
-_mesa_ProgramUniform4i64vARB(GLuint, GLint, GLsizei, const GLint64 *);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1ui64ARB(GLuint, GLint, GLuint64);
-void GLAPIENTRY
-_mesa_ProgramUniform2ui64ARB(GLuint, GLint, GLuint64, GLuint64);
-void GLAPIENTRY
-_mesa_ProgramUniform3ui64ARB(GLuint, GLint, GLuint64, GLuint64, GLuint64);
-void GLAPIENTRY
-_mesa_ProgramUniform4ui64ARB(GLuint, GLint, GLuint64, GLuint64, GLuint64, GLuint64);
-
-void GLAPIENTRY
-_mesa_ProgramUniform1ui64vARB(GLuint, GLint, GLsizei, const GLuint64 *);
-void GLAPIENTRY
-_mesa_ProgramUniform2ui64vARB(GLuint, GLint, GLsizei, const GLuint64 *);
-void GLAPIENTRY
-_mesa_ProgramUniform3ui64vARB(GLuint, GLint, GLsizei, const GLuint64 *);
-void GLAPIENTRY
-_mesa_ProgramUniform4ui64vARB(GLuint, GLint, GLsizei, const GLuint64 *);
-
 void
 _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
               struct gl_context *, struct gl_shader_program *,
@@ -514,6 +93,15 @@ extern void
 _mesa_flush_vertices_for_uniforms(struct gl_context *ctx,
                                   const struct gl_uniform_storage *uni);
 
+extern GLint
+_mesa_GetUniformLocation_impl(GLuint programObj, const GLcharARB *name,
+                              bool glthread);
+
+extern void
+_mesa_GetActiveUniform_impl(GLuint program, GLuint index,
+                            GLsizei maxLength, GLsizei *length, GLint *size,
+                            GLenum *type, GLcharARB *nameOut, bool glthread);
+
 struct gl_builtin_uniform_element {
    const char *field;
    gl_state_index16 tokens[STATE_LENGTH];
index 000b8f8..a4eaa8d 100644 (file)
@@ -42,6 +42,7 @@
 #include "arrayobj.h"
 #include "get.h"
 #include "main/dispatch.h"
+#include "api_exec_decl.h"
 
 
 /** Used to do error checking for GL_EXT_vertex_array_bgra */
index bb02a31..1829896 100644 (file)
@@ -125,215 +125,6 @@ _mesa_bind_vertex_buffer(struct gl_context *ctx,
                          GLintptr offset, GLsizei stride,
                          bool offset_is_int32, bool take_vbo_ownership);
 
-extern void GLAPIENTRY
-_mesa_VertexPointer_no_error(GLint size, GLenum type, GLsizei stride,
-                             const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,
-                    const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_NormalPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_ColorPointer_no_error(GLint size, GLenum type, GLsizei stride,
-                            const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_TexCoordPointer_no_error(GLint size, GLenum type, GLsizei stride,
-                               const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
-                      const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_MultiTexCoordPointerEXT(GLenum texunit, GLint size, GLenum type,
-                              GLsizei stride, const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointer_no_error(GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
-                       GLsizei count, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                       const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
-                         GLsizei count, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
-
-extern void GLAPIENTRY
-_mesa_FogCoordPointer_no_error(GLenum type, GLsizei stride,
-                               const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_SecondaryColorPointer_no_error(GLint size, GLenum type,
-                                     GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_SecondaryColorPointer(GLint size, GLenum type,
-                            GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_PointSizePointerOES_no_error(GLenum type, GLsizei stride,
-                                   const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_VertexAttribPointer_no_error(GLuint index, GLint size, GLenum type,
-                                   GLboolean normalized, GLsizei stride,
-                                   const GLvoid *pointer);
-extern void GLAPIENTRY
-_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
-                          GLboolean normalized, GLsizei stride,
-                          const GLvoid *pointer);
-
-void GLAPIENTRY
-_mesa_VertexAttribIPointer_no_error(GLuint index, GLint size, GLenum type,
-                                    GLsizei stride, const GLvoid *ptr);
-void GLAPIENTRY
-_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
-                           GLsizei stride, const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribLPointer_no_error(GLuint index, GLint size, GLenum type,
-                                    GLsizei stride, const GLvoid *pointer);
-extern void GLAPIENTRY
-_mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum type,
-                           GLsizei stride, const GLvoid *pointer);
-
-extern void GLAPIENTRY
-_mesa_EnableVertexAttribArray(GLuint index);
-
-extern void GLAPIENTRY
-_mesa_EnableVertexAttribArray_no_error(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_EnableVertexArrayAttrib(GLuint vaobj, GLuint index);
-
-extern void GLAPIENTRY
-_mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index);
-
-extern void GLAPIENTRY
-_mesa_EnableVertexArrayAttribEXT( GLuint vaobj, GLuint index );
-
-
-extern void GLAPIENTRY
-_mesa_DisableVertexAttribArray(GLuint index);
-
-extern void GLAPIENTRY
-_mesa_DisableVertexAttribArray_no_error(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index);
-
-extern void GLAPIENTRY
-_mesa_DisableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index);
-
-extern void GLAPIENTRY
-_mesa_DisableVertexArrayAttribEXT( GLuint vaobj, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribLui64vARB(GLuint index, GLenum pname, GLuint64EXT *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer);
-
-
-void GLAPIENTRY
-_mesa_GetVertexArrayIndexediv(GLuint vaobj, GLuint index,
-                              GLenum pname, GLint *param);
-
-
-void GLAPIENTRY
-_mesa_GetVertexArrayIndexed64iv(GLuint vaobj, GLuint index,
-                                GLenum pname, GLint64 *param);
-
-
-extern void GLAPIENTRY
-_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
-
-
-extern void GLAPIENTRY
-_mesa_LockArraysEXT(GLint first, GLsizei count);
-
-extern void GLAPIENTRY
-_mesa_UnlockArraysEXT(void);
-
-
-void GLAPIENTRY
-_mesa_PrimitiveRestartIndex_no_error(GLuint index);
-
-extern void GLAPIENTRY
-_mesa_PrimitiveRestartIndex(GLuint index);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribDivisor_no_error(GLuint index, GLuint divisor);
-extern void GLAPIENTRY
-_mesa_VertexAttribDivisor(GLuint index, GLuint divisor);
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribDivisorEXT(GLuint vaobj, GLuint index, GLuint divisor);
-
 static inline unsigned
 _mesa_get_prim_restart_index(bool fixed_index, unsigned restart_index,
                              unsigned index_size)
@@ -362,129 +153,12 @@ _mesa_primitive_restart_index(const struct gl_context *ctx,
                                        ctx->Array.RestartIndex, index_size);
 }
 
-extern void GLAPIENTRY
-_mesa_BindVertexBuffer_no_error(GLuint bindingIndex, GLuint buffer,
-                                GLintptr offset, GLsizei stride);
-extern void GLAPIENTRY
-_mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,
-                       GLsizei stride);
-
-void GLAPIENTRY
-_mesa_VertexArrayVertexBuffer_no_error(GLuint vaobj, GLuint bindingIndex,
-                                       GLuint buffer, GLintptr offset,
-                                       GLsizei stride);
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexBuffer(GLuint vaobj, GLuint bindingIndex, GLuint buffer,
-                              GLintptr offset, GLsizei stride);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayBindVertexBufferEXT(GLuint vaobj, GLuint bindingIndex, GLuint buffer,
-                                     GLintptr offset, GLsizei stride);
-
-void GLAPIENTRY
-_mesa_BindVertexBuffers_no_error(GLuint first, GLsizei count,
-                                 const GLuint *buffers, const GLintptr *offsets,
-                                 const GLsizei *strides);
-
-extern void GLAPIENTRY
-_mesa_BindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers,
-                        const GLintptr *offsets, const GLsizei *strides);
-
 void
 _mesa_InternalBindVertexBuffers(struct gl_context *ctx,
                                 const struct glthread_attrib_binding *buffers,
                                 GLbitfield buffer_mask,
                                 GLboolean restore_pointers);
 
-void GLAPIENTRY
-_mesa_VertexArrayVertexBuffers_no_error(GLuint vaobj, GLuint first,
-                                        GLsizei count, const GLuint *buffers,
-                                        const GLintptr *offsets,
-                                        const GLsizei *strides);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexBuffers(GLuint vaobj, GLuint first, GLsizei count,
-                               const GLuint *buffers,
-                               const GLintptr *offsets, const GLsizei *strides);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribFormat(GLuint attribIndex, GLint size, GLenum type,
-                         GLboolean normalized, GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayAttribFormat(GLuint vaobj, GLuint attribIndex, GLint size,
-                              GLenum type, GLboolean normalized,
-                              GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribFormatEXT(GLuint vaobj, GLuint attribIndex, GLint size,
-                                       GLenum type, GLboolean normalized,
-                                       GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribIFormat(GLuint attribIndex, GLint size, GLenum type,
-                          GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayAttribIFormat(GLuint vaobj, GLuint attribIndex,
-                               GLint size, GLenum type,
-                               GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribIFormatEXT(GLuint vaobj, GLuint attribIndex,
-                                        GLint size, GLenum type,
-                                        GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribLFormat(GLuint attribIndex, GLint size, GLenum type,
-                          GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayAttribLFormat(GLuint vaobj, GLuint attribIndex,
-                               GLint size, GLenum type,
-                               GLuint relativeOffset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribLFormatEXT(GLuint vaobj, GLuint attribIndex,
-                                        GLint size, GLenum type,
-                                        GLuint relativeOffset);
-
-void GLAPIENTRY
-_mesa_VertexAttribBinding_no_error(GLuint attribIndex, GLuint bindingIndex);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex);
-
-void GLAPIENTRY
-_mesa_VertexArrayAttribBinding_no_error(GLuint vaobj, GLuint attribIndex,
-                                        GLuint bindingIndex);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex,
-                               GLuint bindingIndex);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribBindingEXT(GLuint vaobj, GLuint attribIndex,
-                                        GLuint bindingIndex);
-
-void GLAPIENTRY
-_mesa_VertexBindingDivisor_no_error(GLuint bindingIndex, GLuint divisor);
-
-extern void GLAPIENTRY
-_mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor);
-
-void GLAPIENTRY
-_mesa_VertexArrayBindingDivisor_no_error(GLuint vaobj, GLuint bindingIndex,
-                                         GLuint divisor);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex,
-                                GLuint divisor);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexBindingDivisorEXT(GLuint vaobj, GLuint bindingIndex,
-                                         GLuint divisor);
-
 extern void
 _mesa_print_arrays(struct gl_context *ctx);
 
@@ -494,66 +168,4 @@ _mesa_init_varray(struct gl_context *ctx);
 extern void
 _mesa_free_varray_data(struct gl_context *ctx);
 
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
-                                 GLenum type, GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayColorOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
-                                GLenum type, GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayEdgeFlagOffsetEXT(GLuint vaobj, GLuint buffer, GLsizei stride,
-                                   GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayIndexOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
-                                GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayNormalOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
-                                 GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayTexCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
-                                   GLenum type, GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayMultiTexCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLenum texunit,
-                                        GLint size, GLenum type, GLsizei stride,
-                                        GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayFogCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
-                                   GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArraySecondaryColorOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
-                                         GLenum type, GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
-                                       GLenum type, GLboolean normalized,
-                                       GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribIOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
-                                        GLenum type, GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexAttribLOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
-                                        GLenum type, GLsizei stride, GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_GetVertexArrayIntegervEXT(GLuint vaobj, GLenum pname, GLint *param);
-
-extern void GLAPIENTRY
-_mesa_GetVertexArrayPointervEXT(GLuint vaobj, GLenum pname, GLvoid** param);
-
-extern void GLAPIENTRY
-_mesa_GetVertexArrayIntegeri_vEXT(GLuint vaobj, GLuint index, GLenum pname, GLint *param);
-
-extern void GLAPIENTRY
-_mesa_GetVertexArrayPointeri_vEXT(GLuint vaobj, GLuint index, GLenum pname, GLvoid** param);
-
 #endif
index 05d7815..0dcee8e 100644 (file)
@@ -39,7 +39,7 @@
 #include "glformats.h"
 #include "texobj.h"
 #include "teximage.h"
-#include "vdpau.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_texture.h"
 
diff --git a/src/mesa/main/vdpau.h b/src/mesa/main/vdpau.h
deleted file mode 100644 (file)
index 627609c..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2013 Advanced Micro Devices, Inc.
- * 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, sub license, 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
- *
- **************************************************************************/
-
-/*
- * Authors:
- *      Christian König <christian.koenig@amd.com>
- *
- */
-
-#ifndef VDPAU_H
-#define VDPAU_H
-
-extern void GLAPIENTRY
-_mesa_VDPAUInitNV(const GLvoid *vdpDevice, const GLvoid *getProcAddress);
-
-extern void GLAPIENTRY
-_mesa_VDPAUFiniNV(void);
-
-extern GLintptr GLAPIENTRY
-_mesa_VDPAURegisterVideoSurfaceNV(const GLvoid *vdpSurface, GLenum target,
-                                  GLsizei numTextureNames,
-                                  const GLuint *textureNames);
-
-extern GLintptr GLAPIENTRY
-_mesa_VDPAURegisterOutputSurfaceNV(const GLvoid *vdpSurface, GLenum target,
-                                   GLsizei numTextureNames,
-                                   const GLuint *textureNames);
-
-extern GLboolean GLAPIENTRY
-_mesa_VDPAUIsSurfaceNV(GLintptr surface);
-
-extern void GLAPIENTRY
-_mesa_VDPAUUnregisterSurfaceNV(GLintptr surface);
-
-extern void GLAPIENTRY
-_mesa_VDPAUGetSurfaceivNV(GLintptr surface, GLenum pname, GLsizei bufSize,
-                          GLsizei *length, GLint *values);
-
-extern void GLAPIENTRY
-_mesa_VDPAUSurfaceAccessNV(GLintptr surface, GLenum access);
-
-extern void GLAPIENTRY
-_mesa_VDPAUMapSurfacesNV(GLsizei numSurfaces, const GLintptr *surfaces);
-
-extern void GLAPIENTRY
-_mesa_VDPAUUnmapSurfacesNV(GLsizei numSurfaces, const GLintptr *surfaces);
-
-#endif /* VDPAU_H */
index c377850..38a0651 100644 (file)
@@ -34,6 +34,7 @@
 #include "macros.h"
 #include "mtypes.h"
 #include "viewport.h"
+#include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_viewport.h"
 
index 655873d..d33a5ae 100644 (file)
 
 struct gl_context;
 
-void GLAPIENTRY
-_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
-
-void GLAPIENTRY
-_mesa_ViewportArrayv_no_error(GLuint first, GLsizei count, const GLfloat * v);
-
-extern void GLAPIENTRY
-_mesa_ViewportArrayv(GLuint first, GLsizei count, const GLfloat * v);
-
-void GLAPIENTRY
-_mesa_ViewportIndexedf_no_error(GLuint index, GLfloat x, GLfloat y, GLfloat w,
-                                GLfloat h);
-
-extern void GLAPIENTRY
-_mesa_ViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-
-void GLAPIENTRY
-_mesa_ViewportIndexedfv_no_error(GLuint index, const GLfloat * v);
-
-extern void GLAPIENTRY
-_mesa_ViewportIndexedfv(GLuint index, const GLfloat * v);
-
 extern void 
 _mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLfloat x, GLfloat y,
                    GLfloat width, GLfloat height);
 
-
-extern void GLAPIENTRY
-_mesa_DepthRange(GLclampd nearval, GLclampd farval);
-
-extern void GLAPIENTRY
-_mesa_DepthRangef(GLclampf nearval, GLclampf farval);
-
-void GLAPIENTRY
-_mesa_DepthRangeArrayv_no_error(GLuint first, GLsizei count,
-                                const GLclampd * v);
-
-extern void GLAPIENTRY
-_mesa_DepthRangeArrayv(GLuint first, GLsizei count, const GLclampd * v);
-
-extern void GLAPIENTRY
-_mesa_DepthRangeArrayfvOES(GLuint first, GLsizei count, const GLfloat * v);
-
-void GLAPIENTRY
-_mesa_DepthRangeIndexed_no_error(GLuint index, GLclampd n, GLclampd f);
-
-extern void GLAPIENTRY
-_mesa_DepthRangeIndexed(GLuint index, GLclampd n, GLclampd f);
-
-extern void GLAPIENTRY
-_mesa_DepthRangeIndexedfOES(GLuint index, GLfloat n, GLfloat f);
-
 extern void
 _mesa_set_depth_range(struct gl_context *ctx, unsigned idx,
                       GLclampd nearval, GLclampd farval);
@@ -93,31 +42,8 @@ _mesa_set_depth_range(struct gl_context *ctx, unsigned idx,
 extern void 
 _mesa_init_viewport(struct gl_context *ctx);
 
-
-void GLAPIENTRY
-_mesa_ClipControl_no_error(GLenum origin, GLenum depth);
-
-extern void GLAPIENTRY
-_mesa_ClipControl(GLenum origin, GLenum depth);
-
 extern void
 _mesa_get_viewport_xform(struct gl_context *ctx, unsigned i,
                          float scale[3], float translate[3]);
 
-extern void GLAPIENTRY
-_mesa_SubpixelPrecisionBiasNV_no_error(GLuint xbits, GLuint ybits);
-
-extern void GLAPIENTRY
-_mesa_SubpixelPrecisionBiasNV(GLuint xbits, GLuint ybits);
-
-extern void GLAPIENTRY
-_mesa_ViewportSwizzleNV_no_error(GLuint index,
-                                 GLenum swizzlex, GLenum swizzley,
-                                 GLenum swizzlez, GLenum swizzlew);
-
-extern void GLAPIENTRY
-_mesa_ViewportSwizzleNV(GLuint index,
-                        GLenum swizzlex, GLenum swizzley,
-                        GLenum swizzlez, GLenum swizzlew);
-
 #endif
index 0435292..e759281 100644 (file)
@@ -28,7 +28,6 @@ files_libmesa = files(
   'main/api_arrayelt.c',
   'main/api_arrayelt.h',
   'main/arbprogram.c',
-  'main/arbprogram.h',
   'main/arrayobj.c',
   'main/arrayobj.h',
   'main/atifragshader.c',
@@ -36,7 +35,6 @@ files_libmesa = files(
   'main/attrib.c',
   'main/attrib.h',
   'main/barrier.c',
-  'main/barrier.h',
   'main/bbox.c',
   'main/bbox.h',
   'main/blend.c',
@@ -48,14 +46,11 @@ files_libmesa = files(
   'main/buffers.c',
   'main/buffers.h',
   'main/clear.c',
-  'main/clear.h',
   'main/clip.c',
   'main/clip.h',
   'main/colormac.h',
   'main/colortab.c',
-  'main/colortab.h',
   'main/compute.c',
-  'main/compute.h',
   'main/condrender.c',
   'main/condrender.h',
   'main/config.h',
@@ -64,9 +59,7 @@ files_libmesa = files(
   'main/context.c',
   'main/context.h',
   'main/convolve.c',
-  'main/convolve.h',
   'main/copyimage.c',
-  'main/copyimage.h',
   'main/cpuinfo.c',
   'main/cpuinfo.h',
   'main/dd.h',
@@ -83,16 +76,13 @@ files_libmesa = files(
   'main/draw_validate.c',
   'main/draw_validate.h',
   'main/drawpix.c',
-  'main/drawpix.h',
   'main/drawtex.c',
-  'main/drawtex.h',
   'main/enable.c',
   'main/enable.h',
   'main/enums.h',
   'main/errors.c',
   'main/errors.h',
   'main/es1_conversion.c',
-  'main/es1_conversion.h',
   'main/eval.c',
   'main/eval.h',
   'main/extensions.c',
@@ -144,7 +134,6 @@ files_libmesa = files(
   'main/hint.c',
   'main/hint.h',
   'main/histogram.c',
-  'main/histogram.h',
   'main/image.c',
   'main/image.h',
   'main/light.c',
@@ -162,9 +151,7 @@ files_libmesa = files(
   'main/multisample.c',
   'main/multisample.h',
   'main/objectlabel.c',
-  'main/objectlabel.h',
   'main/objectpurge.c',
-  'main/objectpurge.h',
   'main/pack.c',
   'main/pack.h',
   'main/pbo.c',
@@ -188,9 +175,7 @@ files_libmesa = files(
   'main/program_binary.c',
   'main/program_binary.h',
   'main/program_resource.c',
-  'main/program_resource.h',
   'main/querymatrix.c',
-  'main/querymatrix.h',
   'main/queryobj.c',
   'main/queryobj.h',
   'main/rastpos.c',
@@ -241,12 +226,10 @@ files_libmesa = files(
   'main/texcompress_s3tc.c',
   'main/texcompress_s3tc.h',
   'main/texenv.c',
-  'main/texenv.h',
   'main/texenvprogram.h',
   'main/texformat.c',
   'main/texformat.h',
   'main/texgen.c',
-  'main/texgen.h',
   'main/texgetimage.c',
   'main/texgetimage.h',
   'main/teximage.c',
@@ -273,13 +256,11 @@ files_libmesa = files(
   'main/varray.c',
   'main/varray.h',
   'main/vdpau.c',
-  'main/vdpau.h',
   'main/version.c',
   'main/version.h',
   'main/viewport.c',
   'main/viewport.h',
   'main/es1_conversion.c',
-  'main/es1_conversion.h',
   'math/m_debug.h',
   'math/m_debug_clip.c',
   'math/m_debug_norm.c',
index 4e0fd79..8e75d58 100644 (file)
@@ -29,6 +29,7 @@
 #include "main/teximage.h"
 #include "main/texparam.h"
 #include "st_copytex.h"
+#include "api_exec_decl.h"
 
 
 /**
index f843155..2fcbfc5 100644 (file)
@@ -255,61 +255,6 @@ _es_Materialfv(GLenum face, GLenum pname, const GLfloat *params);
 void GLAPIENTRY
 _es_Materialf(GLenum face, GLenum pname, GLfloat param);
 
-void GLAPIENTRY
-save_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-
-void GLAPIENTRY
-save_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-
-void GLAPIENTRY
-save_Rectdv(const GLdouble *v1, const GLdouble *v2);
-
-void GLAPIENTRY
-save_Rectfv(const GLfloat *v1, const GLfloat *v2);
-
-void GLAPIENTRY
-save_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
-
-void GLAPIENTRY
-save_Rectiv(const GLint *v1, const GLint *v2);
-
-void GLAPIENTRY
-save_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-
-void GLAPIENTRY
-save_Rectsv(const GLshort *v1, const GLshort *v2);
-
-void GLAPIENTRY
-save_DrawArrays(GLenum mode, GLint start, GLsizei count);
-
-void GLAPIENTRY
-save_MultiDrawArrays(GLenum mode, const GLint *first,
-                      const GLsizei *count, GLsizei primcount);
-
-void GLAPIENTRY
-save_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-                             const GLvoid * indices, GLint basevertex);
-
-void GLAPIENTRY
-save_DrawElements(GLenum mode, GLsizei count, GLenum type,
-                   const GLvoid * indices);
-
-void GLAPIENTRY
-save_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
-                        GLsizei count, GLenum type,
-                        const GLvoid * indices);
-
-void GLAPIENTRY
-save_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
-                           const GLvoid * const *indices, GLsizei primcount);
-
-void GLAPIENTRY
-save_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
-                                  GLenum type,
-                                  const GLvoid * const *indices,
-                                  GLsizei primcount,
-                                  const GLint *basevertex);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
index 90f2d97..f4b6120 100644 (file)
@@ -38,6 +38,7 @@
 #include "main/dlist.h"
 #include "main/eval.h"
 #include "vbo_attrib.h"
+#include "api_exec_decl.h"
 
 static void GLAPIENTRY
 _mesa_noop_Materialfv(GLenum face, GLenum pname, const GLfloat * params)
index f828835..066c564 100644 (file)
@@ -121,6 +121,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "gallium/include/pipe/p_state.h"
 
 #include "vbo_private.h"
+#include "api_exec_decl.h"
+#include "api_save.h"
 
 #include "state_tracker/st_cb_bufferobjects.h"
 
@@ -1615,12 +1617,6 @@ save_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 
 
 void GLAPIENTRY
-save_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
-{
-   save_Rectf((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
-}
-
-void GLAPIENTRY
 save_Rectdv(const GLdouble *v1, const GLdouble *v2)
 {
    save_Rectf((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);