OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove FEATURE_EXT_transform_feedback define.

Browse Source 
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden
2012-09-11 11:13:07 +03:00
parent 88233b0bc3
commit dda982f1a7
16 changed files with 0 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/common/meta.c
View File

@@ -190,9 +190,7 @@ struct save_state
/** Miscellaneous (always disabled) */ /** Miscellaneous (always disabled) */
GLboolean Lighting; GLboolean Lighting;
GLboolean RasterDiscard; GLboolean RasterDiscard;
#if FEATURE_EXT_transform_feedback
GLboolean TransformFeedbackNeedsResume; GLboolean TransformFeedbackNeedsResume;
#endif
}; };
/** /**
@@ -464,7 +462,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
memset(save, 0, sizeof(*save)); memset(save, 0, sizeof(*save));
save->SavedState = state; save->SavedState = state;
#if FEATURE_EXT_transform_feedback
/* Pausing transform feedback needs to be done early, or else we won't be /* Pausing transform feedback needs to be done early, or else we won't be
* able to change other state. * able to change other state.
*/ */
@@ -473,7 +470,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
!ctx->TransformFeedback.CurrentObject->Paused; !ctx->TransformFeedback.CurrentObject->Paused;
if (save->TransformFeedbackNeedsResume) if (save->TransformFeedbackNeedsResume)
_mesa_PauseTransformFeedback(); _mesa_PauseTransformFeedback();
#endif
if (state & MESA_META_ALPHA_TEST) { if (state & MESA_META_ALPHA_TEST) {
save->AlphaEnabled = ctx->Color.AlphaEnabled; save->AlphaEnabled = ctx->Color.AlphaEnabled;
@@ -1075,10 +1071,8 @@ _mesa_meta_end(struct gl_context *ctx)
if (save->RasterDiscard) { if (save->RasterDiscard) {
_mesa_set_enable(ctx, GL_RASTERIZER_DISCARD, GL_TRUE); _mesa_set_enable(ctx, GL_RASTERIZER_DISCARD, GL_TRUE);
} }
#if FEATURE_EXT_transform_feedback
if (save->TransformFeedbackNeedsResume) if (save->TransformFeedbackNeedsResume)
_mesa_ResumeTransformFeedback(); _mesa_ResumeTransformFeedback();
#endif
ctx->Meta->SaveStackDepth--; ctx->Meta->SaveStackDepth--;
} }

4
src/mesa/main/api_validate.c
View File

@@ -610,8 +610,6 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
} }
#if FEATURE_EXT_transform_feedback
GLboolean GLboolean
_mesa_validate_DrawTransformFeedback(struct gl_context *ctx, _mesa_validate_DrawTransformFeedback(struct gl_context *ctx,
GLenum mode, GLenum mode,
@@ -656,5 +654,3 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx,
return GL_TRUE; return GL_TRUE;
} }
#endif

3
src/mesa/main/api_validate.h
View File

@@ -78,8 +78,6 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
const GLvoid *indices, GLsizei primcount, const GLvoid *indices, GLsizei primcount,
GLint basevertex); GLint basevertex);
#if FEATURE_EXT_transform_feedback
extern GLboolean extern GLboolean
_mesa_validate_DrawTransformFeedback(struct gl_context *ctx, _mesa_validate_DrawTransformFeedback(struct gl_context *ctx,
GLenum mode, GLenum mode,
@@ -87,6 +85,5 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx,
GLuint stream, GLuint stream,
GLsizei numInstances); GLsizei numInstances);
#endif
#endif #endif

2
src/mesa/main/bufferobj.c
View File

@@ -87,13 +87,11 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
return &ctx->CopyReadBuffer; return &ctx->CopyReadBuffer;
case GL_COPY_WRITE_BUFFER: case GL_COPY_WRITE_BUFFER:
return &ctx->CopyWriteBuffer; return &ctx->CopyWriteBuffer;
#if FEATURE_EXT_transform_feedback
case GL_TRANSFORM_FEEDBACK_BUFFER: case GL_TRANSFORM_FEEDBACK_BUFFER:
if (ctx->Extensions.EXT_transform_feedback) { if (ctx->Extensions.EXT_transform_feedback) {
return &ctx->TransformFeedback.CurrentBuffer; return &ctx->TransformFeedback.CurrentBuffer;
} }
break; break;
#endif
case GL_TEXTURE_BUFFER: case GL_TEXTURE_BUFFER:
if (_mesa_is_desktop_gl(ctx) if (_mesa_is_desktop_gl(ctx)
&& ctx->Extensions.ARB_texture_buffer_object) { && ctx->Extensions.ARB_texture_buffer_object) {

4
src/mesa/main/dlist.c
View File

@@ -66,9 +66,7 @@
#include "varray.h" #include "varray.h"
#include "arbprogram.h" #include "arbprogram.h"
#include "nvprogram.h" #include "nvprogram.h"
#if FEATURE_EXT_transform_feedback
#include "transformfeedback.h" #include "transformfeedback.h"
#endif
#include "math/m_matrix.h" #include "math/m_matrix.h"
@@ -10522,7 +10520,6 @@ _mesa_create_save_table(void)
(void) save_Uniform4uiv; (void) save_Uniform4uiv;
#endif #endif
#if FEATURE_EXT_transform_feedback
/* These are not compiled into display lists: */ /* These are not compiled into display lists: */
SET_BindBufferBaseEXT(table, _mesa_BindBufferBase); SET_BindBufferBaseEXT(table, _mesa_BindBufferBase);
SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT); SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT);
@@ -10542,7 +10539,6 @@ _mesa_create_save_table(void)
save_DrawTransformFeedbackStreamInstanced); save_DrawTransformFeedbackStreamInstanced);
SET_BeginQueryIndexed(table, save_BeginQueryIndexed); SET_BeginQueryIndexed(table, save_BeginQueryIndexed);
SET_EndQueryIndexed(table, save_EndQueryIndexed); SET_EndQueryIndexed(table, save_EndQueryIndexed);
#endif
/* GL_ARB_instanced_arrays */ /* GL_ARB_instanced_arrays */
SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor); SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor);

4
src/mesa/main/enable.c
View File

@@ -1021,7 +1021,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
} }
break; break;
#if FEATURE_EXT_transform_feedback
case GL_RASTERIZER_DISCARD: case GL_RASTERIZER_DISCARD:
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx)) if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error; goto invalid_enum_error;
@@ -1031,7 +1030,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->RasterDiscard = state; ctx->RasterDiscard = state;
} }
break; break;
#endif
/* GL 3.1 primitive restart. Note: this enum is different from /* GL 3.1 primitive restart. Note: this enum is different from
* GL_PRIMITIVE_RESTART_NV (which is client state). * GL_PRIMITIVE_RESTART_NV (which is client state).
@@ -1683,13 +1681,11 @@ _mesa_IsEnabled( GLenum cap )
CHECK_EXTENSION(ARB_seamless_cube_map); CHECK_EXTENSION(ARB_seamless_cube_map);
return ctx->Texture.CubeMapSeamless; return ctx->Texture.CubeMapSeamless;
#if FEATURE_EXT_transform_feedback
case GL_RASTERIZER_DISCARD: case GL_RASTERIZER_DISCARD:
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx)) if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error; goto invalid_enum_error;
CHECK_EXTENSION(EXT_transform_feedback); CHECK_EXTENSION(EXT_transform_feedback);
return ctx->RasterDiscard; return ctx->RasterDiscard;
#endif
/* GL_NV_primitive_restart */ /* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV: case GL_PRIMITIVE_RESTART_NV:

2
src/mesa/main/extensions.c
View File

@@ -463,9 +463,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_texture_sRGB = GL_TRUE; ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE; ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;
ctx->Extensions.EXT_texture_swizzle = GL_TRUE; ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
#if FEATURE_EXT_transform_feedback
/*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/ /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/
#endif
ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE; ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
/*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/ /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/
ctx->Extensions.MESA_pack_invert = GL_TRUE; ctx->Extensions.MESA_pack_invert = GL_TRUE;

2
src/mesa/main/mfeatures.h
View File

@@ -84,8 +84,6 @@
#define FEATURE_remap_table 0 #define FEATURE_remap_table 0
#endif #endif
#define FEATURE_EXT_transform_feedback FEATURE_GL
#define FEATURE_APPLE_object_purgeable FEATURE_GL #define FEATURE_APPLE_object_purgeable FEATURE_GL
#define FEATURE_ATI_fragment_shader FEATURE_GL #define FEATURE_ATI_fragment_shader FEATURE_GL

2
src/mesa/main/queryobj.c
View File

@@ -152,7 +152,6 @@ get_query_binding_point(struct gl_context *ctx, GLenum target)
return &ctx->Query.CurrentTimerObject; return &ctx->Query.CurrentTimerObject;
else else
return NULL; return NULL;
#if FEATURE_EXT_transform_feedback
case GL_PRIMITIVES_GENERATED: case GL_PRIMITIVES_GENERATED:
if (ctx->Extensions.EXT_transform_feedback) if (ctx->Extensions.EXT_transform_feedback)
return &ctx->Query.PrimitivesGenerated; return &ctx->Query.PrimitivesGenerated;
@@ -163,7 +162,6 @@ get_query_binding_point(struct gl_context *ctx, GLenum target)
return &ctx->Query.PrimitivesWritten; return &ctx->Query.PrimitivesWritten;
else else
return NULL; return NULL;
#endif
default: default:
return NULL; return NULL;
} }

4
src/mesa/main/shaderapi.c
View File

@@ -467,14 +467,12 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
struct gl_shader_program *shProg struct gl_shader_program *shProg
= _mesa_lookup_shader_program(ctx, program); = _mesa_lookup_shader_program(ctx, program);
#if FEATURE_EXT_transform_feedback
/* Is transform feedback available in this context? /* Is transform feedback available in this context?
*/ */
const bool has_xfb = const bool has_xfb =
(ctx->API == API_OPENGL && ctx->Extensions.EXT_transform_feedback) (ctx->API == API_OPENGL && ctx->Extensions.EXT_transform_feedback)
|| ctx->API == API_OPENGL_CORE || ctx->API == API_OPENGL_CORE
|| _mesa_is_gles3(ctx); || _mesa_is_gles3(ctx);
#endif
/* Are geometry shaders available in this context? /* 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; *params = max_len;
return; return;
} }
#if FEATURE_EXT_transform_feedback
case GL_TRANSFORM_FEEDBACK_VARYINGS: case GL_TRANSFORM_FEEDBACK_VARYINGS:
if (!has_xfb) if (!has_xfb)
break; break;
@@ -550,7 +547,6 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
break; break;
*params = shProg->TransformFeedback.BufferMode; *params = shProg->TransformFeedback.BufferMode;
return; return;
#endif
case GL_GEOMETRY_VERTICES_OUT_ARB: case GL_GEOMETRY_VERTICES_OUT_ARB:
if (!has_gs) if (!has_gs)
break; break;

42
src/mesa/main/transformfeedback.c
View File

@@ -44,9 +44,6 @@
#include "program/prog_parameter.h" #include "program/prog_parameter.h"
#if FEATURE_EXT_transform_feedback
/** /**
* Do reference counting of transform feedback buffers. * 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() */ /** Default fallback for ctx->Driver.NewTransformFeedback() */
static struct gl_transform_feedback_object * static struct gl_transform_feedback_object *
new_transform_feedback(struct gl_context *ctx, GLuint name) 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() */ /** Default fallback for ctx->Driver.BeginTransformFeedback() */
static void static void
begin_transform_feedback(struct gl_context *ctx, GLenum mode, begin_transform_feedback(struct gl_context *ctx, GLenum mode,
@@ -901,5 +861,3 @@ _mesa_ResumeTransformFeedback(void)
assert(ctx->Driver.ResumeTransformFeedback); assert(ctx->Driver.ResumeTransformFeedback);
ctx->Driver.ResumeTransformFeedback(ctx, obj); ctx->Driver.ResumeTransformFeedback(ctx, obj);
} }
#endif /* FEATURE_EXT_transform_feedback */

28
src/mesa/main/transformfeedback.h
View File

@@ -39,8 +39,6 @@ _mesa_init_transform_feedback(struct gl_context *ctx);
extern void extern void
_mesa_free_transform_feedback(struct gl_context *ctx); _mesa_free_transform_feedback(struct gl_context *ctx);
#if FEATURE_EXT_transform_feedback
extern GLboolean extern GLboolean
_mesa_validate_transform_feedback_buffers(struct gl_context *ctx); _mesa_validate_transform_feedback_buffers(struct gl_context *ctx);
@@ -110,30 +108,4 @@ _mesa_PauseTransformFeedback(void);
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_ResumeTransformFeedback(void); _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 */ #endif /* TRANSFORM_FEEDBACK_H */

4
src/mesa/main/varray.h
View File

@@ -245,13 +245,9 @@ _mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
const GLvoid *indices, const GLvoid *indices,
GLint basevertex); GLint basevertex);
#if FEATURE_EXT_transform_feedback
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_DrawTransformFeedback(GLenum mode, GLuint name); _mesa_DrawTransformFeedback(GLenum mode, GLuint name);
#endif
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_PrimitiveRestartIndex(GLuint index); _mesa_PrimitiveRestartIndex(GLuint index);

4
src/mesa/state_tracker/st_cb_xformfb.c
View File

@@ -48,8 +48,6 @@
#include "util/u_inlines.h" #include "util/u_inlines.h"
#include "cso_cache/cso_context.h" #include "cso_cache/cso_context.h"
#if FEATURE_EXT_transform_feedback
struct st_transform_feedback_object { struct st_transform_feedback_object {
struct gl_transform_feedback_object base; 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->PauseTransformFeedback = st_pause_transform_feedback;
functions->ResumeTransformFeedback = st_resume_transform_feedback; functions->ResumeTransformFeedback = st_resume_transform_feedback;
} }
#endif /* FEATURE_EXT_transform_feedback */

16
src/mesa/state_tracker/st_cb_xformfb.h
View File

@@ -36,8 +36,6 @@ struct dd_function_table;
struct gl_transform_feedback_object; struct gl_transform_feedback_object;
struct pipe_draw_info; struct pipe_draw_info;
#if FEATURE_EXT_transform_feedback
extern void extern void
st_init_xformfb_functions(struct dd_function_table *functions); 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, st_transform_feedback_draw_init(struct gl_transform_feedback_object *obj,
struct pipe_draw_info *out); 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 */ #endif /* ST_CB_XFORMFB_H */

10
src/mesa/vbo/vbo_exec_array.c
View File

@@ -1281,8 +1281,6 @@ vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
basevertex); basevertex);
} }
#if FEATURE_EXT_transform_feedback
static void static void
vbo_draw_transform_feedback(struct gl_context *ctx, GLenum mode, vbo_draw_transform_feedback(struct gl_context *ctx, GLenum mode,
struct gl_transform_feedback_object *obj, 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); vbo_draw_transform_feedback(ctx, mode, obj, stream, primcount);
} }
#endif
/** /**
* Plug in the immediate-mode vertex array drawing commands into the * Plug in the immediate-mode vertex array drawing commands into the
* givven vbo_exec_context object. * 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.DrawElementsInstancedBaseInstance = vbo_exec_DrawElementsInstancedBaseInstance;
exec->vtxfmt.DrawElementsInstancedBaseVertex = vbo_exec_DrawElementsInstancedBaseVertex; exec->vtxfmt.DrawElementsInstancedBaseVertex = vbo_exec_DrawElementsInstancedBaseVertex;
exec->vtxfmt.DrawElementsInstancedBaseVertexBaseInstance = vbo_exec_DrawElementsInstancedBaseVertexBaseInstance; exec->vtxfmt.DrawElementsInstancedBaseVertexBaseInstance = vbo_exec_DrawElementsInstancedBaseVertexBaseInstance;
#if FEATURE_EXT_transform_feedback
exec->vtxfmt.DrawTransformFeedback = vbo_exec_DrawTransformFeedback; exec->vtxfmt.DrawTransformFeedback = vbo_exec_DrawTransformFeedback;
exec->vtxfmt.DrawTransformFeedbackStream = exec->vtxfmt.DrawTransformFeedbackStream =
vbo_exec_DrawTransformFeedbackStream; vbo_exec_DrawTransformFeedbackStream;
@@ -1417,7 +1412,6 @@ vbo_exec_array_init( struct vbo_exec_context *exec )
vbo_exec_DrawTransformFeedbackInstanced; vbo_exec_DrawTransformFeedbackInstanced;
exec->vtxfmt.DrawTransformFeedbackStreamInstanced = exec->vtxfmt.DrawTransformFeedbackStreamInstanced =
vbo_exec_DrawTransformFeedbackStreamInstanced; vbo_exec_DrawTransformFeedbackStreamInstanced;
#endif
} }
@@ -1494,12 +1488,8 @@ _mesa_MultiDrawElementsBaseVertex(GLenum mode,
primcount, basevertex); primcount, basevertex);
} }
#if FEATURE_EXT_transform_feedback
void GLAPIENTRY void GLAPIENTRY
_mesa_DrawTransformFeedback(GLenum mode, GLuint name) _mesa_DrawTransformFeedback(GLenum mode, GLuint name)
{ {
vbo_exec_DrawTransformFeedback(mode, name); vbo_exec_DrawTransformFeedback(mode, name);
} }
#endif