From 67632ff14414e8f42300bde6ad10cad69ca82aeb Mon Sep 17 00:00:00 2001 From: Attila Uygun Date: Sat, 17 Jun 2023 21:05:05 +0200 Subject: [PATCH] Fix typo --- src/engine/mesh.h | 4 ++-- src/engine/renderer/geometry.h | 4 ++-- src/engine/renderer/opengl/render_command.h | 2 +- src/engine/renderer/opengl/renderer_opengl.cc | 6 +++--- src/engine/renderer/opengl/renderer_opengl.h | 6 +++--- src/engine/renderer/renderer.h | 2 +- src/engine/renderer/renderer_types.cc | 2 +- src/engine/renderer/renderer_types.h | 4 ++-- src/engine/renderer/shader.cc | 2 +- src/engine/renderer/shader.h | 2 +- src/engine/renderer/vulkan/renderer_vulkan.cc | 4 ++-- src/engine/renderer/vulkan/renderer_vulkan.h | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/engine/mesh.h b/src/engine/mesh.h index 11ddefc..6ad7f92 100644 --- a/src/engine/mesh.h +++ b/src/engine/mesh.h @@ -30,7 +30,7 @@ class Mesh { size_t GetIndexSize() const; Primitive primitive() const { return primitive_; } - const VertexDescripton& vertex_description() const { + const VertexDescription& vertex_description() const { return vertex_description_; } size_t num_vertices() const { return num_vertices_; } @@ -41,7 +41,7 @@ class Mesh { private: Primitive primitive_ = kPrimitive_TriangleStrip; - VertexDescripton vertex_description_; + VertexDescription vertex_description_; size_t num_vertices_ = 0; DataType index_description_ = kDataType_Invalid; size_t num_indices_ = 0; diff --git a/src/engine/renderer/geometry.h b/src/engine/renderer/geometry.h index df939be..406b81b 100644 --- a/src/engine/renderer/geometry.h +++ b/src/engine/renderer/geometry.h @@ -23,14 +23,14 @@ class Geometry : public RenderResource { void Draw(); - const VertexDescripton& vertex_description() const { + const VertexDescription& vertex_description() const { return vertex_description_; } Primitive primitive() { return primitive_; } private: - VertexDescripton vertex_description_; + VertexDescription vertex_description_; Primitive primitive_ = kPrimitive_Invalid; }; diff --git a/src/engine/renderer/opengl/render_command.h b/src/engine/renderer/opengl/render_command.h index a18f0e7..13a76e7 100644 --- a/src/engine/renderer/opengl/render_command.h +++ b/src/engine/renderer/opengl/render_command.h @@ -85,7 +85,7 @@ RENDER_COMMAND_END RENDER_COMMAND_BEGIN(CmdCreateShader) std::unique_ptr source; - VertexDescripton vertex_description; + VertexDescription vertex_description; uint64_t resource_id; bool enable_depth_test; RENDER_COMMAND_END diff --git a/src/engine/renderer/opengl/renderer_opengl.cc b/src/engine/renderer/opengl/renderer_opengl.cc index 4ecb228..4475b17 100644 --- a/src/engine/renderer/opengl/renderer_opengl.cc +++ b/src/engine/renderer/opengl/renderer_opengl.cc @@ -121,7 +121,7 @@ void RendererOpenGL::ActivateTexture(uint64_t resource_id) { uint64_t RendererOpenGL::CreateShader( std::unique_ptr source, - const VertexDescripton& vertex_description, + const VertexDescription& vertex_description, Primitive primitive, bool enable_depth_test) { auto cmd = std::make_unique(); @@ -853,7 +853,7 @@ void RendererOpenGL::BindTexture(GLuint id) { } bool RendererOpenGL::SetupVertexLayout( - const VertexDescripton& vd, + const VertexDescription& vd, GLuint vertex_size, bool use_vao, std::vector& vertex_layout) { @@ -918,7 +918,7 @@ GLuint RendererOpenGL::CreateShader(const char* source, GLenum type) { } bool RendererOpenGL::BindAttributeLocation(GLuint id, - const VertexDescripton& vd) { + const VertexDescription& vd) { int current = 0; int tex_coord = 0; diff --git a/src/engine/renderer/opengl/renderer_opengl.h b/src/engine/renderer/opengl/renderer_opengl.h index 6e27bdd..71ab414 100644 --- a/src/engine/renderer/opengl/renderer_opengl.h +++ b/src/engine/renderer/opengl/renderer_opengl.h @@ -55,7 +55,7 @@ class RendererOpenGL final : public Renderer { void ActivateTexture(uint64_t resource_id) final; uint64_t CreateShader(std::unique_ptr source, - const VertexDescripton& vertex_description, + const VertexDescription& vertex_description, Primitive primitive, bool enable_depth_test) final; void DestroyShader(uint64_t resource_id) final; @@ -196,12 +196,12 @@ class RendererOpenGL final : public Renderer { void HandleCmdSetUniformInt(RenderCommand* cmd); void BindTexture(GLuint id); - bool SetupVertexLayout(const VertexDescripton& vd, + bool SetupVertexLayout(const VertexDescription& vd, GLuint vertex_size, bool use_vao, std::vector& vertex_layout); GLuint CreateShader(const char* source, GLenum type); - bool BindAttributeLocation(GLuint id, const VertexDescripton& vd); + bool BindAttributeLocation(GLuint id, const VertexDescription& vd); GLint GetUniformLocation(GLuint id, const std::string& name, std::unordered_map& uniforms); diff --git a/src/engine/renderer/renderer.h b/src/engine/renderer/renderer.h index a539ee0..d0dae50 100644 --- a/src/engine/renderer/renderer.h +++ b/src/engine/renderer/renderer.h @@ -41,7 +41,7 @@ class Renderer { virtual void ActivateTexture(uint64_t resource_id) = 0; virtual uint64_t CreateShader(std::unique_ptr source, - const VertexDescripton& vertex_description, + const VertexDescription& vertex_description, Primitive primitive, bool enable_depth_test) = 0; virtual void DestroyShader(uint64_t resource_id) = 0; diff --git a/src/engine/renderer/renderer_types.cc b/src/engine/renderer/renderer_types.cc index 2284878..42b2f02 100644 --- a/src/engine/renderer/renderer_types.cc +++ b/src/engine/renderer/renderer_types.cc @@ -14,7 +14,7 @@ const char kLayoutDelimiter[] = ";/ \t"; namespace eng { -bool ParseVertexDescription(std::string vd_str, VertexDescripton& out) { +bool ParseVertexDescription(std::string vd_str, VertexDescription& out) { // Parse the description. char buffer[32]; strcpy(buffer, vd_str.c_str()); diff --git a/src/engine/renderer/renderer_types.h b/src/engine/renderer/renderer_types.h index b312f28..6354cf6 100644 --- a/src/engine/renderer/renderer_types.h +++ b/src/engine/renderer/renderer_types.h @@ -38,10 +38,10 @@ enum DataType { using ElementCount = size_t; using DataTypeSize = size_t; -using VertexDescripton = +using VertexDescription = std::vector>; -bool ParseVertexDescription(std::string vd_str, VertexDescripton& out); +bool ParseVertexDescription(std::string vd_str, VertexDescription& out); } // namespace eng diff --git a/src/engine/renderer/shader.cc b/src/engine/renderer/shader.cc index 7c103da..bffbb8b 100644 --- a/src/engine/renderer/shader.cc +++ b/src/engine/renderer/shader.cc @@ -14,7 +14,7 @@ Shader::~Shader() { } void Shader::Create(std::unique_ptr source, - const VertexDescripton& vd, + const VertexDescription& vd, Primitive primitive, bool enable_depth_test) { Destroy(); diff --git a/src/engine/renderer/shader.h b/src/engine/renderer/shader.h index 1f1d599..9361b67 100644 --- a/src/engine/renderer/shader.h +++ b/src/engine/renderer/shader.h @@ -19,7 +19,7 @@ class Shader : public RenderResource { ~Shader(); void Create(std::unique_ptr source, - const VertexDescripton& vd, + const VertexDescription& vd, Primitive primitive, bool enable_depth_test); diff --git a/src/engine/renderer/vulkan/renderer_vulkan.cc b/src/engine/renderer/vulkan/renderer_vulkan.cc index f0a1d9a..6208e47 100644 --- a/src/engine/renderer/vulkan/renderer_vulkan.cc +++ b/src/engine/renderer/vulkan/renderer_vulkan.cc @@ -277,7 +277,7 @@ std::vector CompileGlsl(EShLanguage stage, } VertexInputDescription GetVertexInputDescription( - const eng::VertexDescripton& vd) { + const eng::VertexDescription& vd) { unsigned vertex_offset = 0; unsigned location = 0; @@ -534,7 +534,7 @@ void RendererVulkan::ActivateTexture(uint64_t resource_id) { uint64_t RendererVulkan::CreateShader( std::unique_ptr source, - const VertexDescripton& vertex_description, + const VertexDescription& vertex_description, Primitive primitive, bool enable_depth_test) { auto it = spirv_cache_.find(source->name()); diff --git a/src/engine/renderer/vulkan/renderer_vulkan.h b/src/engine/renderer/vulkan/renderer_vulkan.h index 6addbef..eb44e90 100644 --- a/src/engine/renderer/vulkan/renderer_vulkan.h +++ b/src/engine/renderer/vulkan/renderer_vulkan.h @@ -38,7 +38,7 @@ class RendererVulkan final : public Renderer { void ActivateTexture(uint64_t resource_id) final; uint64_t CreateShader(std::unique_ptr source, - const VertexDescripton& vertex_description, + const VertexDescription& vertex_description, Primitive primitive, bool enable_depth_test) final; void DestroyShader(uint64_t resource_id) final;