commit 0c24ce27e7d322cf08a20e2f3d4c906090141273
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 15 22:17:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 15 22:17:16 2017 +0000
tree 7dd35518541dad335eaec5ddc7cd348327734987
parent 9f5a49f63a6ae9ca833c74087ffa86ba70112c55
parent 9f19b8ca2fb36c40f38fbdaf63e3d0931552f504

Merge "Emulator boot animation in angle_indirect" into emu-master-dev

src/libANGLE/validationES3.cpp

diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index c097059..4ac48e5 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -725,6 +725,8 @@
     set.insert(CopyConversion(GL_RGB_INTEGER, GL_RGBA_INTEGER));
     set.insert(CopyConversion(GL_RGBA_INTEGER, GL_RGBA_INTEGER));
 
+    // Necessary for emulator, BUG: 64540066
+    set.insert(CopyConversion(GL_RGBA, GL_RGB));
     return set;
 }
 
@@ -845,9 +847,12 @@
                 !EqualOrFirstZero(textureInternalFormatInfo.greenBits,
                                   sourceEffectiveFormat->greenBits) ||
                 !EqualOrFirstZero(textureInternalFormatInfo.blueBits,
-                                  sourceEffectiveFormat->blueBits) ||
-                !EqualOrFirstZero(textureInternalFormatInfo.alphaBits,
-                                  sourceEffectiveFormat->alphaBits))
+                                  sourceEffectiveFormat->blueBits)
+                // Emulator does not work well with the following rule
+                // BUG: 64540066
+                //|| !EqualOrFirstZero(textureInternalFormatInfo.alphaBits,
+                //                sourceEffectiveFormat->alphaBits)
+                )
             {
                 return false;
             }