Mesa (master): mesa: add stricter checks for float formats in the texstore memcpy path

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri Apr 22 19:29:55 2011 +0200

mesa: add stricter checks for float formats in the texstore memcpy path

E.g. when the internal format was RGBA16F and the source was RG, it would use
memcpy.

---

 src/mesa/main/texstore.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 9a69052..cf12241 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3551,6 +3551,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
    if (!ctx->_ImageTransferState &&
        !srcPacking->SwapBytes &&
        baseInternalFormat == srcFormat &&
+       baseInternalFormat == baseFormat &&
        srcType == GL_FLOAT) {
       /* simple memcpy path */
       memcpy_texture(ctx, dims,
@@ -3625,6 +3626,7 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
    if (!ctx->_ImageTransferState &&
        !srcPacking->SwapBytes &&
        baseInternalFormat == srcFormat &&
+       baseInternalFormat == baseFormat &&
        srcType == GL_HALF_FLOAT_ARB) {
       /* simple memcpy path */
       memcpy_texture(ctx, dims,