Vulkan: Make ImageHelper::flushStagedUpdates take gl::LevelIndex

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -1982,11 +1982,10 @@ angle::Result TextureVk::flushImageStagedUpdates(ContextVk *contextVk)
     ASSERT(mImage->valid());
 
     gl::LevelIndex baseLevelGL = getNativeImageLevel(mImage->getBaseLevel());
-    vk::LevelIndex baseLevelVk = mImage->toVkLevel(baseLevelGL);
 
-    return mImage->flushStagedUpdates(
-        contextVk, baseLevelVk, vk::LevelIndex(mImage->getLevelCount()), getNativeImageLayer(0),
-        mImage->getLayerCount(), mRedefinedLevels);
+    return mImage->flushStagedUpdates(contextVk, baseLevelGL, baseLevelGL + mImage->getLevelCount(),
+                                      getNativeImageLayer(0), mImage->getLayerCount(),
+                                      mRedefinedLevels);
 }
 
 angle::Result TextureVk::initRenderTargets(ContextVk *contextVk,

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -4977,13 +4977,12 @@ angle::Result ImageHelper::flushSingleSubresourceStagedUpdates(ContextVk *contex
         // Otherwise we proceed with a normal update.
     }
 
-    LevelIndex levelVk = toVkLevel(levelGL);
-    return flushStagedUpdates(contextVk, levelVk, levelVk + 1, layer, layer + 1, {});
+    return flushStagedUpdates(contextVk, levelGL, levelGL + 1, layer, layer + 1, {});
 }
 
 angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
-                                              LevelIndex levelVkStart,
-                                              LevelIndex levelVkEnd,
+                                              gl::LevelIndex levelGLStart,
+                                              gl::LevelIndex levelGLEnd,
                                               uint32_t layerStart,
                                               uint32_t layerEnd,
                                               gl::TexLevelMask skipLevelsMask)
@@ -5011,9 +5010,6 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
         }
     }
 
-    const gl::LevelIndex levelGLStart = toGLLevel(levelVkStart);
-    const gl::LevelIndex levelGLEnd   = toGLLevel(levelVkEnd);
-
     ANGLE_TRY(mStagingBuffer.flush(contextVk));
 
     std::vector<SubresourceUpdate> updatesToKeep;
@@ -5164,9 +5160,7 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
 
 angle::Result ImageHelper::flushAllStagedUpdates(ContextVk *contextVk)
 {
-    // Clear the image.
-    return flushStagedUpdates(contextVk, LevelIndex(0), LevelIndex(mLevelCount), 0, mLayerCount,
-                              {});
+    return flushStagedUpdates(contextVk, mBaseLevel, mBaseLevel + mLevelCount, 0, mLayerCount, {});
 }
 
 bool ImageHelper::isUpdateStaged(gl::LevelIndex levelGL, uint32_t layer)

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1521,8 +1521,8 @@ class ImageHelper final : public Resource, public angle::Subject
     // Due to the nature of updates (done wholly to a VkImageSubresourceLayers), some unsolicited
     // layers may also be updated.
     angle::Result flushStagedUpdates(ContextVk *contextVk,
-                                     LevelIndex levelStart,
-                                     LevelIndex levelEnd,
+                                     gl::LevelIndex levelGLStart,
+                                     gl::LevelIndex levelGLEnd,
                                      uint32_t layerStart,
                                      uint32_t layerEnd,
                                      gl::TexLevelMask skipLevelsMask);