0b66fa3b62
* rework how shader interface block naming rules are handled * Fixes 2136 According to the spec, shader interfaces (uniform blocks, buffer blocks, input blocks, output blocks) all should be matched up via their block names across all compilation units, not instance names. Also, all block names can be re-used between all 4 interface types without conflict. This change makes it so all of these blocks are matched and remapped using block name and not by instance name. Additional the rule that matched uniform and buffer blocks must either be anonymous or named (but not nessearily the same name) is now imposed. * add warning if instance names differ between matched shader interfaces * Add test cases from #2137 which is now fixed as well. * replace some tab characters with spaces * buffer blocks and uniform blocks now share the same block namespace
114 lines
4.4 KiB
C++
Executable File
114 lines
4.4 KiB
C++
Executable File
//
|
|
// Copyright (C) 2016 Google, 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 <memory>
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "TestFixture.h"
|
|
|
|
namespace glslangtest {
|
|
namespace {
|
|
|
|
using LinkTest = GlslangTest<
|
|
::testing::TestWithParam<std::vector<std::string>>>;
|
|
|
|
TEST_P(LinkTest, FromFile)
|
|
{
|
|
const auto& fileNames = GetParam();
|
|
const size_t fileCount = fileNames.size();
|
|
const EShMessages controls = DeriveOptions(Source::GLSL, Semantics::OpenGL, Target::AST);
|
|
GlslangResult result;
|
|
result.validationResult = true;
|
|
|
|
// Compile each input shader file.
|
|
std::vector<std::unique_ptr<glslang::TShader>> shaders;
|
|
for (size_t i = 0; i < fileCount; ++i) {
|
|
std::string contents;
|
|
tryLoadFile(GlobalTestSettings.testRoot + "/" + fileNames[i],
|
|
"input", &contents);
|
|
shaders.emplace_back(
|
|
new glslang::TShader(GetShaderStage(GetSuffix(fileNames[i]))));
|
|
auto* shader = shaders.back().get();
|
|
compile(shader, contents, "", controls);
|
|
result.shaderResults.push_back(
|
|
{fileNames[i], shader->getInfoLog(), shader->getInfoDebugLog()});
|
|
}
|
|
|
|
// Link all of them.
|
|
glslang::TProgram program;
|
|
for (const auto& shader : shaders) program.addShader(shader.get());
|
|
program.link(controls);
|
|
result.linkingOutput = program.getInfoLog();
|
|
result.linkingError = program.getInfoDebugLog();
|
|
|
|
std::ostringstream stream;
|
|
outputResultToStream(&stream, result, controls);
|
|
|
|
// Check with expected results.
|
|
const std::string expectedOutputFname =
|
|
GlobalTestSettings.testRoot + "/baseResults/" + fileNames.front() + ".out";
|
|
std::string expectedOutput;
|
|
tryLoadFile(expectedOutputFname, "expected output", &expectedOutput);
|
|
|
|
checkEqAndUpdateIfRequested(expectedOutput, stream.str(), expectedOutputFname);
|
|
}
|
|
|
|
// clang-format off
|
|
INSTANTIATE_TEST_CASE_P(
|
|
Glsl, LinkTest,
|
|
::testing::ValuesIn(std::vector<std::vector<std::string>>({
|
|
{"mains1.frag", "mains2.frag", "noMain1.geom", "noMain2.geom"},
|
|
{"noMain.vert", "mains.frag"},
|
|
{"link1.frag", "link2.frag", "link3.frag"},
|
|
{"recurse1.vert", "recurse1.frag", "recurse2.frag"},
|
|
{"300link.frag"},
|
|
{"300link2.frag"},
|
|
{"300link3.frag"},
|
|
{"empty.frag", "empty2.frag", "empty3.frag"},
|
|
{"150.tesc", "150.tese", "400.tesc", "400.tese", "410.tesc", "420.tesc", "420.tese"},
|
|
{"max_vertices_0.geom"},
|
|
{"es-link1.frag", "es-link2.frag"},
|
|
{"missingBodies.vert"},
|
|
{"link.multiAnonBlocksInvalid.0.0.vert", "link.multiAnonBlocksInvalid.0.1.vert"},
|
|
{"link.multiAnonBlocksValid.0.0.vert", "link.multiAnonBlocksValid.0.1.vert"},
|
|
{"link.multiBlocksInvalid.0.0.vert", "link.multiBlocksInvalid.0.1.vert"},
|
|
{"link.multiBlocksValid.1.0.vert", "link.multiBlocksValid.1.1.vert"},
|
|
}))
|
|
);
|
|
// clang-format on
|
|
|
|
} // anonymous namespace
|
|
} // namespace glslangtest
|