AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 10:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac OpenGL fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-05-27 11:25:00 -10:00
parent c4cc4b8657
commit acd925ffaa
7 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/OpenGL/CShader.cpp
View File

@@ -187,6 +187,12 @@ GLuint CShader::GetUniformBlockIndex(const char* pkUniformBlock)
return glGetUniformBlockIndex(mProgram, pkUniformBlock);
}
void CShader::UniformBlockBinding(GLuint BlockIndex, GLuint BlockBinding)
{
if (BlockIndex != GL_INVALID_INDEX)
glUniformBlockBinding(mProgram, BlockIndex, BlockBinding);
}
void CShader::SetTextureUniforms(uint32 NumTextures)
{
for (uint32 iTex = 0; iTex < NumTextures; iTex++)
@@ -205,11 +211,11 @@ void CShader::SetCurrent()
glUseProgram(mProgram);
spCurrentShader = this;
glUniformBlockBinding(mProgram, mMVPBlockIndex, CGraphics::MVPBlockBindingPoint());
glUniformBlockBinding(mProgram, mVertexBlockIndex, CGraphics::VertexBlockBindingPoint());
glUniformBlockBinding(mProgram, mPixelBlockIndex, CGraphics::PixelBlockBindingPoint());
glUniformBlockBinding(mProgram, mLightBlockIndex, CGraphics::LightBlockBindingPoint());
glUniformBlockBinding(mProgram, mBoneTransformBlockIndex, CGraphics::BoneTransformBlockBindingPoint());
UniformBlockBinding(mMVPBlockIndex, CGraphics::MVPBlockBindingPoint());
UniformBlockBinding(mVertexBlockIndex, CGraphics::VertexBlockBindingPoint());
UniformBlockBinding(mPixelBlockIndex, CGraphics::PixelBlockBindingPoint());
UniformBlockBinding(mLightBlockIndex, CGraphics::LightBlockBindingPoint());
UniformBlockBinding(mBoneTransformBlockIndex, CGraphics::BoneTransformBlockBindingPoint());
}
}

1
src/Core/OpenGL/CShader.h
View File

@@ -37,6 +37,7 @@ public:
GLuint GetProgramID();
GLuint GetUniformLocation(const char* pkUniform);
GLuint GetUniformBlockIndex(const char* pkUniformBlock);
void UniformBlockBinding(GLuint BlockIndex, GLuint BlockBinding);
void SetTextureUniforms(uint32 NumTextures);
void SetNumLights(uint32 NumLights);
void SetCurrent();