diff options
| author | Oliver McFadden <[email protected]> | 2012-09-11 09:43:08 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-09-15 12:57:10 +0300 |
| commit | 009250a096cdf2babc8d87defa05309e96b8bba2 (patch) | |
| tree | d5b2d0115eaa9304b1f5d8297130fd68844648e4 | |
| parent | d09428c9ccb3ed41c3d17bd1505b6c7708fbd08e (diff) | |
mesa: remove FEATURE_es2_glsl and related defines.
Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/main/api_validate.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 2 | ||||
| -rw-r--r-- | src/mesa/program/program.c | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index d0d2ca4d451..d8cf6b8ff57 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -110,25 +110,20 @@ check_valid_to_render(struct gl_context *ctx, const char *function) } switch (ctx->API) { -#if FEATURE_es2_glsl case API_OPENGLES2: /* For ES2, we can draw if any vertex array is enabled (and we * should always have a vertex program/shader). */ if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current) return GL_FALSE; break; -#endif -#if FEATURE_ES1 case API_OPENGLES: /* For OpenGL ES, only draw if we have vertex positions */ if (!ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) return GL_FALSE; break; -#endif -#if FEATURE_GL case API_OPENGL: case API_OPENGL_CORE: { @@ -151,7 +146,6 @@ check_valid_to_render(struct gl_context *ctx, const char *function) } } break; -#endif default: ASSERT_NO_FEATURE(); diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 005d6694927..578cb6a4b94 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_es2_glsl FEATURE_ES2 - #define FEATURE_ARB_fragment_program 1 #define FEATURE_ARB_vertex_program 1 #define FEATURE_ARB_vertex_shader 1 diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index becb77c1d60..7d827b78b5b 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -85,12 +85,8 @@ _mesa_init_program(struct gl_context *ctx) #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program ctx->VertexProgram.Enabled = GL_FALSE; -#if FEATURE_es2_glsl ctx->VertexProgram.PointSizeEnabled = (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE; -#else - ctx->VertexProgram.PointSizeEnabled = GL_FALSE; -#endif ctx->VertexProgram.TwoSideEnabled = GL_FALSE; _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, ctx->Shared->DefaultVertexProgram); |