summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@freedesktop.org>2006-07-11 19:03:21 +0000
committerTilman Sauerbeck <tilman@freedesktop.org>2006-07-11 19:03:21 +0000
commit17b5063c6f7973e83954fe00105b8f1f1ec34493 (patch)
tree68ddaabc196d922eaa2504302d75936f4b976fdd
parentaead688e7fc605fada2624626c7543445412791a (diff)
only access ss->BufferObjects if it's declared
-rw-r--r--src/mesa/main/context.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 2a7d99a892..e7146cf9b1 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -697,7 +697,10 @@ alloc_shared_state( GLcontext *ctx )
goto cleanup;
#endif
+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
ss->BufferObjects = _mesa_NewHashTable();
+#endif
+
ss->ArrayObjects = _mesa_NewHashTable();
ss->GL2Objects = _mesa_NewHashTable ();
@@ -763,7 +766,7 @@ alloc_shared_state( GLcontext *ctx )
if (ss->DefaultFragmentShader)
_mesa_delete_ati_fragment_shader(ctx, ss->DefaultFragmentShader);
#endif
-#if FEATURE_ARB_vertex_buffer_object
+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
if (ss->BufferObjects)
_mesa_DeleteHashTable(ss->BufferObjects);
#endif
@@ -903,7 +906,7 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
_mesa_delete_ati_fragment_shader(ctx, ss->DefaultFragmentShader);
#endif
-#if FEATURE_ARB_vertex_buffer_object
+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
_mesa_HashDeleteAll(ss->BufferObjects, delete_bufferobj_cb, ctx);
_mesa_DeleteHashTable(ss->BufferObjects);
#endif