Mesa (map-texture-image-v4): mesa: remove unused target parameter to _mesa_init_teximage_fields()
Brian Paul
brianp at kemper.freedesktop.org
Wed Jul 20 02:34:05 UTC 2011
Module: Mesa
Branch: map-texture-image-v4
Commit: 2ea167294b4af1dfae9cb18892cbbdf508812fb1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ea167294b4af1dfae9cb18892cbbdf508812fb1
Author: Brian Paul <brianp at vmware.com>
Date: Sat Jul 16 11:33:53 2011 -0600
mesa: remove unused target parameter to _mesa_init_teximage_fields()
---
src/mesa/drivers/dri/intel/intel_tex_image.c | 4 ++--
src/mesa/drivers/dri/nouveau/nouveau_texture.c | 2 +-
src/mesa/drivers/dri/r200/r200_texstate.c | 2 +-
src/mesa/drivers/dri/r300/r300_texstate.c | 2 +-
src/mesa/drivers/dri/r600/evergreen_tex.c | 2 +-
src/mesa/drivers/dri/r600/r600_texstate.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_texstate.c | 2 +-
src/mesa/drivers/dri/swrast/swrast.c | 2 +-
src/mesa/main/mipmap.c | 4 ++--
src/mesa/main/teximage.c | 13 ++++++-------
src/mesa/main/teximage.h | 2 +-
src/mesa/main/texobj.c | 2 +-
src/mesa/state_tracker/st_cb_eglimage.c | 2 +-
src/mesa/state_tracker/st_cb_texture.c | 4 ++--
src/mesa/state_tracker/st_gen_mipmap.c | 2 +-
src/mesa/state_tracker/st_manager.c | 2 +-
16 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 87c6166..5bee784 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -775,7 +775,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
intelObj->mt = mt;
- _mesa_init_teximage_fields(&intel->ctx, target, texImage,
+ _mesa_init_teximage_fields(&intel->ctx, texImage,
rb->region->width, rb->region->height, 1,
0, internalFormat, texFormat);
@@ -830,7 +830,7 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
intel_miptree_release(intel, &intelObj->mt);
intelObj->mt = mt;
- _mesa_init_teximage_fields(&intel->ctx, target, texImage,
+ _mesa_init_teximage_fields(&intel->ctx, texImage,
image->region->width, image->region->height, 1,
0, image->internal_format, image->format);
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index dcfd316..993afa6 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -609,7 +609,7 @@ nouveau_set_texbuffer(__DRIcontext *dri_ctx,
s->format = get_texbuffer_format(rb, format);
/* Update the image fields. */
- _mesa_init_teximage_fields(ctx, target, ti, s->width, s->height,
+ _mesa_init_teximage_fields(ctx, ti, s->width, s->height,
1, 0, s->cpp, s->format);
ti->RowStride = s->pitch / s->cpp;
diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index 7adf9ad..030c596 100644
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -851,7 +851,7 @@ void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format
break;
}
- _mesa_init_teximage_fields(radeon->glCtx, target, texImage,
+ _mesa_init_teximage_fields(radeon->glCtx, texImage,
rb->base.Width, rb->base.Height, 1, 0,
rb->cpp, texFormat);
texImage->RowStride = rb->pitch / rb->cpp;
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index e24ad6f..af2088f 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -502,7 +502,7 @@ void r300SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format
break;
}
- _mesa_init_teximage_fields(radeon->glCtx, target, texImage,
+ _mesa_init_teximage_fields(radeon->glCtx, texImage,
rb->base.Width, rb->base.Height, 1, 0,
rb->cpp, texFormat);
texImage->RowStride = rb->pitch / rb->cpp;
diff --git a/src/mesa/drivers/dri/r600/evergreen_tex.c b/src/mesa/drivers/dri/r600/evergreen_tex.c
index 3e5b36d..c663e25 100644
--- a/src/mesa/drivers/dri/r600/evergreen_tex.c
+++ b/src/mesa/drivers/dri/r600/evergreen_tex.c
@@ -1409,7 +1409,7 @@ void evergreenSetTexBuffer(__DRIcontext *pDRICtx, GLint target, GLint glx_textur
break;
}
- _mesa_init_teximage_fields(radeon->glCtx, target, texImage,
+ _mesa_init_teximage_fields(radeon->glCtx, texImage,
rb->base.Width, rb->base.Height, 1, 0,
rb->cpp, texFormat);
rImage->RowStride = rb->pitch / rb->cpp;
diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index fd1e25b..ad0b219 100644
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -1260,7 +1260,7 @@ void r600SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo
break;
}
- _mesa_init_teximage_fields(radeon->glCtx, target, texImage,
+ _mesa_init_teximage_fields(radeon->glCtx, texImage,
rb->base.Width, rb->base.Height, 1, 0,
rb->cpp, texFormat);
rImage->RowStride = rb->pitch / rb->cpp;
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index 9ba98e3..5eaf7a6 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -724,7 +724,7 @@ void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_form
break;
}
- _mesa_init_teximage_fields(radeon->glCtx, target, texImage,
+ _mesa_init_teximage_fields(radeon->glCtx, texImage,
rb->base.Width, rb->base.Height, 1, 0,
rb->cpp, texFormat);
texImage->RowStride = rb->pitch / rb->cpp;
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 063c90f..8168a13 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -90,7 +90,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
else
texFormat = MESA_FORMAT_ARGB8888;
- _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
+ _mesa_init_teximage_fields(&dri_ctx->Base, texImage,
w, h, 1, 0, internalFormat, texFormat);
sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)swImage->Data,
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 7d96ea2..d7beb38 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1942,7 +1942,7 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target,
ctx->Driver.FreeTextureImageBuffer(ctx, dstImage);
/* initialize new image */
- _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
+ _mesa_init_teximage_fields(ctx, dstImage, dstWidth, dstHeight,
dstDepth, border, srcImage->InternalFormat,
srcImage->TexFormat);
dstImage->DriverData = NULL;
@@ -2112,7 +2112,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
&temp_dst, temp_dst_stride);
/* initialize new image */
- _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
+ _mesa_init_teximage_fields(ctx, dstImage, dstWidth, dstHeight,
dstDepth, border, srcImage->InternalFormat,
srcImage->TexFormat);
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8aa50c7..704f671 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1046,7 +1046,6 @@ clear_teximage_fields(struct gl_texture_image *img)
* Initialize basic fields of the gl_texture_image struct.
*
* \param ctx GL context.
- * \param target texture target (GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, etc).
* \param img texture image structure to be initialized.
* \param width image width.
* \param height image height.
@@ -1059,7 +1058,7 @@ clear_teximage_fields(struct gl_texture_image *img)
* Note: width, height and depth include the border.
*/
void
-_mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,
+_mesa_init_teximage_fields(struct gl_context *ctx,
struct gl_texture_image *img,
GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum internalFormat,
@@ -2329,7 +2328,7 @@ teximage(struct gl_context *ctx, GLuint dims,
format, type);
if (legal_texture_size(ctx, texFormat, width, height, depth)) {
- _mesa_init_teximage_fields(ctx, target, texImage, width, height,
+ _mesa_init_teximage_fields(ctx, texImage, width, height,
depth, border, internalFormat,
texFormat);
}
@@ -2370,7 +2369,7 @@ teximage(struct gl_context *ctx, GLuint dims,
type);
if (legal_texture_size(ctx, texFormat, width, height, depth)) {
- _mesa_init_teximage_fields(ctx, target, texImage,
+ _mesa_init_teximage_fields(ctx, texImage,
width, height, depth,
border, internalFormat, texFormat);
@@ -2706,7 +2705,7 @@ copyteximage(struct gl_context *ctx, GLuint dims,
GL_NONE);
if (legal_texture_size(ctx, texFormat, width, height, 1)) {
- _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
+ _mesa_init_teximage_fields(ctx, texImage, width, height, 1,
border, internalFormat, texFormat);
ASSERT(ctx->Driver.CopyTexImage2D);
@@ -3218,7 +3217,7 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
}
else {
/* no error: store the teximage parameters */
- _mesa_init_teximage_fields(ctx, target, texImage, width, height,
+ _mesa_init_teximage_fields(ctx, texImage, width, height,
depth, border, internalFormat,
MESA_FORMAT_NONE);
}
@@ -3254,7 +3253,7 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
GL_NONE);
if (legal_texture_size(ctx, texFormat, width, height, depth)) {
- _mesa_init_teximage_fields(ctx, target, texImage,
+ _mesa_init_teximage_fields(ctx, texImage,
width, height, depth,
border, internalFormat, texFormat);
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 2cacf0f..565283f 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -58,7 +58,7 @@ _mesa_delete_texture_image( struct gl_context *ctx,
extern void
-_mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,
+_mesa_init_teximage_fields(struct gl_context *ctx,
struct gl_texture_image *img,
GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum internalFormat,
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 6f1230a..09e2207 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -776,7 +776,7 @@ _mesa_get_fallback_texture(struct gl_context *ctx)
GL_UNSIGNED_BYTE);
/* init the image fields */
- _mesa_init_teximage_fields(ctx, GL_TEXTURE_2D, texImage,
+ _mesa_init_teximage_fields(ctx, texImage,
8, 8, 1, 0, GL_RGBA, texFormat);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c
index 531296f..7d9ebd9 100644
--- a/src/mesa/state_tracker/st_cb_eglimage.c
+++ b/src/mesa/state_tracker/st_cb_eglimage.c
@@ -125,7 +125,7 @@ st_bind_surface(struct gl_context *ctx, GLenum target,
texFormat = st_pipe_format_to_mesa_format(ps->format);
- _mesa_init_teximage_fields(ctx, target, texImage,
+ _mesa_init_teximage_fields(ctx, texImage,
ps->width, ps->height, 1, 0, internalFormat,
texFormat);
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index eebee5c..869e0ce 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -554,7 +554,7 @@ st_TexImage(struct gl_context * ctx,
texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,
internalFormat, format, type);
- _mesa_init_teximage_fields(ctx, target, texImage,
+ _mesa_init_teximage_fields(ctx, texImage,
width, height, depth, border,
internalFormat, texFormat);
@@ -1890,7 +1890,7 @@ st_get_default_texture(struct st_context *st)
texImg = _mesa_get_tex_image(st->ctx, texObj, target, 0);
- _mesa_init_teximage_fields(st->ctx, target, texImg,
+ _mesa_init_teximage_fields(st->ctx, texImg,
16, 16, 1, 0, /* w, h, d, border */
GL_RGBA, MESA_FORMAT_RGBA8888);
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index 065ceae..b63ffa9 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -447,7 +447,7 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
ctx->Driver.FreeTextureImageBuffer(ctx, dstImage);
/* initialize new image */
- _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
+ _mesa_init_teximage_fields(ctx, dstImage, dstWidth, dstHeight,
dstDepth, border, srcImage->InternalFormat,
srcImage->TexFormat);
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 7bd82aa..796316d 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -589,7 +589,7 @@ st_context_teximage(struct st_context_iface *stctxi,
texFormat = st_ChooseTextureFormat(ctx, internalFormat,
GL_RGBA, GL_UNSIGNED_BYTE);
- _mesa_init_teximage_fields(ctx, target, texImage,
+ _mesa_init_teximage_fields(ctx, texImage,
tex->width0, tex->height0, 1, 0,
internalFormat, texFormat);
More information about the mesa-commit
mailing list