summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/extensions.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index b56cf539d0..09886ac25e 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -2,7 +2,7 @@
* Mesa 3-D graphics library
* Version: 6.5
*
- * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -189,10 +189,10 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
ctx->Extensions.ARB_occlusion_query = GL_TRUE;
#endif
ctx->Extensions.ARB_point_sprite = GL_TRUE;
-#if 0 && FEATURE_ARB_shader_objects
+#if FEATURE_ARB_shader_objects
ctx->Extensions.ARB_shader_objects = GL_TRUE;
#endif
-#if 0 && FEATURE_ARB_shading_language_100
+#if FEATURE_ARB_shading_language_100
ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
#endif
ctx->Extensions.ARB_shadow = GL_TRUE;
@@ -207,7 +207,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
#if FEATURE_ARB_vertex_program
ctx->Extensions.ARB_vertex_program = GL_TRUE;
#endif
-#if 0 && FEATURE_ARB_vertex_shader
+#if FEATURE_ARB_vertex_shader
ctx->Extensions.ARB_vertex_shader = GL_TRUE;
#endif
#if FEATURE_ARB_vertex_buffer_object
@@ -370,14 +370,14 @@ _mesa_enable_2_0_extensions(GLcontext *ctx)
#endif
ctx->Extensions.ARB_point_sprite = GL_TRUE;
ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
-#if 0 && FEATURE_ARB_shader_objects
+#if FEATURE_ARB_shader_objects
ctx->Extensions.ARB_shader_objects = GL_TRUE;
#endif
-#if 0 && FEATURE_ARB_shading_language_100
+#if FEATURE_ARB_shading_language_100
ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
#endif
ctx->Extensions.EXT_stencil_two_side = GL_FALSE; /* yes, turn it off */
-#if 0 && FEATURE_ARB_vertex_shader
+#if FEATURE_ARB_vertex_shader
ctx->Extensions.ARB_vertex_shader = GL_TRUE;
#endif
}