From 22a7a97a9aadafd606b91081cfdb739aa5fd45bb Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 11 Jul 2019 12:23:04 -0700 Subject: [PATCH] fix forward web + parabola blending --- interface/src/raypick/ParabolaPointer.cpp | 6 ++---- libraries/render-utils/src/GeometryCache.cpp | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp index 961ce627a4..0589124db8 100644 --- a/interface/src/raypick/ParabolaPointer.cpp +++ b/interface/src/raypick/ParabolaPointer.cpp @@ -405,7 +405,8 @@ gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabo using namespace shader::render_utils::program; static const std::vector> keys = { - std::make_tuple(false, false, parabola), std::make_tuple(false, true, parabola_forward), std::make_tuple(true, false, parabola_translucent) + std::make_tuple(false, false, parabola), std::make_tuple(false, true, parabola_forward), + std::make_tuple(true, false, parabola_translucent), std::make_tuple(true, true, parabola_forward) // The forward opaque/translucent pipelines are the same for now }; for (auto& key : keys) { @@ -423,9 +424,6 @@ gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabo _parabolaPipelines[{std::get<0>(key), std::get<1>(key)}] = gpu::Pipeline::create(gpu::Shader::createProgram(std::get<2>(key)), state); } - - // The forward opaque/translucent pipelines are the same for now - _parabolaPipelines[{ true, true }] = _parabolaPipelines[{ false, true}]; } return _parabolaPipelines[{ _parabolaData.color.a < 1.0f, forward }]; } diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index 0553bb56a3..2bd656a664 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -2119,7 +2119,7 @@ gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent, bool using namespace shader::render_utils::program; static const std::vector> keys = { std::make_tuple(false, false, web_browser), std::make_tuple(false, true, web_browser_forward), - std::make_tuple(true, false, web_browser_translucent) + std::make_tuple(true, false, web_browser_translucent), std::make_tuple(true, true, web_browser_forward) // The forward opaque/translucent pipelines are the same for now }; for (auto& key : keys) { @@ -2134,9 +2134,6 @@ gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent, bool _webPipelines[{std::get<0>(key), std::get<1>(key)}] = gpu::Pipeline::create(gpu::Shader::createProgram(std::get<2>(key)), state); } - - // The forward opaque/translucent pipelines are the same for now - _webPipelines[{ true, true }] = _webPipelines[{ false, true }]; } return _webPipelines[{ transparent, forward }];