From db6273e0ddc5dbfcff27b8f75982bbf348810d31 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 13 Sep 2010 13:51:52 +0800 Subject: [PATCH] mesa: Remove unused _MESA_INIT_*_FUNCTIONS. They were intended to be used to build OpenGL ES only DRI drivers, but that never happened. --- src/mesa/main/accum.h | 7 ------- src/mesa/main/colortab.h | 9 --------- src/mesa/main/convolve.h | 8 -------- src/mesa/main/dlist.h | 11 ----------- src/mesa/main/drawpix.h | 9 --------- src/mesa/main/drawtex.h | 9 --------- src/mesa/main/feedback.h | 7 ------- src/mesa/main/mfeatures.h | 3 --- src/mesa/main/queryobj.h | 13 ------------- src/mesa/main/rastpos.h | 7 ------- src/mesa/main/texgen.h | 7 ------- 11 files changed, 90 deletions(-) diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h index c2b74b2..4b628ba 100644 --- a/src/mesa/main/accum.h +++ b/src/mesa/main/accum.h @@ -42,11 +42,6 @@ #if FEATURE_accum -#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) \ - do { \ - (driver)->Accum = impl ## Accum; \ - } while (0) - extern void GLAPIENTRY _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ); @@ -57,8 +52,6 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp); #include "main/compiler.h" -#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) do { } while (0) - static INLINE void _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) { diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h index 744f092d..303c9fb 100644 --- a/src/mesa/main/colortab.h +++ b/src/mesa/main/colortab.h @@ -31,13 +31,6 @@ #if FEATURE_colortable -#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl) \ - do { \ - (driver)->CopyColorTable = impl ## CopyColorTable; \ - (driver)->CopyColorSubTable = impl ## CopyColorSubTable; \ - (driver)->UpdateTexturePalette = impl ## UpdateTexturePalette; \ - } while (0) - extern void GLAPIENTRY _mesa_ColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, @@ -55,8 +48,6 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp); #include "main/compiler.h" -#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl) do { } while (0) - static INLINE void GLAPIENTRY _mesa_ColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h index d140188..80caf94 100644 --- a/src/mesa/main/convolve.h +++ b/src/mesa/main/convolve.h @@ -33,12 +33,6 @@ #if FEATURE_convolve -#define _MESA_INIT_CONVOLVE_FUNCTIONS(driver, impl) \ - do { \ - (driver)->CopyConvolutionFilter1D = impl ## CopyConvolutionFilter1D; \ - (driver)->CopyConvolutionFilter2D = impl ## CopyConvolutionFilter2D; \ - } while (0) - extern void GLAPIENTRY _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); @@ -72,8 +66,6 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp); #include "main/compiler.h" -#define _MESA_INIT_CONVOLVE_FUNCTIONS(driver, impl) do { } while (0) - static INLINE void GLAPIENTRY _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image) diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index d3f5c5c..86bb132 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -38,16 +38,6 @@ #if FEATURE_dlist -#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl) \ - do { \ - (driver)->NewList = impl ## NewList; \ - (driver)->EndList = impl ## EndList; \ - (driver)->BeginCallList = impl ## BeginCallList; \ - (driver)->EndCallList = impl ## EndCallList; \ - (driver)->SaveFlushVertices = impl ## SaveFlushVertices; \ - (driver)->NotifySaveBegin = impl ## NotifyBegin; \ - } while (0) - #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) \ do { \ (vfmt)->CallList = impl ## CallList; \ @@ -83,7 +73,6 @@ extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); #include "main/compiler.h" -#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl) do { } while (0) #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0) static INLINE void diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h index 8ffb1a6..1f95ff5 100644 --- a/src/mesa/main/drawpix.h +++ b/src/mesa/main/drawpix.h @@ -31,20 +31,11 @@ #if FEATURE_drawpix -#define _MESA_INIT_DRAWPIX_FUNCTIONS(driver, impl) \ - do { \ - (driver)->DrawPixels = impl ## DrawPixels; \ - (driver)->CopyPixels = impl ## CopyPixels; \ - (driver)->Bitmap = impl ## Bitmap; \ - } while (0) - extern void _mesa_init_drawpix_dispatch(struct _glapi_table *disp); #else /* FEATURE_drawpix */ -#define _MESA_INIT_DRAWPIX_FUNCTIONS(driver, impl) do { } while (0) - static INLINE void _mesa_init_drawpix_dispatch(struct _glapi_table *disp) { diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h index 95f4ac8..d7d5075 100644 --- a/src/mesa/main/drawtex.h +++ b/src/mesa/main/drawtex.h @@ -30,11 +30,6 @@ #if FEATURE_OES_draw_texture -#define _MESA_INIT_DRAWTEX_FUNCTIONS(driver, impl) \ - do { \ - (driver)->DrawTex = impl ## DrawTex; \ - } while (0) - extern void GLAPIENTRY _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); @@ -59,10 +54,6 @@ _mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); extern void GLAPIENTRY _mesa_DrawTexxv(const GLfixed *coords); -#else /* FEATURE_OES_draw_texture */ - -#define _MESA_INIT_DRAWTEX_FUNCTIONS(driver, impl) do { } while (0) - #endif /* FEATURE_OES_draw_texture */ diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h index 0762930..c6354b9 100644 --- a/src/mesa/main/feedback.h +++ b/src/mesa/main/feedback.h @@ -32,11 +32,6 @@ #if FEATURE_feedback -#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) \ - do { \ - (driver)->RenderMode = impl ## RenderMode; \ - } while (0) - extern void _mesa_feedback_vertex( GLcontext *ctx, const GLfloat win[4], @@ -65,8 +60,6 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp); #include "main/compiler.h" -#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) do { } while (0) - static INLINE void _mesa_feedback_vertex( GLcontext *ctx, const GLfloat win[4], diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 4e838ab..92311ef 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -42,9 +42,6 @@ /** * A feature can be anything. But most of them share certain characteristics. * - * When a feature defines driver entries, they can be initialized by - * _MESA_INIT__FUNCTIONS - * * When a feature defines vtxfmt entries, they can be initialized and * installed by * _MESA_INIT__VTXFMT diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h index b044c0d..8746ed1 100644 --- a/src/mesa/main/queryobj.h +++ b/src/mesa/main/queryobj.h @@ -33,17 +33,6 @@ #if FEATURE_queryobj -#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl) \ - do { \ - (driver)->NewQueryObject = impl ## NewQueryObject; \ - (driver)->DeleteQuery = impl ## DeleteQuery; \ - (driver)->BeginQuery = impl ## BeginQuery; \ - (driver)->EndQuery = impl ## EndQuery; \ - (driver)->WaitQuery = impl ## WaitQuery; \ - (driver)->CheckQuery = impl ## CheckQuery; \ - } while (0) - - static INLINE struct gl_query_object * _mesa_lookup_query_object(GLcontext *ctx, GLuint id) { @@ -78,8 +67,6 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp); #else /* FEATURE_queryobj */ -#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl) do { } while (0) - static INLINE struct gl_query_object * _mesa_lookup_query_object(GLcontext *ctx, GLuint id) { diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h index b212722..4994616 100644 --- a/src/mesa/main/rastpos.h +++ b/src/mesa/main/rastpos.h @@ -37,18 +37,11 @@ #if FEATURE_rastpos -#define _MESA_INIT_RASTPOS_FUNCTIONS(driver, impl) \ - do { \ - (driver)->RasterPos = impl ## RasterPos; \ - } while (0) - extern void _mesa_init_rastpos_dispatch(struct _glapi_table *disp); #else /* FEATURE_rastpos */ -#define _MESA_INIT_RASTPOS_FUNCTIONS(driver, impl) do { } while (0) - static INLINE void _mesa_init_rastpos_dispatch(struct _glapi_table *disp) { diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h index 2224a93..9ed8023 100644 --- a/src/mesa/main/texgen.h +++ b/src/mesa/main/texgen.h @@ -35,11 +35,6 @@ struct _glapi_table; #if FEATURE_texgen -#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) \ - do { \ - (driver)->TexGen = impl ## TexGen; \ - } while (0) - extern void GLAPIENTRY _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); @@ -68,8 +63,6 @@ _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params); #else /* FEATURE_texgen */ -#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) do { } while (0) - static void _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) { -- 2.7.4