Hash :
ebee5b3b
Author :
Date :
2017-11-23T12:56:32
Add GLSL support for runtime-sized arrays in SSBOs
The GLSL parser now allows a runtime-sized array as the last member in
a shader storage block. Clamping indexing against the memory bounds is
done by determining the array length at runtime.
Runtime-sized arrays are used in dEQP tests for many compute shader
tests, so these now work on the OpenGL backend.
BUG=angleproject:1951
TEST=angle_unittests,
dEQP-GLES31.functional.shaders.linkage.shader_storage_block.*
dEQP-GLES31.functional.shaders.builtin_functions.*compute*
Change-Id: Ibecca24623ca8e4723af6f0e0421fe9711ea828d
Reviewed-on: https://chromium-review.googlesource.com/787976
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
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
//
// Copyright (c) 2017 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.
//
// RemoveArrayLengthMethod.cpp:
// Fold array length expressions, including cases where the "this" node has side effects.
// Example:
// int i = (a = b).length();
// int j = (func()).length();
// becomes:
// (a = b);
// int i = <constant array length>;
// func();
// int j = <constant array length>;
//
// Must be run after SplitSequenceOperator, SimplifyLoopConditions and SeparateDeclarations steps
// have been done to expressions containing calls of the array length method.
//
// Does nothing to length method calls done on runtime-sized arrays.
#include "compiler/translator/RemoveArrayLengthMethod.h"
#include "compiler/translator/IntermNode.h"
#include "compiler/translator/IntermTraverse.h"
namespace sh
{
namespace
{
class RemoveArrayLengthTraverser : public TIntermTraverser
{
public:
RemoveArrayLengthTraverser() : TIntermTraverser(true, false, false), mFoundArrayLength(false) {}
bool visitUnary(Visit visit, TIntermUnary *node) override;
void nextIteration() { mFoundArrayLength = false; }
bool foundArrayLength() const { return mFoundArrayLength; }
private:
bool mFoundArrayLength;
};
bool RemoveArrayLengthTraverser::visitUnary(Visit visit, TIntermUnary *node)
{
// The only case where we leave array length() in place is for runtime-sized arrays.
if (node->getOp() == EOpArrayLength && !node->getOperand()->getType().isUnsizedArray())
{
mFoundArrayLength = true;
if (!node->getOperand()->hasSideEffects())
{
queueReplacement(node->fold(nullptr), OriginalNode::IS_DROPPED);
return false;
}
insertStatementInParentBlock(node->getOperand()->deepCopy());
TConstantUnion *constArray = new TConstantUnion[1];
constArray->setIConst(node->getOperand()->getOutermostArraySize());
queueReplacement(new TIntermConstantUnion(constArray, node->getType()),
OriginalNode::IS_DROPPED);
return false;
}
return true;
}
} // anonymous namespace
void RemoveArrayLengthMethod(TIntermBlock *root)
{
RemoveArrayLengthTraverser traverser;
do
{
traverser.nextIteration();
root->traverse(&traverser);
if (traverser.foundArrayLength())
traverser.updateTree();
} while (traverser.foundArrayLength());
}
} // namespace sh