From 9c1558d222cc51f0fa96198773186130a3752302 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 9 May 2017 13:55:00 +0200 Subject: st/mesa: make update_single_texture() non-static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_atom_texture.c | 15 +++++++++------ src/mesa/state_tracker/st_texture.h | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'src/mesa/state_tracker') diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index a99bc1a1886..f9d726a6091 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -52,10 +52,13 @@ #include "cso_cache/cso_context.h" -static GLboolean -update_single_texture(struct st_context *st, - struct pipe_sampler_view **sampler_view, - GLuint texUnit, unsigned glsl_version) +/** + * Get a pipe_sampler_view object from a texture unit. + */ +GLboolean +st_update_single_texture(struct st_context *st, + struct pipe_sampler_view **sampler_view, + GLuint texUnit, unsigned glsl_version) { struct gl_context *ctx = st->ctx; const struct gl_sampler_object *samp; @@ -129,8 +132,8 @@ update_textures(struct st_context *st, const GLuint texUnit = prog->SamplerUnits[unit]; GLboolean retval; - retval = update_single_texture(st, &sampler_view, texUnit, - glsl_version); + retval = st_update_single_texture(st, &sampler_view, texUnit, + glsl_version); if (retval == GL_FALSE) continue; diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index c02d13598ba..3931cbad5a6 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -273,4 +273,9 @@ st_convert_sampler(const struct st_context *st, const struct gl_sampler_object *msamp, struct pipe_sampler_state *sampler); +GLboolean +st_update_single_texture(struct st_context *st, + struct pipe_sampler_view **sampler_view, + GLuint texUnit, unsigned glsl_version); + #endif -- cgit v1.2.3