encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-16 08:27:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Point,Line,Triangle -> PointList,LineList,TriangleList

Browse Source
This commit is contained in:
Austin Eng
2017-07-26 18:10:44 -04:00
committed by Austin Eng
parent c2def461a1
commit 439d963ccd
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tests/end2end/PrimitiveTopologyTests.cpp
View File

@@ -249,8 +249,8 @@ class PrimitiveTopologyTest : public NXTTest {
};
// Test Point primitive topology
TEST_P(PrimitiveTopologyTest, Point) {
DoTest(nxt::PrimitiveTopology::Point, {
TEST_P(PrimitiveTopologyTest, PointList) {
DoTest(nxt::PrimitiveTopology::PointList, {
// Check that the points are drawn
TestPoints(kPointTestLocations, true),
@@ -263,8 +263,8 @@ TEST_P(PrimitiveTopologyTest, Point) {
}
// Test Line primitive topology
TEST_P(PrimitiveTopologyTest, Line) {
DoTest(nxt::PrimitiveTopology::Line, {
TEST_P(PrimitiveTopologyTest, LineList) {
DoTest(nxt::PrimitiveTopology::LineList, {
// Check that lines are drawn
TestPoints(kLineTestLocations, true),
@@ -289,8 +289,8 @@ TEST_P(PrimitiveTopologyTest, LineStrip) {
}
// Test Triangle primitive topology
TEST_P(PrimitiveTopologyTest, Triangle) {
DoTest(nxt::PrimitiveTopology::Triangle, {
TEST_P(PrimitiveTopologyTest, TriangleList) {
DoTest(nxt::PrimitiveTopology::TriangleList, {
// Check that triangles are drawn
TestPoints(kTriangleTestLocations, true),

12
src/tests/unittests/validation/RenderPipelineValidationTests.cpp
View File

@@ -48,7 +48,7 @@ class RenderPipelineValidationTest : public ValidationTest {
.SetLayout(pipelineLayout)
.SetStage(nxt::ShaderStage::Vertex, vsModule, "main")
.SetStage(nxt::ShaderStage::Fragment, fsModule, "main")
.SetPrimitiveTopology(nxt::PrimitiveTopology::Triangle);
.SetPrimitiveTopology(nxt::PrimitiveTopology::TriangleList);
return builder;
}
@@ -74,7 +74,7 @@ TEST_F(RenderPipelineValidationTest, CreationMissingProperty) {
.SetSubpass(renderpass, 0)
.SetLayout(pipelineLayout)
.SetStage(nxt::ShaderStage::Fragment, fsModule, "main")
.SetPrimitiveTopology(nxt::PrimitiveTopology::Triangle)
.SetPrimitiveTopology(nxt::PrimitiveTopology::TriangleList)
.GetResult();
}
@@ -84,7 +84,7 @@ TEST_F(RenderPipelineValidationTest, CreationMissingProperty) {
.SetSubpass(renderpass, 0)
.SetLayout(pipelineLayout)
.SetStage(nxt::ShaderStage::Vertex, vsModule, "main")
.SetPrimitiveTopology(nxt::PrimitiveTopology::Triangle)
.SetPrimitiveTopology(nxt::PrimitiveTopology::TriangleList)
.GetResult();
}
@@ -94,7 +94,7 @@ TEST_F(RenderPipelineValidationTest, CreationMissingProperty) {
.SetLayout(pipelineLayout)
.SetStage(nxt::ShaderStage::Vertex, vsModule, "main")
.SetStage(nxt::ShaderStage::Fragment, fsModule, "main")
.SetPrimitiveTopology(nxt::PrimitiveTopology::Triangle)
.SetPrimitiveTopology(nxt::PrimitiveTopology::TriangleList)
.GetResult();
}
}
@@ -107,7 +107,7 @@ TEST_F(RenderPipelineValidationTest, DISABLED_TodoCreationMissingProperty) {
.SetSubpass(renderpass, 0)
.SetStage(nxt::ShaderStage::Vertex, vsModule, "main")
.SetStage(nxt::ShaderStage::Fragment, fsModule, "main")
.SetPrimitiveTopology(nxt::PrimitiveTopology::Triangle)
.SetPrimitiveTopology(nxt::PrimitiveTopology::TriangleList)
.GetResult();
}
@@ -134,7 +134,7 @@ TEST_F(RenderPipelineValidationTest, DISABLED_CreationDuplicates) {
// Fails because primitive topology is set twice
{
AddDefaultStates(AssertWillBeError(device.CreateRenderPipelineBuilder()))
.SetPrimitiveTopology(nxt::PrimitiveTopology::Triangle)
.SetPrimitiveTopology(nxt::PrimitiveTopology::TriangleList)
.GetResult();
}