diff options
| author | José Fonseca <[email protected]> | 2012-09-15 18:15:22 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2012-09-15 18:18:39 +0100 |
| commit | b6c2234c22d5a935012870fa254e68d026ef265e (patch) | |
| tree | 46441ab3b3110cd9f9c600b821efee6be8feecc9 /src/mesa/main/enable.c | |
| parent | e78ebbc5f9448d459b57884d90b0a6496294c1dd (diff) | |
Temporarily revert "mesa: remove remaining FEATURE_* defines where protected by API check."
This reverts commit 9f37b405a3de8668a5f74c9681829688475ac3b7.
Fixes windows builds.
Diffstat (limited to 'src/mesa/main/enable.c')
| -rw-r--r-- | src/mesa/main/enable.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 3f47bb0bb4b..3643cfb524c 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -717,6 +717,7 @@ _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 */ { @@ -737,6 +738,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) } } break; +#endif /* client-side state */ case GL_VERTEX_ARRAY: @@ -1432,7 +1434,7 @@ _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); @@ -1445,6 +1447,7 @@ _mesa_IsEnabled( GLenum cap ) ? GL_TRUE : GL_FALSE; } } +#endif /* client-side state */ case GL_VERTEX_ARRAY: @@ -1482,10 +1485,12 @@ _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: |