Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/arrayobj.c | 2 --
src/mesa/main/enable.c | 4 +---
src/mesa/main/ffvertex_prog.c | 2 --
src/mesa/main/getstring.c | 2 --
src/mesa/main/mfeatures.h | 2 --
5 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 9337fe7..9255559 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -236,11 +236,9 @@ _mesa_initialize_array_object( struct gl_context *ctx,
case VERT_ATTRIB_EDGEFLAG:
init_array(ctx, &obj->VertexAttrib[VERT_ATTRIB_EDGEFLAG], 1, GL_BOOL);
break;
-#if FEATURE_point_size_array
case VERT_ATTRIB_POINT_SIZE:
init_array(ctx, &obj->VertexAttrib[VERT_ATTRIB_POINT_SIZE], 1,
GL_FLOAT);
break;
-#endif
default:
init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);
break;
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 78ce471..5bb3290 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -92,12 +92,10 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean
state)
flag = VERT_BIT_COLOR1;
break;
-#if FEATURE_point_size_array
case GL_POINT_SIZE_ARRAY_OES:
var = &arrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled;
flag = VERT_BIT_POINT_SIZE;
break;
-#endif
#if FEATURE_NV_vertex_program
case GL_VERTEX_ATTRIB_ARRAY0_NV:
@@ -1486,7 +1484,7 @@ _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_point_size_array
+#if FEATURE_ES
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index e5ab201..0a98c4a 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -229,10 +229,8 @@ static void make_state_key( struct gl_context *ctx, struct
state_key *key )
if (ctx->Point._Attenuated)
key->point_attenuated = 1;
-#if FEATURE_point_size_array
if (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled)
key->point_array = 1;
-#endif
if (ctx->Texture._TexGenEnabled ||
ctx->Texture._TexMatEnabled ||
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 9c9ade3..e8a5930 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -261,13 +261,11 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
goto invalid_pname;
*params = ctx->Select.Buffer;
break;
-#if FEATURE_point_size_array
case GL_POINT_SIZE_ARRAY_POINTER_OES:
if (ctx->API != API_OPENGLES)
goto invalid_pname;
*params = (GLvoid *)
ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr;
break;
-#endif
case GL_DEBUG_CALLBACK_FUNCTION_ARB:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_pname;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index b9e1c55..005d669 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_point_size_array FEATURE_ES
-
#define FEATURE_es2_glsl FEATURE_ES2
#define FEATURE_ARB_fragment_program 1
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
