History

fix forward web + parabola blending

SamGondelman committed 7 years ago

Commit 22a7a971 parent 95396642 files · +3 −8Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 2 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+1−4
@@ -2119,7 +2119,7 @@ gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent, bool · 2118 unmodified lines
2119 using namespace shader::render_utils::program;2119 using namespace shader::render_utils::program;
2120 static const std::vector<std::tuple<bool, bool, uint32_t>> keys = {2120 static const std::vector<std::tuple<bool, bool, uint32_t>> keys = {
2121 std::make_tuple(false, false, web_browser), std::make_tuple(false, true, web_browser_forward),2121 std::make_tuple(false, false, web_browser), std::make_tuple(false, true, web_browser_forward),
2122 std::make_tuple(true, false, web_browser_translucent)2122 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
2123 };2123 };
2124 2124
2125 for (auto& key : keys) {2125 for (auto& key : keys) {
@@ -2134,9 +2134,6 @@ gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent, bool · 8 unmodified lines
2134 2134
2135 _webPipelines[{std::get<0>(key), std::get<1>(key)}] = gpu::Pipeline::create(gpu::Shader::createProgram(std::get<2>(key)), state);2135 _webPipelines[{std::get<0>(key), std::get<1>(key)}] = gpu::Pipeline::create(gpu::Shader::createProgram(std::get<2>(key)), state);
2136 }2136 }
2137
2138 // The forward opaque/translucent pipelines are the same for now
2139 _webPipelines[{ true, true }] = _webPipelines[{ false, true }];
2140 }2137 }
2141 2138
2142 return _webPipelines[{ transparent, forward }];2139 return _webPipelines[{ transparent, forward }];