dawn_native: Fixup namespace from backend:: to dawn_native::
diff --git a/src/dawn_native/opengl/BlendStateGL.cpp b/src/dawn_native/opengl/BlendStateGL.cpp
index 8a57686..6460cec 100644
--- a/src/dawn_native/opengl/BlendStateGL.cpp
+++ b/src/dawn_native/opengl/BlendStateGL.cpp
@@ -16,7 +16,7 @@
#include "common/Assert.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
GLenum GLBlendFactor(dawn::BlendFactor factor, bool alpha) {
@@ -93,4 +93,4 @@
info.colorWriteMask & dawn::ColorWriteMask::Alpha);
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/BlendStateGL.h b/src/dawn_native/opengl/BlendStateGL.h
index 7c7907a..afc2bde 100644
--- a/src/dawn_native/opengl/BlendStateGL.h
+++ b/src/dawn_native/opengl/BlendStateGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class BlendState : public BlendStateBase {
public:
@@ -28,6 +28,6 @@
void ApplyNow(uint32_t attachment);
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_BLENDSTATEGL_H_
diff --git a/src/dawn_native/opengl/BufferGL.cpp b/src/dawn_native/opengl/BufferGL.cpp
index e501f14..4182b4a 100644
--- a/src/dawn_native/opengl/BufferGL.cpp
+++ b/src/dawn_native/opengl/BufferGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/BufferGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
// Buffer
@@ -59,4 +59,4 @@
BufferView::BufferView(BufferViewBuilder* builder) : BufferViewBase(builder) {
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/BufferGL.h b/src/dawn_native/opengl/BufferGL.h
index d5d2f7c..c6c85f6 100644
--- a/src/dawn_native/opengl/BufferGL.h
+++ b/src/dawn_native/opengl/BufferGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -43,6 +43,6 @@
BufferView(BufferViewBuilder* builder);
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_BUFFERGL_H_
diff --git a/src/dawn_native/opengl/CommandBufferGL.cpp b/src/dawn_native/opengl/CommandBufferGL.cpp
index 68fcc51..054a899 100644
--- a/src/dawn_native/opengl/CommandBufferGL.cpp
+++ b/src/dawn_native/opengl/CommandBufferGL.cpp
@@ -28,7 +28,7 @@
#include <cstring>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
@@ -653,4 +653,4 @@
UNREACHABLE();
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/CommandBufferGL.h b/src/dawn_native/opengl/CommandBufferGL.h
index 99a91f8..dc9218b 100644
--- a/src/dawn_native/opengl/CommandBufferGL.h
+++ b/src/dawn_native/opengl/CommandBufferGL.h
@@ -18,11 +18,11 @@
#include "dawn_native/CommandAllocator.h"
#include "dawn_native/CommandBuffer.h"
-namespace backend {
+namespace dawn_native {
class RenderPassDescriptorBase;
-} // namespace backend
+} // namespace dawn_native
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -40,6 +40,6 @@
CommandIterator mCommands;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_COMMANDBUFFERGL_H_
diff --git a/src/dawn_native/opengl/ComputePipelineGL.cpp b/src/dawn_native/opengl/ComputePipelineGL.cpp
index 9bcf43e..f80b2bb 100644
--- a/src/dawn_native/opengl/ComputePipelineGL.cpp
+++ b/src/dawn_native/opengl/ComputePipelineGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/ComputePipelineGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder)
: ComputePipelineBase(builder), PipelineGL(this, builder) {
@@ -24,4 +24,4 @@
PipelineGL::ApplyNow();
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/ComputePipelineGL.h b/src/dawn_native/opengl/ComputePipelineGL.h
index dd505d2..654353c 100644
--- a/src/dawn_native/opengl/ComputePipelineGL.h
+++ b/src/dawn_native/opengl/ComputePipelineGL.h
@@ -21,7 +21,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class ComputePipeline : public ComputePipelineBase, public PipelineGL {
public:
@@ -30,6 +30,6 @@
void ApplyNow();
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_COMPUTEPIPELINEGL_H_
diff --git a/src/dawn_native/opengl/DepthStencilStateGL.cpp b/src/dawn_native/opengl/DepthStencilStateGL.cpp
index dd9fdf0..03cf763 100644
--- a/src/dawn_native/opengl/DepthStencilStateGL.cpp
+++ b/src/dawn_native/opengl/DepthStencilStateGL.cpp
@@ -17,7 +17,7 @@
#include "common/Assert.h"
#include "dawn_native/opengl/PersistentPipelineStateGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
GLuint OpenGLCompareFunction(dawn::CompareFunction compareFunction) {
@@ -113,4 +113,4 @@
glStencilMask(stencilInfo.writeMask);
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/DepthStencilStateGL.h b/src/dawn_native/opengl/DepthStencilStateGL.h
index 0be2914..da06830 100644
--- a/src/dawn_native/opengl/DepthStencilStateGL.h
+++ b/src/dawn_native/opengl/DepthStencilStateGL.h
@@ -17,7 +17,7 @@
#include "dawn_native/DepthStencilState.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
class PersistentPipelineState;
@@ -29,6 +29,6 @@
void ApplyNow(PersistentPipelineState& persistentPipelineState) const;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_DEPTHSTENCILSTATEGL_H_
diff --git a/src/dawn_native/opengl/DeviceGL.cpp b/src/dawn_native/opengl/DeviceGL.cpp
index f414b05..137525a 100644
--- a/src/dawn_native/opengl/DeviceGL.cpp
+++ b/src/dawn_native/opengl/DeviceGL.cpp
@@ -31,7 +31,7 @@
#include "dawn_native/opengl/SwapChainGL.h"
#include "dawn_native/opengl/TextureGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
dawnProcTable GetNonValidatingProcs();
dawnProcTable GetValidatingProcs();
@@ -112,4 +112,4 @@
void Device::TickImpl() {
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/DeviceGL.h b/src/dawn_native/opengl/DeviceGL.h
index eb7aff0..862b22e 100644
--- a/src/dawn_native/opengl/DeviceGL.h
+++ b/src/dawn_native/opengl/DeviceGL.h
@@ -28,7 +28,7 @@
# include "common/windows_with_undefs.h"
#endif
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device : public DeviceBase {
public:
@@ -60,6 +60,6 @@
const dawn::SamplerDescriptor* descriptor) override;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_DEVICEGL_H_
diff --git a/src/dawn_native/opengl/Forward.h b/src/dawn_native/opengl/Forward.h
index d456722..154919f 100644
--- a/src/dawn_native/opengl/Forward.h
+++ b/src/dawn_native/opengl/Forward.h
@@ -23,7 +23,7 @@
class RenderPassDescriptor;
} // namespace
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
using BindGroup = BindGroupBase;
using BindGroupLayout = BindGroupLayoutBase;
@@ -73,6 +73,6 @@
return ToBackendBase<OpenGLBackendTraits>(common);
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_FORWARD_H_
diff --git a/src/dawn_native/opengl/InputStateGL.cpp b/src/dawn_native/opengl/InputStateGL.cpp
index b986dee..6ecaf8f 100644
--- a/src/dawn_native/opengl/InputStateGL.cpp
+++ b/src/dawn_native/opengl/InputStateGL.cpp
@@ -16,7 +16,7 @@
#include "common/Assert.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
InputState::InputState(InputStateBuilder* builder) : InputStateBase(builder) {
glGenVertexArrays(1, &mVertexArrayObject);
@@ -58,4 +58,4 @@
return mVertexArrayObject;
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/InputStateGL.h b/src/dawn_native/opengl/InputStateGL.h
index e15717a..dbdd84b 100644
--- a/src/dawn_native/opengl/InputStateGL.h
+++ b/src/dawn_native/opengl/InputStateGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -35,6 +35,6 @@
std::array<std::bitset<kMaxVertexAttributes>, kMaxVertexInputs> attributesUsingInput;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_INPUTSTATEGL_H_
diff --git a/src/dawn_native/opengl/PersistentPipelineStateGL.cpp b/src/dawn_native/opengl/PersistentPipelineStateGL.cpp
index 0b28a25..5d2b832 100644
--- a/src/dawn_native/opengl/PersistentPipelineStateGL.cpp
+++ b/src/dawn_native/opengl/PersistentPipelineStateGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/PersistentPipelineStateGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
void PersistentPipelineState::SetDefaultState() {
CallGLStencilFunc();
@@ -51,4 +51,4 @@
mStencilReadMask);
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/PersistentPipelineStateGL.h b/src/dawn_native/opengl/PersistentPipelineStateGL.h
index 87698e0..c67f2a5 100644
--- a/src/dawn_native/opengl/PersistentPipelineStateGL.h
+++ b/src/dawn_native/opengl/PersistentPipelineStateGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class PersistentPipelineState {
public:
@@ -38,6 +38,6 @@
GLuint mStencilReference = 0;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_PERSISTENTPIPELINESTATEGL_H_
diff --git a/src/dawn_native/opengl/PipelineGL.cpp b/src/dawn_native/opengl/PipelineGL.cpp
index b2e7e65..3148d06 100644
--- a/src/dawn_native/opengl/PipelineGL.cpp
+++ b/src/dawn_native/opengl/PipelineGL.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <set>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
@@ -212,4 +212,4 @@
glUseProgram(mProgram);
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/PipelineGL.h b/src/dawn_native/opengl/PipelineGL.h
index 14dc7d2..d216c57 100644
--- a/src/dawn_native/opengl/PipelineGL.h
+++ b/src/dawn_native/opengl/PipelineGL.h
@@ -21,7 +21,7 @@
#include <vector>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
class PersistentPipelineState;
@@ -49,6 +49,6 @@
std::vector<std::vector<GLuint>> mUnitsForTextures;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_PIPELINEGL_H_
diff --git a/src/dawn_native/opengl/PipelineLayoutGL.cpp b/src/dawn_native/opengl/PipelineLayoutGL.cpp
index 9bc0c5a..4f5c5a4 100644
--- a/src/dawn_native/opengl/PipelineLayoutGL.cpp
+++ b/src/dawn_native/opengl/PipelineLayoutGL.cpp
@@ -18,7 +18,7 @@
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/opengl/DeviceGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor)
: PipelineLayoutBase(device, descriptor) {
@@ -77,4 +77,4 @@
return mNumSampledTextures;
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/PipelineLayoutGL.h b/src/dawn_native/opengl/PipelineLayoutGL.h
index b1b730b..e824e3f 100644
--- a/src/dawn_native/opengl/PipelineLayoutGL.h
+++ b/src/dawn_native/opengl/PipelineLayoutGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -41,6 +41,6 @@
size_t mNumSampledTextures;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_PIPELINELAYOUTGL_H_
diff --git a/src/dawn_native/opengl/QueueGL.cpp b/src/dawn_native/opengl/QueueGL.cpp
index 1243d6b..5c6d10d 100644
--- a/src/dawn_native/opengl/QueueGL.cpp
+++ b/src/dawn_native/opengl/QueueGL.cpp
@@ -17,7 +17,7 @@
#include "dawn_native/opengl/CommandBufferGL.h"
#include "dawn_native/opengl/DeviceGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
Queue::Queue(Device* device) : QueueBase(device) {
}
@@ -28,4 +28,4 @@
}
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/QueueGL.h b/src/dawn_native/opengl/QueueGL.h
index 35dbd9a..d8bbfa7 100644
--- a/src/dawn_native/opengl/QueueGL.h
+++ b/src/dawn_native/opengl/QueueGL.h
@@ -17,7 +17,7 @@
#include "dawn_native/Queue.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class CommandBuffer;
class Device;
@@ -30,6 +30,6 @@
void Submit(uint32_t numCommands, CommandBuffer* const* commands);
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_QUEUEGL_H_
diff --git a/src/dawn_native/opengl/RenderPipelineGL.cpp b/src/dawn_native/opengl/RenderPipelineGL.cpp
index a6522fd..d9911be 100644
--- a/src/dawn_native/opengl/RenderPipelineGL.cpp
+++ b/src/dawn_native/opengl/RenderPipelineGL.cpp
@@ -20,7 +20,7 @@
#include "dawn_native/opengl/InputStateGL.h"
#include "dawn_native/opengl/PersistentPipelineStateGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
GLenum GLPrimitiveTopology(dawn::PrimitiveTopology primitiveTopology) {
@@ -65,4 +65,4 @@
}
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/RenderPipelineGL.h b/src/dawn_native/opengl/RenderPipelineGL.h
index 9fdff35..042000c 100644
--- a/src/dawn_native/opengl/RenderPipelineGL.h
+++ b/src/dawn_native/opengl/RenderPipelineGL.h
@@ -23,7 +23,7 @@
#include <vector>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class PersistentPipelineState;
@@ -39,6 +39,6 @@
GLenum mGlPrimitiveTopology;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_RENDERPIPELINEGL_H_
diff --git a/src/dawn_native/opengl/SamplerGL.cpp b/src/dawn_native/opengl/SamplerGL.cpp
index ec60d39..d8ee7a4 100644
--- a/src/dawn_native/opengl/SamplerGL.cpp
+++ b/src/dawn_native/opengl/SamplerGL.cpp
@@ -17,7 +17,7 @@
#include "common/Assert.h"
#include "dawn_native/opengl/DeviceGL.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
GLenum MagFilterMode(dawn::FilterMode filter) {
@@ -86,4 +86,4 @@
return mHandle;
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/SamplerGL.h b/src/dawn_native/opengl/SamplerGL.h
index ccad9c2..a94f239 100644
--- a/src/dawn_native/opengl/SamplerGL.h
+++ b/src/dawn_native/opengl/SamplerGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -33,6 +33,6 @@
GLuint mHandle;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_SAMPLERGL_H_
diff --git a/src/dawn_native/opengl/ShaderModuleGL.cpp b/src/dawn_native/opengl/ShaderModuleGL.cpp
index b0651a6..c8f1f4e 100644
--- a/src/dawn_native/opengl/ShaderModuleGL.cpp
+++ b/src/dawn_native/opengl/ShaderModuleGL.cpp
@@ -21,7 +21,7 @@
#include <sstream>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
std::string GetBindingName(uint32_t group, uint32_t binding) {
std::ostringstream o;
@@ -129,4 +129,4 @@
return mCombinedInfo;
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/ShaderModuleGL.h b/src/dawn_native/opengl/ShaderModuleGL.h
index c2c8a19..9bd7727 100644
--- a/src/dawn_native/opengl/ShaderModuleGL.h
+++ b/src/dawn_native/opengl/ShaderModuleGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -52,6 +52,6 @@
std::string mGlslSource;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_SHADERMODULEGL_H_
diff --git a/src/dawn_native/opengl/SwapChainGL.cpp b/src/dawn_native/opengl/SwapChainGL.cpp
index 6fad7b5..2cbeee0 100644
--- a/src/dawn_native/opengl/SwapChainGL.cpp
+++ b/src/dawn_native/opengl/SwapChainGL.cpp
@@ -19,7 +19,7 @@
#include <dawn/dawn_wsi.h>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) {
const auto& im = GetImplementation();
@@ -44,4 +44,4 @@
void SwapChain::OnBeforePresent(TextureBase*) {
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/SwapChainGL.h b/src/dawn_native/opengl/SwapChainGL.h
index 8ae6066..23b8188 100644
--- a/src/dawn_native/opengl/SwapChainGL.h
+++ b/src/dawn_native/opengl/SwapChainGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
class Device;
@@ -33,6 +33,6 @@
void OnBeforePresent(TextureBase* texture) override;
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_SWAPCHAINGL_H_
diff --git a/src/dawn_native/opengl/TextureGL.cpp b/src/dawn_native/opengl/TextureGL.cpp
index 06b612f..fe52874 100644
--- a/src/dawn_native/opengl/TextureGL.cpp
+++ b/src/dawn_native/opengl/TextureGL.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include <vector>
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
namespace {
@@ -116,4 +116,4 @@
TextureView::TextureView(TextureViewBuilder* builder) : TextureViewBase(builder) {
}
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
diff --git a/src/dawn_native/opengl/TextureGL.h b/src/dawn_native/opengl/TextureGL.h
index 0964a2a..3c29a5b 100644
--- a/src/dawn_native/opengl/TextureGL.h
+++ b/src/dawn_native/opengl/TextureGL.h
@@ -19,7 +19,7 @@
#include "glad/glad.h"
-namespace backend { namespace opengl {
+namespace dawn_native { namespace opengl {
struct TextureFormatInfo {
GLenum internalFormat;
@@ -47,6 +47,6 @@
TextureView(TextureViewBuilder* builder);
};
-}} // namespace backend::opengl
+}} // namespace dawn_native::opengl
#endif // DAWNNATIVE_OPENGL_TEXTUREGL_H_
