diff options
| author | Oliver McFadden <[email protected]> | 2012-09-11 11:08:21 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-09-15 12:57:43 +0300 |
| commit | 02a19684f928c4c5277913499302fb4511b15cad (patch) | |
| tree | d3a04283d78d0dc4a689e3d15b3f3c90ebf32624 /src/mesa/main/shared.c | |
| parent | c609bf9786ecc480e0aaf2736324fa8a47592c48 (diff) | |
mesa: remove FEATURE_ARB_sampler_objects define.
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index e4bb83010ac..6b23a131e97 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -38,9 +38,7 @@ #include "shared.h" #include "program/program.h" #include "dlist.h" -#if FEATURE_ARB_sampler_objects #include "samplerobj.h" -#endif #include "shaderobj.h" #include "syncobj.h" @@ -86,10 +84,8 @@ _mesa_alloc_shared_state(struct gl_context *ctx) shared->BufferObjects = _mesa_NewHashTable(); -#if FEATURE_ARB_sampler_objects /* GL_ARB_sampler_objects */ shared->SamplerObjects = _mesa_NewHashTable(); -#endif /* Allocate the default buffer object */ shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0); @@ -269,7 +265,6 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData) } -#if FEATURE_ARB_sampler_objects /** * Callback for deleting a sampler object. Called by _mesa_HashDeleteAll() */ @@ -280,7 +275,6 @@ delete_sampler_object_cb(GLuint id, void *data, void *userData) struct gl_sampler_object *sampObj = (struct gl_sampler_object *) data; _mesa_reference_sampler_object(ctx, &sampObj, NULL); } -#endif /** @@ -347,10 +341,8 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared) } } -#if FEATURE_ARB_sampler_objects _mesa_HashDeleteAll(shared->SamplerObjects, delete_sampler_object_cb, ctx); _mesa_DeleteHashTable(shared->SamplerObjects); -#endif /* * Free texture objects (after FBOs since some textures might have |