YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed simple textured shader.

Browse Source
This commit is contained in:
Dominic Masters
2023-11-01 10:49:02 -05:00
parent 38175d044b
commit cbe67388c8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dawnopengl/display/RenderManager.cpp
View File

@ -21,11 +21,11 @@ void RenderManager::init() {
this->lockSimpleTextured = this->shaderManager.lockShader<SimpleTexturedShader>();
this->simpleTexturedShader = this->shaderManager.getShader<SimpleTexturedShader>(this->lockSimpleTextured);
// this->lockUIShaderProgram = this->shaderManager.lockShader<UIShader>();
// this->uiShader = this->shaderManager.getShader<UIShader>(this->lockUIShaderProgram);
this->lockUIShaderProgram = this->shaderManager.lockShader<UIShader>();
this->uiShader = this->shaderManager.getShader<UIShader>(this->lockUIShaderProgram);
// this->lockFontShader = this->shaderManager.lockShader<FontShader>();
// this->fontShader = this->shaderManager.getShader<FontShader>(this->lockFontShader);
this->lockFontShader = this->shaderManager.lockShader<FontShader>();
this->fontShader = this->shaderManager.getShader<FontShader>(this->lockFontShader);
this->renderPipeline.init();
assertNoGLError();

2
src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp
View File

@ -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" +