Hash :
4cbe8548
Author :
Date :
2023-02-28T21:12:17
Expose shader extensions based on ESSL version Previously, all suported extensions were always exposed in the preprocessor. This broke some games which relied on ESSL1-only extension macros not being defined in ESSL3 shaders. This change adds min/max version information to list of extensions so the preprocessor can conditionally expose extensions based on the shader language version, both via the extension name macros and the #extension directive. Test: angle_unittests --gtest_filter="VersionTest.*" Test: angle_end2end_tests --gtest_filter="*ESSL*ExtensionMacros*" Test: Run com.gameloft.android.ANMP.GloftGGHM on Pixel 6 Bug: b/268091452 Change-Id: I2332a6cb964f54c47d23e2ef6b24e99a0b5c8202 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4304907 Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Mike Schuchardt <mikes@lunarg.com>
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 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242
//
// Copyright 2012 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.
//
#include "PreprocessorTest.h"
#include "compiler/preprocessor/Token.h"
namespace angle
{
class VersionTest : public SimplePreprocessorTest
{};
TEST_F(VersionTest, NoDirectives)
{
const char *str = "foo\n";
const char *expected = "foo\n";
using testing::_;
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 100, SH_GLES2_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected);
}
TEST_F(VersionTest, NoVersion)
{
const char *str = "#define foo\n";
const char *expected = "\n";
using testing::_;
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 100, SH_GLES2_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected);
}
TEST_F(VersionTest, Valid)
{
const char *str = "#version 200\n";
const char *expected = "\n";
using testing::_;
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 200, SH_GLES2_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected);
}
// Test for Desktop GL Shaders
TEST_F(VersionTest, GLSpec)
{
const char *str = "#version 330 core\n";
const char *expected = "\n";
using testing::_;
EXPECT_CALL(mDirectiveHandler,
handleVersion(pp::SourceLocation(0, 1), 330, SH_GL_COMPATIBILITY_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected, SH_GL_COMPATIBILITY_SPEC);
}
TEST_F(VersionTest, CommentsIgnored)
{
const char *str =
"/*foo*/"
"#"
"/*foo*/"
"version"
"/*foo*/"
"200"
"/*foo*/"
"//foo"
"\n";
const char *expected = "\n";
using testing::_;
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 200, SH_GLES2_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected);
}
TEST_F(VersionTest, MissingNewline)
{
const char *str = "#version 200";
const char *expected = "";
using testing::_;
// Directive successfully parsed.
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 200, SH_GLES2_SPEC, _));
// Error reported about EOF.
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_EOF_IN_DIRECTIVE, _, _));
preprocess(str, expected);
}
TEST_F(VersionTest, AfterComments)
{
const char *str =
"/* block comment acceptable */\n"
"// line comment acceptable\n"
"#version 200\n";
const char *expected = "\n\n\n";
using testing::_;
// Directive successfully parsed.
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 3), 200, SH_GLES2_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected);
}
TEST_F(VersionTest, AfterWhitespace)
{
const char *str =
"\n"
"\n"
"#version 200\n";
const char *expected = "\n\n\n";
using testing::_;
// Directive successfully parsed.
EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 3), 200, SH_GLES2_SPEC, _));
// No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
preprocess(str, expected);
}
TEST_F(VersionTest, AfterValidToken)
{
const char *str =
"foo\n"
"#version 200\n";
using testing::_;
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
pp::SourceLocation(0, 2), _));
preprocess(str);
}
TEST_F(VersionTest, AfterInvalidToken)
{
const char *str =
"$\n"
"#version 200\n";
using testing::_;
EXPECT_CALL(mDiagnostics,
print(pp::Diagnostics::PP_INVALID_CHARACTER, pp::SourceLocation(0, 1), "$"));
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
pp::SourceLocation(0, 2), _));
preprocess(str);
}
TEST_F(VersionTest, AfterValidDirective)
{
const char *str =
"#\n"
"#version 200\n";
using testing::_;
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
pp::SourceLocation(0, 2), _));
preprocess(str);
}
TEST_F(VersionTest, AfterInvalidDirective)
{
const char *str =
"#foo\n"
"#version 200\n";
using testing::_;
EXPECT_CALL(mDiagnostics,
print(pp::Diagnostics::PP_DIRECTIVE_INVALID_NAME, pp::SourceLocation(0, 1), "foo"));
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
pp::SourceLocation(0, 2), _));
preprocess(str);
}
TEST_F(VersionTest, AfterExcludedBlock)
{
const char *str =
"#if 0\n"
"foo\n"
"#endif\n"
"#version 200\n";
using testing::_;
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
pp::SourceLocation(0, 4), _));
preprocess(str);
}
struct VersionTestParam
{
const char *str;
pp::Diagnostics::ID id;
};
class InvalidVersionTest : public VersionTest, public testing::WithParamInterface<VersionTestParam>
{};
TEST_P(InvalidVersionTest, Identified)
{
VersionTestParam param = GetParam();
const char *expected = "\n";
using testing::_;
// No handleVersion call.
EXPECT_CALL(mDirectiveHandler, handleVersion(_, _, _, _)).Times(0);
// Invalid version directive call.
EXPECT_CALL(mDiagnostics, print(param.id, pp::SourceLocation(0, 1), _));
preprocess(param.str, expected);
}
static const VersionTestParam kParams[] = {
{"#version\n", pp::Diagnostics::PP_INVALID_VERSION_DIRECTIVE},
{"#version foo\n", pp::Diagnostics::PP_INVALID_VERSION_NUMBER},
{"#version 100 foo\n", pp::Diagnostics::PP_UNEXPECTED_TOKEN},
{"#version 0xffffffff\n", pp::Diagnostics::PP_INTEGER_OVERFLOW}};
INSTANTIATE_TEST_SUITE_P(All, InvalidVersionTest, testing::ValuesIn(kParams));
} // namespace angle