diff options
| author | Brian Paul <[email protected]> | 2011-09-22 16:32:49 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-09-22 16:43:45 -0600 |
| commit | 7276ab2c3664a3460cc8b0de7545c0abc819c7e9 (patch) | |
| tree | 90fb6da3f59a79b620df020e1ccd924b668ed12b /src/mesa/state_tracker | |
| parent | 687e62a5d76e2e4cbbc6268e5b0e3f148b681185 (diff) | |
st/mesa: remove unnecessary st_texture_match_image() parameters
We didn't use the face parameter and the level parameter can be found
in the gl_texture_image.
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_texture.c | 9 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_texture.h | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 97c1fabd52e..e744a9f0d69 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -577,8 +577,7 @@ st_TexImage(struct gl_context * ctx, */ if (stObj->pt) { if (level > (GLint) stObj->pt->last_level || - !st_texture_match_image(stObj->pt, &stImage->base, - stImage->base.Face, stImage->base.Level)) { + !st_texture_match_image(stObj->pt, &stImage->base)) { DBG("release it\n"); pipe_resource_reference(&stObj->pt, NULL); assert(!stObj->pt); @@ -611,8 +610,7 @@ st_TexImage(struct gl_context * ctx, * in its own buffer. */ if (stObj->pt && - st_texture_match_image(stObj->pt, &stImage->base, - stImage->base.Face, stImage->base.Level)) { + st_texture_match_image(stObj->pt, &stImage->base)) { pipe_resource_reference(&stImage->pt, stObj->pt); assert(stImage->pt); diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index bf98e76c783..c182688298f 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -170,8 +170,7 @@ st_gl_texture_dims_to_pipe_dims(GLenum texture, */ GLboolean st_texture_match_image(const struct pipe_resource *pt, - const struct gl_texture_image *image, - GLuint face, GLuint level) + const struct gl_texture_image *image) { GLuint ptWidth, ptHeight, ptDepth, ptLayers; @@ -192,9 +191,9 @@ st_texture_match_image(const struct pipe_resource *pt, /* Test if this image's size matches what's expected in the * established texture. */ - if (ptWidth != u_minify(pt->width0, level) || - ptHeight != u_minify(pt->height0, level) || - ptDepth != u_minify(pt->depth0, level) || + if (ptWidth != u_minify(pt->width0, image->Level) || + ptHeight != u_minify(pt->height0, image->Level) || + ptDepth != u_minify(pt->depth0, image->Level) || ptLayers != pt->array_size) return GL_FALSE; diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 50b7284e760..dd3bc73100d 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -184,8 +184,7 @@ st_gl_texture_dims_to_pipe_dims(GLenum texture, */ extern GLboolean st_texture_match_image(const struct pipe_resource *pt, - const struct gl_texture_image *image, - GLuint face, GLuint level); + const struct gl_texture_image *image); /* Return a pointer to an image within a texture. Return image stride as * well. |