Use transfer format for uploaded data in texture tests

Use transfer format instead of internal format for uploaded data in
texture tests.

Change-Id: I1b72a704aac659c0b276ad922f5fac944ee5286b

diff --git a/modules/gles3/functional/es3fTextureSpecificationTests.cpp b/modules/gles3/functional/es3fTextureSpecificationTests.cpp
index 92765ab..8e5b0ec 100644 (file)
--- a/modules/gles3/functional/es3fTextureSpecificationTests.cpp
+++ b/modules/gles3/functional/es3fTextureSpecificationTests.cpp
@@ -658,7 +658,7 @@ protected:
        void createTexture (void)
        {
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(m_format, m_dataType));
                de::Random                      rnd                     (deStringHash(getName()));
 
                glGenTextures(1, &tex);
@@ -713,7 +713,7 @@ protected:
        void createTexture (void)
        {
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(m_format, m_dataType));
                de::Random                      rnd                     (deStringHash(getName()));
 
                glGenTextures(1, &tex);
@@ -757,9 +757,9 @@ protected:
        void createTexture (void)
        {
                deUint32                                tex                     = 0;
-               tcu::TextureLevel               levelData       (m_texFormat);
                de::Random                              rnd                     (deStringHash(getName()));
                glu::TransferFormat             transferFmt     = glu::getTransferFormat(m_texFormat);
+               tcu::TextureLevel               levelData       (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
@@ -796,9 +796,9 @@ protected:
        void createTexture (void)
        {
                deUint32                                tex                     = 0;
-               tcu::TextureLevel               levelData       (m_texFormat);
                de::Random                              rnd                     (deStringHash(getName()));
                glu::TransferFormat             transferFmt     = glu::getTransferFormat(m_texFormat);
+               tcu::TextureLevel               levelData       (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_3D, tex);
@@ -849,7 +849,7 @@ protected:
        void createTexture (void)
        {
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(m_format, m_dataType));
                de::Random                      rnd                     (deStringHash(getName()));
 
                glGenTextures(1, &tex);
@@ -909,7 +909,7 @@ protected:
        void createTexture (void)
        {
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(m_format, m_dataType));
                de::Random                      rnd                     (deStringHash(getName()));
 
                glGenTextures(1, &tex);
@@ -2128,7 +2128,7 @@ protected:
                tcu::TextureFormat              fmt                             = glu::mapGLInternalFormat(m_internalFormat);
                glu::TransferFormat             transferFmt             = glu::getTransferFormat(fmt);
                deUint32                                tex                             = 0;
-               tcu::TextureLevel               levelData               (fmt);
+               tcu::TextureLevel               levelData               (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
                de::Random                              rnd                             (deStringHash(getName()));
 
                glGenTextures(1, &tex);
@@ -2170,7 +2170,7 @@ protected:
                tcu::TextureFormat              fmt                             = glu::mapGLInternalFormat(m_internalFormat);
                glu::TransferFormat             transferFmt             = glu::getTransferFormat(fmt);
                deUint32                                tex                             = 0;
-               tcu::TextureLevel               levelData               (fmt);
+               tcu::TextureLevel               levelData               (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
                de::Random                              rnd                             (deStringHash(getName()));
 
                glGenTextures(1, &tex);
@@ -2214,9 +2214,9 @@ protected:
        void createTexture (void)
        {
                deUint32                                tex                     = 0;
-               tcu::TextureLevel               levelData       (m_texFormat);
                de::Random                              rnd                     (deStringHash(getName()));
                glu::TransferFormat             transferFmt     = glu::getTransferFormat(m_texFormat);
+               tcu::TextureLevel               levelData       (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
 
                glGenTextures   (1, &tex);
                glBindTexture   (GL_TEXTURE_2D_ARRAY, tex);
@@ -2255,9 +2255,9 @@ protected:
        void createTexture (void)
        {
                deUint32                                tex                     = 0;
-               tcu::TextureLevel               levelData       (m_texFormat);
                de::Random                              rnd                     (deStringHash(getName()));
                glu::TransferFormat             transferFmt     = glu::getTransferFormat(m_texFormat);
+               tcu::TextureLevel               levelData       (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
 
                glGenTextures   (1, &tex);
                glBindTexture   (GL_TEXTURE_3D, tex);
@@ -3032,7 +3032,7 @@ public:
        {
                glu::TransferFormat     fmt                     = glu::getTransferFormat(m_texFormat);
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(fmt.format, fmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_2D, tex);
@@ -3079,7 +3079,7 @@ public:
        {
                glu::TransferFormat     fmt                     = glu::getTransferFormat(m_texFormat);
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(fmt.format, fmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
@@ -3126,7 +3126,7 @@ public:
                glu::TransferFormat     fmt                     = glu::getTransferFormat(m_texFormat);
                de::Random                      rnd                     (deStringHash(getName()));
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(fmt.format, fmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_2D, tex);
@@ -3196,7 +3196,7 @@ public:
                glu::TransferFormat     fmt                     = glu::getTransferFormat(m_texFormat);
                de::Random                      rnd                     (deStringHash(getName()));
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(fmt.format, fmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_2D_ARRAY, tex);

diff --git a/modules/gles31/functional/es31fTextureSpecificationTests.cpp b/modules/gles31/functional/es31fTextureSpecificationTests.cpp
index 302d1b4..bad7f20 100644 (file)
--- a/modules/gles31/functional/es31fTextureSpecificationTests.cpp
+++ b/modules/gles31/functional/es31fTextureSpecificationTests.cpp
@@ -326,9 +326,9 @@ protected:
        void createTexture (void)
        {
                deUint32                                tex                     = 0;
-               tcu::TextureLevel               levelData       (m_texFormat);
                de::Random                              rnd                     (deStringHash(getName()));
                glu::TransferFormat             transferFmt     = glu::getTransferFormat(m_texFormat);
+               tcu::TextureLevel               levelData       (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, tex);
@@ -364,9 +364,9 @@ protected:
        void createTexture (void)
        {
                deUint32                                tex                     = 0;
-               tcu::TextureLevel               levelData       (m_texFormat);
                de::Random                              rnd                     (deStringHash(getName()));
                glu::TransferFormat             transferFmt     = glu::getTransferFormat(m_texFormat);
+               tcu::TextureLevel               levelData       (glu::mapGLTransferFormat(transferFmt.format, transferFmt.dataType));
 
                glGenTextures   (1, &tex);
                glBindTexture   (GL_TEXTURE_CUBE_MAP_ARRAY, tex);
@@ -605,7 +605,7 @@ public:
        {
                glu::TransferFormat     fmt                     = glu::getTransferFormat(m_texFormat);
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(fmt.format, fmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, tex);
@@ -651,7 +651,7 @@ public:
                glu::TransferFormat     fmt                     = glu::getTransferFormat(m_texFormat);
                de::Random                      rnd                     (deStringHash(getName()));
                deUint32                        tex                     = 0;
-               tcu::TextureLevel       levelData       (m_texFormat);
+               tcu::TextureLevel       levelData       (glu::mapGLTransferFormat(fmt.format, fmt.dataType));
 
                glGenTextures(1, &tex);
                glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, tex);