mirror of
https://github.com/KhronosGroup/glslang
synced 2024-09-20 04:40:01 +00:00
a2b01a0da8
This PR implements recursive type flattening. For example, an array of structs of other structs can be flattened to individual member variables at the shader interface. This is sufficient for many purposes, e.g, uniforms containing opaque types, but is not sufficient for geometry shader arrayed inputs. That will be handled separately with structure splitting, which is not implemented by this PR. In the meantime, that case is detected and triggers an error. The recursive flattening extends the following three aspects of single-level flattening: - Flattening of structures to individual members with names such as "foo[0].samp[1]"; - Turning constant references to the nested composite type into a reference to a particular flattened member. - Shadow copies between arrays of flattened members and the nested composite type. Previous single-level flattening only flattened at the shader interface, and that is unchanged by this PR. Internally, shadow copies are, such as if the type is passed to a function. Also, the reasons for flattening are unchanged. Uniforms containing opaque types, and interface struct types are flattened. (The latter will change with structure splitting). One existing test changes: hlsl.structin.vert, which did in fact contain a nested composite type to be flattened. Two new tests are added: hlsl.structarray.flatten.frag, and hlsl.structarray.flatten.geom (currently issues an error until type splitting is online). The process of arriving at the individual member from chained postfix expressions is more complex than it was with one level. See large-ish comment above HlslParseContext::flatten() for details.
243 lines
11 KiB
C++
243 lines
11 KiB
C++
//
|
|
// Copyright (C) 2016 Google, Inc.
|
|
// Copyright (C) 2016 LunarG, Inc.
|
|
//
|
|
// All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions
|
|
// are met:
|
|
//
|
|
// Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
//
|
|
// Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following
|
|
// disclaimer in the documentation and/or other materials provided
|
|
// with the distribution.
|
|
//
|
|
// Neither the name of Google Inc. nor the names of its
|
|
// contributors may be used to endorse or promote products derived
|
|
// from this software without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
// POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "TestFixture.h"
|
|
|
|
namespace glslangtest {
|
|
namespace {
|
|
|
|
struct FileNameEntryPointPair {
|
|
const char* fileName;
|
|
const char* entryPoint;
|
|
};
|
|
|
|
// We are using FileNameEntryPointPair objects as parameters for instantiating
|
|
// the template, so the global FileNameAsCustomTestSuffix() won't work since
|
|
// it assumes std::string as parameters. Thus, an overriding one here.
|
|
std::string FileNameAsCustomTestSuffix(
|
|
const ::testing::TestParamInfo<FileNameEntryPointPair>& info) {
|
|
std::string name = info.param.fileName;
|
|
// A valid test case suffix cannot have '.' and '-' inside.
|
|
std::replace(name.begin(), name.end(), '.', '_');
|
|
std::replace(name.begin(), name.end(), '-', '_');
|
|
return name;
|
|
}
|
|
|
|
using HlslCompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
|
|
using HlslCompileAndFlattenTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
|
|
|
|
// Compiling HLSL to SPIR-V under Vulkan semantics. Expected to successfully
|
|
// generate both AST and SPIR-V.
|
|
TEST_P(HlslCompileTest, FromFile)
|
|
{
|
|
loadFileCompileAndCheck(GlobalTestSettings.testRoot, GetParam().fileName,
|
|
Source::HLSL, Semantics::Vulkan,
|
|
Target::BothASTAndSpv, GetParam().entryPoint);
|
|
}
|
|
|
|
TEST_P(HlslCompileAndFlattenTest, FromFile)
|
|
{
|
|
loadFileCompileFlattenUniformsAndCheck(GlobalTestSettings.testRoot, GetParam().fileName,
|
|
Source::HLSL, Semantics::Vulkan,
|
|
Target::BothASTAndSpv, GetParam().entryPoint);
|
|
}
|
|
|
|
// clang-format off
|
|
INSTANTIATE_TEST_CASE_P(
|
|
ToSpirv, HlslCompileTest,
|
|
::testing::ValuesIn(std::vector<FileNameEntryPointPair>{
|
|
{"hlsl.amend.frag", "f1"},
|
|
{"hlsl.array.frag", "PixelShaderFunction"},
|
|
{"hlsl.array.implicit-size.frag", "PixelShaderFunction"},
|
|
{"hlsl.array.multidim.frag", "main"},
|
|
{"hlsl.assoc.frag", "PixelShaderFunction"},
|
|
{"hlsl.attribute.frag", "PixelShaderFunction"},
|
|
{"hlsl.attribute.expression.comp", "main"},
|
|
{"hlsl.basic.comp", "main"},
|
|
{"hlsl.basic.geom", "main"},
|
|
{"hlsl.buffer.frag", "PixelShaderFunction"},
|
|
{"hlsl.calculatelod.dx10.frag", "main"},
|
|
{"hlsl.calculatelodunclamped.dx10.frag", "main"},
|
|
{"hlsl.cast.frag", "PixelShaderFunction"},
|
|
{"hlsl.comparison.vec.frag", "main"},
|
|
{"hlsl.conditional.frag", "PixelShaderFunction"},
|
|
{"hlsl.constructexpr.frag", "main"},
|
|
{"hlsl.depthGreater.frag", "PixelShaderFunction"},
|
|
{"hlsl.depthLess.frag", "PixelShaderFunction"},
|
|
{"hlsl.discard.frag", "PixelShaderFunction"},
|
|
{"hlsl.doLoop.frag", "PixelShaderFunction"},
|
|
{"hlsl.entry-in.frag", "PixelShaderFunction"},
|
|
{"hlsl.entry-out.frag", "PixelShaderFunction"},
|
|
{"hlsl.float1.frag", "PixelShaderFunction"},
|
|
{"hlsl.float4.frag", "PixelShaderFunction"},
|
|
{"hlsl.flatten.return.frag", "main"},
|
|
{"hlsl.forLoop.frag", "PixelShaderFunction"},
|
|
{"hlsl.gather.array.dx10.frag", "main"},
|
|
{"hlsl.gather.basic.dx10.frag", "main"},
|
|
{"hlsl.gather.basic.dx10.vert", "main"},
|
|
{"hlsl.gather.offset.dx10.frag", "main"},
|
|
{"hlsl.gather.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.gatherRGBA.array.dx10.frag", "main"},
|
|
{"hlsl.gatherRGBA.basic.dx10.frag", "main"},
|
|
{"hlsl.gatherRGBA.offset.dx10.frag", "main"},
|
|
{"hlsl.gatherRGBA.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.getdimensions.dx10.frag", "main"},
|
|
{"hlsl.getdimensions.rw.dx10.frag", "main"},
|
|
{"hlsl.getdimensions.dx10.vert", "main"},
|
|
{"hlsl.getsampleposition.dx10.frag", "main"},
|
|
{"hlsl.identifier.sample.frag", "main"},
|
|
{"hlsl.if.frag", "PixelShaderFunction"},
|
|
{"hlsl.inoutquals.frag", "main"},
|
|
{"hlsl.init.frag", "ShaderFunction"},
|
|
{"hlsl.init2.frag", "main"},
|
|
{"hlsl.intrinsics.barriers.comp", "ComputeShaderFunction"},
|
|
{"hlsl.intrinsics.comp", "ComputeShaderFunction"},
|
|
{"hlsl.intrinsics.evalfns.frag", "main"},
|
|
{"hlsl.intrinsics.double.frag", "PixelShaderFunction"},
|
|
{"hlsl.intrinsics.f1632.frag", "PixelShaderFunction"},
|
|
{"hlsl.intrinsics.frag", "main"},
|
|
{"hlsl.intrinsics.lit.frag", "PixelShaderFunction"},
|
|
{"hlsl.intrinsics.negative.comp", "ComputeShaderFunction"},
|
|
{"hlsl.intrinsics.negative.frag", "PixelShaderFunction"},
|
|
{"hlsl.intrinsics.negative.vert", "VertexShaderFunction"},
|
|
{"hlsl.intrinsics.promote.frag", "main"},
|
|
{"hlsl.intrinsics.promote.down.frag", "main"},
|
|
{"hlsl.intrinsics.promote.outputs.frag", "main"},
|
|
{"hlsl.layout.frag", "main"},
|
|
{"hlsl.load.2dms.dx10.frag", "main"},
|
|
{"hlsl.load.array.dx10.frag", "main"},
|
|
{"hlsl.load.basic.dx10.frag", "main"},
|
|
{"hlsl.load.basic.dx10.vert", "main"},
|
|
{"hlsl.load.buffer.dx10.frag", "main"},
|
|
{"hlsl.load.buffer.float.dx10.frag", "main"},
|
|
{"hlsl.load.rwbuffer.dx10.frag", "main"},
|
|
{"hlsl.load.rwtexture.dx10.frag", "main"},
|
|
{"hlsl.load.rwtexture.array.dx10.frag", "main"},
|
|
{"hlsl.load.offset.dx10.frag", "main"},
|
|
{"hlsl.load.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.logical.unary.frag", "main"},
|
|
{"hlsl.logical.binary.frag", "main"},
|
|
{"hlsl.logical.binary.vec.frag", "main"},
|
|
{"hlsl.matNx1.frag", "main"},
|
|
{"hlsl.mintypes.frag", "main"},
|
|
{"hlsl.multiEntry.vert", "RealEntrypoint"},
|
|
{"hlsl.multiReturn.frag", "main"},
|
|
{"hlsl.matrixindex.frag", "main"},
|
|
{"hlsl.numericsuffixes.frag", "main"},
|
|
{"hlsl.numthreads.comp", "main_aux1"},
|
|
{"hlsl.overload.frag", "PixelShaderFunction"},
|
|
{"hlsl.partialInit.frag", "PixelShaderFunction"},
|
|
{"hlsl.pp.line.frag", "main"},
|
|
{"hlsl.precise.frag", "main"},
|
|
{"hlsl.promote.binary.frag", "main"},
|
|
{"hlsl.promote.vec1.frag", "main"},
|
|
{"hlsl.promotions.frag", "main"},
|
|
{"hlsl.rw.atomics.frag", "main"},
|
|
{"hlsl.rw.bracket.frag", "main"},
|
|
{"hlsl.rw.register.frag", "main"},
|
|
{"hlsl.rw.scalar.bracket.frag", "main"},
|
|
{"hlsl.rw.vec2.bracket.frag", "main"},
|
|
{"hlsl.sample.array.dx10.frag", "main"},
|
|
{"hlsl.sample.basic.dx10.frag", "main"},
|
|
{"hlsl.sample.offset.dx10.frag", "main"},
|
|
{"hlsl.sample.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.samplebias.array.dx10.frag", "main"},
|
|
{"hlsl.samplebias.basic.dx10.frag", "main"},
|
|
{"hlsl.samplebias.offset.dx10.frag", "main"},
|
|
{"hlsl.samplebias.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.samplecmp.array.dx10.frag", "main"},
|
|
{"hlsl.samplecmp.basic.dx10.frag", "main"},
|
|
{"hlsl.samplecmp.offset.dx10.frag", "main"},
|
|
{"hlsl.samplecmp.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.samplecmplevelzero.array.dx10.frag", "main"},
|
|
{"hlsl.samplecmplevelzero.basic.dx10.frag", "main"},
|
|
{"hlsl.samplecmplevelzero.offset.dx10.frag", "main"},
|
|
{"hlsl.samplecmplevelzero.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.samplegrad.array.dx10.frag", "main"},
|
|
{"hlsl.samplegrad.basic.dx10.frag", "main"},
|
|
{"hlsl.samplegrad.basic.dx10.vert", "main"},
|
|
{"hlsl.samplegrad.offset.dx10.frag", "main"},
|
|
{"hlsl.samplegrad.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.samplelevel.array.dx10.frag", "main"},
|
|
{"hlsl.samplelevel.basic.dx10.frag", "main"},
|
|
{"hlsl.samplelevel.basic.dx10.vert", "main"},
|
|
{"hlsl.samplelevel.offset.dx10.frag", "main"},
|
|
{"hlsl.samplelevel.offsetarray.dx10.frag", "main"},
|
|
{"hlsl.sample.sub-vec4.dx10.frag", "main"},
|
|
{"hlsl.semicolons.frag", "main"},
|
|
{"hlsl.shapeConv.frag", "main"},
|
|
{"hlsl.shapeConvRet.frag", "main"},
|
|
{"hlsl.stringtoken.frag", "main"},
|
|
{"hlsl.string.frag", "main"},
|
|
{"hlsl.structarray.flatten.frag", "main"},
|
|
{"hlsl.structarray.flatten.geom", "main"},
|
|
{"hlsl.structin.vert", "main"},
|
|
{"hlsl.intrinsics.vert", "VertexShaderFunction"},
|
|
{"hlsl.matType.frag", "PixelShaderFunction"},
|
|
{"hlsl.matType.bool.frag", "main"},
|
|
{"hlsl.matType.int.frag", "main"},
|
|
{"hlsl.max.frag", "PixelShaderFunction"},
|
|
{"hlsl.precedence.frag", "PixelShaderFunction"},
|
|
{"hlsl.precedence2.frag", "PixelShaderFunction"},
|
|
{"hlsl.scope.frag", "PixelShaderFunction"},
|
|
{"hlsl.sin.frag", "PixelShaderFunction"},
|
|
{"hlsl.struct.frag", "PixelShaderFunction"},
|
|
{"hlsl.switch.frag", "PixelShaderFunction"},
|
|
{"hlsl.swizzle.frag", "PixelShaderFunction"},
|
|
{"hlsl.templatetypes.frag", "PixelShaderFunction"},
|
|
{"hlsl.tx.bracket.frag", "main"},
|
|
{"hlsl.typedef.frag", "PixelShaderFunction"},
|
|
{"hlsl.whileLoop.frag", "PixelShaderFunction"},
|
|
{"hlsl.void.frag", "PixelShaderFunction"},
|
|
}),
|
|
FileNameAsCustomTestSuffix
|
|
);
|
|
// clang-format on
|
|
|
|
// clang-format off
|
|
INSTANTIATE_TEST_CASE_P(
|
|
ToSpirv, HlslCompileAndFlattenTest,
|
|
::testing::ValuesIn(std::vector<FileNameEntryPointPair>{
|
|
{"hlsl.array.flatten.frag", "main"},
|
|
}),
|
|
FileNameAsCustomTestSuffix
|
|
);
|
|
|
|
// clang-format on
|
|
} // anonymous namespace
|
|
} // namespace glslangtest
|