From f97c7b00defbe9c8333e82e53d8ad5fce61ca4d6 Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 10 Mar 2016 14:06:07 -0800 Subject: [PATCH] Removing old modifications --- libraries/gpu/src/gpu/GLBackendOutput.cpp | 1 - libraries/gpu/src/gpu/GLBackendTexture.cpp | 39 ---------------------- 2 files changed, 40 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackendOutput.cpp b/libraries/gpu/src/gpu/GLBackendOutput.cpp index 26754ba652..37a10e670b 100755 --- a/libraries/gpu/src/gpu/GLBackendOutput.cpp +++ b/libraries/gpu/src/gpu/GLBackendOutput.cpp @@ -209,7 +209,6 @@ void GLBackend::resetOutputStage() { _output._drawFBO = 0; glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); } - glEnable(GL_FRAMEBUFFER_SRGB); } void GLBackend::do_setFramebuffer(Batch& batch, size_t paramOffset) { diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp index 5cf3b50f64..a70904a4bf 100755 --- a/libraries/gpu/src/gpu/GLBackendTexture.cpp +++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp @@ -117,45 +117,6 @@ public: break; case gpu::RGBA: texel.internalFormat = GL_RGBA; - switch (dstFormat.getType()) { - case gpu::UINT32: - case gpu::NUINT32: { - texel.internalFormat = GL_RGBA32UI; - break; - } - case gpu::INT32: - case gpu::NINT32: { - texel.internalFormat = GL_RGBA32I; - break; - } - case gpu::FLOAT: { - texel.internalFormat = GL_RGBA32F; - break; - } - case gpu::UINT16: - case gpu::NUINT16: { - texel.internalFormat = GL_RGBA16UI; - break; - } - case gpu::INT16: - case gpu::NINT16: { - texel.internalFormat = GL_RGBA16I; - break; - } - case gpu::HALF: { - texel.internalFormat = GL_RGBA16F; - break; - } - case gpu::UINT8: - case gpu::INT8: - case gpu::NUINT8: - case gpu::NINT8: { - break; - } - case gpu::NUM_TYPES: { // quiet compiler - Q_UNREACHABLE(); - } - } break; case gpu::SRGB: texel.internalFormat = GL_SRGB;