diff options
| author | Brian Paul <[email protected]> | 2011-12-30 08:24:56 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-12-30 08:24:56 -0700 |
| commit | 94a0c518dc90a24cb4c44ce0a5e6abeba57cbb08 (patch) | |
| tree | b33467fc42ec8201ee7915c76af8b41d9409485a /src/mesa/state_tracker | |
| parent | 92c64624cd7533cde466dbec8722f7f72f275fd8 (diff) | |
mesa: simplify Driver.CompressedTex[Sub]Image function parameters
As with previous commits, the target, level and texObj info can be
obtained through the texImage pointer.
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 8597dff0789..ecd21ad9200 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -776,12 +776,11 @@ st_TexImage1D(struct gl_context * ctx, static void -st_CompressedTexImage2D(struct gl_context *ctx, GLenum target, GLint level, +st_CompressedTexImage2D(struct gl_context *ctx, + struct gl_texture_image *texImage, GLint internalFormat, GLint width, GLint height, GLint border, - GLsizei imageSize, const GLvoid *data, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) + GLsizei imageSize, const GLvoid *data) { st_TexImage(ctx, 2, texImage, internalFormat, width, height, 1, border, 0, 0, data, &ctx->Unpack, imageSize, GL_TRUE); @@ -924,25 +923,23 @@ st_GetTexImage(struct gl_context * ctx, static void -st_CompressedTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level, +st_CompressedTexSubImage1D(struct gl_context *ctx, + struct gl_texture_image *texImage, GLint xoffset, GLsizei width, GLenum format, - GLsizei imageSize, const GLvoid *data, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) + GLsizei imageSize, const GLvoid *data) { assert(0); } static void -st_CompressedTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level, +st_CompressedTexSubImage2D(struct gl_context *ctx, + struct gl_texture_image *texImage, GLint xoffset, GLint yoffset, GLsizei width, GLint height, GLenum format, - GLsizei imageSize, const GLvoid *data, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) + GLsizei imageSize, const GLvoid *data) { struct st_context *st = st_context(ctx); struct st_texture_image *stImage = st_texture_image(texImage); @@ -991,13 +988,12 @@ st_CompressedTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level, static void -st_CompressedTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level, +st_CompressedTexSubImage3D(struct gl_context *ctx, + struct gl_texture_image *texImage, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLint height, GLint depth, GLenum format, - GLsizei imageSize, const GLvoid *data, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) + GLsizei imageSize, const GLvoid *data) { assert(0); } |