diff options
| author | Jason Ekstrand <[email protected]> | 2014-08-13 11:03:36 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2014-08-13 19:43:33 -0700 |
| commit | a8379a405aaca0c76252a45de00d6324baedfb85 (patch) | |
| tree | cd8342dc6ae0b07e7d6c5bfe4f2ad62b8c69d87e /src/mesa/main/texstore.c | |
| parent | f1ef4be4be186b0c725f56ea5b52b3306e16fcd2 (diff) | |
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 <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/mesa/main/texstore.c')
| -rw-r--r-- | src/mesa/main/texstore.c | 3 |
1 files changed, 3 insertions, 0 deletions
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: |