From ffe9dac56488ebfc9f5c37c4e400f4f5469a8a46 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 26 Dec 2017 17:29:28 +0100 Subject: Add device memory, device frame. Rendering works --- src/RenderBackend/OpenGL/CompiledShader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/RenderBackend/OpenGL/CompiledShader.cpp') diff --git a/src/RenderBackend/OpenGL/CompiledShader.cpp b/src/RenderBackend/OpenGL/CompiledShader.cpp index 6707b7a..f4a1fec 100644 --- a/src/RenderBackend/OpenGL/CompiledShader.cpp +++ b/src/RenderBackend/OpenGL/CompiledShader.cpp @@ -1,6 +1,8 @@ #include "../../../include/RenderBackend/OpenGL/CompiledShader.hpp" #include "../../../include/RenderBackend/OpenGL/opengl.hpp" +using namespace std; + namespace amalgine { CompiledVertexShader::CompiledVertexShader(u32 _shaderId) : @@ -19,8 +21,9 @@ namespace amalgine return shaderId; } - CompiledPixelShader::CompiledPixelShader(u32 _shaderId) : - shaderId(_shaderId) + CompiledPixelShader::CompiledPixelShader(u32 _shaderId, unordered_map &&_pixelAttributes) : + shaderId(_shaderId), + pixelAttributes(_pixelAttributes) { } -- cgit v1.2.3