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 --- include/RenderBackend/OpenGL/VertexShader.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/RenderBackend/OpenGL/VertexShader.hpp') diff --git a/include/RenderBackend/OpenGL/VertexShader.hpp b/include/RenderBackend/OpenGL/VertexShader.hpp index 43a5dd8..aaf8b24 100644 --- a/include/RenderBackend/OpenGL/VertexShader.hpp +++ b/include/RenderBackend/OpenGL/VertexShader.hpp @@ -3,6 +3,7 @@ #include "../../DataView.hpp" #include "../../utils.hpp" #include "../../Result.hpp" +#include "CommonShader.hpp" #include "ShaderVec.hpp" #include #include @@ -51,7 +52,8 @@ namespace amalgine public: VertexShader(); - const std::string& getInputAttributeName(i32 attributeIndex); + const std::string& getInputAttributeName(i32 attributeIndex) const; + AttributeType getInputAttributeType(i32 attributeIndex) const; ShaderInputVec2 defineInputVec2(const std::string &name); void defineMain(VertexShaderMainFunc mainFunc); Result compile(); @@ -71,7 +73,7 @@ namespace amalgine int locationCounter; i32 maxVertexAttribs; // Could make this static std::unordered_map vertexAttributes; - std::vector vertexAttributeNames; + std::vector vertexAttributeNames; bool mainFuncDefined; }; } -- cgit v1.2.3