mesa/texstore: Don't use the _mesa_swizzle_and_convert if we need transfer ops

The _mesa_swizzle_and_convert path can't do transfer ops, so we should bail
if they're needed.

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 4ea5bd80a5b5962bc8216ffc785857c11050d993..f2eb0def233d795c3c10d01c4dc55b3707be293d 100644 (file)
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1498,6 +1498,9 @@ texstore_swizzle(TEXSTORE_PARAMS)
    if (srcFormat == GL_COLOR_INDEX)
       return GL_FALSE;
 
+   if (_mesa_texstore_needs_transfer_ops(ctx, baseInternalFormat, dstFormat))
+      return GL_FALSE;
+
    switch (srcType) {
    case GL_FLOAT:
    case GL_UNSIGNED_BYTE: