Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup thanks to review

Browse source
This commit is contained in:
samcake 2016-04-20 15:42:30 -07:00
parent 4c2cdc8704
commit f2f092e9c8
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -385,7 +385,7 @@ void GLBackend::do_drawInstanced(Batch& batch, size_t paramOffset) {
if (isStereo()) {
GLint trueNumInstances = (isStereo() ? 2 * numInstances : numInstances);
GLint trueNumInstances = 2 * numInstances;
setupStereoSide(0);
glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances);
@ -428,7 +428,7 @@ void GLBackend::do_drawIndexedInstanced(Batch& batch, size_t paramOffset) {
GLvoid* indexBufferByteOffset = reinterpret_cast<GLvoid*>(startIndex * typeByteSize + _input._indexBufferOffset);
if (isStereo()) {
GLint trueNumInstances = (isStereo() ? 2 * numInstances : numInstances);
GLint trueNumInstances = 2 * numInstances;
setupStereoSide(0);
glbackend_glDrawElementsInstancedBaseVertexBaseInstance(mode, numIndices, glType, indexBufferByteOffset, numInstances, 0, startInstance);

4
libraries/gpu/src/gpu/GLBackendInput.cpp
View file

@ -120,11 +120,7 @@ void GLBackend::updateInput() {
glVertexAttribFormat(slot + locNum, count, type, isNormalized, offset + locNum * perLocationSize);
glVertexAttribBinding(slot + locNum, attrib._channel);
}
#ifdef GPU_STEREO_DRAWCALL_INSTANCED
glVertexBindingDivisor(attrib._channel, attrib._frequency * (isStereo() ? 2 : 1));
#else
glVertexBindingDivisor(attrib._channel, attrib._frequency);
#endif
}
(void) CHECK_GL_ERROR();
}

4
libraries/gpu/src/gpu/GLBackendPipeline.cpp
View file

@ -85,11 +85,7 @@ void GLBackend::do_setPipeline(Batch& batch, size_t paramOffset) {
// check the program cache
// pick the program version
#ifdef GPU_STEREO_CAMERA_BUFFER
GLuint glprogram = pipelineObject->_program->getProgram(isStereo());
#else
GLuint glprogram = pipelineObject->_program->getProgram();
#endif
if (_pipeline._program != glprogram) {
_pipeline._program = glprogram;