Vulkan: Ensure consistent limits for texture & framebuffer

GLES 3.1 requires that the maximum framebuffer width & height be at least as large as the maximum texture size. Vulkan doesn't have that requirement and for SwiftShader the values are different (4096 for FB, 8192 for texture). Use the smaller of the two to keep things consistent. Test: angle_deqp_gles31_tests --use-angle=swiftshader --gtest_filter=dEQP-GLES31.functional.state_query.integer.max_framebuffer_* Bug: angleproject:4102 Change-Id: Ie04a5272084c5f6a19ac06d952281b7df9fe9a06 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1917130 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tobin Ehlis <tobine@google.com>

Vulkan: Ensure consistent limits for texture & framebuffer
d8531638 · Courtney Goeltzenleuchter · Commit Bot · 3b43647f · d8531638
Commit d8531638 authored Nov 14, 2019 by Courtney Goeltzenleuchter Committed by Commit Bot Nov 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

vk_caps_utils.cpp src/libANGLE/renderer/vulkan/vk_caps_utils.cpp +2 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -132,7 +132,8 @@ void RendererVk::ensureCapsInitialized() const
    // https://vulkan.lunarg.com/doc/view/1.0.30.0/linux/vkspec.chunked/ch31s02.html
    mNativeCaps.maxElementIndex       = std::numeric_limits<GLuint>::max() - 1;
    mNativeCaps.max3DTextureSize      = limitsVk.maxImageDimension3D;
-    mNativeCaps.max2DTextureSize      = limitsVk.maxImageDimension2D;
+    mNativeCaps.max2DTextureSize =
+        std::min(limitsVk.maxFramebufferWidth, limitsVk.maxImageDimension2D);
    mNativeCaps.maxArrayTextureLayers = limitsVk.maxImageArrayLayers;
    mNativeCaps.maxLODBias            = limitsVk.maxSamplerLodBias;
    mNativeCaps.maxCubeMapTextureSize = limitsVk.maxImageDimensionCube;