Fix GL_WEBGL_video_texture shader compilation on OpenGL backend

When ESSL 100 shaders using GL_WEBGL_video_texture run on the
OpenGL backend (desktop GL), compilation fails with "no function
with name 'texture2D'" error.

Root cause: textureVideoWEBGL() was always translated to texture2D()
regardless of the target GLSL version. When targeting GLSL 130+,
texture2D() doesn't exist (replaced by texture()), causing the error.

Bug: angleproject:466412253
Change-Id: I1480e30c863bdfaf3bfc06dc85ff22ec4e96b55d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7252470
Reviewed-by: Shahbaz Youssefi <[email protected]>
Reviewed-by: Yuxin Hu <[email protected]>
Commit-Queue: Yuxin Hu <[email protected]>

Author: hocheung-chromium

src/compiler/translator/glsl/OutputESSL.cpp

@@ -44,8 +44,11 @@ ImmutableString TOutputESSL::translateTextureFunction(const ImmutableString &nam
         }
         else
         {
-            // Default translating textureVideoWEBGL to texture2D.
-            return ImmutableString("texture2D");
+            // For ESSL 300+ (ES 3.0+), use "texture" instead of "texture2D" to match the
+            // translation of samplerVideoWEBGL to sampler2D and the ESSL version's texture
+            // function naming. ESSL 100 (ES 2.0) still uses texture2D.
+            return (getShaderVersion() >= 300) ? ImmutableString("texture")
+                                               : ImmutableString("texture2D");
         }
     }
 

src/compiler/translator/glsl/OutputGLSL.cpp

@@ -79,8 +79,10 @@ ImmutableString TOutputGLSL::translateTextureFunction(const ImmutableString &nam
         }
         else
         {
-            // Default translating textureVideoWEBGL to texture2D.
-            return ImmutableString("texture2D");
+            // For GLSL 130+, use "texture" instead of "texture2D" to match the translation
+            // of samplerVideoWEBGL to sampler2D and the GLSL version's texture function naming.
+            return sh::IsGLSL130OrNewer(getShaderOutput()) ? ImmutableString("texture")
+                                                           : ImmutableString("texture2D");
         }
     }
 

src/compiler/translator/glsl/OutputGLSLBase.h

@@ -90,6 +90,7 @@ class TOutputGLSLBase : public TIntermTraverser
     const char *mapQualifierToString(TQualifier qualifier);
 
     sh::GLenum getShaderType() const { return mShaderType; }
+    int getShaderVersion() const { return mShaderVersion; }
     bool isHighPrecisionSupported() const { return mHighPrecisionSupported; }
     const char *getIndentPrefix(int extraIndentDepth = 0);
 

src/tests/angle_end2end_tests_expectations.txt

@@ -29,8 +29,6 @@
 42266349 VULKAN : MultithreadingTestES3.UnsynchronizedTextureReads2/* = SKIP
 377614665 VULKAN : GLSLValidationTest.StructSamplerVsComma/* = SKIP
 410584007 VULKAN : ImageTestES31.UseSourceTextureAsStorageImage/* = SKIP
-// GL_WEBGL_video_texture extension doesn't work correctly with ESSL 100 on OpenGL backend.
-466412253 OPENGL : GLSLValidationExtensionDirectiveTest_ES3.SamplerVideoWEBGL_ESSL100/* = SKIP
 // Incorrectly handled pretty much in all backends
 42266871 : CopyTexImageTestES3.RedefineSameLevel/* = SKIP
 // Fails in Android with EGL_BAD_ALLOC