mesa: use texture format functions

diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 50ce82811c567c31da8a53df1c34e57dd4b2225e..6611956ae83ce77a9474a00633bd4c110770d102 100644 (file)
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -209,7 +209,7 @@ update_samplers(struct st_context *st)
          }
 
          xlate_border_color(texobj->BorderColor,
-                            teximg ? teximg->TexFormat->BaseFormat : GL_RGBA,
+                            teximg ? teximg->_BaseFormat : GL_RGBA,
                             sampler->border_color);
 
         sampler->max_anisotropy = texobj->MaxAnisotropy;

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 62ebdd80564da9c544819146b766585b8a0edacf..8bbffc3ff6109a83a85415411a02d526289ab4ef 100644 (file)
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -563,7 +563,7 @@ st_TexImage(GLcontext * ctx,
 
    _mesa_set_fetch_functions(texImage, dims);
 
-   if (texImage->TexFormat->TexelBytes == 0) {
+   if (_mesa_is_format_compressed(texImage->TexFormat->MesaFormat)) {
       /* must be a compressed format */
       texelBytes = 0;
       texImage->IsCompressed = GL_TRUE;
@@ -573,7 +573,7 @@ st_TexImage(GLcontext * ctx,
                                           texImage->TexFormat->MesaFormat);
    }
    else {
-      texelBytes = texImage->TexFormat->TexelBytes;
+      texelBytes = _mesa_get_format_bytes(texImage->TexFormat->MesaFormat);
       
       /* Minimum pitch of 32 bytes */
       if (postConvWidth * texelBytes < 32) {
@@ -1838,7 +1838,7 @@ st_finalize_texture(GLcontext *ctx,
       cpp = compressed_num_bytes(firstImage->base.TexFormat->MesaFormat);
    }
    else {
-      cpp = firstImage->base.TexFormat->TexelBytes;
+      cpp = _mesa_get_format_bytes(firstImage->base.TexFormat->MesaFormat);
    }
 
    /* If we already have a gallium texture, check that it matches the texture