diff options
| author | Brian Paul <brianp@vmware.com> | 2009-04-09 14:48:21 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-04-09 15:02:47 -0600 |
| commit | f12201567463c7aeb9b76c32f000d577a82e7f92 (patch) | |
| tree | 03ef21a3adc29833e6c811824d9178a9007493be /src/mesa/state_tracker/st_cb_texture.c | |
| parent | 1ad2484f03cbe9ae6bd4ebe50d6894e570d65952 (diff) | |
st: remove comp_byte parameter to st_texture_create()
We can determine if the texture is compressed by checking the format.
Diffstat (limited to 'src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 197ded70c0..bd023e0018 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -265,7 +265,7 @@ guess_and_alloc_texture(struct st_context *st, GLuint width = stImage->base.Width2; /* size w/out border */ GLuint height = stImage->base.Height2; GLuint depth = stImage->base.Depth2; - GLuint i, comp_byte = 0, usage; + GLuint i, usage; enum pipe_format fmt; DBG("%s\n", __FUNCTION__); @@ -323,9 +323,6 @@ guess_and_alloc_texture(struct st_context *st, lastLevel = firstLevel + MAX2(MAX2(l2width, l2height), l2depth); } - if (stImage->base.IsCompressed) - comp_byte = compressed_num_bytes(stImage->base.TexFormat->MesaFormat); - fmt = st_mesa_format_to_pipe_format(stImage->base.TexFormat->MesaFormat); usage = default_usage(fmt); @@ -337,7 +334,6 @@ guess_and_alloc_texture(struct st_context *st, width, height, depth, - comp_byte, usage); DBG("%s - success\n", __FUNCTION__); @@ -1353,7 +1349,7 @@ st_finalize_texture(GLcontext *ctx, { struct st_texture_object *stObj = st_texture_object(tObj); const GLuint nr_faces = (stObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; - GLuint comp_byte = 0, cpp, face; + GLuint cpp, face; struct st_texture_image *firstImage; *needFlush = GL_FALSE; @@ -1380,8 +1376,7 @@ st_finalize_texture(GLcontext *ctx, /* FIXME: determine format block instead of cpp */ if (firstImage->base.IsCompressed) { - comp_byte = compressed_num_bytes(firstImage->base.TexFormat->MesaFormat); - cpp = comp_byte; + cpp = compressed_num_bytes(firstImage->base.TexFormat->MesaFormat); } else { cpp = firstImage->base.TexFormat->TexelBytes; @@ -1420,7 +1415,6 @@ st_finalize_texture(GLcontext *ctx, firstImage->base.Width2, firstImage->base.Height2, firstImage->base.Depth2, - comp_byte, usage); if (!stObj->pt) { |