diff options
| author | Michal Krol <mjkrol@gmail.org> | 2006-08-01 20:07:31 +0000 |
|---|---|---|
| committer | Michal Krol <mjkrol@gmail.org> | 2006-08-01 20:07:31 +0000 |
| commit | 365582dd6f632aafbc1c817aa57926d679bb2efc (patch) | |
| tree | 75f3184e471793c06cd16ef1bdd3e10629f2a28a /src/mesa/main/context.c | |
| parent | cc738e004f083566f3e1723f72623ef9875f72ec (diff) | |
Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492.
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index b30d552362..afe6048c80 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -704,7 +704,9 @@ alloc_shared_state( GLcontext *ctx ) ss->ArrayObjects = _mesa_NewHashTable(); +#if FEATURE_ARB_shader_objects ss->GL2Objects = _mesa_NewHashTable (); +#endif ss->Default1D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D); if (!ss->Default1D) @@ -775,8 +777,10 @@ alloc_shared_state( GLcontext *ctx ) if (ss->ArrayObjects) _mesa_DeleteHashTable (ss->ArrayObjects); +#if FEATURE_ARB_shader_objects if (ss->GL2Objects) _mesa_DeleteHashTable (ss->GL2Objects); +#endif #if FEATURE_EXT_framebuffer_object if (ss->FrameBuffers) @@ -929,7 +933,9 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss ) _mesa_HashDeleteAll(ss->ArrayObjects, delete_arrayobj_cb, ctx); _mesa_DeleteHashTable(ss->ArrayObjects); +#if FEATURE_ARB_shader_objects _mesa_DeleteHashTable(ss->GL2Objects); +#endif #if FEATURE_EXT_framebuffer_object _mesa_DeleteHashTable(ss->FrameBuffers); |