Module: Mesa Branch: master Commit: c50d6a2abc7ab1811f5e41f6bb27ddc491ca5ceb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c50d6a2abc7ab1811f5e41f6bb27ddc491ca5ceb
Author: Brian Paul <[email protected]> Date: Sat Sep 22 18:45:37 2012 -0600 mesa: remove FEATURE_ES1 tests in enable.c code Reviewed-by: Ian Romanick <[email protected]> --- src/mesa/main/enable.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index be105b6..e60a05a 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -709,7 +709,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) } break; -#if FEATURE_ES1 case GL_TEXTURE_GEN_STR_OES: /* disable S, T, and R at the same time */ { @@ -730,7 +729,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) } } break; -#endif /* client-side state */ case GL_VERTEX_ARRAY: @@ -1364,7 +1362,6 @@ _mesa_IsEnabled( GLenum cap ) } } return GL_FALSE; -#if FEATURE_ES1 case GL_TEXTURE_GEN_STR_OES: { const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx); @@ -1377,7 +1374,6 @@ _mesa_IsEnabled( GLenum cap ) ? GL_TRUE : GL_FALSE; } } -#endif /* client-side state */ case GL_VERTEX_ARRAY: @@ -1415,12 +1411,10 @@ _mesa_IsEnabled( GLenum cap ) goto invalid_enum_error; CHECK_EXTENSION(EXT_secondary_color); return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled != 0); -#if FEATURE_ES case GL_POINT_SIZE_ARRAY_OES: if (ctx->API != API_OPENGLES) goto invalid_enum_error; return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled != 0); -#endif /* GL_ARB_texture_cube_map */ case GL_TEXTURE_CUBE_MAP_ARB: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
