From c215831df8b625c0bd8c8ad3a522ad508aabbafa Mon Sep 17 00:00:00 2001 From: Anna Date: Wed, 19 Jun 2019 15:41:53 -0700 Subject: [PATCH] fixed potential unreachable code warnings --- .../display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp index 5e1c720ba3..4258d4db75 100644 --- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp @@ -112,15 +112,17 @@ bool Basic2DWindowOpenGLDisplayPlugin::internalActivate() { gpu::PipelinePointer Basic2DWindowOpenGLDisplayPlugin::getCompositeScenePipeline() { #if defined(Q_OS_ANDROID) return _linearToSRGBPipeline; -#endif +#else return _SRGBToLinearPipeline; +#endif } gpu::Element Basic2DWindowOpenGLDisplayPlugin::getCompositeFBColorSpace() { #if defined(Q_OS_ANDROID) return gpu::Element::COLOR_SRGBA_32; -#endif +#else return gpu::Element::COLOR_RGBA_32; +#endif }