From 803fe1e178dd0b24410487a9ecc652c2b2800d04 Mon Sep 17 00:00:00 2001 From: Anna Date: Tue, 18 Jun 2019 19:33:31 -0700 Subject: [PATCH] added comments --- .../display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp | 1 - .../src/display-plugins/OpenGLDisplayPlugin.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp index 8da8cb432d..5e1c720ba3 100644 --- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp @@ -113,7 +113,6 @@ gpu::PipelinePointer Basic2DWindowOpenGLDisplayPlugin::getCompositeScenePipeline #if defined(Q_OS_ANDROID) return _linearToSRGBPipeline; #endif - //return _drawTexturePipeline; return _SRGBToLinearPipeline; } diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 615fca1096..91a4661d63 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -633,6 +633,7 @@ void OpenGLDisplayPlugin::compositePointer() { }); } +// Overridden by Basic2DWindowDisplayPlugin and OculusDisplayPlugin gpu::PipelinePointer OpenGLDisplayPlugin::getCompositeScenePipeline() { return _drawTexturePipeline; } @@ -917,8 +918,9 @@ void OpenGLDisplayPlugin::render(std::function f) { OpenGLDisplayPlugin::~OpenGLDisplayPlugin() { } -// FIXME: added this to allow desktop composite framebuffer to be RGBA while mobile is SRGBA. -// This is a workaround +// Added this to allow desktop composite framebuffer to be RGBA while mobile is SRGBA +// Overridden by Basic2DWindowDisplayPlugin +// 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; }