summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_texture.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2016-10-03 09:57:50 -0600
committerBrian Paul <[email protected]>2016-10-06 11:29:32 -0600
commit6963f94e98e9b0a1432bc0071d495c9e31b899ae (patch)
treee994485b3ff87de685b1c4bff2da2eb2466acb74 /src/mesa/state_tracker/st_texture.h
parente5cc84dd43be066c1dd418e32f5ad258e31a150a (diff)
st/mesa: move all sampler view code into new st_sampler_view.[ch] files
Previously, the sampler view code was scattered across several different files. Note, the previous REALLOC(), FREE() for st_texture_object::sampler_views are replaced by realloc(), free() to avoid conflicting macros in Mesa vs. Gallium. Reviewed-by: Edward O'Callaghan <[email protected]> Acked-by: Nicolai Hähnle <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_texture.h')
-rw-r--r--src/mesa/state_tracker/st_texture.h34
1 files changed, 0 insertions, 34 deletions
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index 9c9a05b5605..730843ae321 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -155,26 +155,6 @@ st_get_stobj_resource(struct st_texture_object *stObj)
}
-static inline struct pipe_sampler_view *
-st_create_texture_sampler_view_format(struct pipe_context *pipe,
- struct pipe_resource *texture,
- enum pipe_format format)
-{
- struct pipe_sampler_view templ;
-
- u_sampler_view_default_template(&templ, texture, format);
-
- return pipe->create_sampler_view(pipe, texture, &templ);
-}
-
-static inline struct pipe_sampler_view *
-st_create_texture_sampler_view(struct pipe_context *pipe,
- struct pipe_resource *texture)
-{
- return st_create_texture_sampler_view_format(pipe, texture,
- texture->format);
-}
-
static inline struct st_texture_object *
st_get_texture_object(struct gl_context *ctx,
const struct gl_program *prog,
@@ -261,20 +241,6 @@ st_texture_image_copy(struct pipe_context *pipe,
extern struct pipe_resource *
st_create_color_map_texture(struct gl_context *ctx);
-extern struct pipe_sampler_view **
-st_texture_get_sampler_view(struct st_context *st,
- struct st_texture_object *stObj);
-
-extern void
-st_texture_release_sampler_view(struct st_context *st,
- struct st_texture_object *stObj);
-
-extern void
-st_texture_release_all_sampler_views(struct st_context *st,
- struct st_texture_object *stObj);
-
-void
-st_texture_free_sampler_views(struct st_texture_object *stObj);
bool
st_etc_fallback(struct st_context *st, struct gl_texture_image *texImage);