Skip to content

A
angle
Commit 05744c23 by Clemen Deng Committed by Commit Bot
Options

Change gl_DrawID from level = ESSL1+ESSL3 to COMMON

Built in variable gl_DrawID is exposed to ESSL1 with a suffix, when the variable is the exact same. No need to do this. Bug: angleproject:3805 Change-Id: I63c71791bb6a0e8aa7b644171a3f5a81099eddc0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1762359Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Clemen Deng <clemendeng@google.com>
parent aac491fc
Showing with 25 additions and 41 deletions
scripts/code_generation_hashes/ESSL_static_builtins.json
{ {
"src/compiler/translator/ImmutableString_autogen.cpp": "src/compiler/translator/ImmutableString_autogen.cpp":
"49acb8114f600d8f099a826afcb28935", "0a96956b0168817b28032a567f606940",
"src/compiler/translator/ParseContext_autogen.h": "src/compiler/translator/ParseContext_autogen.h":
"48f878f5878e8ab239af7c14e5878b62", "48f878f5878e8ab239af7c14e5878b62",
"src/compiler/translator/SymbolTable_autogen.cpp": "src/compiler/translator/SymbolTable_autogen.cpp":
"bb98f37ed21e89086cc0b9a392a1b168", "e215cb47f2d21e9c2b4b4c8a224fda9d",
"src/compiler/translator/SymbolTable_autogen.h": "src/compiler/translator/SymbolTable_autogen.h":
"bdb3c8eab0d48267a2f264e3af635e1a", "bdb3c8eab0d48267a2f264e3af635e1a",
"src/compiler/translator/builtin_function_declarations.txt": "src/compiler/translator/builtin_function_declarations.txt":
"583e23ceaca8d2baeb07694049b68644", "583e23ceaca8d2baeb07694049b68644",
"src/compiler/translator/builtin_variables.json": "src/compiler/translator/builtin_variables.json":
"779ab43201aac2ac26017e87331c80d1", "802417116fe4b1391b2d80ad04479cf8",
"src/compiler/translator/gen_builtin_symbols.py": "src/compiler/translator/gen_builtin_symbols.py":
"f8f1c8cc208f5f1bb64cf6921e28e966", "f8f1c8cc208f5f1bb64cf6921e28e966",
"src/compiler/translator/tree_util/BuiltIn_autogen.h": "src/compiler/translator/tree_util/BuiltIn_autogen.h":
"12f125f1b65be3379b08d2cf831a2e3a", "80a911c6701baded2fd8d5567c605669",
"src/tests/compiler_tests/ImmutableString_test_autogen.cpp": "src/tests/compiler_tests/ImmutableString_test_autogen.cpp":
"2769eb6b659d8fa676311157f947aecd" "c7c54d5374ccf145a11bd91035b92a5c"
} }
\ No newline at end of file
src/compiler/translator/SymbolTable_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/compiler/translator/builtin_variables.json
...@@ -679,21 +679,7 @@ ...@@ -679,21 +679,7 @@
"ESSL3":{ "ESSL3":{
"variables":{ "variables":{
"gl_DrawID":{ "gl_DrawID":{
"level":"ESSL3_BUILTINS", "level":"COMMON_BUILTINS",
"extension":"ANGLE_multi_draw",
"type":{
"basic":"Int",
"precision":"High",
"qualifier":"DrawID"
}
}
}
},
"ESSL1":{
"variables":{
"gl_DrawID":{
"suffix":"ESSL1",
"level":"ESSL1_BUILTINS",
"extension":"ANGLE_multi_draw", "extension":"ANGLE_multi_draw",
"type":{ "type":{
"basic":"Int", "basic":"Int",
......
src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp
...@@ -42,8 +42,7 @@ class FindGLDrawIDTraverser : public TIntermTraverser ...@@ -42,8 +42,7 @@ class FindGLDrawIDTraverser : public TIntermTraverser
protected: protected:
void visitSymbol(TIntermSymbol *node) override void visitSymbol(TIntermSymbol *node) override
{ {
if (&node->variable() == BuiltInVariable::gl_DrawID() || if (&node->variable() == BuiltInVariable::gl_DrawID())
&node->variable() == BuiltInVariable::gl_DrawIDESSL1())
{ {
mVariable = &node->variable(); mVariable = &node->variable();
} }
......
src/compiler/translator/tree_util/BuiltIn_autogen.h
...@@ -3464,24 +3464,23 @@ class BuiltInId ...@@ -3464,24 +3464,23 @@ class BuiltInId
static constexpr const TSymbolUniqueId gl_ViewportIndex = TSymbolUniqueId(2275); static constexpr const TSymbolUniqueId gl_ViewportIndex = TSymbolUniqueId(2275);
static constexpr const TSymbolUniqueId gl_LayerVS = TSymbolUniqueId(2276); static constexpr const TSymbolUniqueId gl_LayerVS = TSymbolUniqueId(2276);
static constexpr const TSymbolUniqueId gl_DrawID = TSymbolUniqueId(2277); static constexpr const TSymbolUniqueId gl_DrawID = TSymbolUniqueId(2277);
static constexpr const TSymbolUniqueId gl_DrawIDESSL1 = TSymbolUniqueId(2278); static constexpr const TSymbolUniqueId gl_BaseVertex = TSymbolUniqueId(2278);
static constexpr const TSymbolUniqueId gl_BaseVertex = TSymbolUniqueId(2279); static constexpr const TSymbolUniqueId gl_BaseInstance = TSymbolUniqueId(2279);
static constexpr const TSymbolUniqueId gl_BaseInstance = TSymbolUniqueId(2280); static constexpr const TSymbolUniqueId gl_NumWorkGroups = TSymbolUniqueId(2280);
static constexpr const TSymbolUniqueId gl_NumWorkGroups = TSymbolUniqueId(2281); static constexpr const TSymbolUniqueId gl_WorkGroupSize = TSymbolUniqueId(2281);
static constexpr const TSymbolUniqueId gl_WorkGroupSize = TSymbolUniqueId(2282); static constexpr const TSymbolUniqueId gl_WorkGroupID = TSymbolUniqueId(2282);
static constexpr const TSymbolUniqueId gl_WorkGroupID = TSymbolUniqueId(2283); static constexpr const TSymbolUniqueId gl_LocalInvocationID = TSymbolUniqueId(2283);
static constexpr const TSymbolUniqueId gl_LocalInvocationID = TSymbolUniqueId(2284); static constexpr const TSymbolUniqueId gl_GlobalInvocationID = TSymbolUniqueId(2284);
static constexpr const TSymbolUniqueId gl_GlobalInvocationID = TSymbolUniqueId(2285); static constexpr const TSymbolUniqueId gl_LocalInvocationIndex = TSymbolUniqueId(2285);
static constexpr const TSymbolUniqueId gl_LocalInvocationIndex = TSymbolUniqueId(2286); static constexpr const TSymbolUniqueId gl_PrimitiveIDIn = TSymbolUniqueId(2286);
static constexpr const TSymbolUniqueId gl_PrimitiveIDIn = TSymbolUniqueId(2287); static constexpr const TSymbolUniqueId gl_InvocationID = TSymbolUniqueId(2287);
static constexpr const TSymbolUniqueId gl_InvocationID = TSymbolUniqueId(2288); static constexpr const TSymbolUniqueId gl_PrimitiveIDGS = TSymbolUniqueId(2288);
static constexpr const TSymbolUniqueId gl_PrimitiveIDGS = TSymbolUniqueId(2289); static constexpr const TSymbolUniqueId gl_LayerGS = TSymbolUniqueId(2289);
static constexpr const TSymbolUniqueId gl_LayerGS = TSymbolUniqueId(2290); static constexpr const TSymbolUniqueId gl_PerVertex = TSymbolUniqueId(2290);
static constexpr const TSymbolUniqueId gl_PerVertex = TSymbolUniqueId(2291); static constexpr const TSymbolUniqueId gl_in = TSymbolUniqueId(2291);
static constexpr const TSymbolUniqueId gl_in = TSymbolUniqueId(2292); static constexpr const TSymbolUniqueId gl_PerVertexOutBlock = TSymbolUniqueId(2292);
static constexpr const TSymbolUniqueId gl_PerVertexOutBlock = TSymbolUniqueId(2293); static constexpr const TSymbolUniqueId gl_PositionGS = TSymbolUniqueId(2293);
static constexpr const TSymbolUniqueId gl_PositionGS = TSymbolUniqueId(2294); static constexpr const TSymbolUniqueId gl_ViewID_OVR = TSymbolUniqueId(2294);
static constexpr const TSymbolUniqueId gl_ViewID_OVR = TSymbolUniqueId(2295);
}; // class BuiltInId }; // class BuiltInId
...@@ -3491,7 +3490,6 @@ namespace BuiltInVariable ...@@ -3491,7 +3490,6 @@ namespace BuiltInVariable
const TVariable *gl_BaseInstance(); const TVariable *gl_BaseInstance();
const TVariable *gl_BaseVertex(); const TVariable *gl_BaseVertex();
const TVariable *gl_DrawID(); const TVariable *gl_DrawID();
const TVariable *gl_DrawIDESSL1();
const TVariable *gl_FragColor(); const TVariable *gl_FragColor();
const TVariable *gl_FragCoord(); const TVariable *gl_FragCoord();
const TVariable *gl_FragDepth(); const TVariable *gl_FragDepth();
......
src/tests/compiler_tests/ImmutableString_test_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
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