Split backend/common in backend/ and common/

This directory used to contain both the state tracking code for the
backends, and the common utilities that could be used both by the
backends and the rest of the code. Things are now:

 - src/common is utility code for the whole repo
 - src/backend contains libNXT's code
 - src/utils is utility code that we don't want in libNXT

This commit also changes all includes to use global paths from src/
bacause it had to touch a bunch of #include statements anyway.
This commit is contained in:
Corentin Wallez
2017-07-06 14:41:13 -04:00
committed by Corentin Wallez
parent a9b2a9871c
commit fffe6dfa16
161 changed files with 673 additions and 599 deletions

View File

@@ -13,13 +13,13 @@
// limitations under the License.
#include "common/BitSetIterator.h"
#include "BindGroupD3D12.h"
#include "BindGroupLayoutD3D12.h"
#include "BufferD3D12.h"
#include "SamplerD3D12.h"
#include "TextureD3D12.h"
#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 "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,11 +15,11 @@
#ifndef BACKEND_D3D12_BINDGROUPD3D12_H_
#define BACKEND_D3D12_BINDGROUPD3D12_H_
#include "common/BindGroup.h"
#include "backend/BindGroup.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
#include "DescriptorHeapAllocator.h"
#include "backend/d3d12/DescriptorHeapAllocator.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "BindGroupLayoutD3D12.h"
#include "backend/d3d12/BindGroupLayoutD3D12.h"
#include "common/BitSetIterator.h"
#include "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_BINDGROUPLAYOUTD3D12_H_
#define BACKEND_D3D12_BINDGROUPLAYOUTD3D12_H_
#include "common/BindGroupLayout.h"
#include "backend/BindGroupLayout.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "BufferD3D12.h"
#include "backend/d3d12/BufferD3D12.h"
#include "D3D12Backend.h"
#include "ResourceAllocator.h"
#include "ResourceUploader.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/ResourceAllocator.h"
#include "backend/d3d12/ResourceUploader.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,10 +15,10 @@
#ifndef BACKEND_D3D12_BUFFERD3D12_H_
#define BACKEND_D3D12_BUFFERD3D12_H_
#include "common/Buffer.h"
#include "backend/Buffer.h"
#include "common/SerialQueue.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "CommandAllocatorManager.h"
#include "backend/d3d12/CommandAllocatorManager.h"
#include "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
#include "common/BitSetIterator.h"

View File

@@ -15,7 +15,7 @@
#ifndef BACKEND_D3D12_COMMANDALLOCATORMANAGER_H_
#define BACKEND_D3D12_COMMANDALLOCATORMANAGER_H_
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
#include "common/SerialQueue.h"

View File

@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "CommandBufferD3D12.h"
#include "backend/d3d12/CommandBufferD3D12.h"
#include "common/Commands.h"
#include "D3D12Backend.h"
#include "BindGroupD3D12.h"
#include "BindGroupLayoutD3D12.h"
#include "BufferD3D12.h"
#include "DescriptorHeapAllocator.h"
#include "InputStateD3D12.h"
#include "PipelineD3D12.h"
#include "PipelineLayoutD3D12.h"
#include "SamplerD3D12.h"
#include "TextureD3D12.h"
#include "backend/Commands.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/BindGroupD3D12.h"
#include "backend/d3d12/BindGroupLayoutD3D12.h"
#include "backend/d3d12/BufferD3D12.h"
#include "backend/d3d12/DescriptorHeapAllocator.h"
#include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/PipelineD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h"
#include "backend/d3d12/SamplerD3D12.h"
#include "backend/d3d12/TextureD3D12.h"
#include "ResourceAllocator.h"

View File

@@ -15,10 +15,10 @@
#ifndef BACKEND_D3D12_COMMANDBUFFERD3D12_H_
#define BACKEND_D3D12_COMMANDBUFFERD3D12_H_
#include "common/CommandAllocator.h"
#include "common/CommandBuffer.h"
#include "backend/CommandAllocator.h"
#include "backend/CommandBuffer.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
#include "BindGroupD3D12.h"
#include "BindGroupLayoutD3D12.h"
#include "BufferD3D12.h"
#include "CommandBufferD3D12.h"
#include "InputStateD3D12.h"
#include "PipelineD3D12.h"
#include "PipelineLayoutD3D12.h"
#include "QueueD3D12.h"
#include "SamplerD3D12.h"
#include "ShaderModuleD3D12.h"
#include "TextureD3D12.h"
#include "backend/d3d12/BindGroupD3D12.h"
#include "backend/d3d12/BindGroupLayoutD3D12.h"
#include "backend/d3d12/BufferD3D12.h"
#include "backend/d3d12/CommandBufferD3D12.h"
#include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/PipelineD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h"
#include "backend/d3d12/QueueD3D12.h"
#include "backend/d3d12/SamplerD3D12.h"
#include "backend/d3d12/ShaderModuleD3D12.h"
#include "backend/d3d12/TextureD3D12.h"
#include "CommandAllocatorManager.h"
#include "DescriptorHeapAllocator.h"
#include "ResourceAllocator.h"
#include "ResourceUploader.h"
#include "backend/d3d12/CommandAllocatorManager.h"
#include "backend/d3d12/DescriptorHeapAllocator.h"
#include "backend/d3d12/ResourceAllocator.h"
#include "backend/d3d12/ResourceUploader.h"
namespace backend {
namespace d3d12 {

View File

@@ -17,21 +17,21 @@
#include "nxt/nxtcpp.h"
#include "common/Buffer.h"
#include "common/BindGroup.h"
#include "common/BindGroupLayout.h"
#include "common/Device.h"
#include "common/Framebuffer.h"
#include "common/DepthStencilState.h"
#include "common/InputState.h"
#include "common/PipelineLayout.h"
#include "common/Queue.h"
#include "common/RenderPass.h"
#include "common/Sampler.h"
#include "common/Texture.h"
#include "common/ToBackend.h"
#include "backend/Buffer.h"
#include "backend/BindGroup.h"
#include "backend/BindGroupLayout.h"
#include "backend/Device.h"
#include "backend/Framebuffer.h"
#include "backend/DepthStencilState.h"
#include "backend/InputState.h"
#include "backend/PipelineLayout.h"
#include "backend/Queue.h"
#include "backend/RenderPass.h"
#include "backend/Sampler.h"
#include "backend/Texture.h"
#include "backend/ToBackend.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "DescriptorHeapAllocator.h"
#include "backend/d3d12/DescriptorHeapAllocator.h"
#include "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,7 +15,7 @@
#ifndef BACKEND_D3D12_DESCRIPTORHEAPALLOCATOR_H_
#define BACKEND_D3D12_DESCRIPTORHEAPALLOCATOR_H_
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
#include "common/SerialQueue.h"
#include <array>

View File

@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "D3D12Backend.h"
#include "BindGroupD3D12.h"
#include "BindGroupLayoutD3D12.h"
#include "BufferD3D12.h"
#include "CommandBufferD3D12.h"
#include "InputStateD3D12.h"
#include "PipelineD3D12.h"
#include "PipelineLayoutD3D12.h"
#include "QueueD3D12.h"
#include "SamplerD3D12.h"
#include "ShaderModuleD3D12.h"
#include "TextureD3D12.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/BindGroupD3D12.h"
#include "backend/d3d12/BindGroupLayoutD3D12.h"
#include "backend/d3d12/BufferD3D12.h"
#include "backend/d3d12/CommandBufferD3D12.h"
#include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/PipelineD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h"
#include "backend/d3d12/QueueD3D12.h"
#include "backend/d3d12/SamplerD3D12.h"
#include "backend/d3d12/ShaderModuleD3D12.h"
#include "backend/d3d12/TextureD3D12.h"

View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "InputStateD3D12.h"
#include "backend/d3d12/InputStateD3D12.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_INPUTSTATED3D12_H_
#define BACKEND_D3D12_INPUTSTATED3D12_H_
#include "common/InputState.h"
#include "backend/InputState.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "PipelineD3D12.h"
#include "backend/d3d12/PipelineD3D12.h"
#include "D3D12Backend.h"
#include "InputStateD3D12.h"
#include "ShaderModuleD3D12.h"
#include "PipelineLayoutD3D12.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/ShaderModuleD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h"
#include <d3dcompiler.h>

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_PIPELINED3D12_H_
#define BACKEND_D3D12_PIPELINED3D12_H_
#include "common/Pipeline.h"
#include "backend/Pipeline.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "PipelineLayoutD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h"
#include "D3D12Backend.h"
#include "BindGroupLayoutD3D12.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/BindGroupLayoutD3D12.h"
using Microsoft::WRL::ComPtr;

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_PIPELINELAYOUTD3D12_H_
#define BACKEND_D3D12_PIPELINELAYOUTD3D12_H_
#include "common/PipelineLayout.h"
#include "backend/PipelineLayout.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "QueueD3D12.h"
#include "backend/d3d12/QueueD3D12.h"
#include "D3D12Backend.h"
#include "CommandBufferD3D12.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/CommandBufferD3D12.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_QUEUED3D12_H_
#define BACKEND_D3D12_QUEUED3D12_H_
#include "common/Queue.h"
#include "backend/Queue.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "ResourceAllocator.h"
#include "backend/d3d12/ResourceAllocator.h"
#include "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,7 +15,7 @@
#ifndef BACKEND_D3D12_RESOURCEALLOCATIONMANAGER_H_
#define BACKEND_D3D12_RESOURCEALLOCATIONMANAGER_H_
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
#include "common/SerialQueue.h"

View File

@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "ResourceUploader.h"
#include "backend/d3d12/ResourceUploader.h"
#include "D3D12Backend.h"
#include "ResourceAllocator.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/ResourceAllocator.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_RESOURCEUPLOADER_H_
#define BACKEND_D3D12_RESOURCEUPLOADER_H_
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
#include "common/Forward.h"
#include "backend/Forward.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "SamplerD3D12.h"
#include "backend/d3d12/SamplerD3D12.h"
#include "D3D12Backend.h"
#include "backend/d3d12/D3D12Backend.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_SAMPLERD3D12_H_
#define BACKEND_D3D12_SAMPLERD3D12_H_
#include "common/Sampler.h"
#include "backend/Sampler.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "ShaderModuleD3D12.h"
#include "backend/d3d12/ShaderModuleD3D12.h"
#include <spirv-cross/spirv_hlsl.hpp>

View File

@@ -15,7 +15,7 @@
#ifndef BACKEND_D3D12_SHADERMODULED3D12_H_
#define BACKEND_D3D12_SHADERMODULED3D12_H_
#include "common/ShaderModule.h"
#include "backend/ShaderModule.h"
namespace backend {
namespace d3d12 {

View File

@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "TextureD3D12.h"
#include "backend/d3d12/TextureD3D12.h"
#include "D3D12Backend.h"
#include "ResourceAllocator.h"
#include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/ResourceAllocator.h"
namespace backend {
namespace d3d12 {

View File

@@ -15,9 +15,9 @@
#ifndef BACKEND_D3D12_TEXTURED3D12_H_
#define BACKEND_D3D12_TEXTURED3D12_H_
#include "common/Texture.h"
#include "backend/Texture.h"
#include "d3d12_platform.h"
#include "backend/d3d12/d3d12_platform.h"
namespace backend {
namespace d3d12 {