Skip to content

A
angle
Commit 5e280545 by Shahbaz Youssefi Committed by Commit Bot
Options

Move RegenerateStructNames AST transformation to gl/

This AST transformation is used by the chromium validating command decoder on Linux/AMD/GL as well as MacOS. Bug: chromium:1161513 Change-Id: I67e40215ae5576819ba5a58987ceb1776c86c731 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2613195 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent ca94d1da
Showing with 8 additions and 8 deletions
src/compiler.gni
...@@ -155,11 +155,11 @@ angle_translator_sources = [ ...@@ -155,11 +155,11 @@ angle_translator_sources = [
"src/compiler/translator/tree_ops/SplitSequenceOperator.cpp", "src/compiler/translator/tree_ops/SplitSequenceOperator.cpp",
"src/compiler/translator/tree_ops/SplitSequenceOperator.h", "src/compiler/translator/tree_ops/SplitSequenceOperator.h",
"src/compiler/translator/tree_ops/gl/ClampFragDepth.h", "src/compiler/translator/tree_ops/gl/ClampFragDepth.h",
"src/compiler/translator/tree_ops/gl/RegenerateStructNames.h",
"src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h", "src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h",
"src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h", "src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h",
"src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h", "src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h",
"src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h", "src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h",
"src/compiler/translator/tree_ops/gl/mac/RegenerateStructNames.h",
"src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h", "src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h",
"src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h", "src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h",
"src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h", "src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h",
...@@ -231,6 +231,7 @@ angle_translator_glsl_sources = [ ...@@ -231,6 +231,7 @@ angle_translator_glsl_sources = [
"src/compiler/translator/VersionGLSL.cpp", "src/compiler/translator/VersionGLSL.cpp",
"src/compiler/translator/VersionGLSL.h", "src/compiler/translator/VersionGLSL.h",
"src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp", "src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp",
"src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp",
"src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp", "src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp",
"src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp", "src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp",
"src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.cpp", "src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.cpp",
...@@ -239,7 +240,6 @@ angle_translator_glsl_sources = [ ...@@ -239,7 +240,6 @@ angle_translator_glsl_sources = [
] ]
angle_translator_glsl_mac_sources = [ angle_translator_glsl_mac_sources = [
"src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.cpp", "src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.cpp",
"src/compiler/translator/tree_ops/gl/mac/RegenerateStructNames.cpp",
"src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.cpp", "src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.cpp",
"src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.cpp", "src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.cpp",
"src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.cpp", "src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.cpp",
......
src/compiler/translator/Compiler.cpp
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
#include "compiler/translator/tree_ops/SimplifyLoopConditions.h" #include "compiler/translator/tree_ops/SimplifyLoopConditions.h"
#include "compiler/translator/tree_ops/SplitSequenceOperator.h" #include "compiler/translator/tree_ops/SplitSequenceOperator.h"
#include "compiler/translator/tree_ops/gl/ClampFragDepth.h" #include "compiler/translator/tree_ops/gl/ClampFragDepth.h"
#include "compiler/translator/tree_ops/gl/RegenerateStructNames.h"
#include "compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h" #include "compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h"
#include "compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h" #include "compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h"
#include "compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h" #include "compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h"
#include "compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h" #include "compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h"
#include "compiler/translator/tree_ops/gl/mac/RegenerateStructNames.h"
#include "compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h" #include "compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h"
#include "compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h" #include "compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h"
#include "compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h" #include "compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h"
......
src/compiler/translator/tree_ops/gl/mac/RegenerateStructNames.cpp → src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "compiler/translator/tree_ops/gl/mac/RegenerateStructNames.h" #include "compiler/translator/tree_ops/gl/RegenerateStructNames.h"
#include "common/debug.h" #include "common/debug.h"
#include "compiler/translator/Compiler.h" #include "compiler/translator/Compiler.h"
......
src/compiler/translator/tree_ops/gl/mac/RegenerateStructNames.h → src/compiler/translator/tree_ops/gl/RegenerateStructNames.h
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#ifndef COMPILER_TRANSLATOR_TREEOPS_GL_MAC_REGENERATESTRUCTNAMES_H_ #ifndef COMPILER_TRANSLATOR_TREEOPS_GL_REGENERATESTRUCTNAMES_H_
#define COMPILER_TRANSLATOR_TREEOPS_GL_MAC_REGENERATESTRUCTNAMES_H_ #define COMPILER_TRANSLATOR_TREEOPS_GL_REGENERATESTRUCTNAMES_H_
#include "common/angleutils.h" #include "common/angleutils.h"
...@@ -15,7 +15,7 @@ class TCompiler; ...@@ -15,7 +15,7 @@ class TCompiler;
class TIntermBlock; class TIntermBlock;
class TSymbolTable; class TSymbolTable;
#if defined(ANGLE_ENABLE_GLSL) && defined(ANGLE_PLATFORM_APPLE) #if defined(ANGLE_ENABLE_GLSL)
ANGLE_NO_DISCARD bool RegenerateStructNames(TCompiler *compiler, ANGLE_NO_DISCARD bool RegenerateStructNames(TCompiler *compiler,
TIntermBlock *root, TIntermBlock *root,
TSymbolTable *symbolTable); TSymbolTable *symbolTable);
...@@ -31,4 +31,4 @@ ANGLE_NO_DISCARD ANGLE_INLINE bool RegenerateStructNames(TCompiler *compiler, ...@@ -31,4 +31,4 @@ ANGLE_NO_DISCARD ANGLE_INLINE bool RegenerateStructNames(TCompiler *compiler,
} // namespace sh } // namespace sh
#endif // COMPILER_TRANSLATOR_TREEOPS_GL_MAC_REGENERATESTRUCTNAMES_H_ #endif // COMPILER_TRANSLATOR_TREEOPS_GL_REGENERATESTRUCTNAMES_H_
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