diff options
| author | Eric Anholt <[email protected]> | 2011-04-20 11:48:31 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-04-23 13:21:57 -0700 |
| commit | 1f32c665c8af0622e2bbf451edb999ffbcd7d0fe (patch) | |
| tree | 42deb7077604e541224b15de3c65eefaea605922 /src/mesa/state_tracker/st_texture.h | |
| parent | 1df72402d99145425531297eef6772b88ce5225d (diff) | |
intel: Add support for ARB_sampler_objects.
This extension support consists of replacing
"gl_texture_obj->Sampler." with "_mesa_get_samplerobj(ctx, unit)->".
One instance of referencing the texture's base sampler remains in the
initial miptree allocation, where I'm not sure we have a clear
association with any texture unit.
Tested with piglit ARB_sampler_objects/sampler-objects.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_texture.h')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 903e30df52f..d50c3c9af79 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -163,21 +163,6 @@ st_get_texture_sampler_view(struct st_texture_object *stObj, } -/** - * Get pointer to the active sampler object for the given texture unit. - * This will either be a user-defined sampler object or the texture - * object's own sampler state. - */ -static INLINE struct gl_sampler_object * -st_get_mesa_sampler(const struct gl_context *ctx, GLuint unit) -{ - if (ctx->Texture.Unit[unit].Sampler) - return ctx->Texture.Unit[unit].Sampler; - else - return &ctx->Texture.Unit[unit]._Current->Sampler; -} - - extern struct pipe_resource * st_texture_create(struct st_context *st, enum pipe_texture_target target, |