unittests: Add validation tests for InputState.

src/tests/CMakeLists.txt

@@ -34,12 +34,13 @@ add_executable(nxt_unittests
     ${VALIDATION_TESTS_DIR}/CopyCommandsValidationTests.cpp
     ${VALIDATION_TESTS_DIR}/DepthStencilStateValidationTests.cpp
     ${VALIDATION_TESTS_DIR}/FramebufferValidationTests.cpp
+    ${VALIDATION_TESTS_DIR}/InputStateValidationTests.cpp
     ${VALIDATION_TESTS_DIR}/RenderPassValidationTests.cpp
     ${VALIDATION_TESTS_DIR}/ValidationTest.cpp
     ${VALIDATION_TESTS_DIR}/ValidationTest.h
     ${TESTS_DIR}/UnittestsMain.cpp
 )
-target_link_libraries(nxt_unittests gtest nxt_backend mock_nxt nxt_wire)
+target_link_libraries(nxt_unittests gtest nxt_backend mock_nxt nxt_wire utils)
 target_include_directories(nxt_unittests PRIVATE ${SRC_DIR})
 SetCXX14(nxt_unittests)
 

src/tests/unittests/validation/InputStateValidationTests.cpp

@@ -0,0 +1,212 @@
+// Copyright 2017 The NXT Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "ValidationTest.h"
+
+#include "utils/NXTHelpers.h"
+
+// Maximums for NXT, tests will start failing when this changes
+static constexpr uint32_t kMaxVertexAttributes = 16u;
+static constexpr uint32_t kMaxVertexInputs = 16u;
+
+class InputStateTest : public ValidationTest {
+    protected:
+        nxt::Pipeline CreatePipeline(bool success, const nxt::InputState& inputState, std::string vertexSource) {
+            nxt::RenderPass renderPass = AssertWillBeSuccess(device.CreateRenderPassBuilder())
+                .SetAttachmentCount(1)
+                .AttachmentSetFormat(0, nxt::TextureFormat::R8G8B8A8Unorm)
+                .SetSubpassCount(1)
+                .SubpassSetColorAttachment(0, 0, 0)
+                .GetResult();
+
+            nxt::ShaderModuleBuilder vsModuleBuilder = AssertWillBeSuccess(device.CreateShaderModuleBuilder());
+            utils::FillShaderModuleBuilder(vsModuleBuilder, nxt::ShaderStage::Vertex, vertexSource.c_str());
+            nxt::ShaderModule vsModule = vsModuleBuilder.GetResult();
+
+            nxt::ShaderModuleBuilder fsModuleBuilder = AssertWillBeSuccess(device.CreateShaderModuleBuilder());
+            utils::FillShaderModuleBuilder(fsModuleBuilder, nxt::ShaderStage::Fragment, R"(
+                #version 450
+                out vec4 fragColor;
+                void main() {
+                    fragColor = vec4(1.0, 0.0, 0.0, 1.0);
+                }
+            )");
+            nxt::ShaderModule fsModule = fsModuleBuilder.GetResult();
+
+            nxt::PipelineBuilder builder;
+            if (success) {
+                builder = AssertWillBeSuccess(device.CreatePipelineBuilder());
+            } else {
+                builder = AssertWillBeError(device.CreatePipelineBuilder());
+            }
+
+            return builder.SetSubpass(renderPass, 0)
+                .SetStage(nxt::ShaderStage::Vertex, vsModule, "main")
+                .SetStage(nxt::ShaderStage::Fragment, fsModule, "main")
+                .SetInputState(inputState)
+                .GetResult();
+        }
+};
+
+// Check an empty input state is valid
+TEST_F(InputStateTest, EmptyIsOk) {
+    nxt::InputState state = AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .GetResult();
+
+    CreatePipeline(true, state, R"(
+        #version 450
+        void main() {
+            gl_Position = vec4(0.0);
+        }
+    )");
+}
+
+// Check validation that pipeline vertex inputs are backed by attributes in the input state
+TEST_F(InputStateTest, PipelineCompatibility) {
+    nxt::InputState state = AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 2 * sizeof(float), nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 0)
+        .SetAttribute(1, 0, nxt::VertexFormat::FloatR32, sizeof(float))
+        .GetResult();
+
+    // Control case: pipeline with one input per attribute
+    CreatePipeline(true, state, R"(
+        #version 450
+        layout(location = 0) in vec4 a;
+        layout(location = 1) in vec4 b;
+        void main() {
+            gl_Position = vec4(0.0);
+        }
+    )");
+
+    // Check it is valid for the pipeline to use a subset of the InputState
+    CreatePipeline(true, state, R"(
+        #version 450
+        layout(location = 0) in vec4 a;
+        void main() {
+            gl_Position = vec4(0.0);
+        }
+    )");
+
+    // Check for an error when the pipeline uses an attribute not in the input state
+    CreatePipeline(false, state, R"(
+        #version 450
+        layout(location = 2) in vec4 a;
+        void main() {
+            gl_Position = vec4(0.0);
+        }
+    )");
+}
+
+// Test that a stride of 0 is valid
+TEST_F(InputStateTest, StrideZero) {
+    // Works ok without attributes
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .GetResult();
+
+    // Works ok with attributes at a large-ish offset
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 128)
+        .GetResult();
+}
+
+// Test that we cannot set an already set input
+TEST_F(InputStateTest, AlreadySetInput) {
+    // Control case
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .GetResult();
+
+    // Oh no, input 0 is set twice
+    AssertWillBeError(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .GetResult();
+}
+
+// Check out of bounds condition on SetInput
+TEST_F(InputStateTest, SetInputOutOfBounds) {
+    // Control case, setting last input
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(kMaxVertexInputs - 1, 0, nxt::InputStepMode::Vertex)
+        .GetResult();
+
+    // Test OOB
+    AssertWillBeError(device.CreateInputStateBuilder())
+        .SetInput(kMaxVertexInputs, 0, nxt::InputStepMode::Vertex)
+        .GetResult();
+}
+
+// Test that we cannot set an already set attribute
+TEST_F(InputStateTest, AlreadySetAttribute) {
+    // Control case, setting last attribute
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+
+    // Oh no, attribute 0 is set twice
+    AssertWillBeError(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 0)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+}
+
+// Check out of bounds condition on SetAttribute
+TEST_F(InputStateTest, SetAttributeOutOfBounds) {
+    // Control case, setting last attribute
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(kMaxVertexAttributes - 1, 0, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+
+    // Test OOB
+    AssertWillBeError(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(kMaxVertexAttributes, 0, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+}
+
+// Check that all attributes must be backed by an input
+TEST_F(InputStateTest, RequireInputForAttribute) {
+    // Control case
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+
+    // Attribute 0 uses input 1 which doesn't exist
+    AssertWillBeError(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 1, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+}
+
+// Check OOB checks for an attribute's input
+TEST_F(InputStateTest, SetAttributeOOBCheckForInputs) {
+    // Control case
+    AssertWillBeSuccess(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 0, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+
+    // Could crash if we didn't check for OOB
+    AssertWillBeError(device.CreateInputStateBuilder())
+        .SetInput(0, 0, nxt::InputStepMode::Vertex)
+        .SetAttribute(0, 1000000, nxt::VertexFormat::FloatR32, 0)
+        .GetResult();
+}

src/utils/NXTHelpers.cpp

@@ -23,7 +23,7 @@
 
 namespace utils {
 
-    nxt::ShaderModule CreateShaderModule(const nxt::Device& device, nxt::ShaderStage stage, const char* source) {
+    void FillShaderModuleBuilder(const nxt::ShaderModuleBuilder& builder, nxt::ShaderStage stage, const char* source) {
         shaderc::Compiler compiler;
         shaderc::CompileOptions options;
 
@@ -43,10 +43,11 @@ namespace utils {
         auto result = compiler.CompileGlslToSpv(source, strlen(source), kind, "myshader?", options);
         if (result.GetCompilationStatus() != shaderc_compilation_status_success) {
             std::cerr << result.GetErrorMessage();
-            return {};
+            return;
         }
 
         size_t size = (result.cend() - result.cbegin());
+        builder.SetSource(size, result.cbegin());
 
 #ifdef DUMP_SPIRV_ASSEMBLY
         {
@@ -74,10 +75,12 @@ namespace utils {
         printf("\n");
         printf("SPIRV JS ARRAY DUMP END\n");
 #endif
+    }
 
-        return device.CreateShaderModuleBuilder()
+    nxt::ShaderModule CreateShaderModule(const nxt::Device& device, nxt::ShaderStage stage, const char* source) {
-            .SetSource(size, result.cbegin())
+        nxt::ShaderModuleBuilder builder = device.CreateShaderModuleBuilder();
-            .GetResult();
+        FillShaderModuleBuilder(builder, stage, source);
+        return builder.GetResult();
     }
 
     void CreateDefaultRenderPass(const nxt::Device& device, nxt::RenderPass* renderPass, nxt::Framebuffer* framebuffer) {

src/utils/NXTHelpers.h

@@ -16,6 +16,7 @@
 
 namespace utils {
 
+    void FillShaderModuleBuilder(const nxt::ShaderModuleBuilder& builder, nxt::ShaderStage stage, const char* source);
     nxt::ShaderModule CreateShaderModule(const nxt::Device& device, nxt::ShaderStage stage, const char* source);
     void CreateDefaultRenderPass(const nxt::Device& device, nxt::RenderPass* renderPass, nxt::Framebuffer* framebuffer);
     nxt::Buffer CreateFrozenBufferFromData(const nxt::Device& device, const void* data, uint32_t size, nxt::BufferUsageBit usage);