fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: remove unnecessary st_texture_match_image() parameters

Browse source 
We didn't use the face parameter and the level parameter can be found
in the gl_texture_image.
This commit is contained in:
Brian Paul 2011-09-22 16:32:49 -06:00
parent 687e62a5d7
commit 7276ab2c36
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/state_tracker/st_cb_texture.c
View file

@ -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);

9
src/mesa/state_tracker/st_texture.c
View file

@ -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;

3
src/mesa/state_tracker/st_texture.h
View file

@ -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.