summaryrefslogtreecommitdiff
path: root/src/mesa/main/enable.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-10-16 17:57:51 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-10-16 17:57:51 +0000
commit8dfc5b9863f08a713177fd92847573e17febbac9 (patch)
treeea828725e04950d4d7416067493135f6731f9f2e /src/mesa/main/enable.c
parente32b9090541f0e8e44d10953017617621edb5635 (diff)
surround vertex program code with #if FEATURE_NV_vertex_program/#endif
Diffstat (limited to 'src/mesa/main/enable.c')
-rw-r--r--src/mesa/main/enable.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 0f51078c61..8f45a6706a 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.69 2002/09/06 02:56:08 brianp Exp $ */
+/* $Id: enable.c,v 1.70 2002/10/16 17:57:51 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -91,7 +91,7 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state )
flag = _NEW_ARRAY_COLOR1;
break;
- /* GL_NV_vertex_program */
+#if FEATURE_NV_vertex_program
case GL_VERTEX_ATTRIB_ARRAY0_NV:
case GL_VERTEX_ATTRIB_ARRAY1_NV:
case GL_VERTEX_ATTRIB_ARRAY2_NV:
@@ -115,6 +115,8 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state )
flag = _NEW_ARRAY_ATTRIB(n);
}
break;
+#endif /* FEATURE_NV_vertex_program */
+
default:
_mesa_error( ctx, GL_INVALID_ENUM,
"glEnable/DisableClientState(0x%x)", cap);
@@ -804,7 +806,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->Point.PointSprite = state;
break;
- /* GL_NV_vertex_program */
+#if FEATURE_NV_vertex_program
case GL_VERTEX_PROGRAM_NV:
CHECK_EXTENSION(NV_vertex_program, cap);
if (ctx->VertexProgram.Enabled == state)
@@ -872,6 +874,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->Eval.Map2Attrib[map] = state;
}
break;
+#endif /* FEATURE_NV_vertex_program */
/* GL_NV_texture_rectangle */
case GL_TEXTURE_RECTANGLE_NV:
@@ -1190,7 +1193,7 @@ _mesa_IsEnabled( GLenum cap )
case GL_POINT_SPRITE_NV:
return ctx->Point.PointSprite;
- /* GL_NV_vertex_program */
+#if FEATURE_NV_vertex_program
case GL_VERTEX_PROGRAM_NV:
CHECK_EXTENSION(NV_vertex_program);
return ctx->VertexProgram.Enabled;
@@ -1263,6 +1266,7 @@ _mesa_IsEnabled( GLenum cap )
const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
return ctx->Eval.Map2Attrib[map];
}
+#endif /* FEATURE_NV_vertex_program */
/* GL_NV_texture_rectangle */
case GL_TEXTURE_RECTANGLE_NV: