Vulkan: Support external texture binding points.

src/compiler/translator/OutputGLSLBase.h

@@ -42,7 +42,7 @@ class TOutputGLSLBase : public TIntermTraverser
     void writeTriplet(Visit visit, const char *preStr, const char *inStr, const char *postStr);
     virtual void writeLayoutQualifier(TIntermTyped *variable);
     void writeInvariantQualifier(const TType &type);
-    void writeVariableType(const TType &type, const TSymbol *symbol);
+    virtual void writeVariableType(const TType &type, const TSymbol *symbol);
     virtual bool writeVariablePrecision(TPrecision precision) = 0;
     void writeFunctionParameters(const TFunction *func);
     const TConstantUnion *writeConstantUnion(const TType &type, const TConstantUnion *pConstUnion);

src/compiler/translator/OutputVulkanGLSL.cpp

@@ -11,6 +11,7 @@
 
 #include "compiler/translator/OutputVulkanGLSL.h"
 
+#include "compiler/translator/BaseTypes.h"
 #include "compiler/translator/Symbol.h"
 #include "compiler/translator/util.h"
 
@@ -99,6 +100,19 @@ void TOutputVulkanGLSL::writeQualifier(TQualifier qualifier, const TSymbol *symb
     out << "@@ QUALIFIER-" << symbol->name().data() << " @@ ";
 }
 
+void TOutputVulkanGLSL::writeVariableType(const TType &type, const TSymbol *symbol)
+{
+    TType overrideType(type);
+
+    // External textures are treated as 2D textures in the vulkan back-end
+    if (type.getBasicType() == EbtSamplerExternalOES)
+    {
+        overrideType.setBasicType(EbtSampler2D);
+    }
+
+    TOutputGLSL::writeVariableType(overrideType, symbol);
+}
+
 void TOutputVulkanGLSL::writeStructType(const TStructure *structure)
 {
     if (!structDeclared(structure))

src/compiler/translator/OutputVulkanGLSL.h

@@ -32,6 +32,7 @@ class TOutputVulkanGLSL : public TOutputGLSL
   protected:
     void writeLayoutQualifier(TIntermTyped *variable) override;
     void writeQualifier(TQualifier qualifier, const TSymbol *symbol) override;
+    void writeVariableType(const TType &type, const TSymbol *symbol) override;
 };
 
 }  // namespace sh

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -51,8 +51,7 @@ void RendererVk::ensureCapsInitialized() const
     mNativeExtensions.translatedShaderSource = true;
 
     mNativeExtensions.eglImage = true;
-    // TODO(geofflang): Support GL_OES_EGL_image_external. http://anglebug.com/2668
-    mNativeExtensions.eglImageExternal = false;
+    mNativeExtensions.eglImageExternal = true;
     // TODO(geofflang): Support GL_OES_EGL_image_external_essl3. http://anglebug.com/2668
     mNativeExtensions.eglImageExternalEssl3 = false;
 

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -712,6 +712,7 @@ VkImageType GetImageType(gl::TextureType textureType)
         case gl::TextureType::_2DMultisample:
         case gl::TextureType::_2DMultisampleArray:
         case gl::TextureType::CubeMap:
+        case gl::TextureType::External:
             return VK_IMAGE_TYPE_2D;
         case gl::TextureType::_3D:
             return VK_IMAGE_TYPE_3D;
@@ -728,6 +729,7 @@ VkImageViewType GetImageViewType(gl::TextureType textureType)
     {
         case gl::TextureType::_2D:
         case gl::TextureType::_2DMultisample:
+        case gl::TextureType::External:
             return VK_IMAGE_VIEW_TYPE_2D;
         case gl::TextureType::_2DArray:
         case gl::TextureType::_2DMultisampleArray:

src/tests/gl_tests/ImageTest.cpp

@@ -517,8 +517,7 @@ TEST_P(ImageTest, ANGLEExtensionAvailability)
     else if (IsVulkan())
     {
         EXPECT_TRUE(hasOESExt());
-        // TODO(geofflang): Support GL_OES_EGL_image_external. http://anglebug.com/2668
-        EXPECT_FALSE(hasExternalExt());
+        EXPECT_TRUE(hasExternalExt());
         EXPECT_TRUE(hasBaseExt());
         EXPECT_TRUE(has2DTextureExt());
         EXPECT_TRUE(hasCubemapExt());