diff --git a/CMakeLists.txt b/CMakeLists.txt index 76076d4256..d2f4024990 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,7 +210,7 @@ target_link_libraries(dawncpp dawn) add_subdirectory(third_party) add_subdirectory(src/common) -add_subdirectory(src/backend) +add_subdirectory(src/dawn_native) add_subdirectory(src/wire) add_subdirectory(src/utils) add_subdirectory(src/tests) diff --git a/generator/main.py b/generator/main.py index cfbba4f961..37b2f1aa59 100644 --- a/generator/main.py +++ b/generator/main.py @@ -389,7 +389,7 @@ def debug(text): print(text) def main(): - targets = ['dawn', 'dawncpp', 'mock_dawn', 'opengl', 'metal', 'd3d12', 'null', 'wire'] + targets = ['dawn', 'dawncpp', 'mock_dawn', 'opengl', 'metal', 'd3d12', 'null', 'wire', "dawn_native_utils"] parser = argparse.ArgumentParser( description = 'Generates code for various target for Dawn.', @@ -473,11 +473,11 @@ def main(): backend_params = { 'namespace': backend, } - renders.append(FileRender('backend/ProcTable.cpp', 'backend/' + backend + '/ProcTable.' + extension, base_backend_params + [backend_params])) + renders.append(FileRender('dawn_native/ProcTable.cpp', 'dawn_native/' + backend + '/ProcTable.' + extension, base_backend_params + [backend_params])) - if 'backend_utils' in targets: - renders.append(FileRender('backend/ValidationUtils.h', 'backend/ValidationUtils_autogen.h', base_backend_params)) - renders.append(FileRender('backend/ValidationUtils.cpp', 'backend/ValidationUtils_autogen.cpp', base_backend_params)) + if 'dawn_native_utils' in targets: + renders.append(FileRender('dawn_native/ValidationUtils.h', 'dawn_native/ValidationUtils_autogen.h', base_backend_params)) + renders.append(FileRender('dawn_native/ValidationUtils.cpp', 'dawn_native/ValidationUtils_autogen.cpp', base_backend_params)) if 'wire' in targets: renders.append(FileRender('wire/WireCmd.h', 'wire/WireCmd_autogen.h', base_backend_params)) diff --git a/generator/templates/backend/ProcTable.cpp b/generator/templates/dawn_native/ProcTable.cpp similarity index 98% rename from generator/templates/backend/ProcTable.cpp rename to generator/templates/dawn_native/ProcTable.cpp index a1722ad799..cdbf92bfeb 100644 --- a/generator/templates/backend/ProcTable.cpp +++ b/generator/templates/dawn_native/ProcTable.cpp @@ -17,9 +17,9 @@ #include "common/Assert.h" -#include "backend/ErrorData.h" -#include "backend/ValidationUtils_autogen.h" -#include "backend/{{namespace}}/GeneratedCodeIncludes.h" +#include "dawn_native/ErrorData.h" +#include "dawn_native/ValidationUtils_autogen.h" +#include "dawn_native/{{namespace}}/GeneratedCodeIncludes.h" namespace backend { namespace {{namespace}} { diff --git a/generator/templates/backend/ValidationUtils.cpp b/generator/templates/dawn_native/ValidationUtils.cpp similarity index 96% rename from generator/templates/backend/ValidationUtils.cpp rename to generator/templates/dawn_native/ValidationUtils.cpp index a2f2d33e3b..c33966f1c1 100644 --- a/generator/templates/backend/ValidationUtils.cpp +++ b/generator/templates/dawn_native/ValidationUtils.cpp @@ -12,7 +12,7 @@ //* See the License for the specific language governing permissions and //* limitations under the License. -#include "backend/ValidationUtils_autogen.h" +#include "dawn_native/ValidationUtils_autogen.h" namespace backend { diff --git a/generator/templates/backend/ValidationUtils.h b/generator/templates/dawn_native/ValidationUtils.h similarity index 97% rename from generator/templates/backend/ValidationUtils.h rename to generator/templates/dawn_native/ValidationUtils.h index ea86cd7eb2..b5f744c5bc 100644 --- a/generator/templates/backend/ValidationUtils.h +++ b/generator/templates/dawn_native/ValidationUtils.h @@ -17,7 +17,7 @@ #include "dawn/dawncpp.h" -#include "backend/Error.h" +#include "dawn_native/Error.h" namespace backend { diff --git a/src/backend/d3d12/GeneratedCodeIncludes.h b/src/backend/d3d12/GeneratedCodeIncludes.h deleted file mode 100644 index 70205c9538..0000000000 --- a/src/backend/d3d12/GeneratedCodeIncludes.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2017 The Dawn 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 "backend/d3d12/BindGroupD3D12.h" -#include "backend/d3d12/BindGroupLayoutD3D12.h" -#include "backend/d3d12/BlendStateD3D12.h" -#include "backend/d3d12/BufferD3D12.h" -#include "backend/d3d12/CommandBufferD3D12.h" -#include "backend/d3d12/ComputePipelineD3D12.h" -#include "backend/d3d12/DepthStencilStateD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/InputStateD3D12.h" -#include "backend/d3d12/PipelineLayoutD3D12.h" -#include "backend/d3d12/QueueD3D12.h" -#include "backend/d3d12/RenderPassDescriptorD3D12.h" -#include "backend/d3d12/RenderPipelineD3D12.h" -#include "backend/d3d12/SamplerD3D12.h" -#include "backend/d3d12/ShaderModuleD3D12.h" -#include "backend/d3d12/SwapChainD3D12.h" -#include "backend/d3d12/TextureD3D12.h" diff --git a/src/backend/metal/GeneratedCodeIncludes.h b/src/backend/metal/GeneratedCodeIncludes.h deleted file mode 100644 index e606738ba1..0000000000 --- a/src/backend/metal/GeneratedCodeIncludes.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2017 The Dawn 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 "backend/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/metal/BlendStateMTL.h" -#include "backend/metal/BufferMTL.h" -#include "backend/metal/CommandBufferMTL.h" -#include "backend/metal/ComputePipelineMTL.h" -#include "backend/metal/DepthStencilStateMTL.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/InputStateMTL.h" -#include "backend/metal/PipelineLayoutMTL.h" -#include "backend/metal/QueueMTL.h" -#include "backend/metal/RenderPipelineMTL.h" -#include "backend/metal/SamplerMTL.h" -#include "backend/metal/ShaderModuleMTL.h" -#include "backend/metal/SwapChainMTL.h" -#include "backend/metal/TextureMTL.h" diff --git a/src/backend/opengl/GeneratedCodeIncludes.h b/src/backend/opengl/GeneratedCodeIncludes.h deleted file mode 100644 index 3efdc10150..0000000000 --- a/src/backend/opengl/GeneratedCodeIncludes.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Dawn 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 "backend/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/opengl/BlendStateGL.h" -#include "backend/opengl/BufferGL.h" -#include "backend/opengl/CommandBufferGL.h" -#include "backend/opengl/ComputePipelineGL.h" -#include "backend/opengl/DepthStencilStateGL.h" -#include "backend/opengl/DeviceGL.h" -#include "backend/opengl/InputStateGL.h" -#include "backend/opengl/PersistentPipelineStateGL.h" -#include "backend/opengl/PipelineLayoutGL.h" -#include "backend/opengl/QueueGL.h" -#include "backend/opengl/RenderPipelineGL.h" -#include "backend/opengl/SamplerGL.h" -#include "backend/opengl/ShaderModuleGL.h" -#include "backend/opengl/SwapChainGL.h" -#include "backend/opengl/TextureGL.h" diff --git a/src/backend/vulkan/GeneratedCodeIncludes.h b/src/backend/vulkan/GeneratedCodeIncludes.h deleted file mode 100644 index b99d7f8734..0000000000 --- a/src/backend/vulkan/GeneratedCodeIncludes.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2017 The Dawn 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 "backend/vulkan/BindGroupLayoutVk.h" -#include "backend/vulkan/BindGroupVk.h" -#include "backend/vulkan/BlendStateVk.h" -#include "backend/vulkan/BufferVk.h" -#include "backend/vulkan/CommandBufferVk.h" -#include "backend/vulkan/ComputePipelineVk.h" -#include "backend/vulkan/DepthStencilStateVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/InputStateVk.h" -#include "backend/vulkan/PipelineLayoutVk.h" -#include "backend/vulkan/QueueVk.h" -#include "backend/vulkan/RenderPassDescriptorVk.h" -#include "backend/vulkan/RenderPipelineVk.h" -#include "backend/vulkan/SamplerVk.h" -#include "backend/vulkan/ShaderModuleVk.h" -#include "backend/vulkan/SwapChainVk.h" -#include "backend/vulkan/TextureVk.h" diff --git a/src/common/SwapChainUtils.h b/src/common/SwapChainUtils.h index 50733f77f7..78aa702846 100644 --- a/src/common/SwapChainUtils.h +++ b/src/common/SwapChainUtils.h @@ -15,6 +15,8 @@ #ifndef COMMON_SWAPCHAINUTILS_H_ #define COMMON_SWAPCHAINUTILS_H_ +#include "dawn/dawn_wsi.h" + template dawnSwapChainImplementation CreateSwapChainImplementation(T* swapChain) { dawnSwapChainImplementation impl = {}; diff --git a/src/backend/BindGroup.cpp b/src/dawn_native/BindGroup.cpp similarity index 97% rename from src/backend/BindGroup.cpp rename to src/dawn_native/BindGroup.cpp index 233984b611..a4c8a7f913 100644 --- a/src/backend/BindGroup.cpp +++ b/src/dawn_native/BindGroup.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/BindGroup.h" +#include "dawn_native/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/Buffer.h" -#include "backend/Device.h" -#include "backend/Texture.h" #include "common/Assert.h" #include "common/Math.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/Buffer.h" +#include "dawn_native/Device.h" +#include "dawn_native/Texture.h" namespace backend { diff --git a/src/backend/BindGroup.h b/src/dawn_native/BindGroup.h similarity index 95% rename from src/backend/BindGroup.h rename to src/dawn_native/BindGroup.h index b3baa30d56..2361f8897a 100644 --- a/src/backend/BindGroup.h +++ b/src/dawn_native/BindGroup.h @@ -15,11 +15,11 @@ #ifndef BACKEND_BINDGROUP_H_ #define BACKEND_BINDGROUP_H_ -#include "backend/BindGroupLayout.h" -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" #include "common/Constants.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/BindGroupLayout.cpp b/src/dawn_native/BindGroupLayout.cpp similarity index 97% rename from src/backend/BindGroupLayout.cpp rename to src/dawn_native/BindGroupLayout.cpp index 08c0009601..550b08319a 100644 --- a/src/backend/BindGroupLayout.cpp +++ b/src/dawn_native/BindGroupLayout.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/BindGroupLayout.h" +#include "dawn_native/BindGroupLayout.h" -#include "backend/Device.h" -#include "backend/ValidationUtils_autogen.h" #include "common/BitSetIterator.h" #include "common/HashUtils.h" +#include "dawn_native/Device.h" +#include "dawn_native/ValidationUtils_autogen.h" #include diff --git a/src/backend/BindGroupLayout.h b/src/dawn_native/BindGroupLayout.h similarity index 95% rename from src/backend/BindGroupLayout.h rename to src/dawn_native/BindGroupLayout.h index f5bd6d0277..2f332e455f 100644 --- a/src/backend/BindGroupLayout.h +++ b/src/dawn_native/BindGroupLayout.h @@ -15,10 +15,10 @@ #ifndef BACKEND_BINDGROUPLAYOUT_H_ #define BACKEND_BINDGROUPLAYOUT_H_ -#include "backend/Error.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" #include "common/Constants.h" +#include "dawn_native/Error.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/BlendState.cpp b/src/dawn_native/BlendState.cpp similarity index 97% rename from src/backend/BlendState.cpp rename to src/dawn_native/BlendState.cpp index 97a9be0326..ea5ab7e663 100644 --- a/src/backend/BlendState.cpp +++ b/src/dawn_native/BlendState.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/BlendState.h" +#include "dawn_native/BlendState.h" -#include "backend/Device.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/BlendState.h b/src/dawn_native/BlendState.h similarity index 95% rename from src/backend/BlendState.h rename to src/dawn_native/BlendState.h index db2eb84aa4..16e054ebb3 100644 --- a/src/backend/BlendState.h +++ b/src/dawn_native/BlendState.h @@ -15,9 +15,9 @@ #ifndef BACKEND_BLENDSTATE_H_ #define BACKEND_BLENDSTATE_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Buffer.cpp b/src/dawn_native/Buffer.cpp similarity index 99% rename from src/backend/Buffer.cpp rename to src/dawn_native/Buffer.cpp index 180823f55d..31ed2d8de2 100644 --- a/src/backend/Buffer.cpp +++ b/src/dawn_native/Buffer.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Buffer.h" +#include "dawn_native/Buffer.h" -#include "backend/Device.h" #include "common/Assert.h" +#include "dawn_native/Device.h" #include #include diff --git a/src/backend/Buffer.h b/src/dawn_native/Buffer.h similarity index 97% rename from src/backend/Buffer.h rename to src/dawn_native/Buffer.h index 65cc450af6..7183a010da 100644 --- a/src/backend/Buffer.h +++ b/src/dawn_native/Buffer.h @@ -15,10 +15,10 @@ #ifndef BACKEND_BUFFER_H_ #define BACKEND_BUFFER_H_ -#include "backend/Builder.h" -#include "backend/Error.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Error.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Builder.cpp b/src/dawn_native/Builder.cpp similarity index 98% rename from src/backend/Builder.cpp rename to src/dawn_native/Builder.cpp index fc383b2108..917b34381e 100644 --- a/src/backend/Builder.cpp +++ b/src/dawn_native/Builder.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Builder.h" +#include "dawn_native/Builder.h" -#include "backend/Device.h" #include "common/Assert.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/Builder.h b/src/dawn_native/Builder.h similarity index 98% rename from src/backend/Builder.h rename to src/dawn_native/Builder.h index cf956c974a..622c8cc3ab 100644 --- a/src/backend/Builder.h +++ b/src/dawn_native/Builder.h @@ -15,8 +15,8 @@ #ifndef BACKEND_BUILDER_H_ #define BACKEND_BUILDER_H_ -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/CMakeLists.txt b/src/dawn_native/CMakeLists.txt similarity index 79% rename from src/backend/CMakeLists.txt rename to src/dawn_native/CMakeLists.txt index 195711cebf..454279fb65 100644 --- a/src/backend/CMakeLists.txt +++ b/src/dawn_native/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(BACKEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(DAWN_NATIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(D3D12_DIR ${CMAKE_CURRENT_SOURCE_DIR}/d3d12) set(METAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/metal) set(NULL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/null) @@ -20,29 +20,29 @@ set(OPENGL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/opengl) set(VULKAN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan) Generate( - LIB_NAME backend_utils_autogen + LIB_NAME dawn_native_utils_autogen LIB_TYPE STATIC - FOLDER "backend" - PRINT_NAME "Autogenerated backend utilities" + FOLDER "dawn_native" + PRINT_NAME "Autogenerated dawn_native utilities" COMMAND_LINE_ARGS ${GENERATOR_COMMON_ARGS} - -T backend_utils + -T dawn_native_utils ) -target_link_libraries(backend_utils_autogen dawncpp) -target_include_directories(backend_utils_autogen PUBLIC ${GENERATED_DIR}) -target_include_directories(backend_utils_autogen PRIVATE ${SRC_DIR}) +target_link_libraries(dawn_native_utils_autogen dawncpp) +target_include_directories(dawn_native_utils_autogen PUBLIC ${GENERATED_DIR}) +target_include_directories(dawn_native_utils_autogen PRIVATE ${SRC_DIR}) function(GenerateProcTable backend) Generate( LIB_NAME ${backend}_autogen LIB_TYPE STATIC - FOLDER "backend" + FOLDER "dawn_native" PRINT_NAME "${backend} backend autogenerated files" COMMAND_LINE_ARGS ${GENERATOR_COMMON_ARGS} -T ${backend} ) - target_link_libraries(${backend}_autogen dawncpp backend_utils_autogen) + target_link_libraries(${backend}_autogen dawncpp dawn_native_utils_autogen) target_include_directories(${backend}_autogen PRIVATE ${SRC_DIR}) target_include_directories(${backend}_autogen PUBLIC ${GENERATED_DIR}) endfunction() @@ -55,7 +55,7 @@ if (DAWN_ENABLE_OPENGL) GenerateProcTable(opengl) target_link_libraries(opengl_autogen glfw glad) - list(APPEND BACKEND_SOURCES + list(APPEND DAWN_NATIVE_SOURCES ${OPENGL_DIR}/BlendStateGL.cpp ${OPENGL_DIR}/BlendStateGL.h ${OPENGL_DIR}/BufferGL.cpp @@ -99,7 +99,7 @@ endif() if (DAWN_ENABLE_NULL) GenerateProcTable(null) - list(APPEND BACKEND_SOURCES + list(APPEND DAWN_NATIVE_SOURCES ${NULL_DIR}/NullBackend.cpp ${NULL_DIR}/NullBackend.h ) @@ -113,7 +113,7 @@ if (DAWN_ENABLE_METAL) GenerateProcTable(metal) target_link_libraries(metal_autogen "-framework QuartzCore" "-framework Metal") - list(APPEND BACKEND_SOURCES + list(APPEND DAWN_NATIVE_SOURCES ${METAL_DIR}/BlendStateMTL.mm ${METAL_DIR}/BlendStateMTL.h ${METAL_DIR}/BufferMTL.mm @@ -213,7 +213,7 @@ if (DAWN_ENABLE_D3D12) target_link_libraries(d3d12_autogen ${D3D12_LIBRARIES}) target_include_directories(d3d12_autogen SYSTEM PRIVATE ${D3D12_INCLUDE_DIR} ${DXGI_INCLUDE_DIR}) - list(APPEND BACKEND_SOURCES + list(APPEND DAWN_NATIVE_SOURCES ${D3D12_DIR}/d3d12_platform.h ${D3D12_DIR}/BindGroupD3D12.cpp ${D3D12_DIR}/BindGroupD3D12.h @@ -273,7 +273,7 @@ if (DAWN_ENABLE_VULKAN) GenerateProcTable(vulkan) target_include_directories(vulkan_autogen PUBLIC ${VULKAN_HEADERS_INCLUDE_DIR}) - list(APPEND BACKEND_SOURCES + list(APPEND DAWN_NATIVE_SOURCES ${VULKAN_DIR}/BindGroupVk.cpp ${VULKAN_DIR}/BindGroupVk.h ${VULKAN_DIR}/BindGroupLayoutVk.cpp @@ -330,80 +330,80 @@ endif() # Common sources and definition of the library ################################################################################ -list(APPEND BACKEND_SOURCES - ${BACKEND_DIR}/BindGroup.cpp - ${BACKEND_DIR}/BindGroup.h - ${BACKEND_DIR}/BindGroupLayout.cpp - ${BACKEND_DIR}/BindGroupLayout.h - ${BACKEND_DIR}/BlendState.cpp - ${BACKEND_DIR}/BlendState.h - ${BACKEND_DIR}/Builder.cpp - ${BACKEND_DIR}/Builder.h - ${BACKEND_DIR}/Buffer.cpp - ${BACKEND_DIR}/Buffer.h - ${BACKEND_DIR}/CommandAllocator.cpp - ${BACKEND_DIR}/CommandAllocator.h - ${BACKEND_DIR}/CommandBuffer.cpp - ${BACKEND_DIR}/CommandBuffer.h - ${BACKEND_DIR}/Commands.cpp - ${BACKEND_DIR}/Commands.h - ${BACKEND_DIR}/ComputePipeline.cpp - ${BACKEND_DIR}/ComputePipeline.h - ${BACKEND_DIR}/DepthStencilState.cpp - ${BACKEND_DIR}/DepthStencilState.h - ${BACKEND_DIR}/CommandBufferStateTracker.cpp - ${BACKEND_DIR}/CommandBufferStateTracker.h - ${BACKEND_DIR}/Device.cpp - ${BACKEND_DIR}/Device.h - ${BACKEND_DIR}/Error.cpp - ${BACKEND_DIR}/Error.h - ${BACKEND_DIR}/ErrorData.cpp - ${BACKEND_DIR}/ErrorData.h - ${BACKEND_DIR}/Forward.h - ${BACKEND_DIR}/InputState.cpp - ${BACKEND_DIR}/InputState.h - ${BACKEND_DIR}/RenderPipeline.cpp - ${BACKEND_DIR}/RenderPipeline.h - ${BACKEND_DIR}/PassResourceUsage.h - ${BACKEND_DIR}/PerStage.cpp - ${BACKEND_DIR}/PerStage.h - ${BACKEND_DIR}/Pipeline.cpp - ${BACKEND_DIR}/Pipeline.h - ${BACKEND_DIR}/PipelineLayout.cpp - ${BACKEND_DIR}/PipelineLayout.h - ${BACKEND_DIR}/Queue.cpp - ${BACKEND_DIR}/Queue.h - ${BACKEND_DIR}/RenderPassDescriptor.cpp - ${BACKEND_DIR}/RenderPassDescriptor.h - ${BACKEND_DIR}/RefCounted.cpp - ${BACKEND_DIR}/RefCounted.h - ${BACKEND_DIR}/Sampler.cpp - ${BACKEND_DIR}/Sampler.h - ${BACKEND_DIR}/ShaderModule.cpp - ${BACKEND_DIR}/ShaderModule.h - ${BACKEND_DIR}/SwapChain.cpp - ${BACKEND_DIR}/SwapChain.h - ${BACKEND_DIR}/Texture.cpp - ${BACKEND_DIR}/Texture.h - ${BACKEND_DIR}/ToBackend.h +list(APPEND DAWN_NATIVE_SOURCES + ${DAWN_NATIVE_DIR}/BindGroup.cpp + ${DAWN_NATIVE_DIR}/BindGroup.h + ${DAWN_NATIVE_DIR}/BindGroupLayout.cpp + ${DAWN_NATIVE_DIR}/BindGroupLayout.h + ${DAWN_NATIVE_DIR}/BlendState.cpp + ${DAWN_NATIVE_DIR}/BlendState.h + ${DAWN_NATIVE_DIR}/Builder.cpp + ${DAWN_NATIVE_DIR}/Builder.h + ${DAWN_NATIVE_DIR}/Buffer.cpp + ${DAWN_NATIVE_DIR}/Buffer.h + ${DAWN_NATIVE_DIR}/CommandAllocator.cpp + ${DAWN_NATIVE_DIR}/CommandAllocator.h + ${DAWN_NATIVE_DIR}/CommandBuffer.cpp + ${DAWN_NATIVE_DIR}/CommandBuffer.h + ${DAWN_NATIVE_DIR}/Commands.cpp + ${DAWN_NATIVE_DIR}/Commands.h + ${DAWN_NATIVE_DIR}/ComputePipeline.cpp + ${DAWN_NATIVE_DIR}/ComputePipeline.h + ${DAWN_NATIVE_DIR}/DepthStencilState.cpp + ${DAWN_NATIVE_DIR}/DepthStencilState.h + ${DAWN_NATIVE_DIR}/CommandBufferStateTracker.cpp + ${DAWN_NATIVE_DIR}/CommandBufferStateTracker.h + ${DAWN_NATIVE_DIR}/Device.cpp + ${DAWN_NATIVE_DIR}/Device.h + ${DAWN_NATIVE_DIR}/Error.cpp + ${DAWN_NATIVE_DIR}/Error.h + ${DAWN_NATIVE_DIR}/ErrorData.cpp + ${DAWN_NATIVE_DIR}/ErrorData.h + ${DAWN_NATIVE_DIR}/Forward.h + ${DAWN_NATIVE_DIR}/InputState.cpp + ${DAWN_NATIVE_DIR}/InputState.h + ${DAWN_NATIVE_DIR}/RenderPipeline.cpp + ${DAWN_NATIVE_DIR}/RenderPipeline.h + ${DAWN_NATIVE_DIR}/PassResourceUsage.h + ${DAWN_NATIVE_DIR}/PerStage.cpp + ${DAWN_NATIVE_DIR}/PerStage.h + ${DAWN_NATIVE_DIR}/Pipeline.cpp + ${DAWN_NATIVE_DIR}/Pipeline.h + ${DAWN_NATIVE_DIR}/PipelineLayout.cpp + ${DAWN_NATIVE_DIR}/PipelineLayout.h + ${DAWN_NATIVE_DIR}/Queue.cpp + ${DAWN_NATIVE_DIR}/Queue.h + ${DAWN_NATIVE_DIR}/RenderPassDescriptor.cpp + ${DAWN_NATIVE_DIR}/RenderPassDescriptor.h + ${DAWN_NATIVE_DIR}/RefCounted.cpp + ${DAWN_NATIVE_DIR}/RefCounted.h + ${DAWN_NATIVE_DIR}/Sampler.cpp + ${DAWN_NATIVE_DIR}/Sampler.h + ${DAWN_NATIVE_DIR}/ShaderModule.cpp + ${DAWN_NATIVE_DIR}/ShaderModule.h + ${DAWN_NATIVE_DIR}/SwapChain.cpp + ${DAWN_NATIVE_DIR}/SwapChain.h + ${DAWN_NATIVE_DIR}/Texture.cpp + ${DAWN_NATIVE_DIR}/Texture.h + ${DAWN_NATIVE_DIR}/ToBackend.h ) -add_library(dawn_backend STATIC ${BACKEND_SOURCES}) -DawnInternalTarget("backend" dawn_backend) -target_link_libraries(dawn_backend dawn_common glfw glad spirv_cross) +add_library(lib_dawn_native STATIC ${DAWN_NATIVE_SOURCES}) +DawnInternalTarget("dawn_native" lib_dawn_native) +target_link_libraries(lib_dawn_native dawn_common glfw glad spirv_cross) if (DAWN_ENABLE_D3D12) - target_link_libraries(dawn_backend d3d12_autogen) + target_link_libraries(lib_dawn_native d3d12_autogen) endif() if (DAWN_ENABLE_METAL) - target_link_libraries(dawn_backend metal_autogen) + target_link_libraries(lib_dawn_native metal_autogen) endif() if (DAWN_ENABLE_NULL) - target_link_libraries(dawn_backend null_autogen) + target_link_libraries(lib_dawn_native null_autogen) endif() if (DAWN_ENABLE_OPENGL) - target_link_libraries(dawn_backend opengl_autogen) + target_link_libraries(lib_dawn_native opengl_autogen) endif() if (DAWN_ENABLE_VULKAN) - target_link_libraries(dawn_backend vulkan_autogen) + target_link_libraries(lib_dawn_native vulkan_autogen) endif() diff --git a/src/backend/CommandAllocator.cpp b/src/dawn_native/CommandAllocator.cpp similarity index 99% rename from src/backend/CommandAllocator.cpp rename to src/dawn_native/CommandAllocator.cpp index c1829acab9..cb85f9a4fa 100644 --- a/src/backend/CommandAllocator.cpp +++ b/src/dawn_native/CommandAllocator.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/CommandAllocator.h" +#include "dawn_native/CommandAllocator.h" #include "common/Assert.h" #include "common/Math.h" diff --git a/src/backend/CommandAllocator.h b/src/dawn_native/CommandAllocator.h similarity index 100% rename from src/backend/CommandAllocator.h rename to src/dawn_native/CommandAllocator.h diff --git a/src/backend/CommandBuffer.cpp b/src/dawn_native/CommandBuffer.cpp similarity index 98% rename from src/backend/CommandBuffer.cpp rename to src/dawn_native/CommandBuffer.cpp index beb31ca027..df4f15d88e 100644 --- a/src/backend/CommandBuffer.cpp +++ b/src/dawn_native/CommandBuffer.cpp @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/CommandBuffer.h" +#include "dawn_native/CommandBuffer.h" -#include "backend/BindGroup.h" -#include "backend/Buffer.h" -#include "backend/CommandBufferStateTracker.h" -#include "backend/Commands.h" -#include "backend/ComputePipeline.h" -#include "backend/Device.h" -#include "backend/InputState.h" -#include "backend/PipelineLayout.h" -#include "backend/RenderPipeline.h" -#include "backend/Texture.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/Buffer.h" +#include "dawn_native/CommandBufferStateTracker.h" +#include "dawn_native/Commands.h" +#include "dawn_native/ComputePipeline.h" +#include "dawn_native/Device.h" +#include "dawn_native/InputState.h" +#include "dawn_native/PipelineLayout.h" +#include "dawn_native/RenderPipeline.h" +#include "dawn_native/Texture.h" #include #include diff --git a/src/backend/CommandBuffer.h b/src/dawn_native/CommandBuffer.h similarity index 96% rename from src/backend/CommandBuffer.h rename to src/dawn_native/CommandBuffer.h index ce156231f1..5e6464c135 100644 --- a/src/backend/CommandBuffer.h +++ b/src/dawn_native/CommandBuffer.h @@ -17,11 +17,11 @@ #include "dawn/dawncpp.h" -#include "backend/Builder.h" -#include "backend/CommandAllocator.h" -#include "backend/Error.h" -#include "backend/PassResourceUsage.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/CommandAllocator.h" +#include "dawn_native/Error.h" +#include "dawn_native/PassResourceUsage.h" +#include "dawn_native/RefCounted.h" #include #include diff --git a/src/backend/CommandBufferStateTracker.cpp b/src/dawn_native/CommandBufferStateTracker.cpp similarity index 95% rename from src/backend/CommandBufferStateTracker.cpp rename to src/dawn_native/CommandBufferStateTracker.cpp index 37b04c37be..8de6c69a1a 100644 --- a/src/backend/CommandBufferStateTracker.cpp +++ b/src/dawn_native/CommandBufferStateTracker.cpp @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/CommandBufferStateTracker.h" +#include "dawn_native/CommandBufferStateTracker.h" -#include "backend/BindGroup.h" -#include "backend/ComputePipeline.h" -#include "backend/Forward.h" -#include "backend/InputState.h" -#include "backend/PipelineLayout.h" -#include "backend/RenderPipeline.h" #include "common/Assert.h" #include "common/BitSetIterator.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/ComputePipeline.h" +#include "dawn_native/Forward.h" +#include "dawn_native/InputState.h" +#include "dawn_native/PipelineLayout.h" +#include "dawn_native/RenderPipeline.h" namespace backend { diff --git a/src/backend/CommandBufferStateTracker.h b/src/dawn_native/CommandBufferStateTracker.h similarity index 98% rename from src/backend/CommandBufferStateTracker.h rename to src/dawn_native/CommandBufferStateTracker.h index 7b4454be05..e5793f5f9f 100644 --- a/src/backend/CommandBufferStateTracker.h +++ b/src/dawn_native/CommandBufferStateTracker.h @@ -15,8 +15,8 @@ #ifndef BACKEND_COMMANDBUFFERSTATETRACKER_H #define BACKEND_COMMANDBUFFERSTATETRACKER_H -#include "backend/CommandBuffer.h" #include "common/Constants.h" +#include "dawn_native/CommandBuffer.h" #include #include diff --git a/src/backend/Commands.cpp b/src/dawn_native/Commands.cpp similarity index 96% rename from src/backend/Commands.cpp rename to src/dawn_native/Commands.cpp index d2dab8f1a5..ea98ab8d45 100644 --- a/src/backend/Commands.cpp +++ b/src/dawn_native/Commands.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Commands.h" +#include "dawn_native/Commands.h" -#include "backend/BindGroup.h" -#include "backend/Buffer.h" -#include "backend/CommandAllocator.h" -#include "backend/ComputePipeline.h" -#include "backend/RenderPipeline.h" -#include "backend/Texture.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/Buffer.h" +#include "dawn_native/CommandAllocator.h" +#include "dawn_native/ComputePipeline.h" +#include "dawn_native/RenderPipeline.h" +#include "dawn_native/Texture.h" namespace backend { diff --git a/src/backend/Commands.h b/src/dawn_native/Commands.h similarity index 98% rename from src/backend/Commands.h rename to src/dawn_native/Commands.h index f9c69ea3b4..f47cf498ed 100644 --- a/src/backend/Commands.h +++ b/src/dawn_native/Commands.h @@ -15,8 +15,8 @@ #ifndef BACKEND_COMMANDS_H_ #define BACKEND_COMMANDS_H_ -#include "backend/RenderPassDescriptor.h" -#include "backend/Texture.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/Texture.h" #include "dawn/dawncpp.h" diff --git a/src/backend/ComputePipeline.cpp b/src/dawn_native/ComputePipeline.cpp similarity index 94% rename from src/backend/ComputePipeline.cpp rename to src/dawn_native/ComputePipeline.cpp index bf4cdef8e1..c5f4bb653f 100644 --- a/src/backend/ComputePipeline.cpp +++ b/src/dawn_native/ComputePipeline.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/ComputePipeline.h" +#include "dawn_native/ComputePipeline.h" -#include "backend/Device.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/ComputePipeline.h b/src/dawn_native/ComputePipeline.h similarity index 97% rename from src/backend/ComputePipeline.h rename to src/dawn_native/ComputePipeline.h index 7753df1b56..fc43825cbb 100644 --- a/src/backend/ComputePipeline.h +++ b/src/dawn_native/ComputePipeline.h @@ -15,7 +15,7 @@ #ifndef BACKEND_COMPUTEPIPELINE_H_ #define BACKEND_COMPUTEPIPELINE_H_ -#include "backend/Pipeline.h" +#include "dawn_native/Pipeline.h" namespace backend { diff --git a/src/backend/DepthStencilState.cpp b/src/dawn_native/DepthStencilState.cpp similarity index 98% rename from src/backend/DepthStencilState.cpp rename to src/dawn_native/DepthStencilState.cpp index fe573f5da5..2aa4f9c418 100644 --- a/src/backend/DepthStencilState.cpp +++ b/src/dawn_native/DepthStencilState.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/DepthStencilState.h" +#include "dawn_native/DepthStencilState.h" -#include "backend/Device.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/DepthStencilState.h b/src/dawn_native/DepthStencilState.h similarity index 96% rename from src/backend/DepthStencilState.h rename to src/dawn_native/DepthStencilState.h index 7b21f8c29a..d0a7b81d3a 100644 --- a/src/backend/DepthStencilState.h +++ b/src/dawn_native/DepthStencilState.h @@ -15,9 +15,9 @@ #ifndef BACKEND_DEPTHSTENCILSTATE_H_ #define BACKEND_DEPTHSTENCILSTATE_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Device.cpp b/src/dawn_native/Device.cpp similarity index 90% rename from src/backend/Device.cpp rename to src/dawn_native/Device.cpp index 51a9917803..6b0f5de54a 100644 --- a/src/backend/Device.cpp +++ b/src/dawn_native/Device.cpp @@ -12,25 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Device.h" +#include "dawn_native/Device.h" -#include "backend/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/BlendState.h" -#include "backend/Buffer.h" -#include "backend/CommandBuffer.h" -#include "backend/ComputePipeline.h" -#include "backend/DepthStencilState.h" -#include "backend/ErrorData.h" -#include "backend/InputState.h" -#include "backend/PipelineLayout.h" -#include "backend/Queue.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/RenderPipeline.h" -#include "backend/Sampler.h" -#include "backend/ShaderModule.h" -#include "backend/SwapChain.h" -#include "backend/Texture.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/BlendState.h" +#include "dawn_native/Buffer.h" +#include "dawn_native/CommandBuffer.h" +#include "dawn_native/ComputePipeline.h" +#include "dawn_native/DepthStencilState.h" +#include "dawn_native/ErrorData.h" +#include "dawn_native/InputState.h" +#include "dawn_native/PipelineLayout.h" +#include "dawn_native/Queue.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/RenderPipeline.h" +#include "dawn_native/Sampler.h" +#include "dawn_native/ShaderModule.h" +#include "dawn_native/SwapChain.h" +#include "dawn_native/Texture.h" #include diff --git a/src/backend/Device.h b/src/dawn_native/Device.h similarity index 98% rename from src/backend/Device.h rename to src/dawn_native/Device.h index ada648bd8b..8750bb43d5 100644 --- a/src/backend/Device.h +++ b/src/dawn_native/Device.h @@ -15,9 +15,9 @@ #ifndef BACKEND_DEVICEBASE_H_ #define BACKEND_DEVICEBASE_H_ -#include "backend/Error.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Error.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Error.cpp b/src/dawn_native/Error.cpp similarity index 93% rename from src/backend/Error.cpp rename to src/dawn_native/Error.cpp index e76de26038..9d89e6dfc9 100644 --- a/src/backend/Error.cpp +++ b/src/dawn_native/Error.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Error.h" +#include "dawn_native/Error.h" -#include "backend/ErrorData.h" +#include "dawn_native/ErrorData.h" namespace backend { diff --git a/src/backend/Error.h b/src/dawn_native/Error.h similarity index 100% rename from src/backend/Error.h rename to src/dawn_native/Error.h diff --git a/src/backend/ErrorData.cpp b/src/dawn_native/ErrorData.cpp similarity index 97% rename from src/backend/ErrorData.cpp rename to src/dawn_native/ErrorData.cpp index 2f9cdcf4e7..d7fe868db0 100644 --- a/src/backend/ErrorData.cpp +++ b/src/dawn_native/ErrorData.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/ErrorData.h" +#include "dawn_native/ErrorData.h" namespace backend { diff --git a/src/backend/ErrorData.h b/src/dawn_native/ErrorData.h similarity index 100% rename from src/backend/ErrorData.h rename to src/dawn_native/ErrorData.h diff --git a/src/backend/Forward.h b/src/dawn_native/Forward.h similarity index 100% rename from src/backend/Forward.h rename to src/dawn_native/Forward.h diff --git a/src/backend/InputState.cpp b/src/dawn_native/InputState.cpp similarity index 98% rename from src/backend/InputState.cpp rename to src/dawn_native/InputState.cpp index 837d49cdee..4e14ed5c9c 100644 --- a/src/backend/InputState.cpp +++ b/src/dawn_native/InputState.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/InputState.h" +#include "dawn_native/InputState.h" -#include "backend/Device.h" #include "common/Assert.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/InputState.h b/src/dawn_native/InputState.h similarity index 96% rename from src/backend/InputState.h rename to src/dawn_native/InputState.h index 2b8240a6bb..d3751594ea 100644 --- a/src/backend/InputState.h +++ b/src/dawn_native/InputState.h @@ -15,10 +15,10 @@ #ifndef BACKEND_INPUTSTATE_H_ #define BACKEND_INPUTSTATE_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" #include "common/Constants.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/PassResourceUsage.h b/src/dawn_native/PassResourceUsage.h similarity index 100% rename from src/backend/PassResourceUsage.h rename to src/dawn_native/PassResourceUsage.h diff --git a/src/backend/PerStage.cpp b/src/dawn_native/PerStage.cpp similarity index 96% rename from src/backend/PerStage.cpp rename to src/dawn_native/PerStage.cpp index d37dce5f32..e2feb10b14 100644 --- a/src/backend/PerStage.cpp +++ b/src/dawn_native/PerStage.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/PerStage.h" +#include "dawn_native/PerStage.h" namespace backend { diff --git a/src/backend/PerStage.h b/src/dawn_native/PerStage.h similarity index 100% rename from src/backend/PerStage.h rename to src/dawn_native/PerStage.h diff --git a/src/backend/Pipeline.cpp b/src/dawn_native/Pipeline.cpp similarity index 94% rename from src/backend/Pipeline.cpp rename to src/dawn_native/Pipeline.cpp index 5b9f226cd5..6612a46856 100644 --- a/src/backend/Pipeline.cpp +++ b/src/dawn_native/Pipeline.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Pipeline.h" +#include "dawn_native/Pipeline.h" -#include "backend/DepthStencilState.h" -#include "backend/Device.h" -#include "backend/InputState.h" -#include "backend/PipelineLayout.h" -#include "backend/ShaderModule.h" +#include "dawn_native/DepthStencilState.h" +#include "dawn_native/Device.h" +#include "dawn_native/InputState.h" +#include "dawn_native/PipelineLayout.h" +#include "dawn_native/ShaderModule.h" namespace backend { diff --git a/src/backend/Pipeline.h b/src/dawn_native/Pipeline.h similarity index 91% rename from src/backend/Pipeline.h rename to src/dawn_native/Pipeline.h index 8e5d809a2a..0bd8ffc6c1 100644 --- a/src/backend/Pipeline.h +++ b/src/dawn_native/Pipeline.h @@ -15,12 +15,12 @@ #ifndef BACKEND_PIPELINE_H_ #define BACKEND_PIPELINE_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/PerStage.h" -#include "backend/PipelineLayout.h" -#include "backend/RefCounted.h" -#include "backend/ShaderModule.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/PerStage.h" +#include "dawn_native/PipelineLayout.h" +#include "dawn_native/RefCounted.h" +#include "dawn_native/ShaderModule.h" #include "dawn/dawncpp.h" diff --git a/src/backend/PipelineLayout.cpp b/src/dawn_native/PipelineLayout.cpp similarity index 96% rename from src/backend/PipelineLayout.cpp rename to src/dawn_native/PipelineLayout.cpp index 14a5dac752..5629bcb3b1 100644 --- a/src/backend/PipelineLayout.cpp +++ b/src/dawn_native/PipelineLayout.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/PipelineLayout.h" +#include "dawn_native/PipelineLayout.h" -#include "backend/BindGroupLayout.h" -#include "backend/Device.h" #include "common/Assert.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/PipelineLayout.h b/src/dawn_native/PipelineLayout.h similarity index 95% rename from src/backend/PipelineLayout.h rename to src/dawn_native/PipelineLayout.h index 2f6b331aeb..4b2d843832 100644 --- a/src/backend/PipelineLayout.h +++ b/src/dawn_native/PipelineLayout.h @@ -15,10 +15,10 @@ #ifndef BACKEND_PIPELINELAYOUT_H_ #define BACKEND_PIPELINELAYOUT_H_ -#include "backend/Error.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" #include "common/Constants.h" +#include "dawn_native/Error.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Queue.cpp b/src/dawn_native/Queue.cpp similarity index 90% rename from src/backend/Queue.cpp rename to src/dawn_native/Queue.cpp index a9c769be31..803b166f95 100644 --- a/src/backend/Queue.cpp +++ b/src/dawn_native/Queue.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Queue.h" +#include "dawn_native/Queue.h" -#include "backend/CommandBuffer.h" -#include "backend/Device.h" +#include "dawn_native/CommandBuffer.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/Queue.h b/src/dawn_native/Queue.h similarity index 91% rename from src/backend/Queue.h rename to src/dawn_native/Queue.h index d5d822ef63..cd01e55bb2 100644 --- a/src/backend/Queue.h +++ b/src/dawn_native/Queue.h @@ -15,10 +15,10 @@ #ifndef BACKEND_QUEUE_H_ #define BACKEND_QUEUE_H_ -#include "backend/Builder.h" -#include "backend/Error.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Error.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/RefCounted.cpp b/src/dawn_native/RefCounted.cpp similarity index 98% rename from src/backend/RefCounted.cpp rename to src/dawn_native/RefCounted.cpp index b3a76e90f0..da543fed19 100644 --- a/src/backend/RefCounted.cpp +++ b/src/dawn_native/RefCounted.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/RefCounted.h" +#include "dawn_native/RefCounted.h" #include "common/Assert.h" diff --git a/src/backend/RefCounted.h b/src/dawn_native/RefCounted.h similarity index 100% rename from src/backend/RefCounted.h rename to src/dawn_native/RefCounted.h diff --git a/src/backend/RenderPassDescriptor.cpp b/src/dawn_native/RenderPassDescriptor.cpp similarity index 98% rename from src/backend/RenderPassDescriptor.cpp rename to src/dawn_native/RenderPassDescriptor.cpp index b1c621c385..7ec67a7be9 100644 --- a/src/backend/RenderPassDescriptor.cpp +++ b/src/dawn_native/RenderPassDescriptor.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/RenderPassDescriptor.h" +#include "dawn_native/RenderPassDescriptor.h" -#include "backend/Device.h" -#include "backend/Texture.h" #include "common/Assert.h" #include "common/BitSetIterator.h" +#include "dawn_native/Device.h" +#include "dawn_native/Texture.h" namespace backend { diff --git a/src/backend/RenderPassDescriptor.h b/src/dawn_native/RenderPassDescriptor.h similarity index 97% rename from src/backend/RenderPassDescriptor.h rename to src/dawn_native/RenderPassDescriptor.h index 03ba0ec143..f38bd73c05 100644 --- a/src/backend/RenderPassDescriptor.h +++ b/src/dawn_native/RenderPassDescriptor.h @@ -15,10 +15,10 @@ #ifndef BACKEND_RENDERPASSDESCRIPTOR_H_ #define BACKEND_RENDERPASSDESCRIPTOR_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" #include "common/Constants.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/RenderPipeline.cpp b/src/dawn_native/RenderPipeline.cpp similarity index 96% rename from src/backend/RenderPipeline.cpp rename to src/dawn_native/RenderPipeline.cpp index 47788bc674..b333266086 100644 --- a/src/backend/RenderPipeline.cpp +++ b/src/dawn_native/RenderPipeline.cpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/RenderPipeline.h" +#include "dawn_native/RenderPipeline.h" -#include "backend/BlendState.h" -#include "backend/DepthStencilState.h" -#include "backend/Device.h" -#include "backend/InputState.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/Texture.h" #include "common/BitSetIterator.h" +#include "dawn_native/BlendState.h" +#include "dawn_native/DepthStencilState.h" +#include "dawn_native/Device.h" +#include "dawn_native/InputState.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/Texture.h" namespace backend { diff --git a/src/backend/RenderPipeline.h b/src/dawn_native/RenderPipeline.h similarity index 96% rename from src/backend/RenderPipeline.h rename to src/dawn_native/RenderPipeline.h index 8af314fe9a..44bb0be48d 100644 --- a/src/backend/RenderPipeline.h +++ b/src/dawn_native/RenderPipeline.h @@ -15,10 +15,10 @@ #ifndef BACKEND_RENDERPIPELINE_H_ #define BACKEND_RENDERPIPELINE_H_ -#include "backend/BlendState.h" -#include "backend/DepthStencilState.h" -#include "backend/InputState.h" -#include "backend/Pipeline.h" +#include "dawn_native/BlendState.h" +#include "dawn_native/DepthStencilState.h" +#include "dawn_native/InputState.h" +#include "dawn_native/Pipeline.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Sampler.cpp b/src/dawn_native/Sampler.cpp similarity index 92% rename from src/backend/Sampler.cpp rename to src/dawn_native/Sampler.cpp index 95969b820d..cd8684f3f0 100644 --- a/src/backend/Sampler.cpp +++ b/src/dawn_native/Sampler.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Sampler.h" +#include "dawn_native/Sampler.h" -#include "backend/Device.h" -#include "backend/ValidationUtils_autogen.h" +#include "dawn_native/Device.h" +#include "dawn_native/ValidationUtils_autogen.h" namespace backend { diff --git a/src/backend/Sampler.h b/src/dawn_native/Sampler.h similarity index 94% rename from src/backend/Sampler.h rename to src/dawn_native/Sampler.h index 94da2fcdb4..0ccaa4e86e 100644 --- a/src/backend/Sampler.h +++ b/src/dawn_native/Sampler.h @@ -15,8 +15,8 @@ #ifndef BACKEND_SAMPLER_H_ #define BACKEND_SAMPLER_H_ -#include "backend/Error.h" -#include "backend/RefCounted.h" +#include "dawn_native/Error.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp similarity index 98% rename from src/backend/ShaderModule.cpp rename to src/dawn_native/ShaderModule.cpp index eec4bcfdf1..9e3662153f 100644 --- a/src/backend/ShaderModule.cpp +++ b/src/dawn_native/ShaderModule.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/ShaderModule.h" +#include "dawn_native/ShaderModule.h" -#include "backend/BindGroupLayout.h" -#include "backend/Device.h" -#include "backend/Pipeline.h" -#include "backend/PipelineLayout.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/Device.h" +#include "dawn_native/Pipeline.h" +#include "dawn_native/PipelineLayout.h" #include diff --git a/src/backend/ShaderModule.h b/src/dawn_native/ShaderModule.h similarity index 96% rename from src/backend/ShaderModule.h rename to src/dawn_native/ShaderModule.h index c2cc5049bf..801ba35670 100644 --- a/src/backend/ShaderModule.h +++ b/src/dawn_native/ShaderModule.h @@ -15,10 +15,10 @@ #ifndef BACKEND_SHADERMODULE_H_ #define BACKEND_SHADERMODULE_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" #include "common/Constants.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/SwapChain.cpp b/src/dawn_native/SwapChain.cpp similarity index 97% rename from src/backend/SwapChain.cpp rename to src/dawn_native/SwapChain.cpp index 65f8f78bc0..267acee2b1 100644 --- a/src/backend/SwapChain.cpp +++ b/src/dawn_native/SwapChain.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/SwapChain.h" +#include "dawn_native/SwapChain.h" -#include "backend/Device.h" -#include "backend/Texture.h" +#include "dawn_native/Device.h" +#include "dawn_native/Texture.h" namespace backend { diff --git a/src/backend/SwapChain.h b/src/dawn_native/SwapChain.h similarity index 95% rename from src/backend/SwapChain.h rename to src/dawn_native/SwapChain.h index e37b476783..dfc39f417d 100644 --- a/src/backend/SwapChain.h +++ b/src/dawn_native/SwapChain.h @@ -15,9 +15,9 @@ #ifndef BACKEND_SWAPCHAIN_H_ #define BACKEND_SWAPCHAIN_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawn_wsi.h" #include "dawn/dawncpp.h" diff --git a/src/backend/Texture.cpp b/src/dawn_native/Texture.cpp similarity index 99% rename from src/backend/Texture.cpp rename to src/dawn_native/Texture.cpp index 2af352ec51..afb0182bc8 100644 --- a/src/backend/Texture.cpp +++ b/src/dawn_native/Texture.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/Texture.h" +#include "dawn_native/Texture.h" -#include "backend/Device.h" #include "common/Assert.h" +#include "dawn_native/Device.h" namespace backend { diff --git a/src/backend/Texture.h b/src/dawn_native/Texture.h similarity index 97% rename from src/backend/Texture.h rename to src/dawn_native/Texture.h index d29605d69e..c0165afe51 100644 --- a/src/backend/Texture.h +++ b/src/dawn_native/Texture.h @@ -15,9 +15,9 @@ #ifndef BACKEND_TEXTURE_H_ #define BACKEND_TEXTURE_H_ -#include "backend/Builder.h" -#include "backend/Forward.h" -#include "backend/RefCounted.h" +#include "dawn_native/Builder.h" +#include "dawn_native/Forward.h" +#include "dawn_native/RefCounted.h" #include "dawn/dawncpp.h" diff --git a/src/backend/ToBackend.h b/src/dawn_native/ToBackend.h similarity index 99% rename from src/backend/ToBackend.h rename to src/dawn_native/ToBackend.h index 8832a3f710..903a675ebc 100644 --- a/src/backend/ToBackend.h +++ b/src/dawn_native/ToBackend.h @@ -15,7 +15,7 @@ #ifndef BACKEND_TOBACKEND_H_ #define BACKEND_TOBACKEND_H_ -#include "backend/Forward.h" +#include "dawn_native/Forward.h" namespace backend { diff --git a/src/backend/d3d12/BindGroupD3D12.cpp b/src/dawn_native/d3d12/BindGroupD3D12.cpp similarity index 93% rename from src/backend/d3d12/BindGroupD3D12.cpp rename to src/dawn_native/d3d12/BindGroupD3D12.cpp index 44d82cce59..636935924b 100644 --- a/src/backend/d3d12/BindGroupD3D12.cpp +++ b/src/dawn_native/d3d12/BindGroupD3D12.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/BindGroupD3D12.h" -#include "backend/d3d12/BindGroupLayoutD3D12.h" -#include "backend/d3d12/BufferD3D12.h" -#include "backend/d3d12/SamplerD3D12.h" -#include "backend/d3d12/TextureD3D12.h" +#include "dawn_native/d3d12/BindGroupD3D12.h" #include "common/BitSetIterator.h" +#include "dawn_native/d3d12/BindGroupLayoutD3D12.h" +#include "dawn_native/d3d12/BufferD3D12.h" +#include "dawn_native/d3d12/SamplerD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BindGroupD3D12.h b/src/dawn_native/d3d12/BindGroupD3D12.h similarity index 92% rename from src/backend/d3d12/BindGroupD3D12.h rename to src/dawn_native/d3d12/BindGroupD3D12.h index 3f9588888a..3ab28ad164 100644 --- a/src/backend/d3d12/BindGroupD3D12.h +++ b/src/dawn_native/d3d12/BindGroupD3D12.h @@ -15,11 +15,11 @@ #ifndef BACKEND_D3D12_BINDGROUPD3D12_H_ #define BACKEND_D3D12_BINDGROUPD3D12_H_ -#include "backend/BindGroup.h" +#include "dawn_native/BindGroup.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" -#include "backend/d3d12/DescriptorHeapAllocator.h" +#include "dawn_native/d3d12/DescriptorHeapAllocator.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BindGroupLayoutD3D12.cpp b/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp similarity index 98% rename from src/backend/d3d12/BindGroupLayoutD3D12.cpp rename to src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp index 10ed158fc0..36e70d9673 100644 --- a/src/backend/d3d12/BindGroupLayoutD3D12.cpp +++ b/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/BindGroupLayoutD3D12.h" +#include "dawn_native/d3d12/BindGroupLayoutD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" #include "common/BitSetIterator.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BindGroupLayoutD3D12.h b/src/dawn_native/d3d12/BindGroupLayoutD3D12.h similarity index 95% rename from src/backend/d3d12/BindGroupLayoutD3D12.h rename to src/dawn_native/d3d12/BindGroupLayoutD3D12.h index b6d224aa29..fa6f93ea31 100644 --- a/src/backend/d3d12/BindGroupLayoutD3D12.h +++ b/src/dawn_native/d3d12/BindGroupLayoutD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_BINDGROUPLAYOUTD3D12_H_ #define BACKEND_D3D12_BINDGROUPLAYOUTD3D12_H_ -#include "backend/BindGroupLayout.h" +#include "dawn_native/BindGroupLayout.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BlendStateD3D12.cpp b/src/dawn_native/d3d12/BlendStateD3D12.cpp similarity index 98% rename from src/backend/d3d12/BlendStateD3D12.cpp rename to src/dawn_native/d3d12/BlendStateD3D12.cpp index babe2ce165..56d9330413 100644 --- a/src/backend/d3d12/BlendStateD3D12.cpp +++ b/src/dawn_native/d3d12/BlendStateD3D12.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/BlendStateD3D12.h" +#include "dawn_native/d3d12/BlendStateD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" #include "common/Assert.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BlendStateD3D12.h b/src/dawn_native/d3d12/BlendStateD3D12.h similarity index 92% rename from src/backend/d3d12/BlendStateD3D12.h rename to src/dawn_native/d3d12/BlendStateD3D12.h index 188b2ded37..641beb5c66 100644 --- a/src/backend/d3d12/BlendStateD3D12.h +++ b/src/dawn_native/d3d12/BlendStateD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_BLENDSTATED3D12_H_ #define BACKEND_D3D12_BLENDSTATED3D12_H_ -#include "backend/BlendState.h" +#include "dawn_native/BlendState.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BufferD3D12.cpp b/src/dawn_native/d3d12/BufferD3D12.cpp similarity index 98% rename from src/backend/d3d12/BufferD3D12.cpp rename to src/dawn_native/d3d12/BufferD3D12.cpp index 0d00188dfd..de7acd84d2 100644 --- a/src/backend/d3d12/BufferD3D12.cpp +++ b/src/dawn_native/d3d12/BufferD3D12.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/BufferD3D12.h" +#include "dawn_native/d3d12/BufferD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/ResourceAllocator.h" -#include "backend/d3d12/ResourceUploader.h" #include "common/Assert.h" #include "common/Constants.h" #include "common/Math.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/ResourceAllocator.h" +#include "dawn_native/d3d12/ResourceUploader.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/BufferD3D12.h b/src/dawn_native/d3d12/BufferD3D12.h similarity index 97% rename from src/backend/d3d12/BufferD3D12.h rename to src/dawn_native/d3d12/BufferD3D12.h index f2754cbed1..760c706e7d 100644 --- a/src/backend/d3d12/BufferD3D12.h +++ b/src/dawn_native/d3d12/BufferD3D12.h @@ -15,10 +15,10 @@ #ifndef BACKEND_D3D12_BUFFERD3D12_H_ #define BACKEND_D3D12_BUFFERD3D12_H_ -#include "backend/Buffer.h" #include "common/SerialQueue.h" +#include "dawn_native/Buffer.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/CommandAllocatorManager.cpp b/src/dawn_native/d3d12/CommandAllocatorManager.cpp similarity index 96% rename from src/backend/d3d12/CommandAllocatorManager.cpp rename to src/dawn_native/d3d12/CommandAllocatorManager.cpp index 958583d580..14f9280be0 100644 --- a/src/backend/d3d12/CommandAllocatorManager.cpp +++ b/src/dawn_native/d3d12/CommandAllocatorManager.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/CommandAllocatorManager.h" +#include "dawn_native/d3d12/CommandAllocatorManager.h" -#include "backend/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" #include "common/Assert.h" #include "common/BitSetIterator.h" diff --git a/src/backend/d3d12/CommandAllocatorManager.h b/src/dawn_native/d3d12/CommandAllocatorManager.h similarity index 97% rename from src/backend/d3d12/CommandAllocatorManager.h rename to src/dawn_native/d3d12/CommandAllocatorManager.h index 97b4a3ca33..eef8deeb30 100644 --- a/src/backend/d3d12/CommandAllocatorManager.h +++ b/src/dawn_native/d3d12/CommandAllocatorManager.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_COMMANDALLOCATORMANAGER_H_ #define BACKEND_D3D12_COMMANDALLOCATORMANAGER_H_ -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" #include "common/SerialQueue.h" diff --git a/src/backend/d3d12/CommandBufferD3D12.cpp b/src/dawn_native/d3d12/CommandBufferD3D12.cpp similarity index 97% rename from src/backend/d3d12/CommandBufferD3D12.cpp rename to src/dawn_native/d3d12/CommandBufferD3D12.cpp index dbe08a547f..b882365599 100644 --- a/src/backend/d3d12/CommandBufferD3D12.cpp +++ b/src/dawn_native/d3d12/CommandBufferD3D12.cpp @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/CommandBufferD3D12.h" +#include "dawn_native/d3d12/CommandBufferD3D12.h" -#include "backend/Commands.h" -#include "backend/d3d12/BindGroupD3D12.h" -#include "backend/d3d12/BindGroupLayoutD3D12.h" -#include "backend/d3d12/BufferD3D12.h" -#include "backend/d3d12/ComputePipelineD3D12.h" -#include "backend/d3d12/DescriptorHeapAllocator.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/InputStateD3D12.h" -#include "backend/d3d12/PipelineLayoutD3D12.h" -#include "backend/d3d12/RenderPassDescriptorD3D12.h" -#include "backend/d3d12/RenderPipelineD3D12.h" -#include "backend/d3d12/ResourceAllocator.h" -#include "backend/d3d12/SamplerD3D12.h" -#include "backend/d3d12/TextureCopySplitter.h" -#include "backend/d3d12/TextureD3D12.h" #include "common/Assert.h" +#include "dawn_native/Commands.h" +#include "dawn_native/d3d12/BindGroupD3D12.h" +#include "dawn_native/d3d12/BindGroupLayoutD3D12.h" +#include "dawn_native/d3d12/BufferD3D12.h" +#include "dawn_native/d3d12/ComputePipelineD3D12.h" +#include "dawn_native/d3d12/DescriptorHeapAllocator.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/InputStateD3D12.h" +#include "dawn_native/d3d12/PipelineLayoutD3D12.h" +#include "dawn_native/d3d12/RenderPassDescriptorD3D12.h" +#include "dawn_native/d3d12/RenderPipelineD3D12.h" +#include "dawn_native/d3d12/ResourceAllocator.h" +#include "dawn_native/d3d12/SamplerD3D12.h" +#include "dawn_native/d3d12/TextureCopySplitter.h" +#include "dawn_native/d3d12/TextureD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/CommandBufferD3D12.h b/src/dawn_native/d3d12/CommandBufferD3D12.h similarity index 92% rename from src/backend/d3d12/CommandBufferD3D12.h rename to src/dawn_native/d3d12/CommandBufferD3D12.h index 243f31d809..3fab298daf 100644 --- a/src/backend/d3d12/CommandBufferD3D12.h +++ b/src/dawn_native/d3d12/CommandBufferD3D12.h @@ -15,10 +15,10 @@ #ifndef BACKEND_D3D12_COMMANDBUFFERD3D12_H_ #define BACKEND_D3D12_COMMANDBUFFERD3D12_H_ -#include "backend/CommandAllocator.h" -#include "backend/CommandBuffer.h" +#include "dawn_native/CommandAllocator.h" +#include "dawn_native/CommandBuffer.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/ComputePipelineD3D12.cpp b/src/dawn_native/d3d12/ComputePipelineD3D12.cpp similarity index 93% rename from src/backend/d3d12/ComputePipelineD3D12.cpp rename to src/dawn_native/d3d12/ComputePipelineD3D12.cpp index 1784fe8fa0..e5c2426306 100644 --- a/src/backend/d3d12/ComputePipelineD3D12.cpp +++ b/src/dawn_native/d3d12/ComputePipelineD3D12.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/ComputePipelineD3D12.h" +#include "dawn_native/d3d12/ComputePipelineD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/PipelineLayoutD3D12.h" -#include "backend/d3d12/ShaderModuleD3D12.h" #include "common/Assert.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/PipelineLayoutD3D12.h" +#include "dawn_native/d3d12/ShaderModuleD3D12.h" #include diff --git a/src/backend/d3d12/ComputePipelineD3D12.h b/src/dawn_native/d3d12/ComputePipelineD3D12.h similarity index 92% rename from src/backend/d3d12/ComputePipelineD3D12.h rename to src/dawn_native/d3d12/ComputePipelineD3D12.h index 392c38e626..ded4eafebb 100644 --- a/src/backend/d3d12/ComputePipelineD3D12.h +++ b/src/dawn_native/d3d12/ComputePipelineD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_COMPUTEPIPELINED3D12_H_ #define BACKEND_D3D12_COMPUTEPIPELINED3D12_H_ -#include "backend/ComputePipeline.h" +#include "dawn_native/ComputePipeline.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/DepthStencilStateD3D12.cpp b/src/dawn_native/d3d12/DepthStencilStateD3D12.cpp similarity index 98% rename from src/backend/d3d12/DepthStencilStateD3D12.cpp rename to src/dawn_native/d3d12/DepthStencilStateD3D12.cpp index 94111368bc..3a426be004 100644 --- a/src/backend/d3d12/DepthStencilStateD3D12.cpp +++ b/src/dawn_native/d3d12/DepthStencilStateD3D12.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/DepthStencilStateD3D12.h" +#include "dawn_native/d3d12/DepthStencilStateD3D12.h" #include "common/BitSetIterator.h" diff --git a/src/backend/d3d12/DepthStencilStateD3D12.h b/src/dawn_native/d3d12/DepthStencilStateD3D12.h similarity index 92% rename from src/backend/d3d12/DepthStencilStateD3D12.h rename to src/dawn_native/d3d12/DepthStencilStateD3D12.h index b0a826206e..b87b69ce7e 100644 --- a/src/backend/d3d12/DepthStencilStateD3D12.h +++ b/src/dawn_native/d3d12/DepthStencilStateD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_DEPTHSTENCILSTATED3D12_H_ #define BACKEND_D3D12_DEPTHSTENCILSTATED3D12_H_ -#include "backend/DepthStencilState.h" +#include "dawn_native/DepthStencilState.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/DescriptorHeapAllocator.cpp b/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp similarity index 98% rename from src/backend/d3d12/DescriptorHeapAllocator.cpp rename to src/dawn_native/d3d12/DescriptorHeapAllocator.cpp index 9c5edaa31b..a304b37f56 100644 --- a/src/backend/d3d12/DescriptorHeapAllocator.cpp +++ b/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/DescriptorHeapAllocator.h" +#include "dawn_native/d3d12/DescriptorHeapAllocator.h" -#include "backend/d3d12/DeviceD3D12.h" #include "common/Assert.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/DescriptorHeapAllocator.h b/src/dawn_native/d3d12/DescriptorHeapAllocator.h similarity index 98% rename from src/backend/d3d12/DescriptorHeapAllocator.h rename to src/dawn_native/d3d12/DescriptorHeapAllocator.h index 3c6d6b6326..2aaf5557c5 100644 --- a/src/backend/d3d12/DescriptorHeapAllocator.h +++ b/src/dawn_native/d3d12/DescriptorHeapAllocator.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_DESCRIPTORHEAPALLOCATOR_H_ #define BACKEND_D3D12_DESCRIPTORHEAPALLOCATOR_H_ -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" #include #include diff --git a/src/backend/d3d12/DeviceD3D12.cpp b/src/dawn_native/d3d12/DeviceD3D12.cpp similarity index 91% rename from src/backend/d3d12/DeviceD3D12.cpp rename to src/dawn_native/d3d12/DeviceD3D12.cpp index 7d427c138d..6f0d11f320 100644 --- a/src/backend/d3d12/DeviceD3D12.cpp +++ b/src/dawn_native/d3d12/DeviceD3D12.cpp @@ -12,31 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" -#include "backend/d3d12/BindGroupD3D12.h" -#include "backend/d3d12/BindGroupLayoutD3D12.h" -#include "backend/d3d12/BlendStateD3D12.h" -#include "backend/d3d12/BufferD3D12.h" -#include "backend/d3d12/CommandAllocatorManager.h" -#include "backend/d3d12/CommandBufferD3D12.h" -#include "backend/d3d12/ComputePipelineD3D12.h" -#include "backend/d3d12/DepthStencilStateD3D12.h" -#include "backend/d3d12/DescriptorHeapAllocator.h" -#include "backend/d3d12/InputStateD3D12.h" -#include "backend/d3d12/NativeSwapChainImplD3D12.h" -#include "backend/d3d12/PipelineLayoutD3D12.h" -#include "backend/d3d12/QueueD3D12.h" -#include "backend/d3d12/RenderPassDescriptorD3D12.h" -#include "backend/d3d12/RenderPipelineD3D12.h" -#include "backend/d3d12/ResourceAllocator.h" -#include "backend/d3d12/ResourceUploader.h" -#include "backend/d3d12/SamplerD3D12.h" -#include "backend/d3d12/ShaderModuleD3D12.h" -#include "backend/d3d12/SwapChainD3D12.h" -#include "backend/d3d12/TextureD3D12.h" #include "common/Assert.h" #include "common/SwapChainUtils.h" +#include "dawn_native/d3d12/BindGroupD3D12.h" +#include "dawn_native/d3d12/BindGroupLayoutD3D12.h" +#include "dawn_native/d3d12/BlendStateD3D12.h" +#include "dawn_native/d3d12/BufferD3D12.h" +#include "dawn_native/d3d12/CommandAllocatorManager.h" +#include "dawn_native/d3d12/CommandBufferD3D12.h" +#include "dawn_native/d3d12/ComputePipelineD3D12.h" +#include "dawn_native/d3d12/DepthStencilStateD3D12.h" +#include "dawn_native/d3d12/DescriptorHeapAllocator.h" +#include "dawn_native/d3d12/InputStateD3D12.h" +#include "dawn_native/d3d12/NativeSwapChainImplD3D12.h" +#include "dawn_native/d3d12/PipelineLayoutD3D12.h" +#include "dawn_native/d3d12/QueueD3D12.h" +#include "dawn_native/d3d12/RenderPassDescriptorD3D12.h" +#include "dawn_native/d3d12/RenderPipelineD3D12.h" +#include "dawn_native/d3d12/ResourceAllocator.h" +#include "dawn_native/d3d12/ResourceUploader.h" +#include "dawn_native/d3d12/SamplerD3D12.h" +#include "dawn_native/d3d12/ShaderModuleD3D12.h" +#include "dawn_native/d3d12/SwapChainD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/DeviceD3D12.h b/src/dawn_native/d3d12/DeviceD3D12.h similarity index 97% rename from src/backend/d3d12/DeviceD3D12.h rename to src/dawn_native/d3d12/DeviceD3D12.h index 2f1faa3908..dd2869f6da 100644 --- a/src/backend/d3d12/DeviceD3D12.h +++ b/src/dawn_native/d3d12/DeviceD3D12.h @@ -17,10 +17,10 @@ #include "dawn/dawncpp.h" -#include "backend/Device.h" -#include "backend/d3d12/Forward.h" -#include "backend/d3d12/d3d12_platform.h" #include "common/SerialQueue.h" +#include "dawn_native/Device.h" +#include "dawn_native/d3d12/Forward.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/Forward.h b/src/dawn_native/d3d12/Forward.h similarity index 98% rename from src/backend/d3d12/Forward.h rename to src/dawn_native/d3d12/Forward.h index 278af0984d..4751453500 100644 --- a/src/backend/d3d12/Forward.h +++ b/src/dawn_native/d3d12/Forward.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_FORWARD_H_ #define BACKEND_D3D12_FORWARD_H_ -#include "backend/ToBackend.h" +#include "dawn_native/ToBackend.h" namespace backend { namespace d3d12 { diff --git a/src/dawn_native/d3d12/GeneratedCodeIncludes.h b/src/dawn_native/d3d12/GeneratedCodeIncludes.h new file mode 100644 index 0000000000..8d5ac99910 --- /dev/null +++ b/src/dawn_native/d3d12/GeneratedCodeIncludes.h @@ -0,0 +1,31 @@ +// Copyright 2017 The Dawn 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 "dawn_native/d3d12/BindGroupD3D12.h" +#include "dawn_native/d3d12/BindGroupLayoutD3D12.h" +#include "dawn_native/d3d12/BlendStateD3D12.h" +#include "dawn_native/d3d12/BufferD3D12.h" +#include "dawn_native/d3d12/CommandBufferD3D12.h" +#include "dawn_native/d3d12/ComputePipelineD3D12.h" +#include "dawn_native/d3d12/DepthStencilStateD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/InputStateD3D12.h" +#include "dawn_native/d3d12/PipelineLayoutD3D12.h" +#include "dawn_native/d3d12/QueueD3D12.h" +#include "dawn_native/d3d12/RenderPassDescriptorD3D12.h" +#include "dawn_native/d3d12/RenderPipelineD3D12.h" +#include "dawn_native/d3d12/SamplerD3D12.h" +#include "dawn_native/d3d12/ShaderModuleD3D12.h" +#include "dawn_native/d3d12/SwapChainD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" diff --git a/src/backend/d3d12/InputStateD3D12.cpp b/src/dawn_native/d3d12/InputStateD3D12.cpp similarity index 98% rename from src/backend/d3d12/InputStateD3D12.cpp rename to src/dawn_native/d3d12/InputStateD3D12.cpp index 82c8e1143f..a8c8626039 100644 --- a/src/backend/d3d12/InputStateD3D12.cpp +++ b/src/dawn_native/d3d12/InputStateD3D12.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/InputStateD3D12.h" +#include "dawn_native/d3d12/InputStateD3D12.h" #include "common/BitSetIterator.h" diff --git a/src/backend/d3d12/InputStateD3D12.h b/src/dawn_native/d3d12/InputStateD3D12.h similarity index 93% rename from src/backend/d3d12/InputStateD3D12.h rename to src/dawn_native/d3d12/InputStateD3D12.h index f12c8da813..580ef6ac59 100644 --- a/src/backend/d3d12/InputStateD3D12.h +++ b/src/dawn_native/d3d12/InputStateD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_INPUTSTATED3D12_H_ #define BACKEND_D3D12_INPUTSTATED3D12_H_ -#include "backend/InputState.h" +#include "dawn_native/InputState.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/NativeSwapChainImplD3D12.cpp b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp similarity index 96% rename from src/backend/d3d12/NativeSwapChainImplD3D12.cpp rename to src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp index aa49e76e57..eb793b34fd 100644 --- a/src/backend/d3d12/NativeSwapChainImplD3D12.cpp +++ b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/NativeSwapChainImplD3D12.h" +#include "dawn_native/d3d12/NativeSwapChainImplD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/TextureD3D12.h" #include "common/Assert.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/NativeSwapChainImplD3D12.h b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.h similarity index 97% rename from src/backend/d3d12/NativeSwapChainImplD3D12.h rename to src/dawn_native/d3d12/NativeSwapChainImplD3D12.h index ea0ef49508..a8212536b1 100644 --- a/src/backend/d3d12/NativeSwapChainImplD3D12.h +++ b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_NATIVESWAPCHAINIMPLD3D12_H_ #define BACKEND_D3D12_NATIVESWAPCHAINIMPLD3D12_H_ -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn/dawn_wsi.h" #include "dawn/dawncpp.h" diff --git a/src/backend/d3d12/PipelineLayoutD3D12.cpp b/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp similarity index 97% rename from src/backend/d3d12/PipelineLayoutD3D12.cpp rename to src/dawn_native/d3d12/PipelineLayoutD3D12.cpp index cf2ecfb1cd..9d72689a29 100644 --- a/src/backend/d3d12/PipelineLayoutD3D12.cpp +++ b/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/PipelineLayoutD3D12.h" +#include "dawn_native/d3d12/PipelineLayoutD3D12.h" -#include "backend/d3d12/BindGroupLayoutD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" #include "common/Assert.h" #include "common/BitSetIterator.h" +#include "dawn_native/d3d12/BindGroupLayoutD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" using Microsoft::WRL::ComPtr; diff --git a/src/backend/d3d12/PipelineLayoutD3D12.h b/src/dawn_native/d3d12/PipelineLayoutD3D12.h similarity index 94% rename from src/backend/d3d12/PipelineLayoutD3D12.h rename to src/dawn_native/d3d12/PipelineLayoutD3D12.h index 87cbd4a14c..f343fa2f64 100644 --- a/src/backend/d3d12/PipelineLayoutD3D12.h +++ b/src/dawn_native/d3d12/PipelineLayoutD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_PIPELINELAYOUTD3D12_H_ #define BACKEND_D3D12_PIPELINELAYOUTD3D12_H_ -#include "backend/PipelineLayout.h" +#include "dawn_native/PipelineLayout.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/QueueD3D12.cpp b/src/dawn_native/d3d12/QueueD3D12.cpp similarity index 89% rename from src/backend/d3d12/QueueD3D12.cpp rename to src/dawn_native/d3d12/QueueD3D12.cpp index 8a94ea632c..2e3d27833e 100644 --- a/src/backend/d3d12/QueueD3D12.cpp +++ b/src/dawn_native/d3d12/QueueD3D12.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/QueueD3D12.h" +#include "dawn_native/d3d12/QueueD3D12.h" -#include "backend/d3d12/CommandBufferD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/CommandBufferD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/QueueD3D12.h b/src/dawn_native/d3d12/QueueD3D12.h similarity index 93% rename from src/backend/d3d12/QueueD3D12.h rename to src/dawn_native/d3d12/QueueD3D12.h index ab4b4d2f38..d78a0b3709 100644 --- a/src/backend/d3d12/QueueD3D12.h +++ b/src/dawn_native/d3d12/QueueD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_QUEUED3D12_H_ #define BACKEND_D3D12_QUEUED3D12_H_ -#include "backend/Queue.h" +#include "dawn_native/Queue.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/RenderPassDescriptorD3D12.cpp b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp similarity index 95% rename from src/backend/d3d12/RenderPassDescriptorD3D12.cpp rename to src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp index 0c50d8bf0a..98575b551f 100644 --- a/src/backend/d3d12/RenderPassDescriptorD3D12.cpp +++ b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/RenderPassDescriptorD3D12.h" +#include "dawn_native/d3d12/RenderPassDescriptorD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/TextureD3D12.h" #include "common/BitSetIterator.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/RenderPassDescriptorD3D12.h b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.h similarity index 91% rename from src/backend/d3d12/RenderPassDescriptorD3D12.h rename to src/dawn_native/d3d12/RenderPassDescriptorD3D12.h index 19373217fb..0622ce49e1 100644 --- a/src/backend/d3d12/RenderPassDescriptorD3D12.h +++ b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.h @@ -15,11 +15,11 @@ #ifndef BACKEND_D3D12_RENDERPASSDESCRIPTORD3D12_H_ #define BACKEND_D3D12_RENDERPASSDESCRIPTORD3D12_H_ -#include "backend/RenderPassDescriptor.h" +#include "dawn_native/RenderPassDescriptor.h" -#include "backend/d3d12/DescriptorHeapAllocator.h" -#include "backend/d3d12/d3d12_platform.h" #include "common/Constants.h" +#include "dawn_native/d3d12/DescriptorHeapAllocator.h" +#include "dawn_native/d3d12/d3d12_platform.h" #include #include diff --git a/src/backend/d3d12/RenderPipelineD3D12.cpp b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp similarity index 94% rename from src/backend/d3d12/RenderPipelineD3D12.cpp rename to src/dawn_native/d3d12/RenderPipelineD3D12.cpp index ea21210512..a534c6cf45 100644 --- a/src/backend/d3d12/RenderPipelineD3D12.cpp +++ b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/RenderPipelineD3D12.h" +#include "dawn_native/d3d12/RenderPipelineD3D12.h" -#include "backend/d3d12/BlendStateD3D12.h" -#include "backend/d3d12/DepthStencilStateD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/InputStateD3D12.h" -#include "backend/d3d12/PipelineLayoutD3D12.h" -#include "backend/d3d12/ShaderModuleD3D12.h" -#include "backend/d3d12/TextureD3D12.h" #include "common/Assert.h" +#include "dawn_native/d3d12/BlendStateD3D12.h" +#include "dawn_native/d3d12/DepthStencilStateD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/InputStateD3D12.h" +#include "dawn_native/d3d12/PipelineLayoutD3D12.h" +#include "dawn_native/d3d12/ShaderModuleD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" #include diff --git a/src/backend/d3d12/RenderPipelineD3D12.h b/src/dawn_native/d3d12/RenderPipelineD3D12.h similarity index 93% rename from src/backend/d3d12/RenderPipelineD3D12.h rename to src/dawn_native/d3d12/RenderPipelineD3D12.h index 6721d1ec2a..ab3574f32c 100644 --- a/src/backend/d3d12/RenderPipelineD3D12.h +++ b/src/dawn_native/d3d12/RenderPipelineD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_RENDERPIPELINED3D12_H_ #define BACKEND_D3D12_RENDERPIPELINED3D12_H_ -#include "backend/RenderPipeline.h" +#include "dawn_native/RenderPipeline.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/ResourceAllocator.cpp b/src/dawn_native/d3d12/ResourceAllocator.cpp similarity index 96% rename from src/backend/d3d12/ResourceAllocator.cpp rename to src/dawn_native/d3d12/ResourceAllocator.cpp index d624b11bcd..d4396edd55 100644 --- a/src/backend/d3d12/ResourceAllocator.cpp +++ b/src/dawn_native/d3d12/ResourceAllocator.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/ResourceAllocator.h" +#include "dawn_native/d3d12/ResourceAllocator.h" -#include "backend/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/ResourceAllocator.h b/src/dawn_native/d3d12/ResourceAllocator.h similarity index 96% rename from src/backend/d3d12/ResourceAllocator.h rename to src/dawn_native/d3d12/ResourceAllocator.h index 7077c7705e..c3283c646f 100644 --- a/src/backend/d3d12/ResourceAllocator.h +++ b/src/dawn_native/d3d12/ResourceAllocator.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_RESOURCEALLOCATIONMANAGER_H_ #define BACKEND_D3D12_RESOURCEALLOCATIONMANAGER_H_ -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" #include "common/SerialQueue.h" diff --git a/src/backend/d3d12/ResourceUploader.cpp b/src/dawn_native/d3d12/ResourceUploader.cpp similarity index 95% rename from src/backend/d3d12/ResourceUploader.cpp rename to src/dawn_native/d3d12/ResourceUploader.cpp index 735b8281e4..8e656bef0c 100644 --- a/src/backend/d3d12/ResourceUploader.cpp +++ b/src/dawn_native/d3d12/ResourceUploader.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/ResourceUploader.h" +#include "dawn_native/d3d12/ResourceUploader.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/ResourceAllocator.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/ResourceAllocator.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/ResourceUploader.h b/src/dawn_native/d3d12/ResourceUploader.h similarity index 94% rename from src/backend/d3d12/ResourceUploader.h rename to src/dawn_native/d3d12/ResourceUploader.h index 89df8b0536..b3897e3077 100644 --- a/src/backend/d3d12/ResourceUploader.h +++ b/src/dawn_native/d3d12/ResourceUploader.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_RESOURCEUPLOADER_H_ #define BACKEND_D3D12_RESOURCEUPLOADER_H_ -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" -#include "backend/Forward.h" +#include "dawn_native/Forward.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/SamplerD3D12.cpp b/src/dawn_native/d3d12/SamplerD3D12.cpp similarity index 97% rename from src/backend/d3d12/SamplerD3D12.cpp rename to src/dawn_native/d3d12/SamplerD3D12.cpp index c0a60d7aa1..63e4e9699c 100644 --- a/src/backend/d3d12/SamplerD3D12.cpp +++ b/src/dawn_native/d3d12/SamplerD3D12.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/SamplerD3D12.h" +#include "dawn_native/d3d12/SamplerD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/SamplerD3D12.h b/src/dawn_native/d3d12/SamplerD3D12.h similarity index 93% rename from src/backend/d3d12/SamplerD3D12.h rename to src/dawn_native/d3d12/SamplerD3D12.h index 014ef7a880..11d070acb9 100644 --- a/src/backend/d3d12/SamplerD3D12.h +++ b/src/dawn_native/d3d12/SamplerD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_SAMPLERD3D12_H_ #define BACKEND_D3D12_SAMPLERD3D12_H_ -#include "backend/Sampler.h" +#include "dawn_native/Sampler.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/ShaderModuleD3D12.cpp b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp similarity index 98% rename from src/backend/d3d12/ShaderModuleD3D12.cpp rename to src/dawn_native/d3d12/ShaderModuleD3D12.cpp index 0511b76385..e3fb855eb7 100644 --- a/src/backend/d3d12/ShaderModuleD3D12.cpp +++ b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/ShaderModuleD3D12.h" +#include "dawn_native/d3d12/ShaderModuleD3D12.h" #include "common/Assert.h" diff --git a/src/backend/d3d12/ShaderModuleD3D12.h b/src/dawn_native/d3d12/ShaderModuleD3D12.h similarity index 96% rename from src/backend/d3d12/ShaderModuleD3D12.h rename to src/dawn_native/d3d12/ShaderModuleD3D12.h index e326fc6178..153e31b37c 100644 --- a/src/backend/d3d12/ShaderModuleD3D12.h +++ b/src/dawn_native/d3d12/ShaderModuleD3D12.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_SHADERMODULED3D12_H_ #define BACKEND_D3D12_SHADERMODULED3D12_H_ -#include "backend/ShaderModule.h" +#include "dawn_native/ShaderModule.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/SwapChainD3D12.cpp b/src/dawn_native/d3d12/SwapChainD3D12.cpp similarity index 93% rename from src/backend/d3d12/SwapChainD3D12.cpp rename to src/dawn_native/d3d12/SwapChainD3D12.cpp index e5a3fbf956..835d717dbb 100644 --- a/src/backend/d3d12/SwapChainD3D12.cpp +++ b/src/dawn_native/d3d12/SwapChainD3D12.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/SwapChainD3D12.h" +#include "dawn_native/d3d12/SwapChainD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/TextureD3D12.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" #include diff --git a/src/backend/d3d12/SwapChainD3D12.h b/src/dawn_native/d3d12/SwapChainD3D12.h similarity index 96% rename from src/backend/d3d12/SwapChainD3D12.h rename to src/dawn_native/d3d12/SwapChainD3D12.h index 02e0167563..11dfb8b11b 100644 --- a/src/backend/d3d12/SwapChainD3D12.h +++ b/src/dawn_native/d3d12/SwapChainD3D12.h @@ -15,7 +15,7 @@ #ifndef BACKEND_D3D12_SWAPCHAIND3D12_H_ #define BACKEND_D3D12_SWAPCHAIND3D12_H_ -#include "backend/SwapChain.h" +#include "dawn_native/SwapChain.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/TextureCopySplitter.cpp b/src/dawn_native/d3d12/TextureCopySplitter.cpp similarity index 98% rename from src/backend/d3d12/TextureCopySplitter.cpp rename to src/dawn_native/d3d12/TextureCopySplitter.cpp index 3bf4687e24..55de577a8b 100644 --- a/src/backend/d3d12/TextureCopySplitter.cpp +++ b/src/dawn_native/d3d12/TextureCopySplitter.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/TextureCopySplitter.h" +#include "dawn_native/d3d12/TextureCopySplitter.h" -#include "backend/d3d12/d3d12_platform.h" #include "common/Assert.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/TextureCopySplitter.h b/src/dawn_native/d3d12/TextureCopySplitter.h similarity index 100% rename from src/backend/d3d12/TextureCopySplitter.h rename to src/dawn_native/d3d12/TextureCopySplitter.h diff --git a/src/backend/d3d12/TextureD3D12.cpp b/src/dawn_native/d3d12/TextureD3D12.cpp similarity index 98% rename from src/backend/d3d12/TextureD3D12.cpp rename to src/dawn_native/d3d12/TextureD3D12.cpp index c7ee7b8cc5..69793f0598 100644 --- a/src/backend/d3d12/TextureD3D12.cpp +++ b/src/dawn_native/d3d12/TextureD3D12.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/d3d12/TextureD3D12.h" +#include "dawn_native/d3d12/TextureD3D12.h" -#include "backend/d3d12/DeviceD3D12.h" -#include "backend/d3d12/ResourceAllocator.h" +#include "dawn_native/d3d12/DeviceD3D12.h" +#include "dawn_native/d3d12/ResourceAllocator.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/TextureD3D12.h b/src/dawn_native/d3d12/TextureD3D12.h similarity index 95% rename from src/backend/d3d12/TextureD3D12.h rename to src/dawn_native/d3d12/TextureD3D12.h index c07c36aebc..0a7874510e 100644 --- a/src/backend/d3d12/TextureD3D12.h +++ b/src/dawn_native/d3d12/TextureD3D12.h @@ -15,9 +15,9 @@ #ifndef BACKEND_D3D12_TEXTURED3D12_H_ #define BACKEND_D3D12_TEXTURED3D12_H_ -#include "backend/Texture.h" +#include "dawn_native/Texture.h" -#include "backend/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/d3d12_platform.h" namespace backend { namespace d3d12 { diff --git a/src/backend/d3d12/d3d12_platform.h b/src/dawn_native/d3d12/d3d12_platform.h similarity index 100% rename from src/backend/d3d12/d3d12_platform.h rename to src/dawn_native/d3d12/d3d12_platform.h diff --git a/src/backend/metal/BlendStateMTL.h b/src/dawn_native/metal/BlendStateMTL.h similarity index 96% rename from src/backend/metal/BlendStateMTL.h rename to src/dawn_native/metal/BlendStateMTL.h index 1c8200d236..87adf524ca 100644 --- a/src/backend/metal/BlendStateMTL.h +++ b/src/dawn_native/metal/BlendStateMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_BLENDSTATEMTL_H_ #define BACKEND_METAL_BLENDSTATEMTL_H_ -#include "backend/BlendState.h" +#include "dawn_native/BlendState.h" #import namespace backend { namespace metal { diff --git a/src/backend/metal/BlendStateMTL.mm b/src/dawn_native/metal/BlendStateMTL.mm similarity index 99% rename from src/backend/metal/BlendStateMTL.mm rename to src/dawn_native/metal/BlendStateMTL.mm index 3b5fb3828b..27a673714c 100644 --- a/src/backend/metal/BlendStateMTL.mm +++ b/src/dawn_native/metal/BlendStateMTL.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/BlendStateMTL.h" +#include "dawn_native/metal/BlendStateMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/BufferMTL.h b/src/dawn_native/metal/BufferMTL.h similarity index 98% rename from src/backend/metal/BufferMTL.h rename to src/dawn_native/metal/BufferMTL.h index d12afe1ba4..b1b1162b1f 100644 --- a/src/backend/metal/BufferMTL.h +++ b/src/dawn_native/metal/BufferMTL.h @@ -15,8 +15,8 @@ #ifndef BACKEND_METAL_BUFFERMTL_H_ #define BACKEND_METAL_BUFFERMTL_H_ -#include "backend/Buffer.h" #include "common/SerialQueue.h" +#include "dawn_native/Buffer.h" #import diff --git a/src/backend/metal/BufferMTL.mm b/src/dawn_native/metal/BufferMTL.mm similarity index 96% rename from src/backend/metal/BufferMTL.mm rename to src/dawn_native/metal/BufferMTL.mm index 3043092350..df68f93e19 100644 --- a/src/backend/metal/BufferMTL.mm +++ b/src/dawn_native/metal/BufferMTL.mm @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/BufferMTL.h" +#include "dawn_native/metal/BufferMTL.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/ResourceUploader.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/ResourceUploader.h" namespace backend { namespace metal { diff --git a/src/backend/metal/CommandBufferMTL.h b/src/dawn_native/metal/CommandBufferMTL.h similarity index 97% rename from src/backend/metal/CommandBufferMTL.h rename to src/dawn_native/metal/CommandBufferMTL.h index 6b8c3d09ca..307d8d9978 100644 --- a/src/backend/metal/CommandBufferMTL.h +++ b/src/dawn_native/metal/CommandBufferMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_COMMANDBUFFERMTL_H_ #define BACKEND_METAL_COMMANDBUFFERMTL_H_ -#include "backend/CommandBuffer.h" +#include "dawn_native/CommandBuffer.h" #import diff --git a/src/backend/metal/CommandBufferMTL.mm b/src/dawn_native/metal/CommandBufferMTL.mm similarity index 97% rename from src/backend/metal/CommandBufferMTL.mm rename to src/dawn_native/metal/CommandBufferMTL.mm index af9cacf2b6..8ef478b157 100644 --- a/src/backend/metal/CommandBufferMTL.mm +++ b/src/dawn_native/metal/CommandBufferMTL.mm @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/CommandBufferMTL.h" +#include "dawn_native/metal/CommandBufferMTL.h" -#include "backend/BindGroup.h" -#include "backend/Commands.h" -#include "backend/metal/BufferMTL.h" -#include "backend/metal/ComputePipelineMTL.h" -#include "backend/metal/DepthStencilStateMTL.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/InputStateMTL.h" -#include "backend/metal/PipelineLayoutMTL.h" -#include "backend/metal/RenderPipelineMTL.h" -#include "backend/metal/SamplerMTL.h" -#include "backend/metal/TextureMTL.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/Commands.h" +#include "dawn_native/metal/BufferMTL.h" +#include "dawn_native/metal/ComputePipelineMTL.h" +#include "dawn_native/metal/DepthStencilStateMTL.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/InputStateMTL.h" +#include "dawn_native/metal/PipelineLayoutMTL.h" +#include "dawn_native/metal/RenderPipelineMTL.h" +#include "dawn_native/metal/SamplerMTL.h" +#include "dawn_native/metal/TextureMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/ComputePipelineMTL.h b/src/dawn_native/metal/ComputePipelineMTL.h similarity index 96% rename from src/backend/metal/ComputePipelineMTL.h rename to src/dawn_native/metal/ComputePipelineMTL.h index 024324a2e8..33ac823b43 100644 --- a/src/backend/metal/ComputePipelineMTL.h +++ b/src/dawn_native/metal/ComputePipelineMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_COMPUTEPIPELINEMTL_H_ #define BACKEND_METAL_COMPUTEPIPELINEMTL_H_ -#include "backend/ComputePipeline.h" +#include "dawn_native/ComputePipeline.h" #import diff --git a/src/backend/metal/ComputePipelineMTL.mm b/src/dawn_native/metal/ComputePipelineMTL.mm similarity index 93% rename from src/backend/metal/ComputePipelineMTL.mm rename to src/dawn_native/metal/ComputePipelineMTL.mm index f2918bd3e9..c6f0f3a28b 100644 --- a/src/backend/metal/ComputePipelineMTL.mm +++ b/src/dawn_native/metal/ComputePipelineMTL.mm @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/ComputePipelineMTL.h" +#include "dawn_native/metal/ComputePipelineMTL.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/ShaderModuleMTL.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/ShaderModuleMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/DepthStencilStateMTL.h b/src/dawn_native/metal/DepthStencilStateMTL.h similarity index 96% rename from src/backend/metal/DepthStencilStateMTL.h rename to src/dawn_native/metal/DepthStencilStateMTL.h index 5dde2e1856..30956cf53b 100644 --- a/src/backend/metal/DepthStencilStateMTL.h +++ b/src/dawn_native/metal/DepthStencilStateMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_DEPTHSTENCILSTATEMTL_H_ #define BACKEND_METAL_DEPTHSTENCILSTATEMTL_H_ -#include "backend/DepthStencilState.h" +#include "dawn_native/DepthStencilState.h" #import diff --git a/src/backend/metal/DepthStencilStateMTL.mm b/src/dawn_native/metal/DepthStencilStateMTL.mm similarity index 98% rename from src/backend/metal/DepthStencilStateMTL.mm rename to src/dawn_native/metal/DepthStencilStateMTL.mm index 1b5a5bc9fc..7efd68dabd 100644 --- a/src/backend/metal/DepthStencilStateMTL.mm +++ b/src/dawn_native/metal/DepthStencilStateMTL.mm @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/DepthStencilStateMTL.h" +#include "dawn_native/metal/DepthStencilStateMTL.h" -#include "backend/metal/DeviceMTL.h" +#include "dawn_native/metal/DeviceMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/DeviceMTL.h b/src/dawn_native/metal/DeviceMTL.h similarity index 97% rename from src/backend/metal/DeviceMTL.h rename to src/dawn_native/metal/DeviceMTL.h index cfd7d4fb60..780406fcac 100644 --- a/src/backend/metal/DeviceMTL.h +++ b/src/dawn_native/metal/DeviceMTL.h @@ -17,9 +17,9 @@ #include "dawn/dawncpp.h" -#include "backend/Device.h" -#include "backend/metal/Forward.h" #include "common/Serial.h" +#include "dawn_native/Device.h" +#include "dawn_native/metal/Forward.h" #import #import diff --git a/src/backend/metal/DeviceMTL.mm b/src/dawn_native/metal/DeviceMTL.mm similarity index 89% rename from src/backend/metal/DeviceMTL.mm rename to src/dawn_native/metal/DeviceMTL.mm index 2ba726c3c4..fef1ccc064 100644 --- a/src/backend/metal/DeviceMTL.mm +++ b/src/dawn_native/metal/DeviceMTL.mm @@ -12,25 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/DeviceMTL.h" +#include "dawn_native/metal/DeviceMTL.h" -#include "backend/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/metal/BlendStateMTL.h" -#include "backend/metal/BufferMTL.h" -#include "backend/metal/CommandBufferMTL.h" -#include "backend/metal/ComputePipelineMTL.h" -#include "backend/metal/DepthStencilStateMTL.h" -#include "backend/metal/InputStateMTL.h" -#include "backend/metal/PipelineLayoutMTL.h" -#include "backend/metal/QueueMTL.h" -#include "backend/metal/RenderPipelineMTL.h" -#include "backend/metal/ResourceUploader.h" -#include "backend/metal/SamplerMTL.h" -#include "backend/metal/ShaderModuleMTL.h" -#include "backend/metal/SwapChainMTL.h" -#include "backend/metal/TextureMTL.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/metal/BlendStateMTL.h" +#include "dawn_native/metal/BufferMTL.h" +#include "dawn_native/metal/CommandBufferMTL.h" +#include "dawn_native/metal/ComputePipelineMTL.h" +#include "dawn_native/metal/DepthStencilStateMTL.h" +#include "dawn_native/metal/InputStateMTL.h" +#include "dawn_native/metal/PipelineLayoutMTL.h" +#include "dawn_native/metal/QueueMTL.h" +#include "dawn_native/metal/RenderPipelineMTL.h" +#include "dawn_native/metal/ResourceUploader.h" +#include "dawn_native/metal/SamplerMTL.h" +#include "dawn_native/metal/ShaderModuleMTL.h" +#include "dawn_native/metal/SwapChainMTL.h" +#include "dawn_native/metal/TextureMTL.h" #include diff --git a/src/backend/metal/Forward.h b/src/dawn_native/metal/Forward.h similarity index 98% rename from src/backend/metal/Forward.h rename to src/dawn_native/metal/Forward.h index 48c31e02ae..299a6b1f27 100644 --- a/src/backend/metal/Forward.h +++ b/src/dawn_native/metal/Forward.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_FORWARD_H_ #define BACKEND_METAL_FORWARD_H_ -#include "backend/ToBackend.h" +#include "dawn_native/ToBackend.h" namespace { class BindGroupBase; diff --git a/src/dawn_native/metal/GeneratedCodeIncludes.h b/src/dawn_native/metal/GeneratedCodeIncludes.h new file mode 100644 index 0000000000..9f56c30613 --- /dev/null +++ b/src/dawn_native/metal/GeneratedCodeIncludes.h @@ -0,0 +1,31 @@ +// Copyright 2017 The Dawn 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 "dawn_native/BindGroup.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/metal/BlendStateMTL.h" +#include "dawn_native/metal/BufferMTL.h" +#include "dawn_native/metal/CommandBufferMTL.h" +#include "dawn_native/metal/ComputePipelineMTL.h" +#include "dawn_native/metal/DepthStencilStateMTL.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/InputStateMTL.h" +#include "dawn_native/metal/PipelineLayoutMTL.h" +#include "dawn_native/metal/QueueMTL.h" +#include "dawn_native/metal/RenderPipelineMTL.h" +#include "dawn_native/metal/SamplerMTL.h" +#include "dawn_native/metal/ShaderModuleMTL.h" +#include "dawn_native/metal/SwapChainMTL.h" +#include "dawn_native/metal/TextureMTL.h" diff --git a/src/backend/metal/InputStateMTL.h b/src/dawn_native/metal/InputStateMTL.h similarity index 96% rename from src/backend/metal/InputStateMTL.h rename to src/dawn_native/metal/InputStateMTL.h index 6edc47c001..4d3700f28b 100644 --- a/src/backend/metal/InputStateMTL.h +++ b/src/dawn_native/metal/InputStateMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_INPUTSTATEMTL_H_ #define BACKEND_METAL_INPUTSTATEMTL_H_ -#include "backend/InputState.h" +#include "dawn_native/InputState.h" #import diff --git a/src/backend/metal/InputStateMTL.mm b/src/dawn_native/metal/InputStateMTL.mm similarity index 99% rename from src/backend/metal/InputStateMTL.mm rename to src/dawn_native/metal/InputStateMTL.mm index f33491bf05..c204b09b4c 100644 --- a/src/backend/metal/InputStateMTL.mm +++ b/src/dawn_native/metal/InputStateMTL.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/InputStateMTL.h" +#include "dawn_native/metal/InputStateMTL.h" #include "common/BitSetIterator.h" diff --git a/src/backend/metal/PipelineLayoutMTL.h b/src/dawn_native/metal/PipelineLayoutMTL.h similarity index 94% rename from src/backend/metal/PipelineLayoutMTL.h rename to src/dawn_native/metal/PipelineLayoutMTL.h index d68630b858..1ce709757b 100644 --- a/src/backend/metal/PipelineLayoutMTL.h +++ b/src/dawn_native/metal/PipelineLayoutMTL.h @@ -15,9 +15,9 @@ #ifndef BACKEND_METAL_PIPELINELAYOUTMTL_H_ #define BACKEND_METAL_PIPELINELAYOUTMTL_H_ -#include "backend/PipelineLayout.h" +#include "dawn_native/PipelineLayout.h" -#include "backend/PerStage.h" +#include "dawn_native/PerStage.h" #import diff --git a/src/backend/metal/PipelineLayoutMTL.mm b/src/dawn_native/metal/PipelineLayoutMTL.mm similarity index 95% rename from src/backend/metal/PipelineLayoutMTL.mm rename to src/dawn_native/metal/PipelineLayoutMTL.mm index a2f106dbf9..1f156170ab 100644 --- a/src/backend/metal/PipelineLayoutMTL.mm +++ b/src/dawn_native/metal/PipelineLayoutMTL.mm @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/PipelineLayoutMTL.h" +#include "dawn_native/metal/PipelineLayoutMTL.h" -#include "backend/BindGroupLayout.h" -#include "backend/metal/DeviceMTL.h" #include "common/BitSetIterator.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/metal/DeviceMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/QueueMTL.h b/src/dawn_native/metal/QueueMTL.h similarity index 97% rename from src/backend/metal/QueueMTL.h rename to src/dawn_native/metal/QueueMTL.h index dca9fd3079..c7fc4de9cc 100644 --- a/src/backend/metal/QueueMTL.h +++ b/src/dawn_native/metal/QueueMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_QUEUEMTL_H_ #define BACKEND_METAL_QUEUEMTL_H_ -#include "backend/Queue.h" +#include "dawn_native/Queue.h" namespace backend { namespace metal { diff --git a/src/backend/metal/QueueMTL.mm b/src/dawn_native/metal/QueueMTL.mm similarity index 89% rename from src/backend/metal/QueueMTL.mm rename to src/dawn_native/metal/QueueMTL.mm index 244aef0900..4f737771f2 100644 --- a/src/backend/metal/QueueMTL.mm +++ b/src/dawn_native/metal/QueueMTL.mm @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/QueueMTL.h" +#include "dawn_native/metal/QueueMTL.h" -#include "backend/metal/CommandBufferMTL.h" -#include "backend/metal/DeviceMTL.h" +#include "dawn_native/metal/CommandBufferMTL.h" +#include "dawn_native/metal/DeviceMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/RenderPipelineMTL.h b/src/dawn_native/metal/RenderPipelineMTL.h similarity index 97% rename from src/backend/metal/RenderPipelineMTL.h rename to src/dawn_native/metal/RenderPipelineMTL.h index d90b386314..63354a3d22 100644 --- a/src/backend/metal/RenderPipelineMTL.h +++ b/src/dawn_native/metal/RenderPipelineMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_RENDERPIPELINEMTL_H_ #define BACKEND_METAL_RENDERPIPELINEMTL_H_ -#include "backend/RenderPipeline.h" +#include "dawn_native/RenderPipeline.h" #import diff --git a/src/backend/metal/RenderPipelineMTL.mm b/src/dawn_native/metal/RenderPipelineMTL.mm similarity index 90% rename from src/backend/metal/RenderPipelineMTL.mm rename to src/dawn_native/metal/RenderPipelineMTL.mm index 36ffd53adb..104559b3a2 100644 --- a/src/backend/metal/RenderPipelineMTL.mm +++ b/src/dawn_native/metal/RenderPipelineMTL.mm @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/RenderPipelineMTL.h" +#include "dawn_native/metal/RenderPipelineMTL.h" -#include "backend/metal/BlendStateMTL.h" -#include "backend/metal/DepthStencilStateMTL.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/InputStateMTL.h" -#include "backend/metal/PipelineLayoutMTL.h" -#include "backend/metal/ShaderModuleMTL.h" -#include "backend/metal/TextureMTL.h" +#include "dawn_native/metal/BlendStateMTL.h" +#include "dawn_native/metal/DepthStencilStateMTL.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/InputStateMTL.h" +#include "dawn_native/metal/PipelineLayoutMTL.h" +#include "dawn_native/metal/ShaderModuleMTL.h" +#include "dawn_native/metal/TextureMTL.h" namespace backend { namespace metal { @@ -113,8 +113,8 @@ namespace backend { namespace metal { // TODO(kainino@chromium.org): push constants, textures, samplers NSError* error = nil; - mMtlRenderPipelineState = - [mtlDevice newRenderPipelineStateWithDescriptor:descriptor error:&error]; + mMtlRenderPipelineState = [mtlDevice newRenderPipelineStateWithDescriptor:descriptor + error:&error]; if (error != nil) { NSLog(@" error => %@", error); builder->HandleError("Error creating pipeline state"); diff --git a/src/backend/metal/ResourceUploader.h b/src/dawn_native/metal/ResourceUploader.h similarity index 100% rename from src/backend/metal/ResourceUploader.h rename to src/dawn_native/metal/ResourceUploader.h diff --git a/src/backend/metal/ResourceUploader.mm b/src/dawn_native/metal/ResourceUploader.mm similarity index 95% rename from src/backend/metal/ResourceUploader.mm rename to src/dawn_native/metal/ResourceUploader.mm index 95f25dc862..d7a14f5b2d 100644 --- a/src/backend/metal/ResourceUploader.mm +++ b/src/dawn_native/metal/ResourceUploader.mm @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/ResourceUploader.h" +#include "dawn_native/metal/ResourceUploader.h" -#include "backend/metal/DeviceMTL.h" +#include "dawn_native/metal/DeviceMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/SamplerMTL.h b/src/dawn_native/metal/SamplerMTL.h similarity index 97% rename from src/backend/metal/SamplerMTL.h rename to src/dawn_native/metal/SamplerMTL.h index 3437c1c8b8..d0ec2180a2 100644 --- a/src/backend/metal/SamplerMTL.h +++ b/src/dawn_native/metal/SamplerMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_SAMPLERMTL_H_ #define BACKEND_METAL_SAMPLERMTL_H_ -#include "backend/Sampler.h" +#include "dawn_native/Sampler.h" #import diff --git a/src/backend/metal/SamplerMTL.mm b/src/dawn_native/metal/SamplerMTL.mm similarity index 97% rename from src/backend/metal/SamplerMTL.mm rename to src/dawn_native/metal/SamplerMTL.mm index d6cbbaf99c..aa9e0e1d02 100644 --- a/src/backend/metal/SamplerMTL.mm +++ b/src/dawn_native/metal/SamplerMTL.mm @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/SamplerMTL.h" +#include "dawn_native/metal/SamplerMTL.h" -#include "backend/metal/DeviceMTL.h" +#include "dawn_native/metal/DeviceMTL.h" namespace backend { namespace metal { diff --git a/src/backend/metal/ShaderModuleMTL.h b/src/dawn_native/metal/ShaderModuleMTL.h similarity index 97% rename from src/backend/metal/ShaderModuleMTL.h rename to src/dawn_native/metal/ShaderModuleMTL.h index dd00610882..9ce04b29db 100644 --- a/src/backend/metal/ShaderModuleMTL.h +++ b/src/dawn_native/metal/ShaderModuleMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_SHADERMODULEMTL_H_ #define BACKEND_METAL_SHADERMODULEMTL_H_ -#include "backend/ShaderModule.h" +#include "dawn_native/ShaderModule.h" #import diff --git a/src/backend/metal/ShaderModuleMTL.mm b/src/dawn_native/metal/ShaderModuleMTL.mm similarity index 92% rename from src/backend/metal/ShaderModuleMTL.mm rename to src/dawn_native/metal/ShaderModuleMTL.mm index 7377c4bf8e..32aba7a0f2 100644 --- a/src/backend/metal/ShaderModuleMTL.mm +++ b/src/dawn_native/metal/ShaderModuleMTL.mm @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/ShaderModuleMTL.h" +#include "dawn_native/metal/ShaderModuleMTL.h" -#include "backend/BindGroupLayout.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/PipelineLayoutMTL.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/PipelineLayoutMTL.h" #include @@ -103,8 +103,9 @@ namespace backend { namespace metal { auto mtlDevice = ToBackend(GetDevice())->GetMTLDevice(); NSError* error = nil; - id library = - [mtlDevice newLibraryWithSource:mslSource options:nil error:&error]; + id library = [mtlDevice newLibraryWithSource:mslSource + options:nil + error:&error]; if (error != nil) { // TODO(cwallez@chromium.org): forward errors to caller NSLog(@"MTLDevice newLibraryWithSource => %@", error); diff --git a/src/backend/metal/SwapChainMTL.h b/src/dawn_native/metal/SwapChainMTL.h similarity index 96% rename from src/backend/metal/SwapChainMTL.h rename to src/dawn_native/metal/SwapChainMTL.h index 4f43abdfac..cd2b8c4e07 100644 --- a/src/backend/metal/SwapChainMTL.h +++ b/src/dawn_native/metal/SwapChainMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_SWAPCHAINMTL_H_ #define BACKEND_METAL_SWAPCHAINMTL_H_ -#include "backend/SwapChain.h" +#include "dawn_native/SwapChain.h" namespace backend { namespace metal { diff --git a/src/backend/metal/SwapChainMTL.mm b/src/dawn_native/metal/SwapChainMTL.mm similarity index 92% rename from src/backend/metal/SwapChainMTL.mm rename to src/dawn_native/metal/SwapChainMTL.mm index 61e276f359..4411b2d334 100644 --- a/src/backend/metal/SwapChainMTL.mm +++ b/src/dawn_native/metal/SwapChainMTL.mm @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/SwapChainMTL.h" +#include "dawn_native/metal/SwapChainMTL.h" -#include "backend/metal/DeviceMTL.h" -#include "backend/metal/TextureMTL.h" +#include "dawn_native/metal/DeviceMTL.h" +#include "dawn_native/metal/TextureMTL.h" #include diff --git a/src/backend/metal/TextureMTL.h b/src/dawn_native/metal/TextureMTL.h similarity index 97% rename from src/backend/metal/TextureMTL.h rename to src/dawn_native/metal/TextureMTL.h index 088f58ca00..3e2dc27bd4 100644 --- a/src/backend/metal/TextureMTL.h +++ b/src/dawn_native/metal/TextureMTL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_METAL_TEXTUREMTL_H_ #define BACKEND_METAL_TEXTUREMTL_H_ -#include "backend/Texture.h" +#include "dawn_native/Texture.h" #import diff --git a/src/backend/metal/TextureMTL.mm b/src/dawn_native/metal/TextureMTL.mm similarity index 97% rename from src/backend/metal/TextureMTL.mm rename to src/dawn_native/metal/TextureMTL.mm index 31800e9fdb..02991e3f50 100644 --- a/src/backend/metal/TextureMTL.mm +++ b/src/dawn_native/metal/TextureMTL.mm @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/metal/TextureMTL.h" +#include "dawn_native/metal/TextureMTL.h" -#include "backend/metal/DeviceMTL.h" +#include "dawn_native/metal/DeviceMTL.h" namespace backend { namespace metal { diff --git a/src/backend/null/GeneratedCodeIncludes.h b/src/dawn_native/null/GeneratedCodeIncludes.h similarity index 93% rename from src/backend/null/GeneratedCodeIncludes.h rename to src/dawn_native/null/GeneratedCodeIncludes.h index 6cb387ae2c..f917f1875f 100644 --- a/src/backend/null/GeneratedCodeIncludes.h +++ b/src/dawn_native/null/GeneratedCodeIncludes.h @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/null/NullBackend.h" +#include "dawn_native/null/NullBackend.h" diff --git a/src/backend/null/NullBackend.cpp b/src/dawn_native/null/NullBackend.cpp similarity index 98% rename from src/backend/null/NullBackend.cpp rename to src/dawn_native/null/NullBackend.cpp index 5aa8ce21b2..de7cb648fc 100644 --- a/src/backend/null/NullBackend.cpp +++ b/src/dawn_native/null/NullBackend.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/null/NullBackend.h" +#include "dawn_native/null/NullBackend.h" -#include "backend/Commands.h" +#include "dawn_native/Commands.h" #include diff --git a/src/backend/null/NullBackend.h b/src/dawn_native/null/NullBackend.h similarity index 90% rename from src/backend/null/NullBackend.h rename to src/dawn_native/null/NullBackend.h index 0dbcbdcc33..796c4eab4c 100644 --- a/src/backend/null/NullBackend.h +++ b/src/dawn_native/null/NullBackend.h @@ -17,24 +17,24 @@ #include "dawn/dawncpp.h" -#include "backend/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/BlendState.h" -#include "backend/Buffer.h" -#include "backend/CommandBuffer.h" -#include "backend/ComputePipeline.h" -#include "backend/DepthStencilState.h" -#include "backend/Device.h" -#include "backend/InputState.h" -#include "backend/PipelineLayout.h" -#include "backend/Queue.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/RenderPipeline.h" -#include "backend/Sampler.h" -#include "backend/ShaderModule.h" -#include "backend/SwapChain.h" -#include "backend/Texture.h" -#include "backend/ToBackend.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/BlendState.h" +#include "dawn_native/Buffer.h" +#include "dawn_native/CommandBuffer.h" +#include "dawn_native/ComputePipeline.h" +#include "dawn_native/DepthStencilState.h" +#include "dawn_native/Device.h" +#include "dawn_native/InputState.h" +#include "dawn_native/PipelineLayout.h" +#include "dawn_native/Queue.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/RenderPipeline.h" +#include "dawn_native/Sampler.h" +#include "dawn_native/ShaderModule.h" +#include "dawn_native/SwapChain.h" +#include "dawn_native/Texture.h" +#include "dawn_native/ToBackend.h" namespace backend { namespace null { diff --git a/src/backend/opengl/BlendStateGL.cpp b/src/dawn_native/opengl/BlendStateGL.cpp similarity index 98% rename from src/backend/opengl/BlendStateGL.cpp rename to src/dawn_native/opengl/BlendStateGL.cpp index faa81b4698..8a57686e66 100644 --- a/src/backend/opengl/BlendStateGL.cpp +++ b/src/dawn_native/opengl/BlendStateGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/BlendStateGL.h" +#include "dawn_native/opengl/BlendStateGL.h" #include "common/Assert.h" diff --git a/src/backend/opengl/BlendStateGL.h b/src/dawn_native/opengl/BlendStateGL.h similarity index 96% rename from src/backend/opengl/BlendStateGL.h rename to src/dawn_native/opengl/BlendStateGL.h index 52e01da317..355db713ed 100644 --- a/src/backend/opengl/BlendStateGL.h +++ b/src/dawn_native/opengl/BlendStateGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_BLENDSTATEGL_H_ #define BACKEND_OPENGL_BLENDSTATEGL_H_ -#include "backend/BlendState.h" +#include "dawn_native/BlendState.h" #include "glad/glad.h" diff --git a/src/backend/opengl/BufferGL.cpp b/src/dawn_native/opengl/BufferGL.cpp similarity index 98% rename from src/backend/opengl/BufferGL.cpp rename to src/dawn_native/opengl/BufferGL.cpp index be38f38a84..e501f147bd 100644 --- a/src/backend/opengl/BufferGL.cpp +++ b/src/dawn_native/opengl/BufferGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/BufferGL.h" +#include "dawn_native/opengl/BufferGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/BufferGL.h b/src/dawn_native/opengl/BufferGL.h similarity index 97% rename from src/backend/opengl/BufferGL.h rename to src/dawn_native/opengl/BufferGL.h index 305108c099..92ebd411bd 100644 --- a/src/backend/opengl/BufferGL.h +++ b/src/dawn_native/opengl/BufferGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_BUFFERGL_H_ #define BACKEND_OPENGL_BUFFERGL_H_ -#include "backend/Buffer.h" +#include "dawn_native/Buffer.h" #include "glad/glad.h" diff --git a/src/backend/opengl/CommandBufferGL.cpp b/src/dawn_native/opengl/CommandBufferGL.cpp similarity index 98% rename from src/backend/opengl/CommandBufferGL.cpp rename to src/dawn_native/opengl/CommandBufferGL.cpp index 83a2ea3222..68fcc51e12 100644 --- a/src/backend/opengl/CommandBufferGL.cpp +++ b/src/dawn_native/opengl/CommandBufferGL.cpp @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/CommandBufferGL.h" +#include "dawn_native/opengl/CommandBufferGL.h" -#include "backend/BindGroup.h" -#include "backend/Commands.h" -#include "backend/opengl/BufferGL.h" -#include "backend/opengl/ComputePipelineGL.h" -#include "backend/opengl/Forward.h" -#include "backend/opengl/InputStateGL.h" -#include "backend/opengl/PersistentPipelineStateGL.h" -#include "backend/opengl/PipelineLayoutGL.h" -#include "backend/opengl/RenderPipelineGL.h" -#include "backend/opengl/SamplerGL.h" -#include "backend/opengl/TextureGL.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/Commands.h" +#include "dawn_native/opengl/BufferGL.h" +#include "dawn_native/opengl/ComputePipelineGL.h" +#include "dawn_native/opengl/Forward.h" +#include "dawn_native/opengl/InputStateGL.h" +#include "dawn_native/opengl/PersistentPipelineStateGL.h" +#include "dawn_native/opengl/PipelineLayoutGL.h" +#include "dawn_native/opengl/RenderPipelineGL.h" +#include "dawn_native/opengl/SamplerGL.h" +#include "dawn_native/opengl/TextureGL.h" #include diff --git a/src/backend/opengl/CommandBufferGL.h b/src/dawn_native/opengl/CommandBufferGL.h similarity index 93% rename from src/backend/opengl/CommandBufferGL.h rename to src/dawn_native/opengl/CommandBufferGL.h index aedc973d1f..342c506944 100644 --- a/src/backend/opengl/CommandBufferGL.h +++ b/src/dawn_native/opengl/CommandBufferGL.h @@ -15,8 +15,8 @@ #ifndef BACKEND_OPENGL_COMMANDBUFFERGL_H_ #define BACKEND_OPENGL_COMMANDBUFFERGL_H_ -#include "backend/CommandAllocator.h" -#include "backend/CommandBuffer.h" +#include "dawn_native/CommandAllocator.h" +#include "dawn_native/CommandBuffer.h" namespace backend { class RenderPassDescriptorBase; diff --git a/src/backend/opengl/ComputePipelineGL.cpp b/src/dawn_native/opengl/ComputePipelineGL.cpp similarity index 94% rename from src/backend/opengl/ComputePipelineGL.cpp rename to src/dawn_native/opengl/ComputePipelineGL.cpp index a0e9e27775..9bcf43e564 100644 --- a/src/backend/opengl/ComputePipelineGL.cpp +++ b/src/dawn_native/opengl/ComputePipelineGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/ComputePipelineGL.h" +#include "dawn_native/opengl/ComputePipelineGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/ComputePipelineGL.h b/src/dawn_native/opengl/ComputePipelineGL.h similarity index 92% rename from src/backend/opengl/ComputePipelineGL.h rename to src/dawn_native/opengl/ComputePipelineGL.h index c351efd67e..a5c43269b0 100644 --- a/src/backend/opengl/ComputePipelineGL.h +++ b/src/dawn_native/opengl/ComputePipelineGL.h @@ -15,9 +15,9 @@ #ifndef BACKEND_OPENGL_COMPUTEPIPELINEGL_H_ #define BACKEND_OPENGL_COMPUTEPIPELINEGL_H_ -#include "backend/ComputePipeline.h" +#include "dawn_native/ComputePipeline.h" -#include "backend/opengl/PipelineGL.h" +#include "dawn_native/opengl/PipelineGL.h" #include "glad/glad.h" diff --git a/src/backend/opengl/DepthStencilStateGL.cpp b/src/dawn_native/opengl/DepthStencilStateGL.cpp similarity index 97% rename from src/backend/opengl/DepthStencilStateGL.cpp rename to src/dawn_native/opengl/DepthStencilStateGL.cpp index 49f1b044e8..dd9fdf0c77 100644 --- a/src/backend/opengl/DepthStencilStateGL.cpp +++ b/src/dawn_native/opengl/DepthStencilStateGL.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/DepthStencilStateGL.h" +#include "dawn_native/opengl/DepthStencilStateGL.h" -#include "backend/opengl/PersistentPipelineStateGL.h" #include "common/Assert.h" +#include "dawn_native/opengl/PersistentPipelineStateGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/DepthStencilStateGL.h b/src/dawn_native/opengl/DepthStencilStateGL.h similarity index 96% rename from src/backend/opengl/DepthStencilStateGL.h rename to src/dawn_native/opengl/DepthStencilStateGL.h index 8c882cf109..889ce0eabd 100644 --- a/src/backend/opengl/DepthStencilStateGL.h +++ b/src/dawn_native/opengl/DepthStencilStateGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_DEPTHSTENCILSTATEGL_H_ #define BACKEND_OPENGL_DEPTHSTENCILSTATEGL_H_ -#include "backend/DepthStencilState.h" +#include "dawn_native/DepthStencilState.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/DeviceGL.cpp b/src/dawn_native/opengl/DeviceGL.cpp similarity index 82% rename from src/backend/opengl/DeviceGL.cpp rename to src/dawn_native/opengl/DeviceGL.cpp index 121e9085bf..f414b0581a 100644 --- a/src/backend/opengl/DeviceGL.cpp +++ b/src/dawn_native/opengl/DeviceGL.cpp @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/DeviceGL.h" +#include "dawn_native/opengl/DeviceGL.h" -#include "backend/BindGroup.h" -#include "backend/BindGroupLayout.h" -#include "backend/RenderPassDescriptor.h" -#include "backend/opengl/BlendStateGL.h" -#include "backend/opengl/BufferGL.h" -#include "backend/opengl/CommandBufferGL.h" -#include "backend/opengl/ComputePipelineGL.h" -#include "backend/opengl/DepthStencilStateGL.h" -#include "backend/opengl/InputStateGL.h" -#include "backend/opengl/PipelineLayoutGL.h" -#include "backend/opengl/QueueGL.h" -#include "backend/opengl/RenderPipelineGL.h" -#include "backend/opengl/SamplerGL.h" -#include "backend/opengl/ShaderModuleGL.h" -#include "backend/opengl/SwapChainGL.h" -#include "backend/opengl/TextureGL.h" +#include "dawn_native/BindGroup.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/opengl/BlendStateGL.h" +#include "dawn_native/opengl/BufferGL.h" +#include "dawn_native/opengl/CommandBufferGL.h" +#include "dawn_native/opengl/ComputePipelineGL.h" +#include "dawn_native/opengl/DepthStencilStateGL.h" +#include "dawn_native/opengl/InputStateGL.h" +#include "dawn_native/opengl/PipelineLayoutGL.h" +#include "dawn_native/opengl/QueueGL.h" +#include "dawn_native/opengl/RenderPipelineGL.h" +#include "dawn_native/opengl/SamplerGL.h" +#include "dawn_native/opengl/ShaderModuleGL.h" +#include "dawn_native/opengl/SwapChainGL.h" +#include "dawn_native/opengl/TextureGL.h" namespace backend { namespace opengl { dawnProcTable GetNonValidatingProcs(); diff --git a/src/backend/opengl/DeviceGL.h b/src/dawn_native/opengl/DeviceGL.h similarity index 97% rename from src/backend/opengl/DeviceGL.h rename to src/dawn_native/opengl/DeviceGL.h index fd0eaabfdd..6aac3b8c66 100644 --- a/src/backend/opengl/DeviceGL.h +++ b/src/dawn_native/opengl/DeviceGL.h @@ -17,9 +17,9 @@ #include "dawn/dawncpp.h" -#include "backend/Device.h" -#include "backend/opengl/Forward.h" #include "common/Platform.h" +#include "dawn_native/Device.h" +#include "dawn_native/opengl/Forward.h" #include "glad/glad.h" diff --git a/src/backend/opengl/Forward.h b/src/dawn_native/opengl/Forward.h similarity index 98% rename from src/backend/opengl/Forward.h rename to src/dawn_native/opengl/Forward.h index 69aed9ca61..259558f69f 100644 --- a/src/backend/opengl/Forward.h +++ b/src/dawn_native/opengl/Forward.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_FORWARD_H_ #define BACKEND_OPENGL_FORWARD_H_ -#include "backend/ToBackend.h" +#include "dawn_native/ToBackend.h" namespace { class BindGroupBase; diff --git a/src/dawn_native/opengl/GeneratedCodeIncludes.h b/src/dawn_native/opengl/GeneratedCodeIncludes.h new file mode 100644 index 0000000000..10b3c8d770 --- /dev/null +++ b/src/dawn_native/opengl/GeneratedCodeIncludes.h @@ -0,0 +1,32 @@ +// Copyright 2017 The Dawn 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 "dawn_native/BindGroup.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/RenderPassDescriptor.h" +#include "dawn_native/opengl/BlendStateGL.h" +#include "dawn_native/opengl/BufferGL.h" +#include "dawn_native/opengl/CommandBufferGL.h" +#include "dawn_native/opengl/ComputePipelineGL.h" +#include "dawn_native/opengl/DepthStencilStateGL.h" +#include "dawn_native/opengl/DeviceGL.h" +#include "dawn_native/opengl/InputStateGL.h" +#include "dawn_native/opengl/PersistentPipelineStateGL.h" +#include "dawn_native/opengl/PipelineLayoutGL.h" +#include "dawn_native/opengl/QueueGL.h" +#include "dawn_native/opengl/RenderPipelineGL.h" +#include "dawn_native/opengl/SamplerGL.h" +#include "dawn_native/opengl/ShaderModuleGL.h" +#include "dawn_native/opengl/SwapChainGL.h" +#include "dawn_native/opengl/TextureGL.h" diff --git a/src/backend/opengl/InputStateGL.cpp b/src/dawn_native/opengl/InputStateGL.cpp similarity index 98% rename from src/backend/opengl/InputStateGL.cpp rename to src/dawn_native/opengl/InputStateGL.cpp index 915272dcfe..b986dee97c 100644 --- a/src/backend/opengl/InputStateGL.cpp +++ b/src/dawn_native/opengl/InputStateGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/InputStateGL.h" +#include "dawn_native/opengl/InputStateGL.h" #include "common/Assert.h" diff --git a/src/backend/opengl/InputStateGL.h b/src/dawn_native/opengl/InputStateGL.h similarity index 97% rename from src/backend/opengl/InputStateGL.h rename to src/dawn_native/opengl/InputStateGL.h index acaf8fa69e..92161d5ecf 100644 --- a/src/backend/opengl/InputStateGL.h +++ b/src/dawn_native/opengl/InputStateGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_INPUTSTATEGL_H_ #define BACKEND_OPENGL_INPUTSTATEGL_H_ -#include "backend/InputState.h" +#include "dawn_native/InputState.h" #include "glad/glad.h" diff --git a/src/backend/opengl/PersistentPipelineStateGL.cpp b/src/dawn_native/opengl/PersistentPipelineStateGL.cpp similarity index 97% rename from src/backend/opengl/PersistentPipelineStateGL.cpp rename to src/dawn_native/opengl/PersistentPipelineStateGL.cpp index 608373ad26..0b28a25a0e 100644 --- a/src/backend/opengl/PersistentPipelineStateGL.cpp +++ b/src/dawn_native/opengl/PersistentPipelineStateGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/PersistentPipelineStateGL.h" +#include "dawn_native/opengl/PersistentPipelineStateGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/PersistentPipelineStateGL.h b/src/dawn_native/opengl/PersistentPipelineStateGL.h similarity index 100% rename from src/backend/opengl/PersistentPipelineStateGL.h rename to src/dawn_native/opengl/PersistentPipelineStateGL.h diff --git a/src/backend/opengl/PipelineGL.cpp b/src/dawn_native/opengl/PipelineGL.cpp similarity index 96% rename from src/backend/opengl/PipelineGL.cpp rename to src/dawn_native/opengl/PipelineGL.cpp index 984a583ade..b2e7e65a80 100644 --- a/src/backend/opengl/PipelineGL.cpp +++ b/src/dawn_native/opengl/PipelineGL.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/PipelineGL.h" +#include "dawn_native/opengl/PipelineGL.h" -#include "backend/BindGroupLayout.h" -#include "backend/opengl/Forward.h" -#include "backend/opengl/PersistentPipelineStateGL.h" -#include "backend/opengl/PipelineLayoutGL.h" -#include "backend/opengl/ShaderModuleGL.h" #include "common/BitSetIterator.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/opengl/Forward.h" +#include "dawn_native/opengl/PersistentPipelineStateGL.h" +#include "dawn_native/opengl/PipelineLayoutGL.h" +#include "dawn_native/opengl/ShaderModuleGL.h" #include #include diff --git a/src/backend/opengl/PipelineGL.h b/src/dawn_native/opengl/PipelineGL.h similarity index 98% rename from src/backend/opengl/PipelineGL.h rename to src/dawn_native/opengl/PipelineGL.h index e0c9de3a75..74fd9ef600 100644 --- a/src/backend/opengl/PipelineGL.h +++ b/src/dawn_native/opengl/PipelineGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_PIPELINEGL_H_ #define BACKEND_OPENGL_PIPELINEGL_H_ -#include "backend/Pipeline.h" +#include "dawn_native/Pipeline.h" #include "glad/glad.h" diff --git a/src/backend/opengl/PipelineLayoutGL.cpp b/src/dawn_native/opengl/PipelineLayoutGL.cpp similarity index 95% rename from src/backend/opengl/PipelineLayoutGL.cpp rename to src/dawn_native/opengl/PipelineLayoutGL.cpp index 266cc1507b..9bc0c5a93a 100644 --- a/src/backend/opengl/PipelineLayoutGL.cpp +++ b/src/dawn_native/opengl/PipelineLayoutGL.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/PipelineLayoutGL.h" +#include "dawn_native/opengl/PipelineLayoutGL.h" -#include "backend/BindGroupLayout.h" -#include "backend/opengl/DeviceGL.h" #include "common/BitSetIterator.h" +#include "dawn_native/BindGroupLayout.h" +#include "dawn_native/opengl/DeviceGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/PipelineLayoutGL.h b/src/dawn_native/opengl/PipelineLayoutGL.h similarity index 97% rename from src/backend/opengl/PipelineLayoutGL.h rename to src/dawn_native/opengl/PipelineLayoutGL.h index 8c268c1b2d..c3d64fd33c 100644 --- a/src/backend/opengl/PipelineLayoutGL.h +++ b/src/dawn_native/opengl/PipelineLayoutGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_PIPELINELAYOUTGL_H_ #define BACKEND_OPENGL_PIPELINELAYOUTGL_H_ -#include "backend/PipelineLayout.h" +#include "dawn_native/PipelineLayout.h" #include "glad/glad.h" diff --git a/src/backend/opengl/QueueGL.cpp b/src/dawn_native/opengl/QueueGL.cpp similarity index 87% rename from src/backend/opengl/QueueGL.cpp rename to src/dawn_native/opengl/QueueGL.cpp index 9cd4a3d83c..1243d6b0c6 100644 --- a/src/backend/opengl/QueueGL.cpp +++ b/src/dawn_native/opengl/QueueGL.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/QueueGL.h" +#include "dawn_native/opengl/QueueGL.h" -#include "backend/opengl/CommandBufferGL.h" -#include "backend/opengl/DeviceGL.h" +#include "dawn_native/opengl/CommandBufferGL.h" +#include "dawn_native/opengl/DeviceGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/QueueGL.h b/src/dawn_native/opengl/QueueGL.h similarity index 97% rename from src/backend/opengl/QueueGL.h rename to src/dawn_native/opengl/QueueGL.h index eab07e2585..007bed2bf0 100644 --- a/src/backend/opengl/QueueGL.h +++ b/src/dawn_native/opengl/QueueGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_QUEUEGL_H_ #define BACKEND_OPENGL_QUEUEGL_H_ -#include "backend/Queue.h" +#include "dawn_native/Queue.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/RenderPipelineGL.cpp b/src/dawn_native/opengl/RenderPipelineGL.cpp similarity index 88% rename from src/backend/opengl/RenderPipelineGL.cpp rename to src/dawn_native/opengl/RenderPipelineGL.cpp index 12eb116db2..a6522fd44f 100644 --- a/src/backend/opengl/RenderPipelineGL.cpp +++ b/src/dawn_native/opengl/RenderPipelineGL.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/RenderPipelineGL.h" +#include "dawn_native/opengl/RenderPipelineGL.h" -#include "backend/opengl/BlendStateGL.h" -#include "backend/opengl/DepthStencilStateGL.h" -#include "backend/opengl/Forward.h" -#include "backend/opengl/InputStateGL.h" -#include "backend/opengl/PersistentPipelineStateGL.h" +#include "dawn_native/opengl/BlendStateGL.h" +#include "dawn_native/opengl/DepthStencilStateGL.h" +#include "dawn_native/opengl/Forward.h" +#include "dawn_native/opengl/InputStateGL.h" +#include "dawn_native/opengl/PersistentPipelineStateGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/RenderPipelineGL.h b/src/dawn_native/opengl/RenderPipelineGL.h similarity index 93% rename from src/backend/opengl/RenderPipelineGL.h rename to src/dawn_native/opengl/RenderPipelineGL.h index a834ea2aa0..93b39f9fd7 100644 --- a/src/backend/opengl/RenderPipelineGL.h +++ b/src/dawn_native/opengl/RenderPipelineGL.h @@ -15,9 +15,9 @@ #ifndef BACKEND_OPENGL_RENDERPIPELINEGL_H_ #define BACKEND_OPENGL_RENDERPIPELINEGL_H_ -#include "backend/RenderPipeline.h" +#include "dawn_native/RenderPipeline.h" -#include "backend/opengl/PipelineGL.h" +#include "dawn_native/opengl/PipelineGL.h" #include "glad/glad.h" diff --git a/src/backend/opengl/SamplerGL.cpp b/src/dawn_native/opengl/SamplerGL.cpp similarity index 97% rename from src/backend/opengl/SamplerGL.cpp rename to src/dawn_native/opengl/SamplerGL.cpp index c86cc102c2..ec60d39b34 100644 --- a/src/backend/opengl/SamplerGL.cpp +++ b/src/dawn_native/opengl/SamplerGL.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/SamplerGL.h" +#include "dawn_native/opengl/SamplerGL.h" -#include "backend/opengl/DeviceGL.h" #include "common/Assert.h" +#include "dawn_native/opengl/DeviceGL.h" namespace backend { namespace opengl { diff --git a/src/backend/opengl/SamplerGL.h b/src/dawn_native/opengl/SamplerGL.h similarity index 96% rename from src/backend/opengl/SamplerGL.h rename to src/dawn_native/opengl/SamplerGL.h index d4cf9e729c..a879871b9c 100644 --- a/src/backend/opengl/SamplerGL.h +++ b/src/dawn_native/opengl/SamplerGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_SAMPLERGL_H_ #define BACKEND_OPENGL_SAMPLERGL_H_ -#include "backend/Sampler.h" +#include "dawn_native/Sampler.h" #include "glad/glad.h" diff --git a/src/backend/opengl/ShaderModuleGL.cpp b/src/dawn_native/opengl/ShaderModuleGL.cpp similarity index 99% rename from src/backend/opengl/ShaderModuleGL.cpp rename to src/dawn_native/opengl/ShaderModuleGL.cpp index 28c7684eab..b0651a6f3c 100644 --- a/src/backend/opengl/ShaderModuleGL.cpp +++ b/src/dawn_native/opengl/ShaderModuleGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/ShaderModuleGL.h" +#include "dawn_native/opengl/ShaderModuleGL.h" #include "common/Assert.h" #include "common/Platform.h" diff --git a/src/backend/opengl/ShaderModuleGL.h b/src/dawn_native/opengl/ShaderModuleGL.h similarity index 97% rename from src/backend/opengl/ShaderModuleGL.h rename to src/dawn_native/opengl/ShaderModuleGL.h index 9f28b3a22b..53f7e00e57 100644 --- a/src/backend/opengl/ShaderModuleGL.h +++ b/src/dawn_native/opengl/ShaderModuleGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_SHADERMODULEGL_H_ #define BACKEND_OPENGL_SHADERMODULEGL_H_ -#include "backend/ShaderModule.h" +#include "dawn_native/ShaderModule.h" #include "glad/glad.h" diff --git a/src/backend/opengl/SwapChainGL.cpp b/src/dawn_native/opengl/SwapChainGL.cpp similarity index 92% rename from src/backend/opengl/SwapChainGL.cpp rename to src/dawn_native/opengl/SwapChainGL.cpp index a23ceef852..6fad7b55bd 100644 --- a/src/backend/opengl/SwapChainGL.cpp +++ b/src/dawn_native/opengl/SwapChainGL.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/SwapChainGL.h" +#include "dawn_native/opengl/SwapChainGL.h" -#include "backend/Device.h" -#include "backend/opengl/TextureGL.h" +#include "dawn_native/Device.h" +#include "dawn_native/opengl/TextureGL.h" #include diff --git a/src/backend/opengl/SwapChainGL.h b/src/dawn_native/opengl/SwapChainGL.h similarity index 96% rename from src/backend/opengl/SwapChainGL.h rename to src/dawn_native/opengl/SwapChainGL.h index 770544faff..fa0267b4be 100644 --- a/src/backend/opengl/SwapChainGL.h +++ b/src/dawn_native/opengl/SwapChainGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_SWAPCHAINGL_H_ #define BACKEND_OPENGL_SWAPCHAINGL_H_ -#include "backend/SwapChain.h" +#include "dawn_native/SwapChain.h" #include "glad/glad.h" diff --git a/src/backend/opengl/TextureGL.cpp b/src/dawn_native/opengl/TextureGL.cpp similarity index 98% rename from src/backend/opengl/TextureGL.cpp rename to src/dawn_native/opengl/TextureGL.cpp index ce0dd351d8..06b612f054 100644 --- a/src/backend/opengl/TextureGL.cpp +++ b/src/dawn_native/opengl/TextureGL.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/opengl/TextureGL.h" +#include "dawn_native/opengl/TextureGL.h" #include "common/Assert.h" diff --git a/src/backend/opengl/TextureGL.h b/src/dawn_native/opengl/TextureGL.h similarity index 97% rename from src/backend/opengl/TextureGL.h rename to src/dawn_native/opengl/TextureGL.h index 2cec73f025..334dfbe412 100644 --- a/src/backend/opengl/TextureGL.h +++ b/src/dawn_native/opengl/TextureGL.h @@ -15,7 +15,7 @@ #ifndef BACKEND_OPENGL_TEXTUREGL_H_ #define BACKEND_OPENGL_TEXTUREGL_H_ -#include "backend/Texture.h" +#include "dawn_native/Texture.h" #include "glad/glad.h" diff --git a/src/backend/vulkan/BindGroupLayoutVk.cpp b/src/dawn_native/vulkan/BindGroupLayoutVk.cpp similarity index 98% rename from src/backend/vulkan/BindGroupLayoutVk.cpp rename to src/dawn_native/vulkan/BindGroupLayoutVk.cpp index 4aa5715625..3470dd8dc1 100644 --- a/src/backend/vulkan/BindGroupLayoutVk.cpp +++ b/src/dawn_native/vulkan/BindGroupLayoutVk.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/BindGroupLayoutVk.h" +#include "dawn_native/vulkan/BindGroupLayoutVk.h" -#include "backend/vulkan/DeviceVk.h" #include "common/BitSetIterator.h" +#include "dawn_native/vulkan/DeviceVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/BindGroupLayoutVk.h b/src/dawn_native/vulkan/BindGroupLayoutVk.h similarity index 97% rename from src/backend/vulkan/BindGroupLayoutVk.h rename to src/dawn_native/vulkan/BindGroupLayoutVk.h index 5c251a4e35..b011bbbbeb 100644 --- a/src/backend/vulkan/BindGroupLayoutVk.h +++ b/src/dawn_native/vulkan/BindGroupLayoutVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_BINDGROUPLAYOUTVK_H_ #define BACKEND_VULKAN_BINDGROUPLAYOUTVK_H_ -#include "backend/BindGroupLayout.h" +#include "dawn_native/BindGroupLayout.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/BindGroupVk.cpp b/src/dawn_native/vulkan/BindGroupVk.cpp similarity index 94% rename from src/backend/vulkan/BindGroupVk.cpp rename to src/dawn_native/vulkan/BindGroupVk.cpp index 6cbad79141..c496c0b6f0 100644 --- a/src/backend/vulkan/BindGroupVk.cpp +++ b/src/dawn_native/vulkan/BindGroupVk.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/BindGroupVk.h" +#include "dawn_native/vulkan/BindGroupVk.h" -#include "backend/vulkan/BindGroupLayoutVk.h" -#include "backend/vulkan/BufferVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/SamplerVk.h" -#include "backend/vulkan/TextureVk.h" +#include "dawn_native/vulkan/BindGroupLayoutVk.h" +#include "dawn_native/vulkan/BufferVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/SamplerVk.h" +#include "dawn_native/vulkan/TextureVk.h" #include "common/BitSetIterator.h" diff --git a/src/backend/vulkan/BindGroupVk.h b/src/dawn_native/vulkan/BindGroupVk.h similarity index 97% rename from src/backend/vulkan/BindGroupVk.h rename to src/dawn_native/vulkan/BindGroupVk.h index 70150f9d0b..06da0cde98 100644 --- a/src/backend/vulkan/BindGroupVk.h +++ b/src/dawn_native/vulkan/BindGroupVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_BINDGROUPVK_H_ #define BACKEND_VULKAN_BINDGROUPVK_H_ -#include "backend/BindGroup.h" +#include "dawn_native/BindGroup.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/BlendStateVk.cpp b/src/dawn_native/vulkan/BlendStateVk.cpp similarity index 99% rename from src/backend/vulkan/BlendStateVk.cpp rename to src/dawn_native/vulkan/BlendStateVk.cpp index 2269dd1265..58417ae7a5 100644 --- a/src/backend/vulkan/BlendStateVk.cpp +++ b/src/dawn_native/vulkan/BlendStateVk.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/BlendStateVk.h" +#include "dawn_native/vulkan/BlendStateVk.h" #include "common/Assert.h" diff --git a/src/backend/vulkan/BlendStateVk.h b/src/dawn_native/vulkan/BlendStateVk.h similarity index 97% rename from src/backend/vulkan/BlendStateVk.h rename to src/dawn_native/vulkan/BlendStateVk.h index 2ce029c6b4..c18071bea5 100644 --- a/src/backend/vulkan/BlendStateVk.h +++ b/src/dawn_native/vulkan/BlendStateVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_BLENDSTATEVK_H_ #define BACKEND_VULKAN_BLENDSTATEVK_H_ -#include "backend/BlendState.h" +#include "dawn_native/BlendState.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/BufferUploader.cpp b/src/dawn_native/vulkan/BufferUploader.cpp similarity index 95% rename from src/backend/vulkan/BufferUploader.cpp rename to src/dawn_native/vulkan/BufferUploader.cpp index ec9165d2c4..bdcc2af18a 100644 --- a/src/backend/vulkan/BufferUploader.cpp +++ b/src/dawn_native/vulkan/BufferUploader.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/BufferUploader.h" +#include "dawn_native/vulkan/BufferUploader.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/MemoryAllocator.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/MemoryAllocator.h" #include diff --git a/src/backend/vulkan/BufferUploader.h b/src/dawn_native/vulkan/BufferUploader.h similarity index 100% rename from src/backend/vulkan/BufferUploader.h rename to src/dawn_native/vulkan/BufferUploader.h diff --git a/src/backend/vulkan/BufferVk.cpp b/src/dawn_native/vulkan/BufferVk.cpp similarity index 98% rename from src/backend/vulkan/BufferVk.cpp rename to src/dawn_native/vulkan/BufferVk.cpp index 885e455972..d20c7ff02a 100644 --- a/src/backend/vulkan/BufferVk.cpp +++ b/src/dawn_native/vulkan/BufferVk.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/BufferVk.h" +#include "dawn_native/vulkan/BufferVk.h" -#include "backend/vulkan/BufferUploader.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/BufferUploader.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" #include diff --git a/src/backend/vulkan/BufferVk.h b/src/dawn_native/vulkan/BufferVk.h similarity index 96% rename from src/backend/vulkan/BufferVk.h rename to src/dawn_native/vulkan/BufferVk.h index 61b1643d0c..c850818ee9 100644 --- a/src/backend/vulkan/BufferVk.h +++ b/src/dawn_native/vulkan/BufferVk.h @@ -15,11 +15,11 @@ #ifndef BACKEND_VULKAN_BUFFERVK_H_ #define BACKEND_VULKAN_BUFFERVK_H_ -#include "backend/Buffer.h" +#include "dawn_native/Buffer.h" -#include "backend/vulkan/MemoryAllocator.h" #include "common/SerialQueue.h" #include "common/vulkan_platform.h" +#include "dawn_native/vulkan/MemoryAllocator.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/CommandBufferVk.cpp b/src/dawn_native/vulkan/CommandBufferVk.cpp similarity index 97% rename from src/backend/vulkan/CommandBufferVk.cpp rename to src/dawn_native/vulkan/CommandBufferVk.cpp index b293507f05..1b42e96952 100644 --- a/src/backend/vulkan/CommandBufferVk.cpp +++ b/src/dawn_native/vulkan/CommandBufferVk.cpp @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/CommandBufferVk.h" +#include "dawn_native/vulkan/CommandBufferVk.h" -#include "backend/Commands.h" -#include "backend/vulkan/BindGroupVk.h" -#include "backend/vulkan/BufferVk.h" -#include "backend/vulkan/ComputePipelineVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/PipelineLayoutVk.h" -#include "backend/vulkan/RenderPassDescriptorVk.h" -#include "backend/vulkan/RenderPipelineVk.h" -#include "backend/vulkan/TextureVk.h" +#include "dawn_native/Commands.h" +#include "dawn_native/vulkan/BindGroupVk.h" +#include "dawn_native/vulkan/BufferVk.h" +#include "dawn_native/vulkan/ComputePipelineVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/PipelineLayoutVk.h" +#include "dawn_native/vulkan/RenderPassDescriptorVk.h" +#include "dawn_native/vulkan/RenderPipelineVk.h" +#include "dawn_native/vulkan/TextureVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/CommandBufferVk.h b/src/dawn_native/vulkan/CommandBufferVk.h similarity index 97% rename from src/backend/vulkan/CommandBufferVk.h rename to src/dawn_native/vulkan/CommandBufferVk.h index 2d15457818..3bca08f6b9 100644 --- a/src/backend/vulkan/CommandBufferVk.h +++ b/src/dawn_native/vulkan/CommandBufferVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_COMMANDBUFFERVK_H_ #define BACKEND_VULKAN_COMMANDBUFFERVK_H_ -#include "backend/CommandBuffer.h" +#include "dawn_native/CommandBuffer.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/ComputePipelineVk.cpp b/src/dawn_native/vulkan/ComputePipelineVk.cpp similarity index 90% rename from src/backend/vulkan/ComputePipelineVk.cpp rename to src/dawn_native/vulkan/ComputePipelineVk.cpp index 13e02f369b..9d0000a678 100644 --- a/src/backend/vulkan/ComputePipelineVk.cpp +++ b/src/dawn_native/vulkan/ComputePipelineVk.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/ComputePipelineVk.h" +#include "dawn_native/vulkan/ComputePipelineVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/PipelineLayoutVk.h" -#include "backend/vulkan/ShaderModuleVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/PipelineLayoutVk.h" +#include "dawn_native/vulkan/ShaderModuleVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/ComputePipelineVk.h b/src/dawn_native/vulkan/ComputePipelineVk.h similarity index 96% rename from src/backend/vulkan/ComputePipelineVk.h rename to src/dawn_native/vulkan/ComputePipelineVk.h index c50c4c179f..316de70ce8 100644 --- a/src/backend/vulkan/ComputePipelineVk.h +++ b/src/dawn_native/vulkan/ComputePipelineVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_COMPUTEPIPELINEVK_H_ #define BACKEND_VULKAN_COMPUTEPIPELINEVK_H_ -#include "backend/ComputePipeline.h" +#include "dawn_native/ComputePipeline.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/DepthStencilStateVk.cpp b/src/dawn_native/vulkan/DepthStencilStateVk.cpp similarity index 98% rename from src/backend/vulkan/DepthStencilStateVk.cpp rename to src/dawn_native/vulkan/DepthStencilStateVk.cpp index c4837d2822..d5c42b0e11 100644 --- a/src/backend/vulkan/DepthStencilStateVk.cpp +++ b/src/dawn_native/vulkan/DepthStencilStateVk.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/DepthStencilStateVk.h" +#include "dawn_native/vulkan/DepthStencilStateVk.h" #include "common/Assert.h" diff --git a/src/backend/vulkan/DepthStencilStateVk.h b/src/dawn_native/vulkan/DepthStencilStateVk.h similarity index 96% rename from src/backend/vulkan/DepthStencilStateVk.h rename to src/dawn_native/vulkan/DepthStencilStateVk.h index a9ae9395dd..4204cacca4 100644 --- a/src/backend/vulkan/DepthStencilStateVk.h +++ b/src/dawn_native/vulkan/DepthStencilStateVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_DEPTHSTENCILSTATEVK_H_ #define BACKEND_VULKAN_DEPTHSTENCILSTATEVK_H_ -#include "backend/DepthStencilState.h" +#include "dawn_native/DepthStencilState.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/DeviceVk.cpp b/src/dawn_native/vulkan/DeviceVk.cpp similarity index 95% rename from src/backend/vulkan/DeviceVk.cpp rename to src/dawn_native/vulkan/DeviceVk.cpp index 79ec72ecfd..19f518b0c3 100644 --- a/src/backend/vulkan/DeviceVk.cpp +++ b/src/dawn_native/vulkan/DeviceVk.cpp @@ -12,31 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/DeviceVk.h" -#include "backend/Commands.h" -#include "backend/vulkan/BindGroupLayoutVk.h" -#include "backend/vulkan/BindGroupVk.h" -#include "backend/vulkan/BlendStateVk.h" -#include "backend/vulkan/BufferUploader.h" -#include "backend/vulkan/BufferVk.h" -#include "backend/vulkan/CommandBufferVk.h" -#include "backend/vulkan/ComputePipelineVk.h" -#include "backend/vulkan/DepthStencilStateVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/InputStateVk.h" -#include "backend/vulkan/NativeSwapChainImplVk.h" -#include "backend/vulkan/PipelineLayoutVk.h" -#include "backend/vulkan/QueueVk.h" -#include "backend/vulkan/RenderPassCache.h" -#include "backend/vulkan/RenderPassDescriptorVk.h" -#include "backend/vulkan/RenderPipelineVk.h" -#include "backend/vulkan/SamplerVk.h" -#include "backend/vulkan/ShaderModuleVk.h" -#include "backend/vulkan/SwapChainVk.h" -#include "backend/vulkan/TextureVk.h" #include "common/Platform.h" #include "common/SwapChainUtils.h" +#include "dawn_native/Commands.h" +#include "dawn_native/vulkan/BindGroupLayoutVk.h" +#include "dawn_native/vulkan/BindGroupVk.h" +#include "dawn_native/vulkan/BlendStateVk.h" +#include "dawn_native/vulkan/BufferUploader.h" +#include "dawn_native/vulkan/BufferVk.h" +#include "dawn_native/vulkan/CommandBufferVk.h" +#include "dawn_native/vulkan/ComputePipelineVk.h" +#include "dawn_native/vulkan/DepthStencilStateVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/InputStateVk.h" +#include "dawn_native/vulkan/NativeSwapChainImplVk.h" +#include "dawn_native/vulkan/PipelineLayoutVk.h" +#include "dawn_native/vulkan/QueueVk.h" +#include "dawn_native/vulkan/RenderPassCache.h" +#include "dawn_native/vulkan/RenderPassDescriptorVk.h" +#include "dawn_native/vulkan/RenderPipelineVk.h" +#include "dawn_native/vulkan/SamplerVk.h" +#include "dawn_native/vulkan/ShaderModuleVk.h" +#include "dawn_native/vulkan/SwapChainVk.h" +#include "dawn_native/vulkan/TextureVk.h" #include diff --git a/src/backend/vulkan/DeviceVk.h b/src/dawn_native/vulkan/DeviceVk.h similarity index 97% rename from src/backend/vulkan/DeviceVk.h rename to src/dawn_native/vulkan/DeviceVk.h index 25e029deb3..1dd7362068 100644 --- a/src/backend/vulkan/DeviceVk.h +++ b/src/dawn_native/vulkan/DeviceVk.h @@ -17,13 +17,13 @@ #include "dawn/dawncpp.h" -#include "backend/Device.h" -#include "backend/vulkan/Forward.h" -#include "backend/vulkan/VulkanFunctions.h" -#include "backend/vulkan/VulkanInfo.h" #include "common/DynamicLib.h" #include "common/Serial.h" #include "common/SerialQueue.h" +#include "dawn_native/Device.h" +#include "dawn_native/vulkan/Forward.h" +#include "dawn_native/vulkan/VulkanFunctions.h" +#include "dawn_native/vulkan/VulkanInfo.h" #include diff --git a/src/backend/vulkan/FencedDeleter.cpp b/src/dawn_native/vulkan/FencedDeleter.cpp similarity index 98% rename from src/backend/vulkan/FencedDeleter.cpp rename to src/dawn_native/vulkan/FencedDeleter.cpp index f909b53346..ad2234c153 100644 --- a/src/backend/vulkan/FencedDeleter.cpp +++ b/src/dawn_native/vulkan/FencedDeleter.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/FencedDeleter.h" -#include "backend/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/DeviceVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/FencedDeleter.h b/src/dawn_native/vulkan/FencedDeleter.h similarity index 100% rename from src/backend/vulkan/FencedDeleter.h rename to src/dawn_native/vulkan/FencedDeleter.h diff --git a/src/backend/vulkan/Forward.h b/src/dawn_native/vulkan/Forward.h similarity index 98% rename from src/backend/vulkan/Forward.h rename to src/dawn_native/vulkan/Forward.h index 576b1f286f..4a181bae94 100644 --- a/src/backend/vulkan/Forward.h +++ b/src/dawn_native/vulkan/Forward.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_FORWARD_H_ #define BACKEND_VULKAN_FORWARD_H_ -#include "backend/ToBackend.h" +#include "dawn_native/ToBackend.h" namespace backend { class BufferViewBase; diff --git a/src/dawn_native/vulkan/GeneratedCodeIncludes.h b/src/dawn_native/vulkan/GeneratedCodeIncludes.h new file mode 100644 index 0000000000..2f8beee8a8 --- /dev/null +++ b/src/dawn_native/vulkan/GeneratedCodeIncludes.h @@ -0,0 +1,31 @@ +// Copyright 2017 The Dawn 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 "dawn_native/vulkan/BindGroupLayoutVk.h" +#include "dawn_native/vulkan/BindGroupVk.h" +#include "dawn_native/vulkan/BlendStateVk.h" +#include "dawn_native/vulkan/BufferVk.h" +#include "dawn_native/vulkan/CommandBufferVk.h" +#include "dawn_native/vulkan/ComputePipelineVk.h" +#include "dawn_native/vulkan/DepthStencilStateVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/InputStateVk.h" +#include "dawn_native/vulkan/PipelineLayoutVk.h" +#include "dawn_native/vulkan/QueueVk.h" +#include "dawn_native/vulkan/RenderPassDescriptorVk.h" +#include "dawn_native/vulkan/RenderPipelineVk.h" +#include "dawn_native/vulkan/SamplerVk.h" +#include "dawn_native/vulkan/ShaderModuleVk.h" +#include "dawn_native/vulkan/SwapChainVk.h" +#include "dawn_native/vulkan/TextureVk.h" diff --git a/src/backend/vulkan/InputStateVk.cpp b/src/dawn_native/vulkan/InputStateVk.cpp similarity index 98% rename from src/backend/vulkan/InputStateVk.cpp rename to src/dawn_native/vulkan/InputStateVk.cpp index 8d7eb0c6cc..df51c5979e 100644 --- a/src/backend/vulkan/InputStateVk.cpp +++ b/src/dawn_native/vulkan/InputStateVk.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/InputStateVk.h" +#include "dawn_native/vulkan/InputStateVk.h" #include "common/BitSetIterator.h" diff --git a/src/backend/vulkan/InputStateVk.h b/src/dawn_native/vulkan/InputStateVk.h similarity index 97% rename from src/backend/vulkan/InputStateVk.h rename to src/dawn_native/vulkan/InputStateVk.h index 4a4922d29f..b35dd3e4a6 100644 --- a/src/backend/vulkan/InputStateVk.h +++ b/src/dawn_native/vulkan/InputStateVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_INPUTSTATEVK_H_ #define BACKEND_VULKAN_INPUTSTATEVK_H_ -#include "backend/InputState.h" +#include "dawn_native/InputState.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/MemoryAllocator.cpp b/src/dawn_native/vulkan/MemoryAllocator.cpp similarity index 97% rename from src/backend/vulkan/MemoryAllocator.cpp rename to src/dawn_native/vulkan/MemoryAllocator.cpp index 2ed69cdb50..fa0f01924d 100644 --- a/src/backend/vulkan/MemoryAllocator.cpp +++ b/src/dawn_native/vulkan/MemoryAllocator.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/MemoryAllocator.h" +#include "dawn_native/vulkan/MemoryAllocator.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/MemoryAllocator.h b/src/dawn_native/vulkan/MemoryAllocator.h similarity index 100% rename from src/backend/vulkan/MemoryAllocator.h rename to src/dawn_native/vulkan/MemoryAllocator.h diff --git a/src/backend/vulkan/NativeSwapChainImplVk.cpp b/src/dawn_native/vulkan/NativeSwapChainImplVk.cpp similarity index 97% rename from src/backend/vulkan/NativeSwapChainImplVk.cpp rename to src/dawn_native/vulkan/NativeSwapChainImplVk.cpp index f3b8758d75..415c182804 100644 --- a/src/backend/vulkan/NativeSwapChainImplVk.cpp +++ b/src/dawn_native/vulkan/NativeSwapChainImplVk.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/NativeSwapChainImplVk.h" +#include "dawn_native/vulkan/NativeSwapChainImplVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/TextureVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/TextureVk.h" #include diff --git a/src/backend/vulkan/NativeSwapChainImplVk.h b/src/dawn_native/vulkan/NativeSwapChainImplVk.h similarity index 98% rename from src/backend/vulkan/NativeSwapChainImplVk.h rename to src/dawn_native/vulkan/NativeSwapChainImplVk.h index 462ebfef8c..58abddae10 100644 --- a/src/backend/vulkan/NativeSwapChainImplVk.h +++ b/src/dawn_native/vulkan/NativeSwapChainImplVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_NATIVESWAPCHAINIMPLVK_H_ #define BACKEND_VULKAN_NATIVESWAPCHAINIMPLVK_H_ -#include "backend/vulkan/VulkanInfo.h" +#include "dawn_native/vulkan/VulkanInfo.h" #include "dawn/dawn_wsi.h" #include "dawn/dawncpp.h" diff --git a/src/backend/vulkan/PipelineLayoutVk.cpp b/src/dawn_native/vulkan/PipelineLayoutVk.cpp similarity index 93% rename from src/backend/vulkan/PipelineLayoutVk.cpp rename to src/dawn_native/vulkan/PipelineLayoutVk.cpp index c6cd999f2c..89ebe2a81c 100644 --- a/src/backend/vulkan/PipelineLayoutVk.cpp +++ b/src/dawn_native/vulkan/PipelineLayoutVk.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/PipelineLayoutVk.h" +#include "dawn_native/vulkan/PipelineLayoutVk.h" -#include "backend/vulkan/BindGroupLayoutVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/BindGroupLayoutVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" #include "common/BitSetIterator.h" diff --git a/src/backend/vulkan/PipelineLayoutVk.h b/src/dawn_native/vulkan/PipelineLayoutVk.h similarity index 96% rename from src/backend/vulkan/PipelineLayoutVk.h rename to src/dawn_native/vulkan/PipelineLayoutVk.h index 344c2cd362..7b1d8751ec 100644 --- a/src/backend/vulkan/PipelineLayoutVk.h +++ b/src/dawn_native/vulkan/PipelineLayoutVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_PIPELINELAYOUTVK_H_ #define BACKEND_VULKAN_PIPELINELAYOUTVK_H_ -#include "backend/PipelineLayout.h" +#include "dawn_native/PipelineLayout.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/QueueVk.cpp b/src/dawn_native/vulkan/QueueVk.cpp similarity index 89% rename from src/backend/vulkan/QueueVk.cpp rename to src/dawn_native/vulkan/QueueVk.cpp index b883659001..0672f83fd0 100644 --- a/src/backend/vulkan/QueueVk.cpp +++ b/src/dawn_native/vulkan/QueueVk.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/QueueVk.h" +#include "dawn_native/vulkan/QueueVk.h" -#include "backend/vulkan/CommandBufferVk.h" -#include "backend/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/CommandBufferVk.h" +#include "dawn_native/vulkan/DeviceVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/QueueVk.h b/src/dawn_native/vulkan/QueueVk.h similarity index 97% rename from src/backend/vulkan/QueueVk.h rename to src/dawn_native/vulkan/QueueVk.h index 2b6206ee4e..7559229355 100644 --- a/src/backend/vulkan/QueueVk.h +++ b/src/dawn_native/vulkan/QueueVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_QUEUEVK_H_ #define BACKEND_VULKAN_QUEUEVK_H_ -#include "backend/Queue.h" +#include "dawn_native/Queue.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/RenderPassCache.cpp b/src/dawn_native/vulkan/RenderPassCache.cpp similarity index 98% rename from src/backend/vulkan/RenderPassCache.cpp rename to src/dawn_native/vulkan/RenderPassCache.cpp index 6f05c28991..273c4f044c 100644 --- a/src/backend/vulkan/RenderPassCache.cpp +++ b/src/dawn_native/vulkan/RenderPassCache.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/RenderPassCache.h" +#include "dawn_native/vulkan/RenderPassCache.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/TextureVk.h" #include "common/BitSetIterator.h" #include "common/HashUtils.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/TextureVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/RenderPassCache.h b/src/dawn_native/vulkan/RenderPassCache.h similarity index 100% rename from src/backend/vulkan/RenderPassCache.h rename to src/dawn_native/vulkan/RenderPassCache.h diff --git a/src/backend/vulkan/RenderPassDescriptorVk.cpp b/src/dawn_native/vulkan/RenderPassDescriptorVk.cpp similarity index 95% rename from src/backend/vulkan/RenderPassDescriptorVk.cpp rename to src/dawn_native/vulkan/RenderPassDescriptorVk.cpp index fb4763f3d6..194610552a 100644 --- a/src/backend/vulkan/RenderPassDescriptorVk.cpp +++ b/src/dawn_native/vulkan/RenderPassDescriptorVk.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/RenderPassDescriptorVk.h" +#include "dawn_native/vulkan/RenderPassDescriptorVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/RenderPassCache.h" -#include "backend/vulkan/TextureVk.h" #include "common/BitSetIterator.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/RenderPassCache.h" +#include "dawn_native/vulkan/TextureVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/RenderPassDescriptorVk.h b/src/dawn_native/vulkan/RenderPassDescriptorVk.h similarity index 96% rename from src/backend/vulkan/RenderPassDescriptorVk.h rename to src/dawn_native/vulkan/RenderPassDescriptorVk.h index dd423655ae..9e18bf4704 100644 --- a/src/backend/vulkan/RenderPassDescriptorVk.h +++ b/src/dawn_native/vulkan/RenderPassDescriptorVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_RENDERPASSDESCRIPTORVK_H_ #define BACKEND_VULKAN_RENDERPASSDESCRIPTORVK_H_ -#include "backend/RenderPassDescriptor.h" +#include "dawn_native/RenderPassDescriptor.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/RenderPipelineVk.cpp b/src/dawn_native/vulkan/RenderPipelineVk.cpp similarity index 93% rename from src/backend/vulkan/RenderPipelineVk.cpp rename to src/dawn_native/vulkan/RenderPipelineVk.cpp index 9d93c6d82c..8ebafa0927 100644 --- a/src/backend/vulkan/RenderPipelineVk.cpp +++ b/src/dawn_native/vulkan/RenderPipelineVk.cpp @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/RenderPipelineVk.h" +#include "dawn_native/vulkan/RenderPipelineVk.h" -#include "backend/vulkan/BlendStateVk.h" -#include "backend/vulkan/DepthStencilStateVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" -#include "backend/vulkan/InputStateVk.h" -#include "backend/vulkan/PipelineLayoutVk.h" -#include "backend/vulkan/RenderPassCache.h" -#include "backend/vulkan/RenderPassDescriptorVk.h" -#include "backend/vulkan/ShaderModuleVk.h" +#include "dawn_native/vulkan/BlendStateVk.h" +#include "dawn_native/vulkan/DepthStencilStateVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/InputStateVk.h" +#include "dawn_native/vulkan/PipelineLayoutVk.h" +#include "dawn_native/vulkan/RenderPassCache.h" +#include "dawn_native/vulkan/RenderPassDescriptorVk.h" +#include "dawn_native/vulkan/ShaderModuleVk.h" namespace backend { namespace vulkan { @@ -156,12 +156,9 @@ namespace backend { namespace vulkan { // Tag all state as dynamic but stencil masks. VkDynamicState dynamicStates[] = { - VK_DYNAMIC_STATE_VIEWPORT, - VK_DYNAMIC_STATE_SCISSOR, - VK_DYNAMIC_STATE_LINE_WIDTH, - VK_DYNAMIC_STATE_DEPTH_BIAS, - VK_DYNAMIC_STATE_BLEND_CONSTANTS, - VK_DYNAMIC_STATE_DEPTH_BOUNDS, + VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, + VK_DYNAMIC_STATE_LINE_WIDTH, VK_DYNAMIC_STATE_DEPTH_BIAS, + VK_DYNAMIC_STATE_BLEND_CONSTANTS, VK_DYNAMIC_STATE_DEPTH_BOUNDS, VK_DYNAMIC_STATE_STENCIL_REFERENCE, }; VkPipelineDynamicStateCreateInfo dynamic; diff --git a/src/backend/vulkan/RenderPipelineVk.h b/src/dawn_native/vulkan/RenderPipelineVk.h similarity index 96% rename from src/backend/vulkan/RenderPipelineVk.h rename to src/dawn_native/vulkan/RenderPipelineVk.h index 2c8df1e976..fa6eaf332c 100644 --- a/src/backend/vulkan/RenderPipelineVk.h +++ b/src/dawn_native/vulkan/RenderPipelineVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_RENDERPIPELINEVK_H_ #define BACKEND_VULKAN_RENDERPIPELINEVK_H_ -#include "backend/RenderPipeline.h" +#include "dawn_native/RenderPipeline.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/SamplerVk.cpp b/src/dawn_native/vulkan/SamplerVk.cpp similarity index 96% rename from src/backend/vulkan/SamplerVk.cpp rename to src/dawn_native/vulkan/SamplerVk.cpp index 6b1fecbec4..b40af26321 100644 --- a/src/backend/vulkan/SamplerVk.cpp +++ b/src/dawn_native/vulkan/SamplerVk.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/SamplerVk.h" +#include "dawn_native/vulkan/SamplerVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/SamplerVk.h b/src/dawn_native/vulkan/SamplerVk.h similarity index 93% rename from src/backend/vulkan/SamplerVk.h rename to src/dawn_native/vulkan/SamplerVk.h index c3999f00a0..52e61530bb 100644 --- a/src/backend/vulkan/SamplerVk.h +++ b/src/dawn_native/vulkan/SamplerVk.h @@ -15,10 +15,10 @@ #ifndef BACKEND_VULKAN_SAMPLERVK_H_ #define BACKEND_VULKAN_SAMPLERVK_H_ -#include "backend/Sampler.h" +#include "dawn_native/Sampler.h" -#include "backend/vulkan/MemoryAllocator.h" #include "common/vulkan_platform.h" +#include "dawn_native/vulkan/MemoryAllocator.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/ShaderModuleVk.cpp b/src/dawn_native/vulkan/ShaderModuleVk.cpp similarity index 93% rename from src/backend/vulkan/ShaderModuleVk.cpp rename to src/dawn_native/vulkan/ShaderModuleVk.cpp index 236e26dcf2..6db4cc1bb7 100644 --- a/src/backend/vulkan/ShaderModuleVk.cpp +++ b/src/dawn_native/vulkan/ShaderModuleVk.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/ShaderModuleVk.h" +#include "dawn_native/vulkan/ShaderModuleVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" #include diff --git a/src/backend/vulkan/ShaderModuleVk.h b/src/dawn_native/vulkan/ShaderModuleVk.h similarity index 96% rename from src/backend/vulkan/ShaderModuleVk.h rename to src/dawn_native/vulkan/ShaderModuleVk.h index c2e1ce872d..d14e24590b 100644 --- a/src/backend/vulkan/ShaderModuleVk.h +++ b/src/dawn_native/vulkan/ShaderModuleVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_SHADERMODULEVK_H_ #define BACKEND_VULKAN_SHADERMODULEVK_H_ -#include "backend/ShaderModule.h" +#include "dawn_native/ShaderModule.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/SwapChainVk.cpp b/src/dawn_native/vulkan/SwapChainVk.cpp similarity index 93% rename from src/backend/vulkan/SwapChainVk.cpp rename to src/dawn_native/vulkan/SwapChainVk.cpp index 7f73a56897..16ca36e67c 100644 --- a/src/backend/vulkan/SwapChainVk.cpp +++ b/src/dawn_native/vulkan/SwapChainVk.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/SwapChainVk.h" +#include "dawn_native/vulkan/SwapChainVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/TextureVk.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/TextureVk.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/SwapChainVk.h b/src/dawn_native/vulkan/SwapChainVk.h similarity index 97% rename from src/backend/vulkan/SwapChainVk.h rename to src/dawn_native/vulkan/SwapChainVk.h index aca16c1363..c2b6ad1515 100644 --- a/src/backend/vulkan/SwapChainVk.h +++ b/src/dawn_native/vulkan/SwapChainVk.h @@ -15,7 +15,7 @@ #ifndef BACKEND_VULKAN_SWAPCHAINVK_H_ #define BACKEND_VULKAN_SWAPCHAINVK_H_ -#include "backend/SwapChain.h" +#include "dawn_native/SwapChain.h" #include "common/vulkan_platform.h" diff --git a/src/backend/vulkan/TextureVk.cpp b/src/dawn_native/vulkan/TextureVk.cpp similarity index 99% rename from src/backend/vulkan/TextureVk.cpp rename to src/dawn_native/vulkan/TextureVk.cpp index b338fdd10c..fa18435cb3 100644 --- a/src/backend/vulkan/TextureVk.cpp +++ b/src/dawn_native/vulkan/TextureVk.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/TextureVk.h" +#include "dawn_native/vulkan/TextureVk.h" -#include "backend/vulkan/DeviceVk.h" -#include "backend/vulkan/FencedDeleter.h" +#include "dawn_native/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/FencedDeleter.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/TextureVk.h b/src/dawn_native/vulkan/TextureVk.h similarity index 96% rename from src/backend/vulkan/TextureVk.h rename to src/dawn_native/vulkan/TextureVk.h index 96c51d751a..76074f02ca 100644 --- a/src/backend/vulkan/TextureVk.h +++ b/src/dawn_native/vulkan/TextureVk.h @@ -15,10 +15,10 @@ #ifndef BACKEND_VULKAN_TEXTUREVK_H_ #define BACKEND_VULKAN_TEXTUREVK_H_ -#include "backend/Texture.h" +#include "dawn_native/Texture.h" -#include "backend/vulkan/MemoryAllocator.h" #include "common/vulkan_platform.h" +#include "dawn_native/vulkan/MemoryAllocator.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/VulkanFunctions.cpp b/src/dawn_native/vulkan/VulkanFunctions.cpp similarity index 99% rename from src/backend/vulkan/VulkanFunctions.cpp rename to src/dawn_native/vulkan/VulkanFunctions.cpp index 97c0401646..976d958658 100644 --- a/src/backend/vulkan/VulkanFunctions.cpp +++ b/src/dawn_native/vulkan/VulkanFunctions.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/VulkanFunctions.h" +#include "dawn_native/vulkan/VulkanFunctions.h" -#include "backend/vulkan/VulkanInfo.h" #include "common/DynamicLib.h" +#include "dawn_native/vulkan/VulkanInfo.h" namespace backend { namespace vulkan { diff --git a/src/backend/vulkan/VulkanFunctions.h b/src/dawn_native/vulkan/VulkanFunctions.h similarity index 100% rename from src/backend/vulkan/VulkanFunctions.h rename to src/dawn_native/vulkan/VulkanFunctions.h diff --git a/src/backend/vulkan/VulkanInfo.cpp b/src/dawn_native/vulkan/VulkanInfo.cpp similarity index 99% rename from src/backend/vulkan/VulkanInfo.cpp rename to src/dawn_native/vulkan/VulkanInfo.cpp index a2a77ddef4..123a6a29cb 100644 --- a/src/backend/vulkan/VulkanInfo.cpp +++ b/src/dawn_native/vulkan/VulkanInfo.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "backend/vulkan/VulkanInfo.h" +#include "dawn_native/vulkan/VulkanInfo.h" -#include "backend/vulkan/DeviceVk.h" +#include "dawn_native/vulkan/DeviceVk.h" #include diff --git a/src/backend/vulkan/VulkanInfo.h b/src/dawn_native/vulkan/VulkanInfo.h similarity index 100% rename from src/backend/vulkan/VulkanInfo.h rename to src/dawn_native/vulkan/VulkanInfo.h diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index c78161267b..f4b67da1ee 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -67,7 +67,7 @@ if (DAWN_ENABLE_D3D12) endif() add_executable(dawn_unittests ${UNITTEST_SOURCES}) -target_link_libraries(dawn_unittests dawn_common gtest dawn_backend mock_dawn dawn_wire utils) +target_link_libraries(dawn_unittests dawn_common gtest lib_dawn_native mock_dawn dawn_wire utils) DawnInternalTarget("tests" dawn_unittests) add_executable(dawn_end2end_tests diff --git a/src/tests/unittests/CommandAllocatorTests.cpp b/src/tests/unittests/CommandAllocatorTests.cpp index bf2b8b8c83..d0a491ac17 100644 --- a/src/tests/unittests/CommandAllocatorTests.cpp +++ b/src/tests/unittests/CommandAllocatorTests.cpp @@ -14,7 +14,7 @@ #include -#include "backend/CommandAllocator.h" +#include "dawn_native/CommandAllocator.h" using namespace backend; diff --git a/src/tests/unittests/ErrorTests.cpp b/src/tests/unittests/ErrorTests.cpp index 1f2161fc05..fdd2c1fb3e 100644 --- a/src/tests/unittests/ErrorTests.cpp +++ b/src/tests/unittests/ErrorTests.cpp @@ -14,8 +14,8 @@ #include -#include "backend/Error.h" -#include "backend/ErrorData.h" +#include "dawn_native/Error.h" +#include "dawn_native/ErrorData.h" using namespace backend; diff --git a/src/tests/unittests/PerStageTests.cpp b/src/tests/unittests/PerStageTests.cpp index a837c3c0ac..d05714a879 100644 --- a/src/tests/unittests/PerStageTests.cpp +++ b/src/tests/unittests/PerStageTests.cpp @@ -14,7 +14,7 @@ #include -#include "backend/PerStage.h" +#include "dawn_native/PerStage.h" using namespace backend; diff --git a/src/tests/unittests/RefCountedTests.cpp b/src/tests/unittests/RefCountedTests.cpp index 2b923509c6..ff6959600b 100644 --- a/src/tests/unittests/RefCountedTests.cpp +++ b/src/tests/unittests/RefCountedTests.cpp @@ -14,7 +14,7 @@ #include -#include "backend/RefCounted.h" +#include "dawn_native/RefCounted.h" using namespace backend; diff --git a/src/tests/unittests/ToBackendTests.cpp b/src/tests/unittests/ToBackendTests.cpp index 112e303e89..3a0764e73d 100644 --- a/src/tests/unittests/ToBackendTests.cpp +++ b/src/tests/unittests/ToBackendTests.cpp @@ -14,8 +14,8 @@ #include -#include "backend/RefCounted.h" -#include "backend/ToBackend.h" +#include "dawn_native/RefCounted.h" +#include "dawn_native/ToBackend.h" #include diff --git a/src/tests/unittests/d3d12/CopySplitTests.cpp b/src/tests/unittests/d3d12/CopySplitTests.cpp index f4d23bdc1b..d0f16b1dd1 100644 --- a/src/tests/unittests/d3d12/CopySplitTests.cpp +++ b/src/tests/unittests/d3d12/CopySplitTests.cpp @@ -14,8 +14,8 @@ #include -#include "backend/d3d12/d3d12_platform.h" -#include "backend/d3d12/TextureCopySplitter.h" +#include "dawn_native/d3d12/d3d12_platform.h" +#include "dawn_native/d3d12/TextureCopySplitter.h" #include "common/Assert.h" #include "common/Constants.h" #include "common/Math.h" diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 46f846b011..237315e554 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -54,7 +54,7 @@ if (DAWN_ENABLE_VULKAN) endif() add_library(utils STATIC ${UTILS_SOURCES}) -target_link_libraries(utils dawn_backend shaderc_shared dawncpp dawn) +target_link_libraries(utils lib_dawn_native shaderc_shared dawncpp dawn) target_include_directories(utils PUBLIC ${SRC_DIR}) DawnInternalTarget("" utils) if(NOT MSVC)