Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/api_validate.c | 2 +-
src/mesa/main/mfeatures.h | 2 --
src/mesa/program/program.c | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index d0d2ca4..107ebb7 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -110,7 +110,7 @@ check_valid_to_render(struct gl_context *ctx, const char
*function)
}
switch (ctx->API) {
-#if FEATURE_es2_glsl
+#if FEATURE_ES2
case API_OPENGLES2:
/* For ES2, we can draw if any vertex array is enabled (and we
* should always have a vertex program/shader). */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 005d669..578cb6a 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 becb77c..0158c3f 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -85,7 +85,7 @@ _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
+#if FEATURE_ES2
ctx->VertexProgram.PointSizeEnabled =
(ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;
#else
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
