mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-14 07:36:15 +00:00
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:
committed by
Corentin Wallez
parent
a9b2a9871c
commit
fffe6dfa16
@@ -12,15 +12,15 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "CommandBufferGL.h"
|
||||
#include "backend/opengl/CommandBufferGL.h"
|
||||
|
||||
#include "common/Commands.h"
|
||||
#include "OpenGLBackend.h"
|
||||
#include "PersistentPipelineStateGL.h"
|
||||
#include "PipelineGL.h"
|
||||
#include "PipelineLayoutGL.h"
|
||||
#include "SamplerGL.h"
|
||||
#include "TextureGL.h"
|
||||
#include "backend/Commands.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
#include "backend/opengl/PersistentPipelineStateGL.h"
|
||||
#include "backend/opengl/PipelineGL.h"
|
||||
#include "backend/opengl/PipelineLayoutGL.h"
|
||||
#include "backend/opengl/SamplerGL.h"
|
||||
#include "backend/opengl/TextureGL.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
#ifndef BACKEND_OPENGL_COMMANDBUFFERGL_H_
|
||||
#define BACKEND_OPENGL_COMMANDBUFFERGL_H_
|
||||
|
||||
#include "common/CommandAllocator.h"
|
||||
#include "common/CommandBuffer.h"
|
||||
#include "backend/CommandAllocator.h"
|
||||
#include "backend/CommandBuffer.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "DepthStencilStateGL.h"
|
||||
#include "backend/opengl/DepthStencilStateGL.h"
|
||||
|
||||
#include "OpenGLBackend.h"
|
||||
#include "PersistentPipelineStateGL.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
#include "backend/opengl/PersistentPipelineStateGL.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef BACKEND_OPENGL_DEPTHSTENCILSTATEGL_H_
|
||||
#define BACKEND_OPENGL_DEPTHSTENCILSTATEGL_H_
|
||||
|
||||
#include "common/DepthStencilState.h"
|
||||
#include "backend/DepthStencilState.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "OpenGLBackend.h"
|
||||
#include "CommandBufferGL.h"
|
||||
#include "DepthStencilStateGL.h"
|
||||
#include "PersistentPipelineStateGL.h"
|
||||
#include "PipelineGL.h"
|
||||
#include "PipelineLayoutGL.h"
|
||||
#include "SamplerGL.h"
|
||||
#include "ShaderModuleGL.h"
|
||||
#include "TextureGL.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
#include "backend/opengl/CommandBufferGL.h"
|
||||
#include "backend/opengl/DepthStencilStateGL.h"
|
||||
#include "backend/opengl/PersistentPipelineStateGL.h"
|
||||
#include "backend/opengl/PipelineGL.h"
|
||||
#include "backend/opengl/PipelineLayoutGL.h"
|
||||
#include "backend/opengl/SamplerGL.h"
|
||||
#include "backend/opengl/ShaderModuleGL.h"
|
||||
#include "backend/opengl/TextureGL.h"
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "OpenGLBackend.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
|
||||
#include "CommandBufferGL.h"
|
||||
#include "DepthStencilStateGL.h"
|
||||
#include "PipelineGL.h"
|
||||
#include "PipelineLayoutGL.h"
|
||||
#include "ShaderModuleGL.h"
|
||||
#include "SamplerGL.h"
|
||||
#include "TextureGL.h"
|
||||
#include "backend/opengl/CommandBufferGL.h"
|
||||
#include "backend/opengl/DepthStencilStateGL.h"
|
||||
#include "backend/opengl/PipelineGL.h"
|
||||
#include "backend/opengl/PipelineLayoutGL.h"
|
||||
#include "backend/opengl/ShaderModuleGL.h"
|
||||
#include "backend/opengl/SamplerGL.h"
|
||||
#include "backend/opengl/TextureGL.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
|
||||
#include "nxt/nxtcpp.h"
|
||||
|
||||
#include "common/Buffer.h"
|
||||
#include "common/BindGroup.h"
|
||||
#include "common/BindGroupLayout.h"
|
||||
#include "common/Device.h"
|
||||
#include "common/DepthStencilState.h"
|
||||
#include "common/Framebuffer.h"
|
||||
#include "common/InputState.h"
|
||||
#include "common/Queue.h"
|
||||
#include "common/RenderPass.h"
|
||||
#include "common/ToBackend.h"
|
||||
#include "backend/Buffer.h"
|
||||
#include "backend/BindGroup.h"
|
||||
#include "backend/BindGroupLayout.h"
|
||||
#include "backend/Device.h"
|
||||
#include "backend/DepthStencilState.h"
|
||||
#include "backend/Framebuffer.h"
|
||||
#include "backend/InputState.h"
|
||||
#include "backend/Queue.h"
|
||||
#include "backend/RenderPass.h"
|
||||
#include "backend/ToBackend.h"
|
||||
|
||||
#include "glad/glad.h"
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "PersistentPipelineStateGL.h"
|
||||
#include "backend/opengl/PersistentPipelineStateGL.h"
|
||||
|
||||
#include "OpenGLBackend.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "PipelineGL.h"
|
||||
#include "backend/opengl/PipelineGL.h"
|
||||
|
||||
#include "DepthStencilStateGL.h"
|
||||
#include "OpenGLBackend.h"
|
||||
#include "PersistentPipelineStateGL.h"
|
||||
#include "PipelineLayoutGL.h"
|
||||
#include "ShaderModuleGL.h"
|
||||
#include "backend/opengl/DepthStencilStateGL.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
#include "backend/opengl/PersistentPipelineStateGL.h"
|
||||
#include "backend/opengl/PipelineLayoutGL.h"
|
||||
#include "backend/opengl/ShaderModuleGL.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <set>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef BACKEND_OPENGL_PIPELINEGL_H_
|
||||
#define BACKEND_OPENGL_PIPELINEGL_H_
|
||||
|
||||
#include "common/Pipeline.h"
|
||||
#include "backend/Pipeline.h"
|
||||
|
||||
#include "glad/glad.h"
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "PipelineLayoutGL.h"
|
||||
#include "backend/opengl/PipelineLayoutGL.h"
|
||||
|
||||
#include "OpenGLBackend.h"
|
||||
#include "backend/opengl/OpenGLBackend.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef BACKEND_OPENGL_PIPELINELAYOUTGL_H_
|
||||
#define BACKEND_OPENGL_PIPELINELAYOUTGL_H_
|
||||
|
||||
#include "common/PipelineLayout.h"
|
||||
#include "backend/PipelineLayout.h"
|
||||
|
||||
#include "glad/glad.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "SamplerGL.h"
|
||||
#include "backend/opengl/SamplerGL.h"
|
||||
|
||||
namespace backend {
|
||||
namespace opengl {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef BACKEND_OPENGL_SAMPLERGL_H_
|
||||
#define BACKEND_OPENGL_SAMPLERGL_H_
|
||||
|
||||
#include "common/Sampler.h"
|
||||
#include "backend/Sampler.h"
|
||||
|
||||
#include "glad/glad.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ShaderModuleGL.h"
|
||||
#include "backend/opengl/ShaderModuleGL.h"
|
||||
|
||||
#include <spirv-cross/spirv_glsl.hpp>
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef BACKEND_OPENGL_SHADERMODULEGL_H_
|
||||
#define BACKEND_OPENGL_SHADERMODULEGL_H_
|
||||
|
||||
#include "common/ShaderModule.h"
|
||||
#include "backend/ShaderModule.h"
|
||||
|
||||
#include "glad/glad.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "TextureGL.h"
|
||||
#include "backend/opengl/TextureGL.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef BACKEND_OPENGL_TEXTUREGL_H_
|
||||
#define BACKEND_OPENGL_TEXTUREGL_H_
|
||||
|
||||
#include "common/Texture.h"
|
||||
#include "backend/Texture.h"
|
||||
|
||||
#include "glad/glad.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user