summaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2012-09-11 10:09:18 +0300
committerOliver McFadden <[email protected]>2012-09-15 12:57:16 +0300
commit528f48432e58579d28a374581b1e6c7e64055381 (patch)
tree4976a8d94283f5ddf21dd64f4fb3a306be6fb715 /src/mesa/program
parent7ada8d371ede2eb2b3007ddc78225175842ef404 (diff)
mesa: remove FEATURE_ARB_shader_objects and related defines.
Signed-off-by: Oliver McFadden <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/program.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index 7d827b78b5b..939f3f89aaf 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -106,13 +106,11 @@ _mesa_init_program(struct gl_context *ctx)
ctx->FragmentProgram.Cache = _mesa_new_program_cache();
#endif
-#if FEATURE_ARB_geometry_shader4
ctx->GeometryProgram.Enabled = GL_FALSE;
/* right now by default we don't have a geometry program */
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
NULL);
ctx->GeometryProgram.Cache = _mesa_new_program_cache();
-#endif
/* XXX probably move this stuff */
#if FEATURE_ATI_fragment_shader
@@ -138,10 +136,8 @@ _mesa_free_program_data(struct gl_context *ctx)
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
_mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache);
#endif
-#if FEATURE_ARB_geometry_shader4
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
_mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);
-#endif
/* XXX probably move this stuff */
#if FEATURE_ATI_fragment_shader
if (ctx->ATIFragmentShader.Current) {
@@ -175,10 +171,8 @@ _mesa_update_default_objects_program(struct gl_context *ctx)
assert(ctx->FragmentProgram.Current);
#endif
-#if FEATURE_ARB_geometry_shader4
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
ctx->Shared->DefaultGeometryProgram);
-#endif
/* XXX probably move this stuff */
#if FEATURE_ATI_fragment_shader