dawn_native: Fixup namespace from backend:: to dawn_native::

This commit is contained in:
Corentin Wallez 2018-07-24 16:45:45 +02:00 committed by Corentin Wallez
parent 30965a7729
commit 49a65d0c0c
232 changed files with 474 additions and 474 deletions

View File

@ -21,7 +21,7 @@
#include "dawn_native/ValidationUtils_autogen.h" #include "dawn_native/ValidationUtils_autogen.h"
#include "dawn_native/{{namespace}}/GeneratedCodeIncludes.h" #include "dawn_native/{{namespace}}/GeneratedCodeIncludes.h"
namespace backend { namespace dawn_native {
namespace {{namespace}} { namespace {{namespace}} {
namespace { namespace {

View File

@ -14,7 +14,7 @@
#include "dawn_native/ValidationUtils_autogen.h" #include "dawn_native/ValidationUtils_autogen.h"
namespace backend { namespace dawn_native {
{% for type in by_category["enum"] %} {% for type in by_category["enum"] %}
MaybeError Validate{{type.name.CamelCase()}}(dawn::{{as_cppType(type.name)}} value) { MaybeError Validate{{type.name.CamelCase()}}(dawn::{{as_cppType(type.name)}} value) {
@ -40,4 +40,4 @@ namespace backend {
{% endfor %} {% endfor %}
} // namespace backend } // namespace dawn_native

View File

@ -19,13 +19,13 @@
#include "dawn_native/Error.h" #include "dawn_native/Error.h"
namespace backend { namespace dawn_native {
// Helper functions to check the value of enums and bitmasks // Helper functions to check the value of enums and bitmasks
{% for type in by_category["enum"] + by_category["bitmask"] %} {% for type in by_category["enum"] + by_category["bitmask"] %}
MaybeError Validate{{type.name.CamelCase()}}(dawn::{{as_cppType(type.name)}} value); MaybeError Validate{{type.name.CamelCase()}}(dawn::{{as_cppType(type.name)}} value);
{% endfor %} {% endfor %}
} // namespace backend } // namespace dawn_native
#endif // BACKEND_VALIDATIONUTILS_H_ #endif // BACKEND_VALIDATIONUTILS_H_

View File

@ -21,7 +21,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"
namespace backend { namespace dawn_native {
// BindGroup // BindGroup
@ -226,4 +226,4 @@ namespace backend {
return true; return true;
} }
} // namespace backend } // namespace dawn_native

View File

@ -27,7 +27,7 @@
#include <bitset> #include <bitset>
#include <type_traits> #include <type_traits>
namespace backend { namespace dawn_native {
class BindGroupBase : public RefCounted { class BindGroupBase : public RefCounted {
public: public:
@ -91,6 +91,6 @@ namespace backend {
std::array<Ref<RefCounted>, kMaxBindingsPerGroup> mBindings; std::array<Ref<RefCounted>, kMaxBindingsPerGroup> mBindings;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_BINDGROUP_H_ #endif // DAWNNATIVE_BINDGROUP_H_

View File

@ -21,7 +21,7 @@
#include <functional> #include <functional>
namespace backend { namespace dawn_native {
MaybeError ValidateBindGroupLayoutDescriptor( MaybeError ValidateBindGroupLayoutDescriptor(
DeviceBase*, DeviceBase*,
@ -115,4 +115,4 @@ namespace backend {
return a->GetBindingInfo() == b->GetBindingInfo(); return a->GetBindingInfo() == b->GetBindingInfo();
} }
} // namespace backend } // namespace dawn_native

View File

@ -25,7 +25,7 @@
#include <array> #include <array>
#include <bitset> #include <bitset>
namespace backend { namespace dawn_native {
MaybeError ValidateBindGroupLayoutDescriptor(DeviceBase*, MaybeError ValidateBindGroupLayoutDescriptor(DeviceBase*,
const dawn::BindGroupLayoutDescriptor* descriptor); const dawn::BindGroupLayoutDescriptor* descriptor);
@ -61,6 +61,6 @@ namespace backend {
bool operator()(const BindGroupLayoutBase* a, const BindGroupLayoutBase* b) const; bool operator()(const BindGroupLayoutBase* a, const BindGroupLayoutBase* b) const;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_BINDGROUPLAYOUT_H_ #endif // DAWNNATIVE_BINDGROUPLAYOUT_H_

View File

@ -16,7 +16,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
// BlendStateBase // BlendStateBase
@ -90,4 +90,4 @@ namespace backend {
mBlendInfo.colorWriteMask = colorWriteMask; mBlendInfo.colorWriteMask = colorWriteMask;
} }
} // namespace backend } // namespace dawn_native

View File

@ -21,7 +21,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
class BlendStateBase : public RefCounted { class BlendStateBase : public RefCounted {
public: public:
@ -70,6 +70,6 @@ namespace backend {
BlendStateBase::BlendInfo mBlendInfo; BlendStateBase::BlendInfo mBlendInfo;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_BLENDSTATE_H_ #endif // DAWNNATIVE_BLENDSTATE_H_

View File

@ -20,7 +20,7 @@
#include <cstdio> #include <cstdio>
#include <utility> #include <utility>
namespace backend { namespace dawn_native {
// Buffer // Buffer
@ -292,4 +292,4 @@ namespace backend {
mPropertiesSet |= BUFFER_VIEW_PROPERTY_EXTENT; mPropertiesSet |= BUFFER_VIEW_PROPERTY_EXTENT;
} }
} // namespace backend } // namespace dawn_native

View File

@ -22,7 +22,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
static constexpr dawn::BufferUsageBit kReadOnlyBufferUsages = static constexpr dawn::BufferUsageBit kReadOnlyBufferUsages =
dawn::BufferUsageBit::MapRead | dawn::BufferUsageBit::TransferSrc | dawn::BufferUsageBit::MapRead | dawn::BufferUsageBit::TransferSrc |
@ -137,6 +137,6 @@ namespace backend {
int mPropertiesSet = 0; int mPropertiesSet = 0;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_BUFFER_H_ #endif // DAWNNATIVE_BUFFER_H_

View File

@ -17,7 +17,7 @@
#include "common/Assert.h" #include "common/Assert.h"
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
bool BuilderBase::CanBeUsed() const { bool BuilderBase::CanBeUsed() const {
return !mIsConsumed && !mGotStatus; return !mIsConsumed && !mGotStatus;
@ -94,4 +94,4 @@ namespace backend {
return result != nullptr; return result != nullptr;
} }
} // namespace backend } // namespace dawn_native

View File

@ -22,7 +22,7 @@
#include <string> #include <string>
namespace backend { namespace dawn_native {
// This class implements behavior shared by all builders: // This class implements behavior shared by all builders:
// - Tracking whether GetResult has been called already, needed by the autogenerated code to // - Tracking whether GetResult has been called already, needed by the autogenerated code to
@ -102,6 +102,6 @@ namespace backend {
} }
} }
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_BUILDER_H_ #endif // DAWNNATIVE_BUILDER_H_

View File

@ -21,7 +21,7 @@
#include <climits> #include <climits>
#include <cstdlib> #include <cstdlib>
namespace backend { namespace dawn_native {
constexpr uint32_t EndOfBlock = UINT_MAX; // std::numeric_limits<uint32_t>::max(); constexpr uint32_t EndOfBlock = UINT_MAX; // std::numeric_limits<uint32_t>::max();
constexpr uint32_t AdditionalData = UINT_MAX - 1; // std::numeric_limits<uint32_t>::max() - 1; constexpr uint32_t AdditionalData = UINT_MAX - 1; // std::numeric_limits<uint32_t>::max() - 1;
@ -225,4 +225,4 @@ namespace backend {
return true; return true;
} }
} // namespace backend } // namespace dawn_native

View File

@ -19,7 +19,7 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
namespace backend { namespace dawn_native {
// Allocation for command buffers should be fast. To avoid doing an allocation per command // Allocation for command buffers should be fast. To avoid doing an allocation per command
// or to avoid copying commands when reallocing, we use a linear allocator in a growing set // or to avoid copying commands when reallocing, we use a linear allocator in a growing set
@ -145,6 +145,6 @@ namespace backend {
uint32_t mDummyEnum[1] = {0}; uint32_t mDummyEnum[1] = {0};
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_COMMAND_ALLOCATOR_H_ #endif // DAWNNATIVE_COMMAND_ALLOCATOR_H_

View File

@ -28,7 +28,7 @@
#include <cstring> #include <cstring>
#include <map> #include <map>
namespace backend { namespace dawn_native {
namespace { namespace {
@ -780,4 +780,4 @@ namespace backend {
memcpy(cmdOffsets, offsets, count * sizeof(uint32_t)); memcpy(cmdOffsets, offsets, count * sizeof(uint32_t));
} }
} // namespace backend } // namespace dawn_native

View File

@ -27,7 +27,7 @@
#include <set> #include <set>
#include <utility> #include <utility>
namespace backend { namespace dawn_native {
class BindGroupBase; class BindGroupBase;
class BufferBase; class BufferBase;
@ -146,6 +146,6 @@ namespace backend {
std::vector<PassResourceUsage> mPassResourceUsages; std::vector<PassResourceUsage> mPassResourceUsages;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_COMMANDBUFFER_H_ #endif // DAWNNATIVE_COMMANDBUFFER_H_

View File

@ -23,7 +23,7 @@
#include "dawn_native/PipelineLayout.h" #include "dawn_native/PipelineLayout.h"
#include "dawn_native/RenderPipeline.h" #include "dawn_native/RenderPipeline.h"
namespace backend { namespace dawn_native {
enum ValidationAspect { enum ValidationAspect {
VALIDATION_ASPECT_PIPELINE, VALIDATION_ASPECT_PIPELINE,
@ -167,4 +167,4 @@ namespace backend {
mAspects &= ~kLazyAspects; mAspects &= ~kLazyAspects;
} }
} // namespace backend } // namespace dawn_native

View File

@ -23,7 +23,7 @@
#include <map> #include <map>
#include <set> #include <set>
namespace backend { namespace dawn_native {
class CommandBufferStateTracker { class CommandBufferStateTracker {
public: public:
@ -58,6 +58,6 @@ namespace backend {
RenderPipelineBase* mLastRenderPipeline = nullptr; RenderPipelineBase* mLastRenderPipeline = nullptr;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H #endif // DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H

View File

@ -21,7 +21,7 @@
#include "dawn_native/RenderPipeline.h" #include "dawn_native/RenderPipeline.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"
namespace backend { namespace dawn_native {
void FreeCommands(CommandIterator* commands) { void FreeCommands(CommandIterator* commands) {
commands->Reset(); commands->Reset();
@ -199,4 +199,4 @@ namespace backend {
} }
} }
} // namespace backend } // namespace dawn_native

View File

@ -20,7 +20,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
// Definition of the commands that are present in the CommandIterator given by the // Definition of the commands that are present in the CommandIterator given by the
// CommandBufferBuilder. There are not defined in CommandBuffer.h to break some header // CommandBufferBuilder. There are not defined in CommandBuffer.h to break some header
@ -158,6 +158,6 @@ namespace backend {
// consuming the correct amount of data from the command iterator. // consuming the correct amount of data from the command iterator.
void SkipCommand(CommandIterator* commands, Command type); void SkipCommand(CommandIterator* commands, Command type);
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_COMMANDS_H_ #endif // DAWNNATIVE_COMMANDS_H_

View File

@ -16,7 +16,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
// ComputePipelineBase // ComputePipelineBase
@ -38,4 +38,4 @@ namespace backend {
return mDevice->CreateComputePipeline(this); return mDevice->CreateComputePipeline(this);
} }
} // namespace backend } // namespace dawn_native

View File

@ -17,7 +17,7 @@
#include "dawn_native/Pipeline.h" #include "dawn_native/Pipeline.h"
namespace backend { namespace dawn_native {
class ComputePipelineBase : public RefCounted, public PipelineBase { class ComputePipelineBase : public RefCounted, public PipelineBase {
public: public:
@ -32,6 +32,6 @@ namespace backend {
ComputePipelineBase* GetResultImpl() override; ComputePipelineBase* GetResultImpl() override;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_COMPUTEPIPELINE_H_ #endif // DAWNNATIVE_COMPUTEPIPELINE_H_

View File

@ -16,7 +16,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
// DepthStencilStateBase // DepthStencilStateBase
@ -132,4 +132,4 @@ namespace backend {
mStencilInfo.writeMask = writeMask; mStencilInfo.writeMask = writeMask;
} }
} // namespace backend } // namespace dawn_native

View File

@ -21,7 +21,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
class DepthStencilStateBase : public RefCounted { class DepthStencilStateBase : public RefCounted {
public: public:
@ -80,6 +80,6 @@ namespace backend {
DepthStencilStateBase::StencilInfo mStencilInfo; DepthStencilStateBase::StencilInfo mStencilInfo;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_DEPTHSTENCILSTATE_H_ #endif // DAWNNATIVE_DEPTHSTENCILSTATE_H_

View File

@ -34,7 +34,7 @@
#include <unordered_set> #include <unordered_set>
namespace backend { namespace dawn_native {
// DeviceBase::Caches // DeviceBase::Caches
@ -227,4 +227,4 @@ namespace backend {
delete error; delete error;
} }
} // namespace backend } // namespace dawn_native

View File

@ -21,7 +21,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
using ErrorCallback = void (*)(const char* errorMessage, void* userData); using ErrorCallback = void (*)(const char* errorMessage, void* userData);
@ -133,6 +133,6 @@ namespace backend {
uint32_t mRefCount = 1; uint32_t mRefCount = 1;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_DEVICEBASE_H_ #endif // DAWNNATIVE_DEVICEBASE_H_

View File

@ -16,7 +16,7 @@
#include "dawn_native/ErrorData.h" #include "dawn_native/ErrorData.h"
namespace backend { namespace dawn_native {
ErrorData* MakeError(const char* message, const char* file, const char* function, int line) { ErrorData* MakeError(const char* message, const char* file, const char* function, int line) {
ErrorData* error = new ErrorData(message); ErrorData* error = new ErrorData(message);
@ -28,4 +28,4 @@ namespace backend {
error->AppendBacktrace(file, function, line); error->AppendBacktrace(file, function, line);
} }
} // namespace backend } // namespace dawn_native

View File

@ -17,7 +17,7 @@
#include "common/Result.h" #include "common/Result.h"
namespace backend { namespace dawn_native {
// This is the content of an error value for MaybeError or ResultOrError, split off to its own // This is the content of an error value for MaybeError or ResultOrError, split off to its own
// file to avoid having all files including headers like <string> and <vector> // file to avoid having all files including headers like <string> and <vector>
@ -86,6 +86,6 @@ namespace backend {
// Implementation detail of DAWN_RETURN_ERROR // Implementation detail of DAWN_RETURN_ERROR
ErrorData* MakeError(const char* message, const char* file, const char* function, int line); ErrorData* MakeError(const char* message, const char* file, const char* function, int line);
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_ERROR_H_ #endif // DAWNNATIVE_ERROR_H_

View File

@ -14,7 +14,7 @@
#include "dawn_native/ErrorData.h" #include "dawn_native/ErrorData.h"
namespace backend { namespace dawn_native {
ErrorData::ErrorData() = default; ErrorData::ErrorData() = default;
@ -38,4 +38,4 @@ namespace backend {
return mBacktrace; return mBacktrace;
} }
} // namespace backend } // namespace dawn_native

View File

@ -18,7 +18,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
namespace backend { namespace dawn_native {
class ErrorData { class ErrorData {
public: public:
@ -40,6 +40,6 @@ namespace backend {
std::vector<BacktraceRecord> mBacktrace; std::vector<BacktraceRecord> mBacktrace;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_ERRORDATA_H_ #endif // DAWNNATIVE_ERRORDATA_H_

View File

@ -17,7 +17,7 @@
#include <cstdint> #include <cstdint>
namespace backend { namespace dawn_native {
class BindGroupBase; class BindGroupBase;
class BindGroupBuilder; class BindGroupBuilder;
@ -63,6 +63,6 @@ namespace backend {
class PerStage; class PerStage;
enum PushConstantType : uint8_t; enum PushConstantType : uint8_t;
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_FORWARD_H_ #endif // DAWNNATIVE_FORWARD_H_

View File

@ -17,7 +17,7 @@
#include "common/Assert.h" #include "common/Assert.h"
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
// InputState helpers // InputState helpers
@ -168,4 +168,4 @@ namespace backend {
info.stepMode = stepMode; info.stepMode = stepMode;
} }
} // namespace backend } // namespace dawn_native

View File

@ -25,7 +25,7 @@
#include <array> #include <array>
#include <bitset> #include <bitset>
namespace backend { namespace dawn_native {
size_t IndexFormatSize(dawn::IndexFormat format); size_t IndexFormatSize(dawn::IndexFormat format);
uint32_t VertexFormatNumComponents(dawn::VertexFormat format); uint32_t VertexFormatNumComponents(dawn::VertexFormat format);
@ -81,6 +81,6 @@ namespace backend {
std::array<InputStateBase::InputInfo, kMaxVertexInputs> mInputInfos; std::array<InputStateBase::InputInfo, kMaxVertexInputs> mInputInfos;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_INPUTSTATE_H_ #endif // DAWNNATIVE_INPUTSTATE_H_

View File

@ -19,7 +19,7 @@
#include <vector> #include <vector>
namespace backend { namespace dawn_native {
class BufferBase; class BufferBase;
class TextureBase; class TextureBase;
@ -35,6 +35,6 @@ namespace backend {
std::vector<dawn::TextureUsageBit> textureUsages; std::vector<dawn::TextureUsageBit> textureUsages;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_PASSRESOURCEUSAGE_H #endif // DAWNNATIVE_PASSRESOURCEUSAGE_H

View File

@ -14,7 +14,7 @@
#include "dawn_native/PerStage.h" #include "dawn_native/PerStage.h"
namespace backend { namespace dawn_native {
BitSetIterator<kNumStages, dawn::ShaderStage> IterateStages(dawn::ShaderStageBit stages) { BitSetIterator<kNumStages, dawn::ShaderStage> IterateStages(dawn::ShaderStageBit stages) {
std::bitset<kNumStages> bits(static_cast<uint32_t>(stages)); std::bitset<kNumStages> bits(static_cast<uint32_t>(stages));
@ -26,4 +26,4 @@ namespace backend {
return static_cast<dawn::ShaderStageBit>(1 << static_cast<uint32_t>(stage)); return static_cast<dawn::ShaderStageBit>(1 << static_cast<uint32_t>(stage));
} }
} // namespace backend } // namespace dawn_native

View File

@ -23,7 +23,7 @@
#include <array> #include <array>
namespace backend { namespace dawn_native {
static_assert(static_cast<uint32_t>(dawn::ShaderStage::Vertex) < kNumStages, ""); static_assert(static_cast<uint32_t>(dawn::ShaderStage::Vertex) < kNumStages, "");
static_assert(static_cast<uint32_t>(dawn::ShaderStage::Fragment) < kNumStages, ""); static_assert(static_cast<uint32_t>(dawn::ShaderStage::Fragment) < kNumStages, "");
@ -72,6 +72,6 @@ namespace backend {
std::array<T, kNumStages> mData; std::array<T, kNumStages> mData;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_PERSTAGE_H_ #endif // DAWNNATIVE_PERSTAGE_H_

View File

@ -20,7 +20,7 @@
#include "dawn_native/PipelineLayout.h" #include "dawn_native/PipelineLayout.h"
#include "dawn_native/ShaderModule.h" #include "dawn_native/ShaderModule.h"
namespace backend { namespace dawn_native {
// PipelineBase // PipelineBase
@ -118,4 +118,4 @@ namespace backend {
mStages[stage].entryPoint = entryPoint; mStages[stage].entryPoint = entryPoint;
} }
} // namespace backend } // namespace dawn_native

View File

@ -27,7 +27,7 @@
#include <array> #include <array>
#include <bitset> #include <bitset>
namespace backend { namespace dawn_native {
enum PushConstantType : uint8_t { enum PushConstantType : uint8_t {
Int, Int,
@ -80,6 +80,6 @@ namespace backend {
PerStage<StageInfo> mStages; PerStage<StageInfo> mStages;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_PIPELINE_H_ #endif // DAWNNATIVE_PIPELINE_H_

View File

@ -18,7 +18,7 @@
#include "dawn_native/BindGroupLayout.h" #include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
MaybeError ValidatePipelineLayoutDescriptor(DeviceBase*, MaybeError ValidatePipelineLayoutDescriptor(DeviceBase*,
const dawn::PipelineLayoutDescriptor* descriptor) { const dawn::PipelineLayoutDescriptor* descriptor) {
@ -72,4 +72,4 @@ namespace backend {
return mDevice; return mDevice;
} }
} // namespace backend } // namespace dawn_native

View File

@ -25,7 +25,7 @@
#include <array> #include <array>
#include <bitset> #include <bitset>
namespace backend { namespace dawn_native {
MaybeError ValidatePipelineLayoutDescriptor(DeviceBase*, MaybeError ValidatePipelineLayoutDescriptor(DeviceBase*,
const dawn::PipelineLayoutDescriptor* descriptor); const dawn::PipelineLayoutDescriptor* descriptor);
@ -55,6 +55,6 @@ namespace backend {
std::bitset<kMaxBindGroups> mMask; std::bitset<kMaxBindGroups> mMask;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_PIPELINELAYOUT_H_ #endif // DAWNNATIVE_PIPELINELAYOUT_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/CommandBuffer.h" #include "dawn_native/CommandBuffer.h"
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
// QueueBase // QueueBase
@ -33,4 +33,4 @@ namespace backend {
return {}; return {};
} }
} // namespace backend } // namespace dawn_native

View File

@ -22,7 +22,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
class QueueBase : public RefCounted { class QueueBase : public RefCounted {
public: public:
@ -47,6 +47,6 @@ namespace backend {
DeviceBase* mDevice; DeviceBase* mDevice;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_QUEUE_H_ #endif // DAWNNATIVE_QUEUE_H_

View File

@ -16,7 +16,7 @@
#include "common/Assert.h" #include "common/Assert.h"
namespace backend { namespace dawn_native {
RefCounted::RefCounted() { RefCounted::RefCounted() {
} }
@ -74,4 +74,4 @@ namespace backend {
} }
} }
} // namespace backend } // namespace dawn_native

View File

@ -17,7 +17,7 @@
#include <cstdint> #include <cstdint>
namespace backend { namespace dawn_native {
class RefCounted { class RefCounted {
public: public:
@ -124,6 +124,6 @@ namespace backend {
T* mPointee = nullptr; T* mPointee = nullptr;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_REFCOUNTED_H_ #endif // DAWNNATIVE_REFCOUNTED_H_

View File

@ -19,7 +19,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"
namespace backend { namespace dawn_native {
// RenderPassDescriptor // RenderPassDescriptor
@ -178,4 +178,4 @@ namespace backend {
mDepthStencilAttachment.clearStencil = clearStencil; mDepthStencilAttachment.clearStencil = clearStencil;
} }
} // namespace backend } // namespace dawn_native

View File

@ -26,7 +26,7 @@
#include <bitset> #include <bitset>
#include <vector> #include <vector>
namespace backend { namespace dawn_native {
struct RenderPassColorAttachmentInfo { struct RenderPassColorAttachmentInfo {
dawn::LoadOp loadOp; dawn::LoadOp loadOp;
@ -104,6 +104,6 @@ namespace backend {
uint32_t mHeight = 0; uint32_t mHeight = 0;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_RENDERPASS_H_ #endif // DAWNNATIVE_RENDERPASS_H_

View File

@ -22,7 +22,7 @@
#include "dawn_native/RenderPassDescriptor.h" #include "dawn_native/RenderPassDescriptor.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"
namespace backend { namespace dawn_native {
// RenderPipelineBase // RenderPipelineBase
@ -218,4 +218,4 @@ namespace backend {
mPrimitiveTopology = primitiveTopology; mPrimitiveTopology = primitiveTopology;
} }
} // namespace backend } // namespace dawn_native

View File

@ -25,7 +25,7 @@
#include <array> #include <array>
#include <bitset> #include <bitset>
namespace backend { namespace dawn_native {
class RenderPipelineBase : public RefCounted, public PipelineBase { class RenderPipelineBase : public RefCounted, public PipelineBase {
public: public:
@ -91,6 +91,6 @@ namespace backend {
dawn::TextureFormat mDepthStencilFormat; dawn::TextureFormat mDepthStencilFormat;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_RENDERPIPELINE_H_ #endif // DAWNNATIVE_RENDERPIPELINE_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
#include "dawn_native/ValidationUtils_autogen.h" #include "dawn_native/ValidationUtils_autogen.h"
namespace backend { namespace dawn_native {
MaybeError ValidateSamplerDescriptor(DeviceBase*, const dawn::SamplerDescriptor* descriptor) { MaybeError ValidateSamplerDescriptor(DeviceBase*, const dawn::SamplerDescriptor* descriptor) {
DAWN_TRY_ASSERT(descriptor->nextInChain == nullptr, "nextInChain must be nullptr"); DAWN_TRY_ASSERT(descriptor->nextInChain == nullptr, "nextInChain must be nullptr");
@ -35,4 +35,4 @@ namespace backend {
SamplerBase::SamplerBase(DeviceBase*, const dawn::SamplerDescriptor*) { SamplerBase::SamplerBase(DeviceBase*, const dawn::SamplerDescriptor*) {
} }
} // namespace backend } // namespace dawn_native

View File

@ -20,7 +20,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
class DeviceBase; class DeviceBase;
@ -32,6 +32,6 @@ namespace backend {
SamplerBase(DeviceBase* device, const dawn::SamplerDescriptor* descriptor); SamplerBase(DeviceBase* device, const dawn::SamplerDescriptor* descriptor);
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_SAMPLER_H_ #endif // DAWNNATIVE_SAMPLER_H_

View File

@ -21,7 +21,7 @@
#include <spirv-cross/spirv_cross.hpp> #include <spirv-cross/spirv_cross.hpp>
namespace backend { namespace dawn_native {
ShaderModuleBase::ShaderModuleBase(ShaderModuleBuilder* builder) : mDevice(builder->mDevice) { ShaderModuleBase::ShaderModuleBase(ShaderModuleBuilder* builder) : mDevice(builder->mDevice) {
} }
@ -238,4 +238,4 @@ namespace backend {
mSpirv.assign(code, code + codeSize); mSpirv.assign(code, code + codeSize);
} }
} // namespace backend } // namespace dawn_native

View File

@ -30,7 +30,7 @@ namespace spirv_cross {
class Compiler; class Compiler;
} }
namespace backend { namespace dawn_native {
class ShaderModuleBase : public RefCounted { class ShaderModuleBase : public RefCounted {
public: public:
@ -92,6 +92,6 @@ namespace backend {
std::vector<uint32_t> mSpirv; std::vector<uint32_t> mSpirv;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_SHADERMODULE_H_ #endif // DAWNNATIVE_SHADERMODULE_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"
namespace backend { namespace dawn_native {
// SwapChain // SwapChain
@ -117,4 +117,4 @@ namespace backend {
mImplementation = impl; mImplementation = impl;
} }
} // namespace backend } // namespace dawn_native

View File

@ -22,7 +22,7 @@
#include "dawn/dawn_wsi.h" #include "dawn/dawn_wsi.h"
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
class SwapChainBase : public RefCounted { class SwapChainBase : public RefCounted {
public: public:
@ -68,6 +68,6 @@ namespace backend {
dawnSwapChainImplementation mImplementation = {}; dawnSwapChainImplementation mImplementation = {};
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_SWAPCHAIN_H_ #endif // DAWNNATIVE_SWAPCHAIN_H_

View File

@ -17,7 +17,7 @@
#include "common/Assert.h" #include "common/Assert.h"
#include "dawn_native/Device.h" #include "dawn_native/Device.h"
namespace backend { namespace dawn_native {
uint32_t TextureFormatPixelSize(dawn::TextureFormat format) { uint32_t TextureFormatPixelSize(dawn::TextureFormat format) {
switch (format) { switch (format) {
@ -215,4 +215,4 @@ namespace backend {
return mDevice->CreateTextureView(this); return mDevice->CreateTextureView(this);
} }
} // namespace backend } // namespace dawn_native

View File

@ -21,7 +21,7 @@
#include "dawn/dawncpp.h" #include "dawn/dawncpp.h"
namespace backend { namespace dawn_native {
uint32_t TextureFormatPixelSize(dawn::TextureFormat format); uint32_t TextureFormatPixelSize(dawn::TextureFormat format);
bool TextureFormatHasDepth(dawn::TextureFormat format); bool TextureFormatHasDepth(dawn::TextureFormat format);
@ -111,6 +111,6 @@ namespace backend {
Ref<TextureBase> mTexture; Ref<TextureBase> mTexture;
}; };
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_TEXTURE_H_ #endif // DAWNNATIVE_TEXTURE_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/Forward.h" #include "dawn_native/Forward.h"
namespace backend { namespace dawn_native {
// ToBackendTraits implements the mapping from base type to member type of BackendTraits // ToBackendTraits implements the mapping from base type to member type of BackendTraits
template <typename T, typename BackendTraits> template <typename T, typename BackendTraits>
@ -149,6 +149,6 @@ namespace backend {
common); common);
} }
} // namespace backend } // namespace dawn_native
#endif // DAWNNATIVE_TOBACKEND_H_ #endif // DAWNNATIVE_TOBACKEND_H_

View File

@ -21,7 +21,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
BindGroup::BindGroup(Device* device, BindGroupBuilder* builder) BindGroup::BindGroup(Device* device, BindGroupBuilder* builder)
: BindGroupBase(builder), mDevice(device) { : BindGroupBase(builder), mDevice(device) {
@ -96,4 +96,4 @@ namespace backend { namespace d3d12 {
return mHeapSerial; return mHeapSerial;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -21,7 +21,7 @@
#include "dawn_native/d3d12/DescriptorHeapAllocator.h" #include "dawn_native/d3d12/DescriptorHeapAllocator.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -47,6 +47,6 @@ namespace backend { namespace d3d12 {
uint64_t mHeapSerial = 0; uint64_t mHeapSerial = 0;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_BINDGROUPD3D12_H_ #endif // DAWNNATIVE_D3D12_BINDGROUPD3D12_H_

View File

@ -17,7 +17,7 @@
#include "common/BitSetIterator.h" #include "common/BitSetIterator.h"
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
BindGroupLayout::BindGroupLayout(Device* device, BindGroupLayout::BindGroupLayout(Device* device,
const dawn::BindGroupLayoutDescriptor* descriptor) const dawn::BindGroupLayoutDescriptor* descriptor)
@ -131,4 +131,4 @@ namespace backend { namespace d3d12 {
return &mRanges[Sampler]; return &mRanges[Sampler];
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -49,6 +49,6 @@ namespace backend { namespace d3d12 {
D3D12_DESCRIPTOR_RANGE mRanges[DescriptorType::Count]; D3D12_DESCRIPTOR_RANGE mRanges[DescriptorType::Count];
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_BINDGROUPLAYOUTD3D12_H_ #endif // DAWNNATIVE_D3D12_BINDGROUPLAYOUTD3D12_H_

View File

@ -17,7 +17,7 @@
#include "common/Assert.h" #include "common/Assert.h"
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
D3D12_BLEND D3D12Blend(dawn::BlendFactor factor) { D3D12_BLEND D3D12Blend(dawn::BlendFactor factor) {
@ -105,4 +105,4 @@ namespace backend { namespace d3d12 {
return mBlendDesc; return mBlendDesc;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class BlendState : public BlendStateBase { class BlendState : public BlendStateBase {
public: public:
@ -31,6 +31,6 @@ namespace backend { namespace d3d12 {
D3D12_RENDER_TARGET_BLEND_DESC mBlendDesc; D3D12_RENDER_TARGET_BLEND_DESC mBlendDesc;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_BLENDSTATED3D12_H_ #endif // DAWNNATIVE_D3D12_BLENDSTATED3D12_H_

View File

@ -21,7 +21,7 @@
#include "dawn_native/d3d12/ResourceAllocator.h" #include "dawn_native/d3d12/ResourceAllocator.h"
#include "dawn_native/d3d12/ResourceUploader.h" #include "dawn_native/d3d12/ResourceUploader.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
D3D12_RESOURCE_FLAGS D3D12ResourceFlags(dawn::BufferUsageBit usage) { D3D12_RESOURCE_FLAGS D3D12ResourceFlags(dawn::BufferUsageBit usage) {
@ -249,4 +249,4 @@ namespace backend { namespace d3d12 {
mInflightRequests.ClearUpTo(finishedSerial); mInflightRequests.ClearUpTo(finishedSerial);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -20,7 +20,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -82,6 +82,6 @@ namespace backend { namespace d3d12 {
SerialQueue<Request> mInflightRequests; SerialQueue<Request> mInflightRequests;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_BUFFERD3D12_H_ #endif // DAWNNATIVE_D3D12_BUFFERD3D12_H_

View File

@ -19,7 +19,7 @@
#include "common/Assert.h" #include "common/Assert.h"
#include "common/BitSetIterator.h" #include "common/BitSetIterator.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
CommandAllocatorManager::CommandAllocatorManager(Device* device) CommandAllocatorManager::CommandAllocatorManager(Device* device)
: device(device), mAllocatorCount(0) { : device(device), mAllocatorCount(0) {
@ -66,4 +66,4 @@ namespace backend { namespace d3d12 {
mInFlightCommandAllocators.ClearUpTo(lastCompletedSerial); mInFlightCommandAllocators.ClearUpTo(lastCompletedSerial);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -21,7 +21,7 @@
#include <bitset> #include <bitset>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -51,6 +51,6 @@ namespace backend { namespace d3d12 {
SerialQueue<IndexedCommandAllocator> mInFlightCommandAllocators; SerialQueue<IndexedCommandAllocator> mInFlightCommandAllocators;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_COMMANDALLOCATORMANAGER_H_ #endif // DAWNNATIVE_D3D12_COMMANDALLOCATORMANAGER_H_

View File

@ -31,7 +31,7 @@
#include "dawn_native/d3d12/TextureCopySplitter.h" #include "dawn_native/d3d12/TextureCopySplitter.h"
#include "dawn_native/d3d12/TextureD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
DXGI_FORMAT DXGIIndexFormat(dawn::IndexFormat format) { DXGI_FORMAT DXGIIndexFormat(dawn::IndexFormat format) {
@ -629,4 +629,4 @@ namespace backend { namespace d3d12 {
} }
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -20,7 +20,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
class RenderPassDescriptor; class RenderPassDescriptor;
@ -45,6 +45,6 @@ namespace backend { namespace d3d12 {
std::vector<PassResourceUsage> mPassResourceUsages; std::vector<PassResourceUsage> mPassResourceUsages;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_COMMANDBUFFERD3D12_H_ #endif // DAWNNATIVE_D3D12_COMMANDBUFFERD3D12_H_

View File

@ -21,7 +21,7 @@
#include <d3dcompiler.h> #include <d3dcompiler.h>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder) ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder)
: ComputePipelineBase(builder), mDevice(ToBackend(builder->GetDevice())) { : ComputePipelineBase(builder), mDevice(ToBackend(builder->GetDevice())) {
@ -65,4 +65,4 @@ namespace backend { namespace d3d12 {
return mPipelineState; return mPipelineState;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -35,6 +35,6 @@ namespace backend { namespace d3d12 {
Device* mDevice = nullptr; Device* mDevice = nullptr;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_COMPUTEPIPELINED3D12_H_ #endif // DAWNNATIVE_D3D12_COMPUTEPIPELINED3D12_H_

View File

@ -16,7 +16,7 @@
#include "common/BitSetIterator.h" #include "common/BitSetIterator.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
static D3D12_STENCIL_OP StencilOp(dawn::StencilOperation op) { static D3D12_STENCIL_OP StencilOp(dawn::StencilOperation op) {
switch (op) { switch (op) {
@ -65,7 +65,7 @@ namespace backend { namespace d3d12 {
} }
static D3D12_DEPTH_STENCILOP_DESC StencilOpDesc( static D3D12_DEPTH_STENCILOP_DESC StencilOpDesc(
backend::DepthStencilStateBase::StencilFaceInfo faceInfo) { DepthStencilStateBase::StencilFaceInfo faceInfo) {
D3D12_DEPTH_STENCILOP_DESC desc; D3D12_DEPTH_STENCILOP_DESC desc;
desc.StencilFailOp = StencilOp(faceInfo.stencilFail); desc.StencilFailOp = StencilOp(faceInfo.stencilFail);
@ -95,4 +95,4 @@ namespace backend { namespace d3d12 {
return mDepthStencilDescriptor; return mDepthStencilDescriptor;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -34,6 +34,6 @@ namespace backend { namespace d3d12 {
D3D12_DEPTH_STENCIL_DESC mDepthStencilDescriptor; D3D12_DEPTH_STENCIL_DESC mDepthStencilDescriptor;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_DEPTHSTENCILSTATED3D12_H_ #endif // DAWNNATIVE_D3D12_DEPTHSTENCILSTATED3D12_H_

View File

@ -17,7 +17,7 @@
#include "common/Assert.h" #include "common/Assert.h"
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
DescriptorHeapHandle::DescriptorHeapHandle() DescriptorHeapHandle::DescriptorHeapHandle()
: mDescriptorHeap(nullptr), mSizeIncrement(0), mOffset(0) { : mDescriptorHeap(nullptr), mSizeIncrement(0), mOffset(0) {
@ -129,4 +129,4 @@ namespace backend { namespace d3d12 {
void DescriptorHeapAllocator::Release(DescriptorHeapHandle handle) { void DescriptorHeapAllocator::Release(DescriptorHeapHandle handle) {
mReleasedHandles.Enqueue(handle, mDevice->GetSerial()); mReleasedHandles.Enqueue(handle, mDevice->GetSerial());
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -21,7 +21,7 @@
#include <vector> #include <vector>
#include "common/SerialQueue.h" #include "common/SerialQueue.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -78,6 +78,6 @@ namespace backend { namespace d3d12 {
SerialQueue<DescriptorHeapHandle> mReleasedHandles; SerialQueue<DescriptorHeapHandle> mReleasedHandles;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_DESCRIPTORHEAPALLOCATOR_H_ #endif // DAWNNATIVE_D3D12_DESCRIPTORHEAPALLOCATOR_H_

View File

@ -38,7 +38,7 @@
#include "dawn_native/d3d12/SwapChainD3D12.h" #include "dawn_native/d3d12/SwapChainD3D12.h"
#include "dawn_native/d3d12/TextureD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
dawnProcTable GetNonValidatingProcs(); dawnProcTable GetNonValidatingProcs();
dawnProcTable GetValidatingProcs(); dawnProcTable GetValidatingProcs();
@ -322,4 +322,4 @@ namespace backend { namespace d3d12 {
return new TextureView(builder); return new TextureView(builder);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -22,7 +22,7 @@
#include "dawn_native/d3d12/Forward.h" #include "dawn_native/d3d12/Forward.h"
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class CommandAllocatorManager; class CommandAllocatorManager;
class DescriptorHeapAllocator; class DescriptorHeapAllocator;
@ -108,6 +108,6 @@ namespace backend { namespace d3d12 {
SerialQueue<ComPtr<IUnknown>> mUsedComObjectRefs; SerialQueue<ComPtr<IUnknown>> mUsedComObjectRefs;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_DEVICED3D12_H_ #endif // DAWNNATIVE_D3D12_DEVICED3D12_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/ToBackend.h" #include "dawn_native/ToBackend.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class BindGroup; class BindGroup;
class BindGroupLayout; class BindGroupLayout;
@ -66,6 +66,6 @@ namespace backend { namespace d3d12 {
return ToBackendBase<D3D12BackendTraits>(common); return ToBackendBase<D3D12BackendTraits>(common);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_FORWARD_H_ #endif // DAWNNATIVE_D3D12_FORWARD_H_

View File

@ -16,7 +16,7 @@
#include "common/BitSetIterator.h" #include "common/BitSetIterator.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
static DXGI_FORMAT VertexFormatType(dawn::VertexFormat format) { static DXGI_FORMAT VertexFormatType(dawn::VertexFormat format) {
switch (format) { switch (format) {
@ -101,4 +101,4 @@ namespace backend { namespace d3d12 {
return mInputLayoutDescriptor; return mInputLayoutDescriptor;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -35,6 +35,6 @@ namespace backend { namespace d3d12 {
D3D12_INPUT_ELEMENT_DESC mInputElementDescriptors[kMaxVertexAttributes]; D3D12_INPUT_ELEMENT_DESC mInputElementDescriptors[kMaxVertexAttributes];
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_INPUTSTATED3D12_H_ #endif // DAWNNATIVE_D3D12_INPUTSTATED3D12_H_

View File

@ -18,7 +18,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/TextureD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
DXGI_USAGE D3D12SwapChainBufferUsage(dawnTextureUsageBit allowedUsages) { DXGI_USAGE D3D12SwapChainBufferUsage(dawnTextureUsageBit allowedUsages) {
@ -115,4 +115,4 @@ namespace backend { namespace d3d12 {
return dawn::TextureFormat::R8G8B8A8Unorm; return dawn::TextureFormat::R8G8B8A8Unorm;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -22,7 +22,7 @@
#include <vector> #include <vector>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -53,6 +53,6 @@ namespace backend { namespace d3d12 {
uint32_t mCurrentBuffer; uint32_t mCurrentBuffer;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_NATIVESWAPCHAINIMPLD3D12_H_ #endif // DAWNNATIVE_D3D12_NATIVESWAPCHAINIMPLD3D12_H_

View File

@ -21,7 +21,7 @@
using Microsoft::WRL::ComPtr; using Microsoft::WRL::ComPtr;
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor) PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor)
: PipelineLayoutBase(device, descriptor) { : PipelineLayoutBase(device, descriptor) {
@ -112,4 +112,4 @@ namespace backend { namespace d3d12 {
ComPtr<ID3D12RootSignature> PipelineLayout::GetRootSignature() { ComPtr<ID3D12RootSignature> PipelineLayout::GetRootSignature() {
return mRootSignature; return mRootSignature;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -39,6 +39,6 @@ namespace backend { namespace d3d12 {
ComPtr<ID3D12RootSignature> mRootSignature; ComPtr<ID3D12RootSignature> mRootSignature;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_PIPELINELAYOUTD3D12_H_ #endif // DAWNNATIVE_D3D12_PIPELINELAYOUTD3D12_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/d3d12/CommandBufferD3D12.h" #include "dawn_native/d3d12/CommandBufferD3D12.h"
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
Queue::Queue(Device* device) : QueueBase(device) { Queue::Queue(Device* device) : QueueBase(device) {
} }
@ -38,4 +38,4 @@ namespace backend { namespace d3d12 {
device->NextSerial(); device->NextSerial();
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
class CommandBuffer; class CommandBuffer;
@ -35,6 +35,6 @@ namespace backend { namespace d3d12 {
ComPtr<ID3D12GraphicsCommandList> mCommandList; ComPtr<ID3D12GraphicsCommandList> mCommandList;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_QUEUED3D12_H_ #endif // DAWNNATIVE_D3D12_QUEUED3D12_H_

View File

@ -18,7 +18,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/TextureD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
RenderPassDescriptor::RenderPassDescriptor(Device* device, RenderPassDescriptorBuilder* builder) RenderPassDescriptor::RenderPassDescriptor(Device* device, RenderPassDescriptorBuilder* builder)
: RenderPassDescriptorBase(builder), mDevice(device) { : RenderPassDescriptorBase(builder), mDevice(device) {
@ -79,4 +79,4 @@ namespace backend { namespace d3d12 {
return mDsvHeap.GetCPUHandle(0); return mDsvHeap.GetCPUHandle(0);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -24,7 +24,7 @@
#include <array> #include <array>
#include <vector> #include <vector>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -47,6 +47,6 @@ namespace backend { namespace d3d12 {
DescriptorHeapHandle mDsvHeap = {}; DescriptorHeapHandle mDsvHeap = {};
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_RENDERPASSDESCRIPTORD3D12_H_ #endif // DAWNNATIVE_D3D12_RENDERPASSDESCRIPTORD3D12_H_

View File

@ -25,7 +25,7 @@
#include <d3dcompiler.h> #include <d3dcompiler.h>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
D3D12_PRIMITIVE_TOPOLOGY D3D12PrimitiveTopology(dawn::PrimitiveTopology primitiveTopology) { D3D12_PRIMITIVE_TOPOLOGY D3D12PrimitiveTopology(dawn::PrimitiveTopology primitiveTopology) {
@ -174,4 +174,4 @@ namespace backend { namespace d3d12 {
return mPipelineState; return mPipelineState;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -38,6 +38,6 @@ namespace backend { namespace d3d12 {
Device* mDevice = nullptr; Device* mDevice = nullptr;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_RENDERPIPELINED3D12_H_ #endif // DAWNNATIVE_D3D12_RENDERPIPELINED3D12_H_

View File

@ -16,7 +16,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
static constexpr D3D12_HEAP_PROPERTIES kDefaultHeapProperties = { static constexpr D3D12_HEAP_PROPERTIES kDefaultHeapProperties = {
@ -74,4 +74,4 @@ namespace backend { namespace d3d12 {
mReleasedResources.ClearUpTo(lastCompletedSerial); mReleasedResources.ClearUpTo(lastCompletedSerial);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "common/SerialQueue.h" #include "common/SerialQueue.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -39,6 +39,6 @@ namespace backend { namespace d3d12 {
SerialQueue<ComPtr<ID3D12Resource>> mReleasedResources; SerialQueue<ComPtr<ID3D12Resource>> mReleasedResources;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_RESOURCEALLOCATIONMANAGER_H_ #endif // DAWNNATIVE_D3D12_RESOURCEALLOCATIONMANAGER_H_

View File

@ -17,7 +17,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/ResourceAllocator.h" #include "dawn_native/d3d12/ResourceAllocator.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
ResourceUploader::ResourceUploader(Device* device) : mDevice(device) { ResourceUploader::ResourceUploader(Device* device) : mDevice(device) {
} }
@ -70,4 +70,4 @@ namespace backend { namespace d3d12 {
mDevice->GetResourceAllocator()->Release(uploadHandle.resource); mDevice->GetResourceAllocator()->Release(uploadHandle.resource);
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/Forward.h" #include "dawn_native/Forward.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -43,6 +43,6 @@ namespace backend { namespace d3d12 {
Device* mDevice; Device* mDevice;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_RESOURCEUPLOADER_H_ #endif // DAWNNATIVE_D3D12_RESOURCEUPLOADER_H_

View File

@ -16,7 +16,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
namespace { namespace {
D3D12_TEXTURE_ADDRESS_MODE AddressMode(dawn::AddressMode mode) { D3D12_TEXTURE_ADDRESS_MODE AddressMode(dawn::AddressMode mode) {
@ -93,4 +93,4 @@ namespace backend { namespace d3d12 {
return mSamplerDesc; return mSamplerDesc;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -19,7 +19,7 @@
#include "dawn_native/d3d12/d3d12_platform.h" #include "dawn_native/d3d12/d3d12_platform.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -33,6 +33,6 @@ namespace backend { namespace d3d12 {
D3D12_SAMPLER_DESC mSamplerDesc; D3D12_SAMPLER_DESC mSamplerDesc;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_SAMPLERD3D12_H_ #endif // DAWNNATIVE_D3D12_SAMPLERD3D12_H_

View File

@ -18,7 +18,7 @@
#include <spirv-cross/spirv_hlsl.hpp> #include <spirv-cross/spirv_hlsl.hpp>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
// TODO(kainino@chromium.org): Consider replacing this with a generic enum_map. // TODO(kainino@chromium.org): Consider replacing this with a generic enum_map.
template <typename T> template <typename T>
@ -83,4 +83,4 @@ namespace backend { namespace d3d12 {
return mHlslSource; return mHlslSource;
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

View File

@ -17,7 +17,7 @@
#include "dawn_native/ShaderModule.h" #include "dawn_native/ShaderModule.h"
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
class Device; class Device;
@ -33,6 +33,6 @@ namespace backend { namespace d3d12 {
std::string mHlslSource; std::string mHlslSource;
}; };
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12
#endif // DAWNNATIVE_D3D12_SHADERMODULED3D12_H_ #endif // DAWNNATIVE_D3D12_SHADERMODULED3D12_H_

View File

@ -19,7 +19,7 @@
#include <dawn/dawn_wsi.h> #include <dawn/dawn_wsi.h>
namespace backend { namespace d3d12 { namespace dawn_native { namespace d3d12 {
SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) { SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) {
const auto& im = GetImplementation(); const auto& im = GetImplementation();
@ -56,4 +56,4 @@ namespace backend { namespace d3d12 {
device->ExecuteCommandLists({}); device->ExecuteCommandLists({});
} }
}} // namespace backend::d3d12 }} // namespace dawn_native::d3d12

Some files were not shown because too many files have changed in this diff Show More