Vulkan: Incomplete textures support

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -69,9 +69,19 @@ ContextVk::~ContextVk()
 
 void ContextVk::onDestroy(const gl::Context *context)
 {
+    mIncompleteTextures.onDestroy(context);
     mDynamicDescriptorPool.destroy(mRenderer);
 }
 
+gl::Error ContextVk::getIncompleteTexture(const gl::Context *context,
+                                          gl::TextureType type,
+                                          gl::Texture **textureOut)
+{
+    // At some point, we'll need to support multisample and we'll pass "this" instead of nullptr
+    // and implement the necessary interface.
+    return mIncompleteTextures.getIncompleteTexture(context, type, nullptr, textureOut);
+}
+
 gl::Error ContextVk::initialize()
 {
     ANGLE_TRY(mDynamicDescriptorPool.init(this->getDevice(),
@@ -127,7 +137,8 @@ gl::Error ContextVk::initPipeline()
     return gl::NoError();
 }
 
-gl::Error ContextVk::setupDraw(const gl::DrawCallParams &drawCallParams,
+gl::Error ContextVk::setupDraw(const gl::Context *context,
+                               const gl::DrawCallParams &drawCallParams,
                                vk::CommandGraphNode **drawNodeOut,
                                bool *newCommandBufferOut)
 {
@@ -180,11 +191,14 @@ gl::Error ContextVk::setupDraw(const gl::DrawCallParams &drawCallParams,
             // TODO(jmadill): Sampler arrays
             ASSERT(samplerBinding.boundTextureUnits.size() == 1);
 
-            GLuint textureUnit         = samplerBinding.boundTextureUnits[0];
-            const gl::Texture *texture = completeTextures[textureUnit];
+            GLuint textureUnit   = samplerBinding.boundTextureUnits[0];
+            gl::Texture *texture = completeTextures[textureUnit];
 
-            // TODO(jmadill): Incomplete textures handling.
-            ASSERT(texture);
+            // Null textures represent incomplete textures.
+            if (texture == nullptr)
+            {
+                ANGLE_TRY(getIncompleteTexture(context, samplerBinding.textureType, &texture));
+            }
 
             TextureVk *textureVk = vk::GetImpl(texture);
             ANGLE_TRY(textureVk->ensureImageInitialized(mRenderer));
@@ -200,7 +214,7 @@ gl::Error ContextVk::setupDraw(const gl::DrawCallParams &drawCallParams,
 
     // TODO(jmadill): Can probably use more dirty bits here.
     ANGLE_TRY(programVk->updateUniforms(this));
-    ANGLE_TRY(programVk->updateTexturesDescriptorSet(this));
+    ANGLE_TRY(programVk->updateTexturesDescriptorSet(context));
 
     // Bind the graphics descriptor sets.
     // TODO(jmadill): Handle multiple command buffers.
@@ -227,7 +241,7 @@ gl::Error ContextVk::drawArrays(const gl::Context *context, GLenum mode, GLint f
 
     vk::CommandGraphNode *drawNode = nullptr;
     bool newCommands               = false;
-    ANGLE_TRY(setupDraw(drawCallParams, &drawNode, &newCommands));
+    ANGLE_TRY(setupDraw(context, drawCallParams, &drawNode, &newCommands));
 
     const gl::VertexArray *vertexArray = context->getGLState().getVertexArray();
     VertexArrayVk *vertexArrayVk       = vk::GetImpl(vertexArray);
@@ -256,7 +270,7 @@ gl::Error ContextVk::drawElements(const gl::Context *context,
 
     vk::CommandGraphNode *drawNode = nullptr;
     bool newCommands               = false;
-    ANGLE_TRY(setupDraw(drawCallParams, &drawNode, &newCommands));
+    ANGLE_TRY(setupDraw(context, drawCallParams, &drawNode, &newCommands));
 
     gl::VertexArray *vao         = mState.getState().getVertexArray();
     VertexArrayVk *vertexArrayVk = vk::GetImpl(vao);

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -160,10 +160,14 @@ class ContextVk : public ContextImpl
     const VkClearValue &getClearDepthStencilValue() const;
     VkColorComponentFlags getClearColorMask() const;
     const VkRect2D &getScissor() const { return mPipelineDesc->getScissor(); }
+    gl::Error getIncompleteTexture(const gl::Context *context,
+                                   gl::TextureType type,
+                                   gl::Texture **textureOut);
 
   private:
     gl::Error initPipeline();
-    gl::Error setupDraw(const gl::DrawCallParams &drawCallParams,
+    gl::Error setupDraw(const gl::Context *context,
+                        const gl::DrawCallParams &drawCallParams,
                         vk::CommandGraphNode **drawNodeOut,
                         bool *newCommandBufferOut);
 
@@ -189,6 +193,8 @@ class ContextVk : public ContextImpl
     VkClearValue mClearColorValue;
     VkClearValue mClearDepthStencilValue;
     VkColorComponentFlags mClearColorMask;
+
+    IncompleteTextureSet mIncompleteTextures;
 };
 }  // namespace rx
 

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -825,13 +825,14 @@ const gl::RangeUI &ProgramVk::getUsedDescriptorSetRange() const
     return mUsedDescriptorSetRange;
 }
 
-vk::Error ProgramVk::updateTexturesDescriptorSet(ContextVk *contextVk)
+gl::Error ProgramVk::updateTexturesDescriptorSet(const gl::Context *context)
 {
     if (mState.getSamplerBindings().empty() || !mDirtyTextures)
     {
-        return vk::NoError();
+        return gl::NoError();
     }
 
+    ContextVk *contextVk = GetImplAs<ContextVk>(context);
     ANGLE_TRY(allocateDescriptorSet(contextVk, vk::TextureIndex));
 
     ASSERT(mUsedDescriptorSetRange.contains(1));
@@ -852,11 +853,15 @@ vk::Error ProgramVk::updateTexturesDescriptorSet(ContextVk *contextVk)
         // TODO(jmadill): Sampler arrays
         ASSERT(samplerBinding.boundTextureUnits.size() == 1);
 
-        GLuint textureUnit         = samplerBinding.boundTextureUnits[0];
-        const gl::Texture *texture = completeTextures[textureUnit];
+        GLuint textureUnit   = samplerBinding.boundTextureUnits[0];
+        gl::Texture *texture = completeTextures[textureUnit];
 
-        // TODO(jmadill): Incomplete textures handling.
-        ASSERT(texture);
+        if (texture == nullptr)
+        {
+            // If we have an incomplete texture, fetch it from our renderer.
+            ANGLE_TRY(
+                contextVk->getIncompleteTexture(context, samplerBinding.textureType, &texture));
+        }
 
         TextureVk *textureVk   = vk::GetImpl(texture);
         const vk::ImageHelper &image = textureVk->getImage();
@@ -889,7 +894,7 @@ vk::Error ProgramVk::updateTexturesDescriptorSet(ContextVk *contextVk)
     vkUpdateDescriptorSets(device, imageCount, writeDescriptorInfo.data(), 0, nullptr);
 
     mDirtyTextures = false;
-    return vk::NoError();
+    return gl::NoError();
 }
 
 void ProgramVk::invalidateTextures()

src/libANGLE/renderer/vulkan/ProgramVk.h

@@ -118,7 +118,7 @@ class ProgramVk : public ProgramImpl
     // or Textures.
     const gl::RangeUI &getUsedDescriptorSetRange() const;
 
-    vk::Error updateTexturesDescriptorSet(ContextVk *contextVk);
+    gl::Error updateTexturesDescriptorSet(const gl::Context *context);
     void invalidateTextures();
 
     // For testing only.

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1029,4 +1029,5 @@ vk::ShaderLibrary *RendererVk::getShaderLibrary()
 {
     return &mShaderLibrary;
 }
+
 }  // namespace rx

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -238,9 +238,12 @@ gl::Error TextureVk::setImage(const gl::Context *context,
 
     if (mImage.valid())
     {
-        const gl::ImageDesc &desc  = mState.getImageDesc(index);
         const vk::Format &vkFormat = renderer->getFormat(formatInfo.sizedInternalFormat);
-        if (desc.size != size || mImage.getFormat() != vkFormat)
+
+        // Calculate the expected size for the index we are defining. If the size is different from
+        // the given size, or the format is different, we are redefining the image so we must
+        // release it.
+        if (mImage.getFormat() != vkFormat || size != mImage.getSize(index))
         {
             releaseImage(context, renderer);
         }

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -209,6 +209,8 @@ Error DynamicBuffer::flush(VkDevice device)
 
 void DynamicBuffer::release(RendererVk *renderer)
 {
+    releaseRetainedBuffers(renderer);
+
     mAlignment           = 0;
     Serial currentSerial = renderer->getCurrentQueueSerial();
     renderer->releaseObject(currentSerial, &mBuffer);
@@ -796,6 +798,16 @@ void ImageHelper::clearDepthStencil(VkImageAspectFlags aspectFlags,
     commandBuffer->clearDepthStencilImage(mImage, mCurrentLayout, depthStencil, 1, &clearRange);
 }
 
+gl::Extents ImageHelper::getSize(const gl::ImageIndex &index) const
+{
+    ASSERT(mExtents.depth == 1);
+    GLint mipLevel = index.getLevelIndex();
+    // Level 0 should be the size of the extents, after that every time you increase a level
+    // you shrink the extents by half.
+    return gl::Extents(std::max(1, mExtents.width >> mipLevel),
+                       std::max(1, mExtents.height >> mipLevel), mExtents.depth);
+}
+
 // static
 void ImageHelper::Copy(ImageHelper *srcImage,
                        ImageHelper *dstImage,

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -221,6 +221,7 @@ class ImageHelper final : angle::NonCopyable
     void clearDepthStencil(VkImageAspectFlags aspectFlags,
                            const VkClearDepthStencilValue &depthStencil,
                            CommandBuffer *commandBuffer);
+    gl::Extents getSize(const gl::ImageIndex &index) const;
 
     static void Copy(ImageHelper *srcImage,
                      ImageHelper *dstImage,

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -193,7 +193,6 @@
 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.2d.generate.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.generate.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.specification.basic_copytex* = SKIP
-2161 VULKAN : dEQP-GLES2.functional.texture.completeness.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.vertex.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.fragment_ops.random.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.fragment_ops.interaction.* = SKIP

src/tests/gl_tests/IncompleteTextureTest.cpp

@@ -206,6 +206,7 @@ ANGLE_INSTANTIATE_TEST(IncompleteTextureTest,
                        ES2_D3D9(),
                        ES2_D3D11(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 
 ANGLE_INSTANTIATE_TEST(IncompleteTextureTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());