summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_texture.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2014-08-02 21:00:41 +0200
committerMarek Olšák <[email protected]>2014-08-11 21:53:57 +0200
commit547e2880bc9ac88a5897306fb9eadee0c825d14c (patch)
treed7edbba7d4816452136b56ba2a7c0423a1619487 /src/mesa/state_tracker/st_texture.c
parent3d56732c1fa1e021341fff33404e1c6bc41ec991 (diff)
st/mesa: add st_context parameter to st_mesa_format_to_pipe_format
This will be used by the next commit. Reviewed-by: Glenn Kennard <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
-rw-r--r--src/mesa/state_tracker/st_texture.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 9f57cfb3d96..af9b7675f10 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -197,7 +197,8 @@ st_gl_texture_dims_to_pipe_dims(GLenum texture,
* Check if a texture image can be pulled into a unified mipmap texture.
*/
GLboolean
-st_texture_match_image(const struct pipe_resource *pt,
+st_texture_match_image(struct st_context *st,
+ const struct pipe_resource *pt,
const struct gl_texture_image *image)
{
GLuint ptWidth, ptHeight, ptDepth, ptLayers;
@@ -209,7 +210,7 @@ st_texture_match_image(const struct pipe_resource *pt,
/* Check if this image's format matches the established texture's format.
*/
- if (st_mesa_format_to_pipe_format(image->TexFormat) != pt->format)
+ if (st_mesa_format_to_pipe_format(st, image->TexFormat) != pt->format)
return GL_FALSE;
st_gl_texture_dims_to_pipe_dims(image->TexObject->Target,