From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 13 Aug 2014 18:03:36 +0000 (-0700)
Subject: mesa/texstore: Don't use the _mesa_swizzle_and_convert if we need transfer ops
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8379a405aaca0c76252a45de00d6324baedfb85;p=mesa.git

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 4ea5bd80a5b..f2eb0def233 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: