Commit 74f7be6d by Mohan Maiya Committed by Commit Bot

Vulkan: Rectify typo in EXT_texture_format_sRGB_override

The extension string for EXT_texture_format_sRGB_override was missing the "format" substring. Bug: angleproject:4561 Change-Id: I19788191b589b64639b036d2bb54508077fca7e8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2658355 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 312ffba8
...@@ -1002,7 +1002,7 @@ const ExtensionInfoMap &GetExtensionInfoMap() ...@@ -1002,7 +1002,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
map["GL_CHROMIUM_bind_generates_resource"] = esOnlyExtension(&Extensions::bindGeneratesResource); map["GL_CHROMIUM_bind_generates_resource"] = esOnlyExtension(&Extensions::bindGeneratesResource);
map["GL_ANGLE_robust_client_memory"] = esOnlyExtension(&Extensions::robustClientMemory); map["GL_ANGLE_robust_client_memory"] = esOnlyExtension(&Extensions::robustClientMemory);
map["GL_EXT_texture_sRGB_decode"] = esOnlyExtension(&Extensions::textureSRGBDecode); map["GL_EXT_texture_sRGB_decode"] = esOnlyExtension(&Extensions::textureSRGBDecode);
map["GL_EXT_texture_sRGB_override"] = esOnlyExtension(&Extensions::textureSRGBOverride); map["GL_EXT_texture_format_sRGB_override"] = esOnlyExtension(&Extensions::textureSRGBOverride);
map["GL_EXT_sRGB_write_control"] = esOnlyExtension(&Extensions::sRGBWriteControl); map["GL_EXT_sRGB_write_control"] = esOnlyExtension(&Extensions::sRGBWriteControl);
map["GL_CHROMIUM_color_buffer_float_rgb"] = enableableExtension(&Extensions::colorBufferFloatRGB); map["GL_CHROMIUM_color_buffer_float_rgb"] = enableableExtension(&Extensions::colorBufferFloatRGB);
map["GL_CHROMIUM_color_buffer_float_rgba"] = enableableExtension(&Extensions::colorBufferFloatRGBA); map["GL_CHROMIUM_color_buffer_float_rgba"] = enableableExtension(&Extensions::colorBufferFloatRGBA);
......
...@@ -510,7 +510,7 @@ struct Extensions ...@@ -510,7 +510,7 @@ struct Extensions
// GL_EXT_texture_sRGB_decode // GL_EXT_texture_sRGB_decode
bool textureSRGBDecode = false; bool textureSRGBDecode = false;
// GL_EXT_texture_sRGB_override // GL_EXT_texture_format_sRGB_override
bool textureSRGBOverride = false; bool textureSRGBOverride = false;
// GL_EXT_sRGB_write_control // GL_EXT_sRGB_write_control
......
...@@ -1630,7 +1630,7 @@ TEST_P(ImageTest, Source2DTarget2DTargetTextureRespecifyColorspace) ...@@ -1630,7 +1630,7 @@ TEST_P(ImageTest, Source2DTarget2DTargetTextureRespecifyColorspace)
{ {
EGLWindow *window = getEGLWindow(); EGLWindow *window = getEGLWindow();
ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt()); ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
// Create the Image // Create the Image
GLuint source; GLuint source;
......
...@@ -276,7 +276,7 @@ TEST_P(SRGBTextureTest, SRGBDecodeTextureParameter) ...@@ -276,7 +276,7 @@ TEST_P(SRGBTextureTest, SRGBDecodeTextureParameter)
// Test basic functionality of SRGB override using the texture parameter // Test basic functionality of SRGB override using the texture parameter
TEST_P(SRGBTextureTest, SRGBOverrideTextureParameter) TEST_P(SRGBTextureTest, SRGBOverrideTextureParameter)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
GLColor linearColor = kLinearColor; GLColor linearColor = kLinearColor;
GLColor srgbColor = kNonlinearColor; GLColor srgbColor = kNonlinearColor;
...@@ -307,7 +307,7 @@ TEST_P(SRGBTextureTest, SRGBOverrideTextureParameter) ...@@ -307,7 +307,7 @@ TEST_P(SRGBTextureTest, SRGBOverrideTextureParameter)
// Test that all supported formats can be overridden // Test that all supported formats can be overridden
TEST_P(SRGBTextureTestES3, SRGBOverrideFormats) TEST_P(SRGBTextureTestES3, SRGBOverrideFormats)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
constexpr GLenum possibleFormats[] = {GL_RGB8, constexpr GLenum possibleFormats[] = {GL_RGB8,
GL_RGBA8, GL_RGBA8,
...@@ -369,7 +369,7 @@ TEST_P(SRGBTextureTestES3, SRGBOverrideFormats) ...@@ -369,7 +369,7 @@ TEST_P(SRGBTextureTestES3, SRGBOverrideFormats)
// Test interaction between sRGB_override and sampler objects // Test interaction between sRGB_override and sampler objects
TEST_P(SRGBTextureTestES3, SRGBOverrideTextureParameterWithSampler) TEST_P(SRGBTextureTestES3, SRGBOverrideTextureParameterWithSampler)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
GLColor linearColor = kLinearColor; GLColor linearColor = kLinearColor;
GLColor srgbColor = kNonlinearColor; GLColor srgbColor = kNonlinearColor;
...@@ -411,7 +411,7 @@ TEST_P(SRGBTextureTestES3, SRGBOverrideTextureParameterWithSampler) ...@@ -411,7 +411,7 @@ TEST_P(SRGBTextureTestES3, SRGBOverrideTextureParameterWithSampler)
// the value of TEXTURE_FORMAT_SRGB_OVERRIDE_EXT is ignored." // the value of TEXTURE_FORMAT_SRGB_OVERRIDE_EXT is ignored."
TEST_P(SRGBTextureTestES3, SRGBOverrideTextureParameterNoop) TEST_P(SRGBTextureTestES3, SRGBOverrideTextureParameterNoop)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_sRGB")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_sRGB"));
GLColor linearColor = kLinearColor; GLColor linearColor = kLinearColor;
...@@ -544,7 +544,7 @@ TEST_P(SRGBTextureTestES3, SRGBDecodeTextureAndSamplerParameter) ...@@ -544,7 +544,7 @@ TEST_P(SRGBTextureTestES3, SRGBDecodeTextureAndSamplerParameter)
TEST_P(SRGBTextureTestES3, SRGBDecodeOverridePriority) TEST_P(SRGBTextureTestES3, SRGBDecodeOverridePriority)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_decode")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_decode"));
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
GLColor linearColor = kLinearColor; GLColor linearColor = kLinearColor;
......
...@@ -274,7 +274,7 @@ class TextureSamplingMutableFormatBenchmark : public TextureSamplingBenchmark ...@@ -274,7 +274,7 @@ class TextureSamplingMutableFormatBenchmark : public TextureSamplingBenchmark
void TextureSamplingMutableFormatBenchmark::initializeBenchmark() void TextureSamplingMutableFormatBenchmark::initializeBenchmark()
{ {
if (IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")) if (IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"))
{ {
TextureSamplingBenchmark::initializeBenchmark(); TextureSamplingBenchmark::initializeBenchmark();
initTextures(); initTextures();
...@@ -328,13 +328,13 @@ TextureSamplingParams VulkanParams() ...@@ -328,13 +328,13 @@ TextureSamplingParams VulkanParams()
TEST_P(TextureSamplingBenchmark, Run) TEST_P(TextureSamplingBenchmark, Run)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
run(); run();
} }
TEST_P(TextureSamplingMutableFormatBenchmark, Run) TEST_P(TextureSamplingMutableFormatBenchmark, Run)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_override")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_sRGB_override"));
run(); run();
} }
......
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