From 3d36c5714fd9fb9a03e6422a9158860f08314095 Mon Sep 17 00:00:00 2001
From: Anna <anna@highfidelity.io>
Date: Fri, 21 Jun 2019 11:34:10 -0700
Subject: [PATCH] added comments and cleaned up
---
.../src/display-plugins/OpenGLDisplayPlugin.cpp | 8 ++++++--
plugins/oculus/src/OculusDisplayPlugin.cpp | 1 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index c990be6e42..cdbbc15877 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -574,9 +574,10 @@ std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> OpenGL
std::array<glm::ivec4, 2> hudEyeViewports;
for_each_eye([&](Eye eye) { hudEyeViewports[eye] = eyeViewport(eye); });
return [=](gpu::Batch& batch, const gpu::TexturePointer& hudTexture, bool mirror) {
- if (hudPipeline && hudTexture) {
+ auto pipeline = mirror ? hudMirrorPipeline : hudPipeline;
+ if (pipeline && hudTexture) {
batch.enableStereo(false);
- batch.setPipeline(mirror ? hudMirrorPipeline : hudPipeline);
+ batch.setPipeline(pipeline);
batch.setResourceTexture(0, hudTexture);
if (hudStereo) {
for_each_eye([&](Eye eye) {
@@ -954,6 +955,9 @@ gpu::PipelinePointer OpenGLDisplayPlugin::getCompositeScenePipeline() {
return _drawTexturePipeline;
}
+// Added this to allow desktop composite framebuffer to be RGBA while mobile is SRGBA, so that tone mapping looks right on both platforms
+// Overridden by Basic2DWindowDisplayPlugin to achieve this
+// FIXME: Eventually it would be ideal to have both framebuffers be of the same type
gpu::Element OpenGLDisplayPlugin::getCompositeFBColorSpace() {
return gpu::Element::COLOR_RGBA_32;
}
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index 43eabf3544..c493588992 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -167,7 +167,6 @@ void OculusDisplayPlugin::hmdPresent() {
batch.setStateScissorRect(ivec4(uvec2(), _outputFramebuffer->getSize()));
batch.resetViewTransform();
batch.setProjectionTransform(mat4());
- //batch.setPipeline(_drawTexturePipeline);
batch.setPipeline(_drawTexturePipeline);
batch.setResourceTexture(0, _compositeFramebuffer->getRenderBuffer(0));
batch.draw(gpu::TRIANGLE_STRIP, 4);