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

mesa: remove FEATURE_es2_glsl and related defines.

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:43:08 +03:00
parent d09428c9cc
commit 009250a096
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,25 +110,20 @@ check_valid_to_render(struct gl_context *ctx, const char *function)
} }
switch (ctx->API) { switch (ctx->API) {
#if FEATURE_es2_glsl
case API_OPENGLES2: case API_OPENGLES2:
/* For ES2, we can draw if any vertex array is enabled (and we /* For ES2, we can draw if any vertex array is enabled (and we
* should always have a vertex program/shader). */ * should always have a vertex program/shader). */
if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current) if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
return GL_FALSE; return GL_FALSE;
break; break;
#endif
#if FEATURE_ES1
case API_OPENGLES: case API_OPENGLES:
/* For OpenGL ES, only draw if we have vertex positions /* For OpenGL ES, only draw if we have vertex positions
*/ */
if (!ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) if (!ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled)
return GL_FALSE; return GL_FALSE;
break; break;
#endif
#if FEATURE_GL
case API_OPENGL: case API_OPENGL:
case API_OPENGL_CORE: case API_OPENGL_CORE:
{ {
@@ -151,7 +146,6 @@ check_valid_to_render(struct gl_context *ctx, const char *function)
} }
} }
break; break;
#endif
default: default:
ASSERT_NO_FEATURE(); ASSERT_NO_FEATURE();

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_es2_glsl FEATURE_ES2
#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_vertex_shader 1

4
src/mesa/program/program.c
View File

@@ -85,12 +85,8 @@ _mesa_init_program(struct gl_context *ctx)
#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
ctx->VertexProgram.Enabled = GL_FALSE; ctx->VertexProgram.Enabled = GL_FALSE;
#if FEATURE_es2_glsl
ctx->VertexProgram.PointSizeEnabled = ctx->VertexProgram.PointSizeEnabled =
(ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE; (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;
#else
ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
#endif
ctx->VertexProgram.TwoSideEnabled = GL_FALSE; ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
_mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
ctx->Shared->DefaultVertexProgram); ctx->Shared->DefaultVertexProgram);