Update conditions for exposing ASTC extensions.

Add commenents to explain the Vulkan ASTC situation. Expose GL_KHR_texture_compression_astc_sliced_3d when the HDR profile exists. Bug: angleproject:4447 Change-Id: I00a86cb3c44873a28397aab33a47fb363d4ecfe9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2112283Reviewed-by: Alexis Hétu <sugoi@chromium.org> Reviewed-by: Alexey Knyazev <lexa.knyazev@gmail.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Update conditions for exposing ASTC extensions.
dd4e09ef · Geoff Lang · Commit Bot · 07467b4a · dd4e09ef · dd4e09ef
Commit dd4e09ef authored Mar 20, 2020 by Geoff Lang Committed by Commit Bot Mar 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +3 -2

vk_caps_utils.cpp src/libANGLE/renderer/vulkan/vk_caps_utils.cpp +7 -3

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1132,8 +1132,9 @@ void GenerateCaps(const FunctionsGL *functions,
        extensions->textureCompressionASTCLDRKHR &&
        functions->hasExtension("GL_KHR_texture_compression_astc_hdr");
    extensions->textureCompressionSliced3dASTCKHR =
-        extensions->textureCompressionASTCLDRKHR &&
+        (extensions->textureCompressionASTCLDRKHR &&
-        functions->hasExtension("GL_KHR_texture_compression_astc_sliced_3d");
+         functions->hasExtension("GL_KHR_texture_compression_astc_sliced_3d")) ||
+        extensions->textureCompressionASTCHDRKHR;
    extensions->elementIndexUintOES = functions->standard == STANDARD_GL_DESKTOP ||
                                      functions->isAtLeastGLES(gl::Version(3, 0)) ||
                                      functions->hasGLESExtension("GL_OES_element_index_uint");

--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -55,10 +55,14 @@ void RendererVk::ensureCapsInitialized() const
        (mPhysicalDeviceFeatures.textureCompressionETC2 == VK_TRUE) &&
        gl::DetermineCompressedTextureETCSupport(mNativeTextureCaps);
-    // Vulkan doesn't support 3D ASTC textures, which are required by both
+    // Vulkan doesn't support ASTC 3D block textures, which are required by
-    // GL_OES_texture_compression_astc and GL_KHR_texture_compression_astc_hdr
+    // GL_OES_texture_compression_astc.
+    mNativeExtensions.textureCompressionASTCOES = false;
+    // Vulkan doesn't guarantee HDR blocks decoding without VK_EXT_texture_compression_astc_hdr.
    mNativeExtensions.textureCompressionASTCHDRKHR = false;
-    mNativeExtensions.textureCompressionASTCOES    = false;
+    // Vulkan supports sliced 3D ASTC texture uploads when ASTC is supported.
    mNativeExtensions.textureCompressionSliced3dASTCKHR =
        mNativeExtensions.textureCompressionASTCLDRKHR;