From 96291cbd88781ebe4dd0a1e489c0e5779b051c2c Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 1 Nov 2023 10:49:02 -0500 Subject: [PATCH] Fixed simple textured shader. --- src/dawnopengl/display/RenderManager.cpp | 8 ++++---- .../display/shader/shaders/SimpleTexturedShader.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dawnopengl/display/RenderManager.cpp b/src/dawnopengl/display/RenderManager.cpp index 9d034beb..ef01f7b1 100644 --- a/src/dawnopengl/display/RenderManager.cpp +++ b/src/dawnopengl/display/RenderManager.cpp @@ -21,11 +21,11 @@ void RenderManager::init() { this->lockSimpleTextured = this->shaderManager.lockShader(); this->simpleTexturedShader = this->shaderManager.getShader(this->lockSimpleTextured); - // this->lockUIShaderProgram = this->shaderManager.lockShader(); - // this->uiShader = this->shaderManager.getShader(this->lockUIShaderProgram); + this->lockUIShaderProgram = this->shaderManager.lockShader(); + this->uiShader = this->shaderManager.getShader(this->lockUIShaderProgram); - // this->lockFontShader = this->shaderManager.lockShader(); - // this->fontShader = this->shaderManager.getShader(this->lockFontShader); + this->lockFontShader = this->shaderManager.lockShader(); + this->fontShader = this->shaderManager.getShader(this->lockFontShader); this->renderPipeline.init(); assertNoGLError(); diff --git a/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp b/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp index 99f8a799..53399e2d 100644 --- a/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp +++ b/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp @@ -15,7 +15,7 @@ void SimpleTexturedShader::compile() { { "aTexCoord", 1 } }, // Vertex Shader - "#version 300 es\n" + "#version 330 core\n" "layout (location = 0) in vec3 aPos;\n" "layout (location = 1) in vec2 aTexCoord;\n" +