Hash :
a4e00c64
Author :
Date :
2022-06-30T00:00:00
Expose EXT_compressed_ETC1_RGB8_sub_texture on Metal and GL Updated the test to ensure that this extension is exposed on Apple GPUs when using Metal. Updated emulatedEtc1 limitation to hide this extension when the main ETC1 extension is hidden. Real WebGL apps cannot enable this extension because it is not exposed in WebIDL. Removed bogus entry from IsETC1Format and use the helper consistently in all validation functions. Simplified GetNativeCompressedFormat. Bug: angleproject:7471 Change-Id: I61321fadad7d962358d0fefecd08aaddaedd2ec2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3737762 Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
//
// Copyright 2021 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// WebGLCompressedTextureAvailabilityTest:
// Compressed formats must be enabled on platforms that always support them.
// Compressed formats must be disabled on platforms that never support them.
//
#include "test_utils/ANGLETest.h"
using namespace angle;
namespace
{
class WebGLCompressedTextureAvailabilityTest : public ANGLETest<>
{
public:
WebGLCompressedTextureAvailabilityTest() { setWebGLCompatibilityEnabled(true); }
};
const char kDXT1[] = "GL_EXT_texture_compression_dxt1";
const char kDXT3[] = "GL_ANGLE_texture_compression_dxt3";
const char kDXT5[] = "GL_ANGLE_texture_compression_dxt5";
const char kS3TCSRGB[] = "GL_EXT_texture_compression_s3tc_srgb";
const char kRGTC[] = "GL_EXT_texture_compression_rgtc";
const char kBPTC[] = "GL_EXT_texture_compression_bptc";
const char kETC1[] = "GL_OES_compressed_ETC1_RGB8_texture";
const char kETC1Sub[] = "GL_EXT_compressed_ETC1_RGB8_sub_texture"; // Not exposed to WebGL apps
const char kETC2[] = "GL_ANGLE_compressed_texture_etc";
const char kASTCLDR[] = "GL_KHR_texture_compression_astc_ldr";
const char kASTCHDR[] = "GL_KHR_texture_compression_astc_hdr";
const char kPVRTC1[] = "GL_IMG_texture_compression_pvrtc";
// Test compressed formats availability
TEST_P(WebGLCompressedTextureAvailabilityTest, Test)
{
if (IsD3D())
{
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT1));
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT3));
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT5));
EXPECT_TRUE(EnsureGLExtensionEnabled(kS3TCSRGB));
if (IsD3D9())
{
EXPECT_FALSE(EnsureGLExtensionEnabled(kRGTC));
EXPECT_FALSE(EnsureGLExtensionEnabled(kBPTC));
}
else
{
EXPECT_TRUE(EnsureGLExtensionEnabled(kRGTC));
}
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1Sub));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC2));
EXPECT_FALSE(EnsureGLExtensionEnabled(kASTCLDR));
EXPECT_FALSE(EnsureGLExtensionEnabled(kASTCHDR));
EXPECT_FALSE(EnsureGLExtensionEnabled(kPVRTC1));
}
else if (IsMetal())
{
if (IsOSX())
{
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT1));
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT3));
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT5));
EXPECT_TRUE(EnsureGLExtensionEnabled(kS3TCSRGB));
EXPECT_TRUE(EnsureGLExtensionEnabled(kRGTC));
EXPECT_TRUE(EnsureGLExtensionEnabled(kBPTC));
if (IsApple())
{
// M1 or newer
EXPECT_TRUE(EnsureGLExtensionEnabled(kETC1));
EXPECT_TRUE(EnsureGLExtensionEnabled(kETC1Sub));
EXPECT_TRUE(EnsureGLExtensionEnabled(kETC2));
EXPECT_TRUE(EnsureGLExtensionEnabled(kASTCLDR));
EXPECT_TRUE(EnsureGLExtensionEnabled(kASTCHDR));
EXPECT_TRUE(EnsureGLExtensionEnabled(kPVRTC1));
}
else
{
// macOS with non-Apple GPU
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1Sub));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC2));
EXPECT_FALSE(EnsureGLExtensionEnabled(kASTCLDR));
EXPECT_FALSE(EnsureGLExtensionEnabled(kASTCHDR));
EXPECT_FALSE(EnsureGLExtensionEnabled(kPVRTC1));
}
}
else
{
// Need proper Catalyst detection to assert formats here.
}
}
else if (IsDesktopOpenGL())
{
if (IsOSX())
{
// OpenGL version is fixed to 4.1 on macOS, so the supported formats are the same on all
// devices.
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT1));
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT3));
EXPECT_TRUE(EnsureGLExtensionEnabled(kDXT5));
EXPECT_TRUE(EnsureGLExtensionEnabled(kS3TCSRGB));
EXPECT_TRUE(EnsureGLExtensionEnabled(kRGTC));
EXPECT_FALSE(EnsureGLExtensionEnabled(kBPTC));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1Sub));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC2));
EXPECT_FALSE(EnsureGLExtensionEnabled(kASTCLDR));
EXPECT_FALSE(EnsureGLExtensionEnabled(kASTCHDR));
EXPECT_FALSE(EnsureGLExtensionEnabled(kPVRTC1));
}
}
}
// Regression test for emulated ETC1 being exposed to WebGL contexts.
//
// Relies on the fact that ETC1 is a strict subset of ETC2 and the ANGLE-specific ETC2 extension
// string is exposed only when the hardware support is available. Hardware support for ETC1
// without ETC2 exists only on native OpenGL ES.
//
// Note that non-WebGL contexts are allowed to expose emulated ETC1.
// https://crbug.com/1048244
TEST_P(WebGLCompressedTextureAvailabilityTest, EmulatedEtc1Test)
{
if (!IsOpenGLES())
{
if (EnsureGLExtensionEnabled(kETC2))
{
EXPECT_TRUE(EnsureGLExtensionEnabled(kETC1));
EXPECT_TRUE(EnsureGLExtensionEnabled(kETC1Sub));
}
else
{
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1));
EXPECT_FALSE(EnsureGLExtensionEnabled(kETC1Sub));
}
}
}
ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(WebGLCompressedTextureAvailabilityTest);
} // namespace