summaryrefslogtreecommitdiffstats
path: root/gfx/angle/src/third_party/compiler
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:11:13 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:11:13 +0200
commit4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 (patch)
treef000dd831240707a03b8c806db292c2a15cde3ce /gfx/angle/src/third_party/compiler
parent3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff)
downloadUXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.gz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.lz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.xz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.zip
Roll back to ANGLE/2845
Diffstat (limited to 'gfx/angle/src/third_party/compiler')
-rwxr-xr-xgfx/angle/src/third_party/compiler/ArrayBoundsClamper.cpp8
-rwxr-xr-xgfx/angle/src/third_party/compiler/ArrayBoundsClamper.h10
2 files changed, 3 insertions, 15 deletions
diff --git a/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.cpp b/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.cpp
index aadb87553..fa6c8b8d7 100755
--- a/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.cpp
+++ b/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.cpp
@@ -38,11 +38,7 @@ const char* kIntClampBegin = "// BEGIN: Generated code for array bounds clamping
const char* kIntClampEnd = "// END: Generated code for array bounds clamping\n\n";
const char* kIntClampDefinition = "int webgl_int_clamp(int value, int minValue, int maxValue) { return ((value < minValue) ? minValue : ((value > maxValue) ? maxValue : value)); }\n\n";
-namespace sh
-{
-
-namespace
-{
+namespace {
class ArrayBoundsClamperMarker : public TIntermTraverser {
public:
@@ -109,5 +105,3 @@ void ArrayBoundsClamper::OutputClampingFunctionDefinition(TInfoSinkBase& out) co
}
out << kIntClampBegin << kIntClampDefinition << kIntClampEnd;
}
-
-} // namespace sh
diff --git a/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.h b/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.h
index a4c407f76..27917e6ee 100755
--- a/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.h
+++ b/gfx/angle/src/third_party/compiler/ArrayBoundsClamper.h
@@ -29,12 +29,8 @@
#include "compiler/translator/InfoSink.h"
#include "compiler/translator/IntermNode.h"
-namespace sh
-{
-
-class ArrayBoundsClamper
-{
- public:
+class ArrayBoundsClamper {
+public:
ArrayBoundsClamper();
// Must be set before compiling any shaders to ensure consistency
@@ -61,6 +57,4 @@ private:
bool mArrayBoundsClampDefinitionNeeded;
};
-} // namespace sh
-
#endif // THIRD_PARTY_COMPILER_ARRAYBOUNDSCLAMPER_H_