From 55513703b200ee8e8d7a10d22436436385758610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Sat, 3 Jul 2021 14:43:55 +0200 Subject: [PATCH] Removed unused static buffer types --- src/graphics/core/device.h | 12 ------------ src/graphics/opengl/gl33device.h | 16 ---------------- 2 files changed, 28 deletions(-) diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h index 57e5f647..aa60de1a 100644 --- a/src/graphics/core/device.h +++ b/src/graphics/core/device.h @@ -444,24 +444,12 @@ public: virtual void DrawPrimitives(PrimitiveType type, const VertexCol *vertices, int first[], int count[], int drawCount) = 0; - //! Creates a static buffer composed of given primitives with single texture vertices - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) = 0; - //! Creates a static buffer composed of given primitives with multitexturing virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) = 0; - //! Creates a static buffer composed of given primitives with solid color - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) = 0; - - //! Updates the static buffer composed of given primitives with single texture vertices - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) = 0; - //! Updates the static buffer composed of given primitives with multitexturing virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) = 0; - //! Updates the static buffer composed of given primitives with solid color - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) = 0; - //! Draws a static buffer virtual void DrawStaticBuffer(unsigned int bufferId) = 0; diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h index 1b39ce00..9d883eea 100644 --- a/src/graphics/opengl/gl33device.h +++ b/src/graphics/opengl/gl33device.h @@ -137,30 +137,14 @@ public: virtual void DrawPrimitives(PrimitiveType type, const VertexCol *vertices, int first[], int count[], int drawCount) override; - unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override - { - return CreateStaticBufferImpl(primitiveType, vertices, vertexCount); - } unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override { return CreateStaticBufferImpl(primitiveType, vertices, vertexCount); } - unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override - { - return CreateStaticBufferImpl(primitiveType, vertices, vertexCount); - } - void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override - { - UpdateStaticBufferImpl(bufferId, primitiveType, vertices, vertexCount); - } void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override { UpdateStaticBufferImpl(bufferId, primitiveType, vertices, vertexCount); } - void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override - { - UpdateStaticBufferImpl(bufferId, primitiveType, vertices, vertexCount); - } void DrawStaticBuffer(unsigned int bufferId) override; void DestroyStaticBuffer(unsigned int bufferId) override;