[drape] test fixes. In new GPU drivers has extension RequiredInternalFormat, and textures use exact formats

3 files changed, 18 insertions, 14 deletions

diff --git a/drape/drape_tests/memory_comparer.hpp b/drape/drape_tests/memory_comparer.hpp
index bf3a475775..7eca3b2afa 100644
--- a/drape/drape_tests/memory_comparer.hpp
+++ b/drape/drape_tests/memory_comparer.hpp
@@ -30,12 +30,16 @@ struct MemoryComparer
                    glConst layout, glConst pixelFormat, void const * data) const
   {
     uint32_t channelCount = 0;
-    if (layout == gl_const::GLRGBA)
+    if (layout == gl_const::GLRGBA ||
+        layout == gl_const::GLRGBA8 ||
+        layout == gl_const::GLRGBA4)
       channelCount = 4;
     else if (layout == gl_const::GLRGB)
       channelCount = 3;
     else if (layout == gl_const::GLAlpha ||
+             layout == gl_const::GLAlpha8 ||
              layout == gl_const::GLLuminance ||
+             layout == gl_const::GLLuminance8 ||
              layout == gl_const::GLAlphaLuminance)
     {
       channelCount = 1;
diff --git a/drape/drape_tests/stipple_pen_tests.cpp b/drape/drape_tests/stipple_pen_tests.cpp
index 675ecd4b5f..0597925b0f 100644
--- a/drape/drape_tests/stipple_pen_tests.cpp
+++ b/drape/drape_tests/stipple_pen_tests.cpp
@@ -435,13 +435,13 @@ UNIT_TEST(StippleMappingTest)
   EXPECTGL(glHasExtension(_)).WillRepeatedly(Return(true));
   EXPECTGL(glGenTexture()).WillOnce(Return(1));
   EXPECTGL(glBindTexture(1)).WillOnce(Return());
-  EXPECTGL(glTexImage2D(512, 8, gl_const::GLAlpha, gl_const::GL8BitOnChannel, NULL));
+  EXPECTGL(glTexImage2D(512, 8, AnyOf(gl_const::GLAlpha, gl_const::GLAlpha8), gl_const::GL8BitOnChannel, NULL));
   EXPECTGL(glTexParameter(gl_const::GLMinFilter, gl_const::GLLinear));
   EXPECTGL(glTexParameter(gl_const::GLMagFilter, gl_const::GLLinear));
   EXPECTGL(glTexParameter(gl_const::GLWrapS, gl_const::GLClampToEdge));
   EXPECTGL(glTexParameter(gl_const::GLWrapT, gl_const::GLClampToEdge));
   MemoryComparer cmp(firstUploadEtalon, ARRAY_SIZE(firstUploadEtalon));
-  EXPECTGL(glTexSubImage2D(0, 0, 256, 6, gl_const::GLAlpha, gl_const::GL8BitOnChannel, _))
+  EXPECTGL(glTexSubImage2D(0, 0, 256, 6, AnyOf(gl_const::GLAlpha, gl_const::GLAlpha8), gl_const::GL8BitOnChannel, _))
       .WillOnce(Invoke(&cmp, &MemoryComparer::cmpSubImage));
 
   DummyTexture texture;
@@ -462,11 +462,11 @@ UNIT_TEST(StippleMappingTest)
                                                  497.0f / width, 1.0f / height)), ());
 
   MemoryComparer cmp21(secondUploadFirstPartEtalon, ARRAY_SIZE(secondUploadFirstPartEtalon));
-  EXPECTGL(glTexSubImage2D(0, 6, 256, 2, gl_const::GLAlpha, gl_const::GL8BitOnChannel, _))
+  EXPECTGL(glTexSubImage2D(0, 6, 256, 2, AnyOf(gl_const::GLAlpha, gl_const::GLAlpha8), gl_const::GL8BitOnChannel, _))
       .WillOnce(Invoke(&cmp21, &MemoryComparer::cmpSubImage));
 
   MemoryComparer cmp22(secondUploadSecondPartEtalon, ARRAY_SIZE(secondUploadSecondPartEtalon));
-  EXPECTGL(glTexSubImage2D(256, 0, 256, 2, gl_const::GLAlpha, gl_const::GL8BitOnChannel, _))
+  EXPECTGL(glTexSubImage2D(256, 0, 256, 2, AnyOf(gl_const::GLAlpha, gl_const::GLAlpha8), gl_const::GL8BitOnChannel, _))
       .WillOnce(Invoke(&cmp22, &MemoryComparer::cmpSubImage));
   index.UploadResources(MakeStackRefPointer<Texture>(&texture));
   EXPECTGL(glDeleteTexture(1));
diff --git a/drape/drape_tests/texture_of_colors_tests.cpp b/drape/drape_tests/texture_of_colors_tests.cpp
index 2dbe599b62..0a9de054de 100644
--- a/drape/drape_tests/texture_of_colors_tests.cpp
+++ b/drape/drape_tests/texture_of_colors_tests.cpp
@@ -43,7 +43,7 @@ void InitOpenGLTextures(int const w, int const h)
   EXPECTGL(glHasExtension(_)).WillRepeatedly(Return(true));
   EXPECTGL(glGenTexture()).WillOnce(Return(1));
   EXPECTGL(glBindTexture(1)).WillOnce(Return());
-  EXPECTGL(glTexImage2D(w, h, gl_const::GLRGBA, gl_const::GL8BitOnChannel, NULL));
+  EXPECTGL(glTexImage2D(w, h, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, NULL));
   EXPECTGL(glTexParameter(gl_const::GLMinFilter, gl_const::GLLinear));
   EXPECTGL(glTexParameter(gl_const::GLMagFilter, gl_const::GLLinear));
   EXPECTGL(glTexParameter(gl_const::GLWrapS, gl_const::GLClampToEdge));
@@ -106,7 +106,7 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
-    EXPECTGL(glTexSubImage2D(0, 0, 10, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(0, 0, 10, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp, &MemoryComparer::cmpSubImage));
 
     cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
@@ -132,7 +132,7 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
-    EXPECTGL(glTexSubImage2D(10, 0, 10, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(10, 0, 10, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp, &MemoryComparer::cmpSubImage));
 
     cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
@@ -173,7 +173,7 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
-    EXPECTGL(glTexSubImage2D(0, 0, 12, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(0, 0, 12, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp, &MemoryComparer::cmpSubImage));
 
     cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
@@ -202,11 +202,11 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
     };
 
     MemoryComparer cmp1(memoryEtalon1, ARRAY_SIZE(memoryEtalon1));
-    EXPECTGL(glTexSubImage2D(12, 0, 4, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(12, 0, 4, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp1, &MemoryComparer::cmpSubImage));
 
     MemoryComparer cmp2(memoryEtalon2, ARRAY_SIZE(memoryEtalon2));
-    EXPECTGL(glTexSubImage2D(0, 2, 4, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(0, 2, 4, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp2, &MemoryComparer::cmpSubImage));
 
     cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
@@ -240,7 +240,7 @@ UNIT_TEST(ColorPalleteUploadingMultipyRow)
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
-    EXPECTGL(glTexSubImage2D(0, 0, 4, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(0, 0, 4, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp, &MemoryComparer::cmpSubImage));
 
     cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
@@ -280,11 +280,11 @@ UNIT_TEST(ColorPalleteUploadingMultipyRow)
     };
 
     MemoryComparer cmp1(memoryEtalon1, ARRAY_SIZE(memoryEtalon1));
-    EXPECTGL(glTexSubImage2D(4, 0, 4, 2, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(4, 0, 4, 2, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp1, &MemoryComparer::cmpSubImage));
 
     MemoryComparer cmp2(memoryEtalon2, ARRAY_SIZE(memoryEtalon2));
-    EXPECTGL(glTexSubImage2D(0, 2, 8, 4, gl_const::GLRGBA, gl_const::GL8BitOnChannel, _))
+    EXPECTGL(glTexSubImage2D(0, 2, 8, 4, AnyOf(gl_const::GLRGBA, gl_const::GLRGBA8), gl_const::GL8BitOnChannel, _))
         .WillOnce(Invoke(&cmp2, &MemoryComparer::cmpSubImage));
 
     cp.UploadResources(MakeStackRefPointer<Texture>(&texture));