Mesa (master): mesa/texstore: Don' t use the _mesa_swizzle_and_convert if we need transfer ops

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: a8379a405aaca0c76252a45de00d6324baedfb85
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8379a405aaca0c76252a45de00d6324baedfb85

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 13 11:03:36 2014 -0700

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 at intel.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/mesa/main/texstore.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 4ea5bd8..f2eb0de 100644
--- 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: