MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

UniformBlock: remove GLES specific fixes.

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-06-29 12:19:32 +06:00
parent 83ba9b5741
commit d691d98451
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/OGL3X/UniformBlock.cpp
View File

@ -31,7 +31,7 @@ const char * strLightUniforms[UniformBlock::luTotal] = {
"uLightColor"
};
UniformBlock::UniformBlock() : m_currentBuffer(0), m_renderer(video().getRender().getRenderer())
UniformBlock::UniformBlock() : m_currentBuffer(0)
{
}
@ -148,10 +148,7 @@ void UniformBlock::setColorData(ColorUniforms _index, u32 _dataSize, const void
glBindBuffer(GL_UNIFORM_BUFFER, m_colorsBlock.m_buffer);
}
if (m_renderer != OGLRender::glrAdreno)
glBufferSubData(GL_UNIFORM_BUFFER, m_colorsBlock.m_offsets[_index], _dataSize, _data);
else
glBufferData(GL_UNIFORM_BUFFER, m_colorsBlockData.size(), m_colorsBlockData.data(), GL_STATIC_DRAW);
glBufferSubData(GL_UNIFORM_BUFFER, m_colorsBlock.m_offsets[_index], _dataSize, _data);
}
void UniformBlock::updateTextureParameters()
@ -231,10 +228,7 @@ void UniformBlock::updateTextureParameters()
glBindBuffer(GL_UNIFORM_BUFFER, m_textureBlock.m_buffer);
}
if (m_renderer != OGLRender::glrAdreno)
glBufferSubData(GL_UNIFORM_BUFFER, m_textureBlock.m_offsets[tuTexScale], m_textureBlockData.size(), pData);
else
glBufferData(GL_UNIFORM_BUFFER, m_textureBlockData.size(), m_textureBlockData.data(), GL_STATIC_DRAW);
glBufferSubData(GL_UNIFORM_BUFFER, m_textureBlock.m_offsets[tuTexScale], m_textureBlockData.size(), pData);
}
void UniformBlock::updateLightParameters()
@ -253,10 +247,7 @@ void UniformBlock::updateLightParameters()
glBindBuffer(GL_UNIFORM_BUFFER, m_lightBlock.m_buffer);
}
if (m_renderer != OGLRender::glrAdreno)
glBufferSubData(GL_UNIFORM_BUFFER, m_lightBlock.m_offsets[luLightDirection], m_lightBlockData.size(), pData);
else
glBufferData(GL_UNIFORM_BUFFER, m_lightBlockData.size(), m_lightBlockData.data(), GL_STATIC_DRAW);
glBufferSubData(GL_UNIFORM_BUFFER, m_lightBlock.m_offsets[luLightDirection], m_lightBlockData.size(), pData);
}
UniformCollection * createUniformCollection()

1
src/OGL3X/UniformBlock.h
View File

@ -63,7 +63,6 @@ private:
};
GLuint m_currentBuffer;
OGLRender::OGL_RENDERER m_renderer;
UniformBlockData<tuTotal, 1> m_textureBlock;
UniformBlockData<cuTotal, 2> m_colorsBlock;