Vulkan: Pass correct level count in getLevelDrawImageView

This bug was hit by a KHR ES 3.1 test. This CL just applies the obvious fix already noted by jmadill@. Test: KHR-GLES31.core.shader_image_size.*-nonMS-* Bug: angleproject:4008 Bug: angleproject:4108 Change-Id: I5d05c0a7432f7b70d2b995fd8b11224c119ece5f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2042491 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>
flutter · Feb 6, 2020 · e02f499 · e02f499
1 parent 36f2c80
commit e02f499
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -3652,8 +3652,7 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk,
 {
     onResourceAccess(&contextVk->getResourceUseList());
 
-    // TODO(http://anglebug.com/4008): Possibly incorrect level count.
-    ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, level, 1);
+    ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, level, image.getLevelCount());
 
     *imageViewOut = imageView;
     if (imageView->valid())

diff --git a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -62,7 +62,6 @@
 
 4312 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-sync-imageAccess = SKIP
 4315 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-memory-order-vsfs = FAIL
-4108 VULKAN : KHR-GLES31.core.shader_image_size.*-nonMS-* = SKIP
 
 // Unimplemented glValidateCreateShaderProgramv:
 4146 : KHR-GLES31.core.shader_storage_buffer_object.basic-syntaxSSO = FAIL