commit 84c662b9ce4037280d8381795b85574434eca028
author Jamie Madill <jmadill@chromium.org> Thu Jul 12 15:56:55 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jul 16 15:31:20 2018 +0000
tree fac9ab8a33fa9b0677aefc16a8ecf5e00d934ae3
parent d34aa362944c95b6384b2ef2593754c9436c0f69

Vulkan: Store program textures cache.

The program textures update needs to call into the incomplete textures
cache. Moving this step into an update mechanism allows us to avoid
some complexity of calling the incomplete textures cache inside the
ProgramVk class.

This enables further refactors for draw call shader patching and line
segment raster.

Bug: angleproject:2598
Change-Id: I0fd81ca58d2641572a2dd444992ccddd99ebc823
Reviewed-on: https://chromium-review.googlesource.com/1127301
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/vulkan/ProgramVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.cpp b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
index 03ef8e1..07be0bd 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
@@ -860,26 +860,23 @@
     return mUsedDescriptorSetRange;
 }
 
-gl::Error ProgramVk::updateTexturesDescriptorSet(const gl::Context *context)
+angle::Result ProgramVk::updateTexturesDescriptorSet(ContextVk *contextVk)
 {
     if (mState.getSamplerBindings().empty() || !mDirtyTextures)
     {
-        return gl::NoError();
+        return angle::Result::Continue();
     }
 
-    ContextVk *contextVk = GetImplAs<ContextVk>(context);
     ANGLE_TRY(allocateDescriptorSet(contextVk, kTextureDescriptorSetIndex));
 
     ASSERT(mUsedDescriptorSetRange.contains(1));
     VkDescriptorSet descriptorSet = mDescriptorSets[kTextureDescriptorSetIndex];
 
-    // TODO(jmadill): Don't hard-code the texture limit.
-    ShaderTextureArray<VkDescriptorImageInfo> descriptorImageInfo;
-    ShaderTextureArray<VkWriteDescriptorSet> writeDescriptorInfo;
+    gl::ActiveTextureArray<VkDescriptorImageInfo> descriptorImageInfo;
+    gl::ActiveTextureArray<VkWriteDescriptorSet> writeDescriptorInfo;
     uint32_t writeCount = 0;
 
-    const gl::State &glState     = contextVk->getGLState();
-    const auto &completeTextures = glState.getCompleteTextureCache();
+    const gl::ActiveTextureArray<TextureVk *> &activeTextures = contextVk->getActiveTextures();
 
     for (uint32_t textureIndex = 0; textureIndex < mState.getSamplerBindings().size();
          ++textureIndex)
@@ -891,17 +888,8 @@
         for (uint32_t arrayElement = 0; arrayElement < samplerBinding.boundTextureUnits.size();
              ++arrayElement)
         {
-            GLuint textureUnit   = samplerBinding.boundTextureUnits[arrayElement];
-            gl::Texture *texture = completeTextures[textureUnit];
-
-            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);
+            GLuint textureUnit           = samplerBinding.boundTextureUnits[arrayElement];
+            TextureVk *textureVk         = activeTextures[textureUnit];
             const vk::ImageHelper &image = textureVk->getImage();
 
             VkDescriptorImageInfo &imageInfo = descriptorImageInfo[writeCount];
@@ -933,7 +921,7 @@
     vkUpdateDescriptorSets(device, writeCount, writeDescriptorInfo.data(), 0, nullptr);
 
     mDirtyTextures = false;
-    return gl::NoError();
+    return angle::Result::Continue();
 }
 
 void ProgramVk::invalidateTextures()