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

Made emscripten work a bit better

Browse Source
This commit is contained in:
Dominic Masters
2023-11-01 10:42:51 -05:00
parent 8ca8358aa5
commit 4315a7e847
33 changed files with 548 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +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->lockFontShader = this->shaderManager.lockShader<FontShader>();
this->fontShader = this->shaderManager.getShader<FontShader>(this->lockFontShader);
// 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->renderPipeline.init();
assertNoGLError();

2
src/dawnopengl/display/shader/Shader.hpp
View File

@ -64,7 +64,7 @@ namespace Dawn {
*/
shaderbufferlocation_t getBufferLocationByName(std::string name);
virtual void compile() = 0;
virtual void compile() override = 0;
void bind() override;
void setParameterBuffer(shaderbufferlocation_t location, shaderbufferslot_t slot);
void setMatrix(shaderparameter_t parameter, glm::mat4 matrix) override;

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

@ -15,7 +15,7 @@ void SimpleTexturedShader::compile() {
{ "aTexCoord", 1 }
},
// Vertex Shader
"#version 330 core\n"
"#version 300 es\n"
"layout (location = 0) in vec3 aPos;\n"
"layout (location = 1) in vec2 aTexCoord;\n" +
@ -91,6 +91,5 @@ void SimpleTexturedShader::compile() {
this->paramColor = this->getParameterByName("u_Color");
this->paramTexture = this->getParameterByName("u_Text");
this->paramHasTexture = this->getParameterByName("u_HasTexture");
this->bufferRenderPipeline = this->getBufferLocationByName(RenderPipelineShaderBuffer::getShaderUniformName());
}