From f2f092e9c8f44f94a6ee8e273f18085c275c61b4 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 20 Apr 2016 15:42:30 -0700 Subject: [PATCH] Cleanup thanks to review --- libraries/gpu/src/gpu/GLBackend.cpp | 4 ++-- libraries/gpu/src/gpu/GLBackendInput.cpp | 4 ---- libraries/gpu/src/gpu/GLBackendPipeline.cpp | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp index 298040c8b4..0c5a0cfb42 100644 --- a/libraries/gpu/src/gpu/GLBackend.cpp +++ b/libraries/gpu/src/gpu/GLBackend.cpp @@ -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(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); diff --git a/libraries/gpu/src/gpu/GLBackendInput.cpp b/libraries/gpu/src/gpu/GLBackendInput.cpp index 1bb7a9b5db..75f4be3cbe 100755 --- a/libraries/gpu/src/gpu/GLBackendInput.cpp +++ b/libraries/gpu/src/gpu/GLBackendInput.cpp @@ -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(); } diff --git a/libraries/gpu/src/gpu/GLBackendPipeline.cpp b/libraries/gpu/src/gpu/GLBackendPipeline.cpp index ccf38ec071..0b539f75b9 100755 --- a/libraries/gpu/src/gpu/GLBackendPipeline.cpp +++ b/libraries/gpu/src/gpu/GLBackendPipeline.cpp @@ -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;