summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shared.c
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/main/shared.c
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/main/shared.c')
-rw-r--r--src/mesa/main/shared.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 58cbc525065..f8d66455a4e 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -87,9 +87,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
shared->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0);
#endif
-#if FEATURE_ARB_shader_objects
shared->ShaderObjects = _mesa_NewHashTable();
-#endif
shared->BufferObjects = _mesa_NewHashTable();
@@ -321,11 +319,9 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
_mesa_HashDeleteAll(shared->DisplayList, delete_displaylist_cb, ctx);
_mesa_DeleteHashTable(shared->DisplayList);
-#if FEATURE_ARB_shader_objects
_mesa_HashWalk(shared->ShaderObjects, free_shader_program_data_cb, ctx);
_mesa_HashDeleteAll(shared->ShaderObjects, delete_shader_cb, ctx);
_mesa_DeleteHashTable(shared->ShaderObjects);
-#endif
_mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);
_mesa_DeleteHashTable(shared->Programs);