From dda982f1a7f1b8f525894e01975e69b262696153 Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Tue, 11 Sep 2012 11:13:07 +0300 Subject: [PATCH] mesa: remove FEATURE_EXT_transform_feedback define. Signed-off-by: Oliver McFadden Reviewed-by: Brian Paul --- src/mesa/drivers/common/meta.c | 6 ---- src/mesa/main/api_validate.c | 4 --- src/mesa/main/api_validate.h | 3 -- src/mesa/main/bufferobj.c | 2 -- src/mesa/main/dlist.c | 4 --- src/mesa/main/enable.c | 4 --- src/mesa/main/extensions.c | 2 -- src/mesa/main/mfeatures.h | 2 -- src/mesa/main/queryobj.c | 2 -- src/mesa/main/shaderapi.c | 4 --- src/mesa/main/transformfeedback.c | 42 -------------------------- src/mesa/main/transformfeedback.h | 28 ----------------- src/mesa/main/varray.h | 4 --- src/mesa/state_tracker/st_cb_xformfb.c | 4 --- src/mesa/state_tracker/st_cb_xformfb.h | 16 ---------- src/mesa/vbo/vbo_exec_array.c | 10 ------ 16 files changed, 137 deletions(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 1454154618a..80eeff39ef4 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -190,9 +190,7 @@ struct save_state /** Miscellaneous (always disabled) */ GLboolean Lighting; GLboolean RasterDiscard; -#if FEATURE_EXT_transform_feedback GLboolean TransformFeedbackNeedsResume; -#endif }; /** @@ -464,7 +462,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) memset(save, 0, sizeof(*save)); save->SavedState = state; -#if FEATURE_EXT_transform_feedback /* Pausing transform feedback needs to be done early, or else we won't be * able to change other state. */ @@ -473,7 +470,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) !ctx->TransformFeedback.CurrentObject->Paused; if (save->TransformFeedbackNeedsResume) _mesa_PauseTransformFeedback(); -#endif if (state & MESA_META_ALPHA_TEST) { save->AlphaEnabled = ctx->Color.AlphaEnabled; @@ -1075,10 +1071,8 @@ _mesa_meta_end(struct gl_context *ctx) if (save->RasterDiscard) { _mesa_set_enable(ctx, GL_RASTERIZER_DISCARD, GL_TRUE); } -#if FEATURE_EXT_transform_feedback if (save->TransformFeedbackNeedsResume) _mesa_ResumeTransformFeedback(); -#endif ctx->Meta->SaveStackDepth--; } diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index d8cf6b8ff57..db9d14a4cc2 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -610,8 +610,6 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, } -#if FEATURE_EXT_transform_feedback - GLboolean _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, GLenum mode, @@ -656,5 +654,3 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, return GL_TRUE; } - -#endif diff --git a/src/mesa/main/api_validate.h b/src/mesa/main/api_validate.h index 8dc8df4b2fc..0ca9c90d92c 100644 --- a/src/mesa/main/api_validate.h +++ b/src/mesa/main/api_validate.h @@ -78,8 +78,6 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, const GLvoid *indices, GLsizei primcount, GLint basevertex); -#if FEATURE_EXT_transform_feedback - extern GLboolean _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, GLenum mode, @@ -87,6 +85,5 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, GLuint stream, GLsizei numInstances); -#endif #endif diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 0ce3667b616..f8355a48b8c 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -87,13 +87,11 @@ get_buffer_target(struct gl_context *ctx, GLenum target) return &ctx->CopyReadBuffer; case GL_COPY_WRITE_BUFFER: return &ctx->CopyWriteBuffer; -#if FEATURE_EXT_transform_feedback case GL_TRANSFORM_FEEDBACK_BUFFER: if (ctx->Extensions.EXT_transform_feedback) { return &ctx->TransformFeedback.CurrentBuffer; } break; -#endif case GL_TEXTURE_BUFFER: if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_buffer_object) { diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index fdc70b5adb9..bec8ff1553b 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -66,9 +66,7 @@ #include "varray.h" #include "arbprogram.h" #include "nvprogram.h" -#if FEATURE_EXT_transform_feedback #include "transformfeedback.h" -#endif #include "math/m_matrix.h" @@ -10522,7 +10520,6 @@ _mesa_create_save_table(void) (void) save_Uniform4uiv; #endif -#if FEATURE_EXT_transform_feedback /* These are not compiled into display lists: */ SET_BindBufferBaseEXT(table, _mesa_BindBufferBase); SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT); @@ -10542,7 +10539,6 @@ _mesa_create_save_table(void) save_DrawTransformFeedbackStreamInstanced); SET_BeginQueryIndexed(table, save_BeginQueryIndexed); SET_EndQueryIndexed(table, save_EndQueryIndexed); -#endif /* GL_ARB_instanced_arrays */ SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor); diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index c8c6996a11c..acf3f1a5db2 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1021,7 +1021,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) } break; -#if FEATURE_EXT_transform_feedback case GL_RASTERIZER_DISCARD: if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx)) goto invalid_enum_error; @@ -1031,7 +1030,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) ctx->RasterDiscard = state; } break; -#endif /* GL 3.1 primitive restart. Note: this enum is different from * GL_PRIMITIVE_RESTART_NV (which is client state). @@ -1683,13 +1681,11 @@ _mesa_IsEnabled( GLenum cap ) CHECK_EXTENSION(ARB_seamless_cube_map); return ctx->Texture.CubeMapSeamless; -#if FEATURE_EXT_transform_feedback case GL_RASTERIZER_DISCARD: if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx)) goto invalid_enum_error; CHECK_EXTENSION(EXT_transform_feedback); return ctx->RasterDiscard; -#endif /* GL_NV_primitive_restart */ case GL_PRIMITIVE_RESTART_NV: diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 5077e4dd65f..08061ca6b86 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -463,9 +463,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.EXT_texture_sRGB = GL_TRUE; ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE; ctx->Extensions.EXT_texture_swizzle = GL_TRUE; -#if FEATURE_EXT_transform_feedback /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/ -#endif ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE; /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/ ctx->Extensions.MESA_pack_invert = GL_TRUE; diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index fd3eae10064..bc825e8e547 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -84,8 +84,6 @@ #define FEATURE_remap_table 0 #endif -#define FEATURE_EXT_transform_feedback FEATURE_GL - #define FEATURE_APPLE_object_purgeable FEATURE_GL #define FEATURE_ATI_fragment_shader FEATURE_GL diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 2b3b259331d..18792cf6c0e 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -152,7 +152,6 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) return &ctx->Query.CurrentTimerObject; else return NULL; -#if FEATURE_EXT_transform_feedback case GL_PRIMITIVES_GENERATED: if (ctx->Extensions.EXT_transform_feedback) return &ctx->Query.PrimitivesGenerated; @@ -163,7 +162,6 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) return &ctx->Query.PrimitivesWritten; else return NULL; -#endif default: return NULL; } diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 4ce02e6bf55..c2ec1fa428c 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -467,14 +467,12 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, program); -#if FEATURE_EXT_transform_feedback /* Is transform feedback available in this context? */ const bool has_xfb = (ctx->API == API_OPENGL && ctx->Extensions.EXT_transform_feedback) || ctx->API == API_OPENGL_CORE || _mesa_is_gles3(ctx); -#endif /* Are geometry shaders available in this context? */ @@ -534,7 +532,6 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param *params = max_len; return; } -#if FEATURE_EXT_transform_feedback case GL_TRANSFORM_FEEDBACK_VARYINGS: if (!has_xfb) break; @@ -550,7 +547,6 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param break; *params = shProg->TransformFeedback.BufferMode; return; -#endif case GL_GEOMETRY_VERTICES_OUT_ARB: if (!has_gs) break; diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index 26345b10029..ea6cfdf8c61 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@ -44,9 +44,6 @@ #include "program/prog_parameter.h" -#if FEATURE_EXT_transform_feedback - - /** * Do reference counting of transform feedback buffers. */ @@ -171,40 +168,6 @@ _mesa_free_transform_feedback(struct gl_context *ctx) } -#else /* FEATURE_EXT_transform_feedback */ - -/* forward declarations */ -static struct gl_transform_feedback_object * -new_transform_feedback(struct gl_context *ctx, GLuint name); - -static void -delete_transform_feedback(struct gl_context *ctx, - struct gl_transform_feedback_object *obj); - -/* dummy per-context init/clean-up for transform feedback */ -void -_mesa_init_transform_feedback(struct gl_context *ctx) -{ - ctx->TransformFeedback.DefaultObject = new_transform_feedback(ctx, 0); - ctx->TransformFeedback.CurrentObject = ctx->TransformFeedback.DefaultObject; - _mesa_reference_buffer_object(ctx, - &ctx->TransformFeedback.CurrentBuffer, - ctx->Shared->NullBufferObj); -} - -void -_mesa_free_transform_feedback(struct gl_context *ctx) -{ - _mesa_reference_buffer_object(ctx, - &ctx->TransformFeedback.CurrentBuffer, - NULL); - ctx->TransformFeedback.CurrentObject = NULL; - delete_transform_feedback(ctx, ctx->TransformFeedback.DefaultObject); -} - -#endif /* FEATURE_EXT_transform_feedback */ - - /** Default fallback for ctx->Driver.NewTransformFeedback() */ static struct gl_transform_feedback_object * new_transform_feedback(struct gl_context *ctx, GLuint name) @@ -233,9 +196,6 @@ delete_transform_feedback(struct gl_context *ctx, } -#if FEATURE_EXT_transform_feedback - - /** Default fallback for ctx->Driver.BeginTransformFeedback() */ static void begin_transform_feedback(struct gl_context *ctx, GLenum mode, @@ -901,5 +861,3 @@ _mesa_ResumeTransformFeedback(void) assert(ctx->Driver.ResumeTransformFeedback); ctx->Driver.ResumeTransformFeedback(ctx, obj); } - -#endif /* FEATURE_EXT_transform_feedback */ diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h index 85f4cbc77ee..7d4a945c594 100644 --- a/src/mesa/main/transformfeedback.h +++ b/src/mesa/main/transformfeedback.h @@ -39,8 +39,6 @@ _mesa_init_transform_feedback(struct gl_context *ctx); extern void _mesa_free_transform_feedback(struct gl_context *ctx); -#if FEATURE_EXT_transform_feedback - extern GLboolean _mesa_validate_transform_feedback_buffers(struct gl_context *ctx); @@ -110,30 +108,4 @@ _mesa_PauseTransformFeedback(void); extern void GLAPIENTRY _mesa_ResumeTransformFeedback(void); -#else /* FEATURE_EXT_transform_feedback */ - -static inline GLboolean -_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode) -{ - return GL_TRUE; -} - -static inline GLboolean -_mesa_validate_transform_feedback_buffers(struct gl_context *ctx) -{ - return GL_TRUE; -} - -static inline void -_mesa_init_transform_feedback_functions(struct dd_function_table *driver) -{ -} - -static inline void -_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_EXT_transform_feedback */ - #endif /* TRANSFORM_FEEDBACK_H */ diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index b6041bd787e..d4836125619 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -245,13 +245,9 @@ _mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, const GLvoid *indices, GLint basevertex); -#if FEATURE_EXT_transform_feedback - extern void GLAPIENTRY _mesa_DrawTransformFeedback(GLenum mode, GLuint name); -#endif - extern void GLAPIENTRY _mesa_PrimitiveRestartIndex(GLuint index); diff --git a/src/mesa/state_tracker/st_cb_xformfb.c b/src/mesa/state_tracker/st_cb_xformfb.c index b8534855b32..3e52c9988ba 100644 --- a/src/mesa/state_tracker/st_cb_xformfb.c +++ b/src/mesa/state_tracker/st_cb_xformfb.c @@ -48,8 +48,6 @@ #include "util/u_inlines.h" #include "cso_cache/cso_context.h" -#if FEATURE_EXT_transform_feedback - struct st_transform_feedback_object { struct gl_transform_feedback_object base; @@ -229,5 +227,3 @@ st_init_xformfb_functions(struct dd_function_table *functions) functions->PauseTransformFeedback = st_pause_transform_feedback; functions->ResumeTransformFeedback = st_resume_transform_feedback; } - -#endif /* FEATURE_EXT_transform_feedback */ diff --git a/src/mesa/state_tracker/st_cb_xformfb.h b/src/mesa/state_tracker/st_cb_xformfb.h index c5261b39b94..5c82fed18c7 100644 --- a/src/mesa/state_tracker/st_cb_xformfb.h +++ b/src/mesa/state_tracker/st_cb_xformfb.h @@ -36,8 +36,6 @@ struct dd_function_table; struct gl_transform_feedback_object; struct pipe_draw_info; -#if FEATURE_EXT_transform_feedback - extern void st_init_xformfb_functions(struct dd_function_table *functions); @@ -45,19 +43,5 @@ extern void st_transform_feedback_draw_init(struct gl_transform_feedback_object *obj, struct pipe_draw_info *out); -#else - -static INLINE void -st_init_xformfb_functions(struct dd_function_table *functions) -{ -} - -static INLINE void -st_transform_feedback_draw_init(struct gl_transform_feedback_object *obj, - struct pipe_draw_info *out) -{ -} - -#endif /* FEATURE_EXT_transform_feedback */ #endif /* ST_CB_XFORMFB_H */ diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index a923aa1fa5b..f0ef2058e94 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -1281,8 +1281,6 @@ vbo_exec_MultiDrawElementsBaseVertex(GLenum mode, basevertex); } -#if FEATURE_EXT_transform_feedback - static void vbo_draw_transform_feedback(struct gl_context *ctx, GLenum mode, struct gl_transform_feedback_object *obj, @@ -1387,8 +1385,6 @@ vbo_exec_DrawTransformFeedbackStreamInstanced(GLenum mode, GLuint name, vbo_draw_transform_feedback(ctx, mode, obj, stream, primcount); } -#endif - /** * Plug in the immediate-mode vertex array drawing commands into the * givven vbo_exec_context object. @@ -1409,7 +1405,6 @@ vbo_exec_array_init( struct vbo_exec_context *exec ) exec->vtxfmt.DrawElementsInstancedBaseInstance = vbo_exec_DrawElementsInstancedBaseInstance; exec->vtxfmt.DrawElementsInstancedBaseVertex = vbo_exec_DrawElementsInstancedBaseVertex; exec->vtxfmt.DrawElementsInstancedBaseVertexBaseInstance = vbo_exec_DrawElementsInstancedBaseVertexBaseInstance; -#if FEATURE_EXT_transform_feedback exec->vtxfmt.DrawTransformFeedback = vbo_exec_DrawTransformFeedback; exec->vtxfmt.DrawTransformFeedbackStream = vbo_exec_DrawTransformFeedbackStream; @@ -1417,7 +1412,6 @@ vbo_exec_array_init( struct vbo_exec_context *exec ) vbo_exec_DrawTransformFeedbackInstanced; exec->vtxfmt.DrawTransformFeedbackStreamInstanced = vbo_exec_DrawTransformFeedbackStreamInstanced; -#endif } @@ -1494,12 +1488,8 @@ _mesa_MultiDrawElementsBaseVertex(GLenum mode, primcount, basevertex); } -#if FEATURE_EXT_transform_feedback - void GLAPIENTRY _mesa_DrawTransformFeedback(GLenum mode, GLuint name) { vbo_exec_DrawTransformFeedback(mode, name); } - -#endif -- 2.30.2