st/mesa: consolidate dstRowStride computation code

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 b3c30fe0caf..49af0a1650a 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -685,19 +685,13 @@ st_TexImage(GLcontext * ctx,
                                             transfer_usage, 0, 0,
                                             stImage->base.Width,
                                             stImage->base.Height);
-      if(stImage->transfer)
+      if (stImage->transfer)
          dstRowStride = stImage->transfer->stride;
    }
    else {
       /* Allocate regular memory and store the image there temporarily.   */
-      if (_mesa_is_format_compressed(texImage->TexFormat)) {
-         dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);
-         assert(dims != 3);
-      }
-      else {
-         dstRowStride = postConvWidth * texelBytes;
-      }
-
+      dstRowStride = _mesa_format_row_stride(texImage->TexFormat,
+                                             postConvWidth);
       if (!ctx->Driver.AllocTexImageData(ctx, texImage)) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
          return;