From 91b828ea740daa0bff6abb7da03dd18594016091 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 31 Oct 2012 14:13:16 -0700 Subject: [PATCH] dispatch: Delete unused init_dispatch functions. The new code-generated version of _mesa_create_exec_table() populates the entire dispatch table (except for dynamic functions) by itself; it no longer calls separate functions to initialize parts of the dispatch table. This patch removes those no-longer-needed functions. Reviewed-by: Jordan Justen Reviewed-by: Matt Turner --- src/mesa/main/accum.c | 8 ---- src/mesa/main/accum.h | 3 -- src/mesa/main/atifragshader.c | 20 -------- src/mesa/main/atifragshader.h | 3 -- src/mesa/main/attrib.c | 10 ---- src/mesa/main/attrib.h | 3 -- src/mesa/main/bufferobj.c | 31 ------------- src/mesa/main/bufferobj.h | 4 -- src/mesa/main/colortab.c | 18 -------- src/mesa/main/colortab.h | 3 -- src/mesa/main/convolve.c | 22 --------- src/mesa/main/convolve.h | 3 -- src/mesa/main/dlist.c | 14 ------ src/mesa/main/dlist.h | 2 - src/mesa/main/drawpix.c | 9 ---- src/mesa/main/drawpix.h | 3 -- src/mesa/main/eval.c | 22 --------- src/mesa/main/eval.h | 3 -- src/mesa/main/feedback.c | 14 ------ src/mesa/main/feedback.h | 4 -- src/mesa/main/histogram.c | 20 -------- src/mesa/main/histogram.h | 3 -- src/mesa/main/pixel.c | 20 -------- src/mesa/main/pixel.h | 3 -- src/mesa/main/rastpos.c | 56 ---------------------- src/mesa/main/rastpos.h | 3 -- src/mesa/main/texgen.c | 17 ------- src/mesa/main/texgen.h | 3 -- src/mesa/main/transformfeedback.c | 22 --------- src/mesa/main/transformfeedback.h | 4 -- src/mesa/main/uniforms.c | 77 ------------------------------- src/mesa/main/uniforms.h | 4 -- 32 files changed, 431 deletions(-) diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index 0206c16f76b..6416ee86059 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -106,14 +106,6 @@ _mesa_Accum( GLenum op, GLfloat value ) } -void -_mesa_init_accum_dispatch(struct _glapi_table *disp) -{ - SET_Accum(disp, _mesa_Accum); - SET_ClearAccum(disp, _mesa_ClearAccum); -} - - /** * Clear the accumulation buffer by mapping the renderbuffer and * writing the clear color to it. Called by the driver's implementation diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h index be1ef7652d7..00c24b2db0a 100644 --- a/src/mesa/main/accum.h +++ b/src/mesa/main/accum.h @@ -49,9 +49,6 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ); void GLAPIENTRY _mesa_Accum( GLenum op, GLfloat value ); -extern void -_mesa_init_accum_dispatch(struct _glapi_table *disp); - extern void _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value); diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c index 32ddfb8bbe1..2a079086216 100644 --- a/src/mesa/main/atifragshader.c +++ b/src/mesa/main/atifragshader.c @@ -37,26 +37,6 @@ static struct ati_fragment_shader DummyShader; -void -_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp) -{ - SET_GenFragmentShadersATI(disp, _mesa_GenFragmentShadersATI); - SET_BindFragmentShaderATI(disp, _mesa_BindFragmentShaderATI); - SET_DeleteFragmentShaderATI(disp, _mesa_DeleteFragmentShaderATI); - SET_BeginFragmentShaderATI(disp, _mesa_BeginFragmentShaderATI); - SET_EndFragmentShaderATI(disp, _mesa_EndFragmentShaderATI); - SET_PassTexCoordATI(disp, _mesa_PassTexCoordATI); - SET_SampleMapATI(disp, _mesa_SampleMapATI); - SET_ColorFragmentOp1ATI(disp, _mesa_ColorFragmentOp1ATI); - SET_ColorFragmentOp2ATI(disp, _mesa_ColorFragmentOp2ATI); - SET_ColorFragmentOp3ATI(disp, _mesa_ColorFragmentOp3ATI); - SET_AlphaFragmentOp1ATI(disp, _mesa_AlphaFragmentOp1ATI); - SET_AlphaFragmentOp2ATI(disp, _mesa_AlphaFragmentOp2ATI); - SET_AlphaFragmentOp3ATI(disp, _mesa_AlphaFragmentOp3ATI); - SET_SetFragmentShaderConstantATI(disp, _mesa_SetFragmentShaderConstantATI); -} - - /** * Allocate and initialize a new ATI fragment shader object. */ diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h index f5af5f15f4b..c47a7d56e44 100644 --- a/src/mesa/main/atifragshader.h +++ b/src/mesa/main/atifragshader.h @@ -63,9 +63,6 @@ struct atifs_setupinst }; -extern void -_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp); - extern struct ati_fragment_shader * _mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id); diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 48df7f16b28..05db35b8e10 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1584,16 +1584,6 @@ _mesa_PopClientAttrib(void) } -void -_mesa_init_attrib_dispatch(struct _glapi_table *disp) -{ - SET_PopAttrib(disp, _mesa_PopAttrib); - SET_PushAttrib(disp, _mesa_PushAttrib); - SET_PopClientAttrib(disp, _mesa_PopClientAttrib); - SET_PushClientAttrib(disp, _mesa_PushClientAttrib); -} - - /** * Free any attribute state data that might be attached to the context. */ diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h index f75c3c5ced5..1ecf3a591f2 100644 --- a/src/mesa/main/attrib.h +++ b/src/mesa/main/attrib.h @@ -45,9 +45,6 @@ _mesa_PushClientAttrib( GLbitfield mask ); extern void GLAPIENTRY _mesa_PopClientAttrib( void ); -extern void -_mesa_init_attrib_dispatch(struct _glapi_table *disp); - extern void _mesa_init_attrib( struct gl_context *ctx ); diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 646f56b0fe4..43eb8876ea6 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -2337,34 +2337,3 @@ _mesa_InvalidateBufferData(GLuint buffer) */ return; } - -void -_mesa_init_bufferobj_dispatch(struct gl_context *ctx, struct _glapi_table *disp) -{ - SET_BindBufferARB(disp, _mesa_BindBufferARB); - SET_BufferDataARB(disp, _mesa_BufferDataARB); - SET_BufferSubDataARB(disp, _mesa_BufferSubDataARB); - SET_DeleteBuffersARB(disp, _mesa_DeleteBuffersARB); - SET_GenBuffersARB(disp, _mesa_GenBuffersARB); - SET_GetBufferParameterivARB(disp, _mesa_GetBufferParameterivARB); - /* TODO: add GetBufferParameteri64v for desktop GL and GLES3 once tests - * exist for it. - */ - SET_GetBufferPointervARB(disp, _mesa_GetBufferPointervARB); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetBufferSubDataARB(disp, _mesa_GetBufferSubDataARB); - } - SET_IsBufferARB(disp, _mesa_IsBufferARB); - SET_MapBufferARB(disp, _mesa_MapBufferARB); - SET_UnmapBufferARB(disp, _mesa_UnmapBufferARB); - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange); - SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_InvalidateBufferData(disp, _mesa_InvalidateBufferData); - SET_InvalidateBufferSubData(disp, _mesa_InvalidateBufferSubData); - } -} diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index e47815de66b..4d5446ac082 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -152,8 +152,4 @@ void GLAPIENTRY _mesa_InvalidateBufferData(GLuint buffer); -extern void -_mesa_init_bufferobj_dispatch(struct gl_context *ctx, - struct _glapi_table *disp); - #endif diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index 9edf4d0cff2..f1b3e585ac9 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -144,21 +144,3 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ) ASSERT_OUTSIDE_BEGIN_END(ctx); _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)"); } - - -void -_mesa_init_colortable_dispatch(struct _glapi_table *disp) -{ - SET_ColorSubTable(disp, _mesa_ColorSubTable); - SET_ColorTable(disp, _mesa_ColorTable); - SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv); - SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv); - SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable); - SET_CopyColorTable(disp, _mesa_CopyColorTable); - SET_GetColorTable(disp, _mesa_GetColorTable); - SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv); - - /* GL_ARB_robustness */ - SET_GetnColorTableARB(disp, _mesa_GetnColorTableARB); -} diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h index fb80d49fcb0..f25fbe8a5dc 100644 --- a/src/mesa/main/colortab.h +++ b/src/mesa/main/colortab.h @@ -63,8 +63,5 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ); void GLAPIENTRY _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ); -extern void -_mesa_init_colortable_dispatch(struct _glapi_table *disp); - #endif /* COLORTAB_H */ diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c index 58b88bb2408..dfc1b9465bd 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -176,25 +176,3 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D"); } - -void -_mesa_init_convolve_dispatch(struct _glapi_table *disp) -{ - SET_ConvolutionFilter1D(disp, _mesa_ConvolutionFilter1D); - SET_ConvolutionFilter2D(disp, _mesa_ConvolutionFilter2D); - SET_ConvolutionParameterf(disp, _mesa_ConvolutionParameterf); - SET_ConvolutionParameterfv(disp, _mesa_ConvolutionParameterfv); - SET_ConvolutionParameteri(disp, _mesa_ConvolutionParameteri); - SET_ConvolutionParameteriv(disp, _mesa_ConvolutionParameteriv); - SET_CopyConvolutionFilter1D(disp, _mesa_CopyConvolutionFilter1D); - SET_CopyConvolutionFilter2D(disp, _mesa_CopyConvolutionFilter2D); - SET_GetConvolutionFilter(disp, _mesa_GetConvolutionFilter); - SET_GetConvolutionParameterfv(disp, _mesa_GetConvolutionParameterfv); - SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv); - SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D); - SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter); - - /* GL_ARB_robustness */ - SET_GetnConvolutionFilterARB(disp, _mesa_GetnConvolutionFilterARB); - SET_GetnSeparableFilterARB(disp, _mesa_GetnSeparableFilterARB); -} diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h index afbc78a5404..812debd6123 100644 --- a/src/mesa/main/convolve.h +++ b/src/mesa/main/convolve.h @@ -33,9 +33,6 @@ struct _glapi_table; -extern void -_mesa_init_convolve_dispatch(struct _glapi_table *disp); - void GLAPIENTRY _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 99e64c439ae..8bbead7c4a2 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -10633,20 +10633,6 @@ _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, } -void _mesa_init_dlist_dispatch(struct _glapi_table *disp) -{ - SET_CallList(disp, _mesa_CallList); - SET_CallLists(disp, _mesa_CallLists); - - SET_DeleteLists(disp, _mesa_DeleteLists); - SET_EndList(disp, _mesa_EndList); - SET_GenLists(disp, _mesa_GenLists); - SET_IsList(disp, _mesa_IsList); - SET_ListBase(disp, _mesa_ListBase); - SET_NewList(disp, _mesa_NewList); -} - - /** * Initialize display list state for given context. */ diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index f77a1408999..9d4fc6899a4 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -79,8 +79,6 @@ extern struct _glapi_table *_mesa_create_save_table(const struct gl_context *); extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); - extern void _mesa_init_display_list( struct gl_context * ctx ); extern void _mesa_free_display_list_data(struct gl_context *ctx); diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 9eb239500af..3d25ae52b73 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -365,12 +365,3 @@ _mesa_Bitmap( GLsizei width, GLsizei height, _mesa_flush(ctx); } } - - -void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp) -{ - SET_Bitmap(disp, _mesa_Bitmap); - SET_CopyPixels(disp, _mesa_CopyPixels); - SET_DrawPixels(disp, _mesa_DrawPixels); -} diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h index 8a1550aa1dd..087b3a8c94e 100644 --- a/src/mesa/main/drawpix.h +++ b/src/mesa/main/drawpix.h @@ -32,9 +32,6 @@ struct _glapi_table; -extern void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp); - void GLAPIENTRY _mesa_DrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels ); diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index fab30cd8e94..59627cc433a 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -848,28 +848,6 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp, } -void -_mesa_init_eval_dispatch(struct _glapi_table *disp) -{ - SET_GetMapdv(disp, _mesa_GetMapdv); - SET_GetMapfv(disp, _mesa_GetMapfv); - SET_GetMapiv(disp, _mesa_GetMapiv); - SET_Map1d(disp, _mesa_Map1d); - SET_Map1f(disp, _mesa_Map1f); - SET_Map2d(disp, _mesa_Map2d); - SET_Map2f(disp, _mesa_Map2f); - SET_MapGrid1d(disp, _mesa_MapGrid1d); - SET_MapGrid1f(disp, _mesa_MapGrid1f); - SET_MapGrid2d(disp, _mesa_MapGrid2d); - SET_MapGrid2f(disp, _mesa_MapGrid2f); - - /* GL_ARB_robustness */ - SET_GetnMapdvARB(disp, _mesa_GetnMapdvARB); - SET_GetnMapfvARB(disp, _mesa_GetnMapfvARB); - SET_GetnMapivARB(disp, _mesa_GetnMapivARB); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h index 311afd5e57e..1b6c704ca3b 100644 --- a/src/mesa/main/eval.h +++ b/src/mesa/main/eval.h @@ -78,9 +78,6 @@ extern void _mesa_install_eval_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void -_mesa_init_eval_dispatch(struct _glapi_table *disp); - extern void _mesa_init_eval( struct gl_context *ctx ); extern void _mesa_free_eval_data( struct gl_context *ctx ); diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index bc62edcb671..128a12622e8 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -494,20 +494,6 @@ _mesa_RenderMode( GLenum mode ) /*@}*/ -void -_mesa_init_feedback_dispatch(struct _glapi_table *disp) -{ - SET_InitNames(disp, _mesa_InitNames); - SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer); - SET_LoadName(disp, _mesa_LoadName); - SET_PassThrough(disp, _mesa_PassThrough); - SET_PopName(disp, _mesa_PopName); - SET_PushName(disp, _mesa_PushName); - SET_SelectBuffer(disp, _mesa_SelectBuffer); - SET_RenderMode(disp, _mesa_RenderMode); -} - - /**********************************************************************/ /** \name Initialization */ /*@{*/ diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h index 8c1e132ad64..a697dc0d25b 100644 --- a/src/mesa/main/feedback.h +++ b/src/mesa/main/feedback.h @@ -69,10 +69,6 @@ extern void _mesa_update_hitflag( struct gl_context *ctx, GLfloat z ); -extern void -_mesa_init_feedback_dispatch(struct _glapi_table *disp); - - extern void _mesa_init_feedback( struct gl_context *ctx ); diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c index b11fbf12a20..fe454bcfb06 100644 --- a/src/mesa/main/histogram.c +++ b/src/mesa/main/histogram.c @@ -143,23 +143,3 @@ _mesa_ResetMinmax(GLenum target) _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax"); } - - -void -_mesa_init_histogram_dispatch(struct _glapi_table *disp) -{ - SET_GetHistogram(disp, _mesa_GetHistogram); - SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv); - SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv); - SET_GetMinmax(disp, _mesa_GetMinmax); - SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv); - SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv); - SET_Histogram(disp, _mesa_Histogram); - SET_Minmax(disp, _mesa_Minmax); - SET_ResetHistogram(disp, _mesa_ResetHistogram); - SET_ResetMinmax(disp, _mesa_ResetMinmax); - - /* GL_ARB_robustness */ - SET_GetnHistogramARB(disp, _mesa_GetnHistogramARB); - SET_GetnMinmaxARB(disp, _mesa_GetnMinmaxARB); -} diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h index 41fe3213379..06781e732a1 100644 --- a/src/mesa/main/histogram.h +++ b/src/mesa/main/histogram.h @@ -41,9 +41,6 @@ struct _glapi_table; -extern void -_mesa_init_histogram_dispatch(struct _glapi_table *disp); - void GLAPIENTRY _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index cfc6b03c87e..9940eda5250 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -647,26 +647,6 @@ void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state ) } -void -_mesa_init_pixel_dispatch(struct _glapi_table *disp) -{ - SET_GetPixelMapfv(disp, _mesa_GetPixelMapfv); - SET_GetPixelMapuiv(disp, _mesa_GetPixelMapuiv); - SET_GetPixelMapusv(disp, _mesa_GetPixelMapusv); - SET_PixelMapfv(disp, _mesa_PixelMapfv); - SET_PixelMapuiv(disp, _mesa_PixelMapuiv); - SET_PixelMapusv(disp, _mesa_PixelMapusv); - SET_PixelTransferf(disp, _mesa_PixelTransferf); - SET_PixelTransferi(disp, _mesa_PixelTransferi); - SET_PixelZoom(disp, _mesa_PixelZoom); - - /* GL_ARB_robustness */ - SET_GetnPixelMapfvARB(disp, _mesa_GetnPixelMapfvARB); - SET_GetnPixelMapuivARB(disp, _mesa_GetnPixelMapuivARB); - SET_GetnPixelMapusvARB(disp, _mesa_GetnPixelMapusvARB); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h index a5baecf038b..433208cb652 100644 --- a/src/mesa/main/pixel.h +++ b/src/mesa/main/pixel.h @@ -69,9 +69,6 @@ _mesa_PixelTransferi( GLenum pname, GLint param ); extern void _mesa_update_pixel( struct gl_context *ctx, GLuint newstate ); -extern void -_mesa_init_pixel_dispatch( struct _glapi_table * disp ); - extern void _mesa_init_pixel( struct gl_context * ctx ); diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index b746c8838d3..0ea95b59407 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -474,62 +474,6 @@ void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) #endif -void -_mesa_init_rastpos_dispatch(struct _glapi_table *disp) -{ - SET_RasterPos2f(disp, _mesa_RasterPos2f); - SET_RasterPos2fv(disp, _mesa_RasterPos2fv); - SET_RasterPos2i(disp, _mesa_RasterPos2i); - SET_RasterPos2iv(disp, _mesa_RasterPos2iv); - SET_RasterPos2d(disp, _mesa_RasterPos2d); - SET_RasterPos2dv(disp, _mesa_RasterPos2dv); - SET_RasterPos2s(disp, _mesa_RasterPos2s); - SET_RasterPos2sv(disp, _mesa_RasterPos2sv); - SET_RasterPos3d(disp, _mesa_RasterPos3d); - SET_RasterPos3dv(disp, _mesa_RasterPos3dv); - SET_RasterPos3f(disp, _mesa_RasterPos3f); - SET_RasterPos3fv(disp, _mesa_RasterPos3fv); - SET_RasterPos3i(disp, _mesa_RasterPos3i); - SET_RasterPos3iv(disp, _mesa_RasterPos3iv); - SET_RasterPos3s(disp, _mesa_RasterPos3s); - SET_RasterPos3sv(disp, _mesa_RasterPos3sv); - SET_RasterPos4d(disp, _mesa_RasterPos4d); - SET_RasterPos4dv(disp, _mesa_RasterPos4dv); - SET_RasterPos4f(disp, _mesa_RasterPos4f); - SET_RasterPos4fv(disp, _mesa_RasterPos4fv); - SET_RasterPos4i(disp, _mesa_RasterPos4i); - SET_RasterPos4iv(disp, _mesa_RasterPos4iv); - SET_RasterPos4s(disp, _mesa_RasterPos4s); - SET_RasterPos4sv(disp, _mesa_RasterPos4sv); - - /* 197. GL_MESA_window_pos */ - SET_WindowPos2dMESA(disp, _mesa_WindowPos2dMESA); - SET_WindowPos2dvMESA(disp, _mesa_WindowPos2dvMESA); - SET_WindowPos2fMESA(disp, _mesa_WindowPos2fMESA); - SET_WindowPos2fvMESA(disp, _mesa_WindowPos2fvMESA); - SET_WindowPos2iMESA(disp, _mesa_WindowPos2iMESA); - SET_WindowPos2ivMESA(disp, _mesa_WindowPos2ivMESA); - SET_WindowPos2sMESA(disp, _mesa_WindowPos2sMESA); - SET_WindowPos2svMESA(disp, _mesa_WindowPos2svMESA); - SET_WindowPos3dMESA(disp, _mesa_WindowPos3dMESA); - SET_WindowPos3dvMESA(disp, _mesa_WindowPos3dvMESA); - SET_WindowPos3fMESA(disp, _mesa_WindowPos3fMESA); - SET_WindowPos3fvMESA(disp, _mesa_WindowPos3fvMESA); - SET_WindowPos3iMESA(disp, _mesa_WindowPos3iMESA); - SET_WindowPos3ivMESA(disp, _mesa_WindowPos3ivMESA); - SET_WindowPos3sMESA(disp, _mesa_WindowPos3sMESA); - SET_WindowPos3svMESA(disp, _mesa_WindowPos3svMESA); - SET_WindowPos4dMESA(disp, _mesa_WindowPos4dMESA); - SET_WindowPos4dvMESA(disp, _mesa_WindowPos4dvMESA); - SET_WindowPos4fMESA(disp, _mesa_WindowPos4fMESA); - SET_WindowPos4fvMESA(disp, _mesa_WindowPos4fvMESA); - SET_WindowPos4iMESA(disp, _mesa_WindowPos4iMESA); - SET_WindowPos4ivMESA(disp, _mesa_WindowPos4ivMESA); - SET_WindowPos4sMESA(disp, _mesa_WindowPos4sMESA); - SET_WindowPos4svMESA(disp, _mesa_WindowPos4svMESA); -} - - /**********************************************************************/ /** \name Initialization */ /**********************************************************************/ diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h index 0c4c193e20d..90351e86bee 100644 --- a/src/mesa/main/rastpos.h +++ b/src/mesa/main/rastpos.h @@ -38,9 +38,6 @@ struct _glapi_table; struct gl_context; -extern void -_mesa_init_rastpos_dispatch(struct _glapi_table *disp); - extern void _mesa_init_rastpos(struct gl_context *ctx); diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c index 33154698a2c..7c9c2a76023 100644 --- a/src/mesa/main/texgen.c +++ b/src/mesa/main/texgen.c @@ -421,20 +421,3 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ) _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" ); } } - - -void -_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp) -{ - SET_GetTexGenfv(disp, _mesa_GetTexGenfv); - SET_GetTexGeniv(disp, _mesa_GetTexGeniv); - SET_TexGenf(disp, _mesa_TexGenf); - SET_TexGenfv(disp, _mesa_TexGenfv); - SET_TexGeni(disp, _mesa_TexGeni); - SET_TexGeniv(disp, _mesa_TexGeniv); - if (ctx->API == API_OPENGL) { - SET_GetTexGendv(disp, _mesa_GetTexGendv); - SET_TexGend(disp, _mesa_TexGend); - SET_TexGendv(disp, _mesa_TexGendv); - } -} diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h index ee680235e28..97563a0f071 100644 --- a/src/mesa/main/texgen.h +++ b/src/mesa/main/texgen.h @@ -53,9 +53,6 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); void GLAPIENTRY _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ); -extern void -_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp); - extern void GLAPIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params); diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index 1e3a7ea0f32..52cb065c296 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@ -245,28 +245,6 @@ _mesa_init_transform_feedback_functions(struct dd_function_table *driver) } -void -_mesa_init_transform_feedback_dispatch(const struct gl_context *ctx, - struct _glapi_table *disp) -{ - /* EXT_transform_feedback */ - SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback); - SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback); - if (_mesa_is_desktop_gl(ctx)) { - SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT); - } - SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings); - SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying); - /* ARB_transform_feedback2 */ - SET_BindTransformFeedback(disp, _mesa_BindTransformFeedback); - SET_DeleteTransformFeedbacks(disp, _mesa_DeleteTransformFeedbacks); - SET_GenTransformFeedbacks(disp, _mesa_GenTransformFeedbacks); - SET_IsTransformFeedback(disp, _mesa_IsTransformFeedback); - SET_PauseTransformFeedback(disp, _mesa_PauseTransformFeedback); - SET_ResumeTransformFeedback(disp, _mesa_ResumeTransformFeedback); -} - - /** ** Begin API functions **/ diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h index 6ff9c50b41b..dec11ffa0d1 100644 --- a/src/mesa/main/transformfeedback.h +++ b/src/mesa/main/transformfeedback.h @@ -46,10 +46,6 @@ _mesa_validate_transform_feedback_buffers(struct gl_context *ctx); extern void _mesa_init_transform_feedback_functions(struct dd_function_table *driver); -extern void -_mesa_init_transform_feedback_dispatch(const struct gl_context *ctx, - struct _glapi_table *disp); - /*** GL_EXT_transform_feedback ***/ diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index f503c3f110b..2b7a564f0c5 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -799,80 +799,3 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, shProg->UniformStorage[uniformIndex].name); } } - -/** - * Plug in shader uniform-related functions into API dispatch table. - */ -void -_mesa_init_shader_uniform_dispatch(const struct gl_context *ctx, - struct _glapi_table *exec) -{ -#if FEATURE_GL - if (ctx->API != API_OPENGLES) { - SET_Uniform1fARB(exec, _mesa_Uniform1fARB); - SET_Uniform2fARB(exec, _mesa_Uniform2fARB); - SET_Uniform3fARB(exec, _mesa_Uniform3fARB); - SET_Uniform4fARB(exec, _mesa_Uniform4fARB); - SET_Uniform1iARB(exec, _mesa_Uniform1iARB); - SET_Uniform2iARB(exec, _mesa_Uniform2iARB); - SET_Uniform3iARB(exec, _mesa_Uniform3iARB); - SET_Uniform4iARB(exec, _mesa_Uniform4iARB); - SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB); - SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB); - SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB); - SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB); - SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB); - SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB); - SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB); - SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB); - SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB); - SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB); - SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB); - - SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB); - SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB); - SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB); - SET_GetUniformivARB(exec, _mesa_GetUniformivARB); - } - - /* OpenGL 2.1 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv); - SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv); - SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv); - SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv); - SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv); - SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv); - - /* OpenGL 3.0 */ - SET_Uniform1uiEXT(exec, _mesa_Uniform1ui); - SET_Uniform2uiEXT(exec, _mesa_Uniform2ui); - SET_Uniform3uiEXT(exec, _mesa_Uniform3ui); - SET_Uniform4uiEXT(exec, _mesa_Uniform4ui); - SET_Uniform1uivEXT(exec, _mesa_Uniform1uiv); - SET_Uniform2uivEXT(exec, _mesa_Uniform2uiv); - SET_Uniform3uivEXT(exec, _mesa_Uniform3uiv); - SET_Uniform4uivEXT(exec, _mesa_Uniform4uiv); - SET_GetUniformuivEXT(exec, _mesa_GetUniformuiv); - - /* GL_ARB_uniform_buffer_object / GL 3.1 */ - SET_GetUniformBlockIndex(exec, _mesa_GetUniformBlockIndex); - SET_GetUniformIndices(exec, _mesa_GetUniformIndices); - SET_GetActiveUniformsiv(exec, _mesa_GetActiveUniformsiv); - SET_GetActiveUniformBlockiv(exec, _mesa_GetActiveUniformBlockiv); - SET_GetActiveUniformBlockName(exec, _mesa_GetActiveUniformBlockName); - SET_UniformBlockBinding(exec, _mesa_UniformBlockBinding); - } - - if (_mesa_is_desktop_gl(ctx)) { - /* GL_ARB_robustness */ - SET_GetnUniformfvARB(exec, _mesa_GetnUniformfvARB); - SET_GetnUniformivARB(exec, _mesa_GetnUniformivARB); - SET_GetnUniformuivARB(exec, _mesa_GetnUniformuivARB); - SET_GetnUniformdvARB(exec, _mesa_GetnUniformdvARB); - - /* GL_ARB_uniform_buffer_object / GL 3.1 */ - SET_GetActiveUniformName(exec, _mesa_GetActiveUniformName); - } -#endif /* FEATURE_GL */ -} diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 77c24319b9a..076bde3c85e 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -210,10 +210,6 @@ extern bool _mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg, char *errMsg, size_t errMsgLength); -extern void -_mesa_init_shader_uniform_dispatch(const struct gl_context *ctx, - struct _glapi_table *exec); - extern const struct gl_program_parameter * get_uniform_parameter(struct gl_shader_program *shProg, GLint index); -- 2.30.2