Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 08:43:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

No more Magic numbers and fixing the code path for linux

Browse source
This commit is contained in:
Sam Gateau 2015-01-16 10:26:51 -08:00
parent 8634d86167
commit 6b55b4ff82
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/gpu/src/gpu/GLBackend.cpp
View file

@ -498,9 +498,12 @@ void GLBackend::do_setUniformBuffer(Batch& batch, uint32 paramOffset) {
// NOT working so we ll stick to the uniform float array until we move to core profile // NOT working so we ll stick to the uniform float array until we move to core profile
// GLuint bo = getBufferID(*uniformBuffer); // GLuint bo = getBufferID(*uniformBuffer);
//glUniformBufferEXT(_shader._program, slot, bo); //glUniformBufferEXT(_shader._program, slot, bo);
#else #elif defined(Q_OS_WIN)
GLuint bo = getBufferID(*uniformBuffer); GLuint bo = getBufferID(*uniformBuffer);
glBindBufferRange(GL_UNIFORM_BUFFER, slot, bo, rangeStart, rangeSize); glBindBufferRange(GL_UNIFORM_BUFFER, slot, bo, rangeStart, rangeSize);
#else
GLfloat* data = (GLfloat*) (uniformBuffer->getData() + rangeStart);
glUniform4fv(slot, rangeSize / sizeof(GLfloat[4]), data);
#endif #endif
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }

4
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -54,6 +54,8 @@ public:
glm::vec3 L21 ; float spare7; glm::vec3 L21 ; float spare7;
glm::vec3 L22 ; float spare8; glm::vec3 L22 ; float spare8;
static const int NUM_COEFFICIENTS = 9;
void assignPreset(int p) { void assignPreset(int p) {
switch (p) { switch (p) {
case DeferredLightingEffect::OLD_TOWN_SQUARE: { case DeferredLightingEffect::OLD_TOWN_SQUARE: {
@ -387,7 +389,7 @@ void DeferredLightingEffect::render() {
sh.assignPreset(0); sh.assignPreset(0);
} }
for (int i =0; i <9; i++) { for (int i =0; i <SphericalHarmonics::NUM_COEFFICIENTS; i++) {
program->setUniformValue(locations->ambientSphere + i, *(((QVector4D*) &sh) + i)); program->setUniformValue(locations->ambientSphere + i, *(((QVector4D*) &sh) + i));
} }
} }

9
libraries/render-utils/src/Model.cpp
View file

@ -206,7 +206,7 @@ void Model::initProgram(ProgramObject& program, Model::Locations& locations, boo
} else { } else {
locations.materialBufferUnit = -1; locations.materialBufferUnit = -1;
} }
#else #elif defined(Q_OS_WIN)
loc = glGetUniformBlockIndex(program.programId(), "materialBuffer"); loc = glGetUniformBlockIndex(program.programId(), "materialBuffer");
if (loc >= 0) { if (loc >= 0) {
glUniformBlockBinding(program.programId(), loc, 1); glUniformBlockBinding(program.programId(), loc, 1);
@ -214,6 +214,13 @@ void Model::initProgram(ProgramObject& program, Model::Locations& locations, boo
} else { } else {
locations.materialBufferUnit = -1; locations.materialBufferUnit = -1;
} }
#else
loc = program.uniformLocation("materialBuffer");
if (loc >= 0) {
locations.materialBufferUnit = loc;
} else {
locations.materialBufferUnit = -1;
}
#endif #endif
if (!program.isLinked()) { if (!program.isLinked()) {