diff --git a/examples/Animometer.cpp b/examples/Animometer.cpp index 47b010fc60..dc6feacc07 100644 --- a/examples/Animometer.cpp +++ b/examples/Animometer.cpp @@ -14,7 +14,7 @@ #include "SampleUtils.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" #include diff --git a/examples/CHelloTriangle.cpp b/examples/CHelloTriangle.cpp index a147ec76af..078c1433dc 100644 --- a/examples/CHelloTriangle.cpp +++ b/examples/CHelloTriangle.cpp @@ -14,7 +14,7 @@ #include "SampleUtils.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" nxtDevice device; diff --git a/examples/ComputeBoids.cpp b/examples/ComputeBoids.cpp index a930ac53ec..3939d05309 100644 --- a/examples/ComputeBoids.cpp +++ b/examples/ComputeBoids.cpp @@ -14,7 +14,7 @@ #include "SampleUtils.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" #include diff --git a/examples/CppHelloTriangle.cpp b/examples/CppHelloTriangle.cpp index 4cd9671717..95baf29ab7 100644 --- a/examples/CppHelloTriangle.cpp +++ b/examples/CppHelloTriangle.cpp @@ -14,7 +14,7 @@ #include "SampleUtils.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" #include diff --git a/examples/CubeReflection.cpp b/examples/CubeReflection.cpp index 205485f76a..2b898c0c6c 100644 --- a/examples/CubeReflection.cpp +++ b/examples/CubeReflection.cpp @@ -14,7 +14,7 @@ #include "SampleUtils.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" #include diff --git a/examples/glTFViewer/glTFViewer.cpp b/examples/glTFViewer/glTFViewer.cpp index 6295f62a87..6b84c3bae5 100644 --- a/examples/glTFViewer/glTFViewer.cpp +++ b/examples/glTFViewer/glTFViewer.cpp @@ -22,7 +22,7 @@ #include "common/Math.h" #include "common/Constants.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" #include diff --git a/src/tests/NXTTest.cpp b/src/tests/NXTTest.cpp index af37e0c8ba..9b264e4055 100644 --- a/src/tests/NXTTest.cpp +++ b/src/tests/NXTTest.cpp @@ -18,7 +18,7 @@ #include "common/Constants.h" #include "common/Math.h" #include "utils/BackendBinding.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "utils/SystemUtils.h" #include "wire/TerribleCommandBuffer.h" #include "wire/Wire.h" diff --git a/src/tests/end2end/BasicTests.cpp b/src/tests/end2end/BasicTests.cpp index 338764d35b..0d0f2338d4 100644 --- a/src/tests/end2end/BasicTests.cpp +++ b/src/tests/end2end/BasicTests.cpp @@ -14,7 +14,7 @@ #include "tests/NXTTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class BasicTests : public NXTTest { }; diff --git a/src/tests/end2end/BlendStateTests.cpp b/src/tests/end2end/BlendStateTests.cpp index 8cd74fd81d..d1cbe3b06b 100644 --- a/src/tests/end2end/BlendStateTests.cpp +++ b/src/tests/end2end/BlendStateTests.cpp @@ -19,7 +19,7 @@ #include "common/Assert.h" #include "common/Constants.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" constexpr static unsigned int kRTSize = 64; diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp index 04fb524505..d5d65a2f14 100644 --- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -14,7 +14,7 @@ #include "tests/NXTTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp index 7693c8b672..84b809f88c 100644 --- a/src/tests/end2end/CopyTests.cpp +++ b/src/tests/end2end/CopyTests.cpp @@ -17,7 +17,7 @@ #include #include "common/Constants.h" #include "common/Math.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class CopyTests : public NXTTest { protected: diff --git a/src/tests/end2end/DepthStencilStateTests.cpp b/src/tests/end2end/DepthStencilStateTests.cpp index 0d280bcc93..d0fb7fe7b2 100644 --- a/src/tests/end2end/DepthStencilStateTests.cpp +++ b/src/tests/end2end/DepthStencilStateTests.cpp @@ -15,7 +15,7 @@ #include "tests/NXTTest.h" #include "common/Assert.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" constexpr static unsigned int kRTSize = 64; diff --git a/src/tests/end2end/DrawElementsTests.cpp b/src/tests/end2end/DrawElementsTests.cpp index 25eabc877f..ba570ca53e 100644 --- a/src/tests/end2end/DrawElementsTests.cpp +++ b/src/tests/end2end/DrawElementsTests.cpp @@ -14,7 +14,7 @@ #include "tests/NXTTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" constexpr uint32_t kRTSize = 4; diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp index a8266fc9b6..da6a9c58c0 100644 --- a/src/tests/end2end/IndexFormatTests.cpp +++ b/src/tests/end2end/IndexFormatTests.cpp @@ -15,7 +15,7 @@ #include "tests/NXTTest.h" #include "common/Assert.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" constexpr uint32_t kRTSize = 400; diff --git a/src/tests/end2end/InputStateTests.cpp b/src/tests/end2end/InputStateTests.cpp index b065dfe2ab..9de9cd7b92 100644 --- a/src/tests/end2end/InputStateTests.cpp +++ b/src/tests/end2end/InputStateTests.cpp @@ -15,7 +15,7 @@ #include "tests/NXTTest.h" #include "common/Assert.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" using dawn::InputStepMode; using dawn::VertexFormat; diff --git a/src/tests/end2end/PrimitiveTopologyTests.cpp b/src/tests/end2end/PrimitiveTopologyTests.cpp index ebde93eef8..6f03326371 100644 --- a/src/tests/end2end/PrimitiveTopologyTests.cpp +++ b/src/tests/end2end/PrimitiveTopologyTests.cpp @@ -15,7 +15,7 @@ #include "tests/NXTTest.h" #include "common/Assert.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" // Primitive topology tests work by drawing the following vertices with all the different primitive topology states: // ------------------------------------- diff --git a/src/tests/end2end/PushConstantTests.cpp b/src/tests/end2end/PushConstantTests.cpp index a6a2b71289..cbd6b3be2d 100644 --- a/src/tests/end2end/PushConstantTests.cpp +++ b/src/tests/end2end/PushConstantTests.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" #include "common/Constants.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include diff --git a/src/tests/end2end/RenderPassLoadOpTests.cpp b/src/tests/end2end/RenderPassLoadOpTests.cpp index 96d95326d7..7efcde361b 100644 --- a/src/tests/end2end/RenderPassLoadOpTests.cpp +++ b/src/tests/end2end/RenderPassLoadOpTests.cpp @@ -14,7 +14,7 @@ #include "tests/NXTTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp index a5872cdd2a..3c83b960e1 100644 --- a/src/tests/end2end/SamplerTests.cpp +++ b/src/tests/end2end/SamplerTests.cpp @@ -19,7 +19,7 @@ #include "common/Assert.h" #include "common/Constants.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" constexpr static unsigned int kRTSize = 64; diff --git a/src/tests/end2end/ScissorTests.cpp b/src/tests/end2end/ScissorTests.cpp index e42bd13a06..c3d4f83684 100644 --- a/src/tests/end2end/ScissorTests.cpp +++ b/src/tests/end2end/ScissorTests.cpp @@ -14,7 +14,7 @@ #include "tests/NXTTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class ScissorTest: public NXTTest { protected: diff --git a/src/tests/end2end/ViewportOrientationTests.cpp b/src/tests/end2end/ViewportOrientationTests.cpp index d2b462901d..3c4de3ee95 100644 --- a/src/tests/end2end/ViewportOrientationTests.cpp +++ b/src/tests/end2end/ViewportOrientationTests.cpp @@ -14,7 +14,7 @@ #include "tests/NXTTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class ViewportOrientationTests : public NXTTest {}; diff --git a/src/tests/unittests/validation/BindGroupValidationTests.cpp b/src/tests/unittests/validation/BindGroupValidationTests.cpp index 62909eb74e..89ed87bbf1 100644 --- a/src/tests/unittests/validation/BindGroupValidationTests.cpp +++ b/src/tests/unittests/validation/BindGroupValidationTests.cpp @@ -13,7 +13,7 @@ // limitations under the License. #include "tests/unittests/validation/ValidationTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class BindGroupValidationTest : public ValidationTest { }; diff --git a/src/tests/unittests/validation/InputStateValidationTests.cpp b/src/tests/unittests/validation/InputStateValidationTests.cpp index 08a54f7d15..7f78243e83 100644 --- a/src/tests/unittests/validation/InputStateValidationTests.cpp +++ b/src/tests/unittests/validation/InputStateValidationTests.cpp @@ -14,7 +14,7 @@ #include "tests/unittests/validation/ValidationTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" // Maximums for NXT, tests will start failing when this changes static constexpr uint32_t kMaxVertexAttributes = 16u; diff --git a/src/tests/unittests/validation/PushConstantsValidationTests.cpp b/src/tests/unittests/validation/PushConstantsValidationTests.cpp index d51fc85dda..c436697cea 100644 --- a/src/tests/unittests/validation/PushConstantsValidationTests.cpp +++ b/src/tests/unittests/validation/PushConstantsValidationTests.cpp @@ -15,7 +15,7 @@ #include "tests/unittests/validation/ValidationTest.h" #include "common/Constants.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include diff --git a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp index e132c1071e..0da72080da 100644 --- a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp +++ b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp @@ -15,7 +15,7 @@ #include "tests/unittests/validation/ValidationTest.h" #include "common/Constants.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class RenderPipelineValidationTest : public ValidationTest { protected: diff --git a/src/tests/unittests/validation/VertexBufferValidationTests.cpp b/src/tests/unittests/validation/VertexBufferValidationTests.cpp index bedc827ef9..733f893e83 100644 --- a/src/tests/unittests/validation/VertexBufferValidationTests.cpp +++ b/src/tests/unittests/validation/VertexBufferValidationTests.cpp @@ -16,7 +16,7 @@ #include "tests/unittests/validation/ValidationTest.h" -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" class VertexBufferValidationTest : public ValidationTest { protected: diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 1aecbf69e5..9da24dee74 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -17,8 +17,8 @@ set(UTILS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND UTILS_SOURCES ${UTILS_DIR}/BackendBinding.cpp ${UTILS_DIR}/BackendBinding.h - ${UTILS_DIR}/NXTHelpers.cpp - ${UTILS_DIR}/NXTHelpers.h + ${UTILS_DIR}/DawnHelpers.cpp + ${UTILS_DIR}/DawnHelpers.h ${UTILS_DIR}/SystemUtils.cpp ${UTILS_DIR}/SystemUtils.h ) diff --git a/src/utils/NXTHelpers.cpp b/src/utils/DawnHelpers.cpp similarity index 99% rename from src/utils/NXTHelpers.cpp rename to src/utils/DawnHelpers.cpp index c51fb40187..c7b9549426 100644 --- a/src/utils/NXTHelpers.cpp +++ b/src/utils/DawnHelpers.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "utils/NXTHelpers.h" +#include "utils/DawnHelpers.h" #include "common/Assert.h" diff --git a/src/utils/NXTHelpers.h b/src/utils/DawnHelpers.h similarity index 100% rename from src/utils/NXTHelpers.h rename to src/utils/DawnHelpers.h