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

mesa: remove FEATURE_ARB_vertex_shader 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 09:54:00 +03:00
parent 5489fc7b9f
commit 6c4cddadaa
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -622,11 +622,9 @@ _mesa_init_constants(struct gl_context *ctx)
ctx->Const.MaxRenderbufferSize = MAX_RENDERBUFFER_SIZE; ctx->Const.MaxRenderbufferSize = MAX_RENDERBUFFER_SIZE;
#endif #endif
#if FEATURE_ARB_vertex_shader
ctx->Const.MaxVertexTextureImageUnits = MAX_VERTEX_TEXTURE_IMAGE_UNITS; ctx->Const.MaxVertexTextureImageUnits = MAX_VERTEX_TEXTURE_IMAGE_UNITS;
ctx->Const.MaxCombinedTextureImageUnits = MAX_COMBINED_TEXTURE_IMAGE_UNITS; ctx->Const.MaxCombinedTextureImageUnits = MAX_COMBINED_TEXTURE_IMAGE_UNITS;
ctx->Const.MaxVarying = MAX_VARYING; ctx->Const.MaxVarying = MAX_VARYING;
#endif
#if FEATURE_ARB_geometry_shader4 #if FEATURE_ARB_geometry_shader4
ctx->Const.MaxGeometryTextureImageUnits = MAX_GEOMETRY_TEXTURE_IMAGE_UNITS; ctx->Const.MaxGeometryTextureImageUnits = MAX_GEOMETRY_TEXTURE_IMAGE_UNITS;
ctx->Const.MaxVertexVaryingComponents = MAX_VERTEX_VARYING_COMPONENTS; ctx->Const.MaxVertexVaryingComponents = MAX_VERTEX_VARYING_COMPONENTS;

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

@@ -438,9 +438,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_ARB_vertex_program #if FEATURE_ARB_vertex_program
ctx->Extensions.ARB_vertex_program = GL_TRUE; ctx->Extensions.ARB_vertex_program = GL_TRUE;
#endif #endif
#if FEATURE_ARB_vertex_shader
ctx->Extensions.ARB_vertex_shader = GL_TRUE; ctx->Extensions.ARB_vertex_shader = GL_TRUE;
#endif
#if FEATURE_ARB_sync #if FEATURE_ARB_sync
ctx->Extensions.ARB_sync = GL_TRUE; ctx->Extensions.ARB_sync = GL_TRUE;
#endif #endif
@@ -596,9 +594,7 @@ _mesa_enable_2_0_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_shading_language_100 = GL_TRUE; ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
#endif #endif
ctx->Extensions.EXT_stencil_two_side = GL_TRUE; ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
#if FEATURE_ARB_vertex_shader
ctx->Extensions.ARB_vertex_shader = GL_TRUE; ctx->Extensions.ARB_vertex_shader = GL_TRUE;
#endif
} }

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

@@ -86,9 +86,8 @@
#define FEATURE_ARB_fragment_program 1 #define FEATURE_ARB_fragment_program 1
#define FEATURE_ARB_vertex_program 1 #define FEATURE_ARB_vertex_program 1
#define FEATURE_ARB_vertex_shader 1
#define FEATURE_ARB_fragment_shader 1 #define FEATURE_ARB_fragment_shader 1
#define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader) #define FEATURE_ARB_shader_objects FEATURE_ARB_fragment_shader
#define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects #define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
#define FEATURE_ARB_geometry_shader4 FEATURE_ARB_shader_objects #define FEATURE_ARB_geometry_shader4 FEATURE_ARB_shader_objects

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

@@ -171,10 +171,8 @@ validate_shader_target(const struct gl_context *ctx, GLenum type)
case GL_FRAGMENT_SHADER: case GL_FRAGMENT_SHADER:
return ctx->Extensions.ARB_fragment_shader; return ctx->Extensions.ARB_fragment_shader;
#endif #endif
#if FEATURE_ARB_vertex_shader
case GL_VERTEX_SHADER: case GL_VERTEX_SHADER:
return ctx->Extensions.ARB_vertex_shader; return ctx->Extensions.ARB_vertex_shader;
#endif
#if FEATURE_ARB_geometry_shader4 #if FEATURE_ARB_geometry_shader4
case GL_GEOMETRY_SHADER_ARB: case GL_GEOMETRY_SHADER_ARB:
return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_geometry_shader4; return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_geometry_shader4;
@@ -860,7 +858,6 @@ use_shader_program(struct gl_context *ctx, GLenum type,
struct gl_shader_program **target; struct gl_shader_program **target;
switch (type) { switch (type) {
#if FEATURE_ARB_vertex_shader
case GL_VERTEX_SHADER: case GL_VERTEX_SHADER:
target = &ctx->Shader.CurrentVertexProgram; target = &ctx->Shader.CurrentVertexProgram;
if ((shProg == NULL) if ((shProg == NULL)
@@ -868,7 +865,6 @@ use_shader_program(struct gl_context *ctx, GLenum type,
shProg = NULL; shProg = NULL;
} }
break; break;
#endif
#if FEATURE_ARB_geometry_shader4 #if FEATURE_ARB_geometry_shader4
case GL_GEOMETRY_SHADER_ARB: case GL_GEOMETRY_SHADER_ARB:
target = &ctx->Shader.CurrentGeometryProgram; target = &ctx->Shader.CurrentGeometryProgram;
@@ -899,11 +895,9 @@ use_shader_program(struct gl_context *ctx, GLenum type,
* semantics of glDeleteProgram are maintained. * semantics of glDeleteProgram are maintained.
*/ */
switch (type) { switch (type) {
#if FEATURE_ARB_vertex_shader
case GL_VERTEX_SHADER: case GL_VERTEX_SHADER:
/* Empty for now. */ /* Empty for now. */
break; break;
#endif
#if FEATURE_ARB_geometry_shader4 #if FEATURE_ARB_geometry_shader4
case GL_GEOMETRY_SHADER_ARB: case GL_GEOMETRY_SHADER_ARB:
/* Empty for now. */ /* Empty for now. */
@@ -1752,11 +1746,10 @@ _mesa_init_shader_dispatch(struct _glapi_table *exec)
SET_IsProgram(exec, _mesa_IsProgram); SET_IsProgram(exec, _mesa_IsProgram);
SET_IsShader(exec, _mesa_IsShader); SET_IsShader(exec, _mesa_IsShader);
#if FEATURE_ARB_vertex_shader /* GL_ARB_vertex_shader */
SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB); SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB); SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB); SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
#endif
#if FEATURE_ARB_geometry_shader4 #if FEATURE_ARB_geometry_shader4
SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB); SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);