Rename generated files nxt -> dawn

examples/SampleUtils.cpp

@@ -19,8 +19,8 @@
 #include "utils/BackendBinding.h"
 #include "wire/TerribleCommandBuffer.h"
 
-#include <nxt/nxt.h>
-#include <nxt/nxtcpp.h>
+#include <dawn/dawn.h>
+#include <dawn/dawncpp.h>
 #include <nxt/nxt_wsi.h>
 #include "GLFW/glfw3.h"
 

examples/SampleUtils.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <nxt/nxtcpp.h>
+#include <dawn/dawncpp.h>
 #include <nxt/nxt_wsi.h>
 
 bool InitSample(int argc, const char** argv);

generator/main.py

@@ -439,18 +439,18 @@ def main():
     c_params = {'native_methods': lambda typ: c_native_methods(api_params['types'], typ)}
 
     if 'dawn' in targets:
-        renders.append(FileRender('api.h', 'nxt/nxt.h', [base_params, api_params, c_params]))
-        renders.append(FileRender('api.c', 'nxt/nxt.c', [base_params, api_params, c_params]))
+        renders.append(FileRender('api.h', 'dawn/dawn.h', [base_params, api_params, c_params]))
+        renders.append(FileRender('api.c', 'dawn/dawn.c', [base_params, api_params, c_params]))
 
     if 'dawncpp' in targets:
         additional_params = {'native_methods': lambda typ: cpp_native_methods(api_params['types'], typ)}
-        renders.append(FileRender('apicpp.h', 'nxt/nxtcpp.h', [base_params, api_params, additional_params]))
-        renders.append(FileRender('apicpp.cpp', 'nxt/nxtcpp.cpp', [base_params, api_params, additional_params]))
-        renders.append(FileRender('apicpp_traits.h', 'nxt/nxtcpp_traits.h', [base_params, api_params, additional_params]))
+        renders.append(FileRender('apicpp.h', 'dawn/dawncpp.h', [base_params, api_params, additional_params]))
+        renders.append(FileRender('apicpp.cpp', 'dawn/dawncpp.cpp', [base_params, api_params, additional_params]))
+        renders.append(FileRender('apicpp_traits.h', 'dawn/dawncpp_traits.h', [base_params, api_params, additional_params]))
 
     if 'mock_dawn' in targets:
-        renders.append(FileRender('mock_api.h', 'mock/mock_nxt.h', [base_params, api_params, c_params]))
-        renders.append(FileRender('mock_api.cpp', 'mock/mock_nxt.cpp', [base_params, api_params, c_params]))
+        renders.append(FileRender('mock_api.h', 'mock/mock_dawn.h', [base_params, api_params, c_params]))
+        renders.append(FileRender('mock_api.cpp', 'mock/mock_dawn.cpp', [base_params, api_params, c_params]))
 
     base_backend_params = [
         base_params,

generator/templates/api.c

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "nxt/nxt.h"
+#include "dawn/dawn.h"
 
 static nxtProcTable procs;
 

generator/templates/apicpp.cpp

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "nxtcpp.h"
+#include "dawncpp.h"
 
 namespace nxt {
 

generator/templates/apicpp.h

@@ -15,7 +15,7 @@
 #ifndef NXTCPP_H
 #define NXTCPP_H
 
-#include "nxt.h"
+#include "dawn.h"
 
 #include "nxt/EnumClassBitmasks.h"
 

generator/templates/apicpp_traits.h

@@ -15,7 +15,7 @@
 #ifndef NXTCPP_TRAITS_H
 #define NXTCPP_TRAITS_H
 
-#include "nxtcpp.h"
+#include "dawncpp.h"
 
 #include <type_traits>
 

generator/templates/backend/ProcTable.cpp

@@ -12,8 +12,8 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "nxt/nxt.h"
-#include "nxt/nxtcpp.h"
+#include "dawn/dawn.h"
+#include "dawn/dawncpp.h"
 
 #include "common/Assert.h"
 

generator/templates/backend/ValidationUtils.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_VALIDATIONUTILS_H_
 #define BACKEND_VALIDATIONUTILS_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/Error.h"
 

generator/templates/mock_api.cpp

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "mock_nxt.h"
+#include "mock_dawn.h"
 
 namespace {
     {% for type in by_category["object"] %}

generator/templates/mock_api.h

@@ -16,7 +16,7 @@
 #define MOCK_NXT_H
 
 #include <gmock/gmock.h>
-#include <nxt/nxt.h>
+#include <dawn/dawn.h>
 
 #include <memory>
 

src/backend/BindGroup.h

@@ -21,7 +21,7 @@
 #include "backend/RefCounted.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/BindGroupLayout.h

@@ -20,7 +20,7 @@
 #include "backend/RefCounted.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/BlendState.h

@@ -19,7 +19,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/Buffer.h

@@ -19,7 +19,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/Builder.h

@@ -18,7 +18,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <string>
 

src/backend/CommandBuffer.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_COMMANDBUFFER_H_
 #define BACKEND_COMMANDBUFFER_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/Builder.h"
 #include "backend/CommandAllocator.h"

src/backend/Commands.h

@@ -18,7 +18,7 @@
 #include "backend/RenderPassDescriptor.h"
 #include "backend/Texture.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/DepthStencilState.h

@@ -19,7 +19,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/Device.h

@@ -19,7 +19,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/InputState.h

@@ -20,7 +20,7 @@
 #include "backend/RefCounted.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/PassResourceUsage.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_PASSRESOURCEUSAGE_H
 #define BACKEND_PASSRESOURCEUSAGE_H
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <vector>
 

src/backend/PerStage.h

@@ -19,7 +19,7 @@
 #include "common/BitSetIterator.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 

src/backend/Pipeline.h

@@ -22,7 +22,7 @@
 #include "backend/RefCounted.h"
 #include "backend/ShaderModule.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/PipelineLayout.h

@@ -20,7 +20,7 @@
 #include "backend/RefCounted.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/Queue.h

@@ -20,7 +20,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/RenderPassDescriptor.h

@@ -20,7 +20,7 @@
 #include "backend/RefCounted.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/RenderPipeline.h

@@ -20,7 +20,7 @@
 #include "backend/InputState.h"
 #include "backend/Pipeline.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/Sampler.h

@@ -18,7 +18,7 @@
 #include "backend/Error.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/ShaderModule.h

@@ -20,7 +20,7 @@
 #include "backend/RefCounted.h"
 #include "common/Constants.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/backend/SwapChain.h

@@ -20,7 +20,7 @@
 #include "backend/RefCounted.h"
 
 #include "nxt/nxt_wsi.h"
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/Texture.h

@@ -19,7 +19,7 @@
 #include "backend/Forward.h"
 #include "backend/RefCounted.h"
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend {
 

src/backend/d3d12/DeviceD3D12.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_D3D12_DEVICED3D12_H_
 #define BACKEND_D3D12_DEVICED3D12_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/Device.h"
 #include "backend/d3d12/Forward.h"

src/backend/d3d12/NativeSwapChainImplD3D12.h

@@ -18,7 +18,7 @@
 #include "backend/d3d12/d3d12_platform.h"
 
 #include "nxt/nxt_wsi.h"
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <vector>
 

src/backend/d3d12/TextureCopySplitter.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_D3D12_TEXTURECOPYSPLITTER_H_
 #define BACKEND_D3D12_TEXTURECOPYSPLITTER_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 

src/backend/metal/DeviceMTL.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_METAL_DEVICEMTL_H_
 #define BACKEND_METAL_DEVICEMTL_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/Device.h"
 #include "backend/metal/Forward.h"

src/backend/null/NullBackend.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_NULL_NULLBACKEND_H_
 #define BACKEND_NULL_NULLBACKEND_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/BindGroup.h"
 #include "backend/BindGroupLayout.h"

src/backend/opengl/DeviceGL.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_OPENGL_DEVICEGL_H_
 #define BACKEND_OPENGL_DEVICEGL_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/Device.h"
 #include "backend/opengl/Forward.h"

src/backend/opengl/PersistentPipelineStateGL.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_OPENGL_PERSISTENTPIPELINESTATEGL_H_
 #define BACKEND_OPENGL_PERSISTENTPIPELINESTATEGL_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "glad/glad.h"
 

src/backend/vulkan/DeviceVk.h

@@ -15,7 +15,7 @@
 #ifndef BACKEND_VULKAN_DEVICEVK_H_
 #define BACKEND_VULKAN_DEVICEVK_H_
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include "backend/Device.h"
 #include "backend/vulkan/Forward.h"

src/backend/vulkan/NativeSwapChainImplVk.h

@@ -18,7 +18,7 @@
 #include "backend/vulkan/VulkanInfo.h"
 
 #include "nxt/nxt_wsi.h"
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 namespace backend { namespace vulkan {
 

src/backend/vulkan/RenderPassCache.h

@@ -18,7 +18,7 @@
 #include "common/vulkan_platform.h"
 
 #include "common/Constants.h"
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <array>
 #include <bitset>

src/include/nxt/nxt_wsi.h

@@ -15,7 +15,7 @@
 #ifndef NXT_WSI_H
 #define NXT_WSI_H
 
-#include <nxt/nxt.h>
+#include <dawn/dawn.h>
 
 // Error message (or nullptr if there was no error)
 typedef const char* nxtSwapChainError;

src/tests/NXTTest.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 #include <gtest/gtest.h>
 #include <memory>

src/tests/unittests/ObjectBaseTests.cpp

@@ -14,7 +14,7 @@
 
 #include <gtest/gtest.h>
 
-#include "nxt/nxtcpp.h"
+#include "dawn/dawncpp.h"
 
 class Object : public dawn::ObjectBase<Object, int*> {
     public:

src/tests/unittests/WireTests.cpp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "gtest/gtest.h"
-#include "mock/mock_nxt.h"
+#include "mock/mock_dawn.h"
 
 #include "common/Assert.h"
 #include "wire/TerribleCommandBuffer.h"

src/tests/unittests/validation/ValidationTest.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/unittests/validation/ValidationTest.h"
 
-#include "nxt/nxt.h"
+#include "dawn/dawn.h"
 
 namespace backend {
     namespace null {

src/tests/unittests/validation/ValidationTest.h

@@ -16,8 +16,8 @@
 #define TESTS_UNITTESTS_VALIDATIONTEST_H_
 
 #include "gtest/gtest.h"
-#include "nxt/nxtcpp.h"
-#include "nxt/nxtcpp_traits.h"
+#include "dawn/dawncpp.h"
+#include "dawn/dawncpp_traits.h"
 
 #define ASSERT_DEVICE_ERROR(statement) \
     StartExpectDeviceError(); \

src/utils/DawnHelpers.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <nxt/nxtcpp.h>
+#include <dawn/dawncpp.h>
 
 #include <initializer_list>
 

src/wire/Wire.h

@@ -17,7 +17,7 @@
 
 #include <cstdint>
 
-#include "nxt/nxt.h"
+#include "dawn/dawn.h"
 
 namespace nxt { namespace wire {
 

src/wire/WireCmd.h

@@ -15,7 +15,7 @@
 #ifndef WIRE_WIRECMD_H_
 #define WIRE_WIRECMD_H_
 
-#include <nxt/nxt.h>
+#include <dawn/dawn.h>
 
 #include "wire/WireCmd_autogen.h"