Skip to content

A
angle
Commit d9456b25 by Tobin Ehlis Committed by Commit Bot
Options

Vulkan: Enable further dEQP 3.1 tests

As TimVP pointed out, a previous change enabled some previously-skipped texture gather 2d_array tests. Enabling them. Bug: angleproject:3605 Bug: angleproject:3189 Change-Id: I3ad190131339a04441fdd05e23ff3b7ac724dc83 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1797655Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Tobin Ehlis <tobine@google.com>
parent 9dbfeac8
Showing with 4 additions and 7 deletions
src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
...@@ -215,10 +215,6 @@ void RendererVk::ensureCapsInitialized() const ...@@ -215,10 +215,6 @@ void RendererVk::ensureCapsInitialized() const
} }
mNativeCaps.maxUniformLocations = maxUniformVectors; mNativeCaps.maxUniformLocations = maxUniformVectors;
// Pass through min/max texel gather offsets
mNativeCaps.minProgramTextureGatherOffset = limitsVk.minTexelGatherOffset;
mNativeCaps.maxProgramTextureGatherOffset = limitsVk.maxTexelGatherOffset;
// Every stage has 1 reserved uniform buffer for the default uniforms, and 1 for the driver // Every stage has 1 reserved uniform buffer for the default uniforms, and 1 for the driver
// uniforms. // uniforms.
constexpr uint32_t kTotalReservedPerStageUniformBuffers = constexpr uint32_t kTotalReservedPerStageUniformBuffers =
...@@ -358,8 +354,10 @@ void RendererVk::ensureCapsInitialized() const ...@@ -358,8 +354,10 @@ void RendererVk::ensureCapsInitialized() const
mNativeCaps.maxCombinedImageUniforms = maxCombinedImages; mNativeCaps.maxCombinedImageUniforms = maxCombinedImages;
mNativeCaps.maxImageUnits = maxCombinedImages; mNativeCaps.maxImageUnits = maxCombinedImages;
mNativeCaps.minProgramTexelOffset = mPhysicalDeviceProperties.limits.minTexelOffset; mNativeCaps.minProgramTexelOffset = limitsVk.minTexelOffset;
mNativeCaps.maxProgramTexelOffset = mPhysicalDeviceProperties.limits.maxTexelOffset; mNativeCaps.maxProgramTexelOffset = limitsVk.maxTexelOffset;
mNativeCaps.minProgramTextureGatherOffset = limitsVk.minTexelGatherOffset;
mNativeCaps.maxProgramTextureGatherOffset = limitsVk.maxTexelGatherOffset;
// There is no additional limit to the combined number of components. We can have up to a // There is no additional limit to the combined number of components. We can have up to a
// maximum number of uniform buffers, each having the maximum number of components. Note that // maximum number of uniform buffers, each having the maximum number of components. Note that
......
src/tests/deqp_support/deqp_gles31_test_expectations.txt
...@@ -730,7 +730,6 @@ ...@@ -730,7 +730,6 @@
3148 VULKAN : dEQP-GLES31.functional.texture.gather.*base_level* = SKIP 3148 VULKAN : dEQP-GLES31.functional.texture.gather.*base_level* = SKIP
// 2D array textures: // 2D array textures:
3189 VULKAN : dEQP-GLES31.functional.texture.gather.*2d_array* = SKIP
3189 VULKAN : dEQP-GLES31.functional.state_query.*2d_array* = SKIP 3189 VULKAN : dEQP-GLES31.functional.state_query.*2d_array* = SKIP
// Compressed integer textures: // Compressed integer textures:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment