From 23a37b2cdd8ffde8bb85a4159888bf3a7ec35966 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Mon, 4 Nov 2019 00:50:45 +0100
Subject: Use external shaders instead of generating shader code from c++
 code...

---
 src/RenderBackend/OpenGL/DeviceMemory.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/RenderBackend/OpenGL/DeviceMemory.cpp')

diff --git a/src/RenderBackend/OpenGL/DeviceMemory.cpp b/src/RenderBackend/OpenGL/DeviceMemory.cpp
index 0dd3e89..2d40569 100644
--- a/src/RenderBackend/OpenGL/DeviceMemory.cpp
+++ b/src/RenderBackend/OpenGL/DeviceMemory.cpp
@@ -33,7 +33,7 @@ namespace amalgine
         }
     }
     
-    DeviceMemory::DeviceMemory() : primitiveType(0), numVertices(0)
+    DeviceMemory::DeviceMemory() : primitiveType(0), numVertices(0), type(DeviceMemoryType::NONE)
     {
         glGenBuffers(1, &vertexBufferObjectId);
     }
@@ -43,11 +43,6 @@ namespace amalgine
         glDeleteBuffers(1, &vertexBufferObjectId);
     }
     
-    void DeviceMemory::operator delete(void *data)
-    {
-        free(data);
-    }
-    
     void DeviceMemory::use() const
     {
         // TODO: Bind vao here?
@@ -68,12 +63,11 @@ namespace amalgine
         glBufferData(GL_ARRAY_BUFFER, triangles.getByteSize(), triangles.data, getOpenglStorageType(storageType));
         primitiveType = GL_TRIANGLES;
         numVertices = triangles.size * 3;
+        type = DeviceMemoryType::VEC2;
     }
     
     void DeviceMemory::draw()
     {
-        if(primitiveType == 0)
-            throw DeviceMemoryEmpty("Unable to draw buffer as no data has been copied to device memory");
         glDrawArrays(primitiveType, 0, numVertices);
     }
 }
-- 
cgit v1.2.3