Fixed compilation with new shader system

Olivier Prat committed 8 years ago

Commit 49549ce1 parent 3911ce531 files · +292 −300Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+16−19

     static std::once_flag once;
     std::call_once(once, [&] {
         auto state = std::make_shared<gpu::State>();
-        auto VS = gpu::Shader::createVertex(std::string(glowLine_vert));
+        auto VS = glowLine_vert::getShader();
-        auto PS = gpu::Shader::createPixel(std::string(glowLine_frag));
+        auto PS = glowLine_frag::getShader();
         auto program = gpu::Shader::createProgram(VS, PS);
         state->setCullMode(gpu::State::CULL_NONE);
         state->setDepthTest(true, false, gpu::LESS_EQUAL);
 void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
     if (!_standardDrawPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(standardTransformPNTC_vert));
+        auto vs = standardTransformPNTC_vert::getShader();
-        auto ps = gpu::Shader::createPixel(std::string(standardDrawTexture_frag));
+        auto ps = standardDrawTexture_frag::getShader();
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram((*program));
 void GeometryCache::useGridPipeline(gpu::Batch& batch, GridBuffer gridBuffer, bool isLayered) {
     if (!_gridPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(standardTransformPNTC_vert));
+        auto vs = standardTransformPNTC_vert::getShader();
-        auto ps = gpu::Shader::createPixel(std::string(grid_frag));
+        auto ps = grid_frag::getShader();
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram((*program));
         _gridSlot = program->getUniformBuffers().findLocation("gridBuffer");
     return a.getRaw() == b.getRaw();
 }
-static void buildWebShader(const std::string& vertShaderText, const std::string& fragShaderText, bool blendEnable,
+static void buildWebShader(const gpu::ShaderPointer& vertShader, const gpu::ShaderPointer& fragShader, bool blendEnable,
                            gpu::ShaderPointer& shaderPointerOut, gpu::PipelinePointer& pipelinePointerOut) {
-    auto VS = gpu::Shader::createVertex(vertShaderText);
+    shaderPointerOut = gpu::Shader::createProgram(vertShader, fragShader);
-    auto PS = gpu::Shader::createPixel(fragShaderText);
-    shaderPointerOut = gpu::Shader::createProgram(VS, PS);
     gpu::Shader::BindingSet slotBindings;
     gpu::Shader::makeProgram(*shaderPointerOut, slotBindings);
 gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent) {
     static std::once_flag once;
     std::call_once(once, [&]() {
-        buildWebShader(simple_vert, simple_opaque_web_browser_frag, false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
+        buildWebShader(simple_vert::getShader(), simple_opaque_web_browser_frag::getShader(), false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
-        buildWebShader(simple_vert, simple_transparent_web_browser_frag, true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
+        buildWebShader(simple_vert::getShader(), simple_transparent_web_browser_frag::getShader(), true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
     });
     return transparent ? _simpleTransparentWebBrowserPipelineNoAA : _simpleOpaqueWebBrowserPipelineNoAA;
     if (!fading) {
         static std::once_flag once;
         std::call_once(once, [&]() {
-            auto VS = gpu::Shader::createVertex(std::string(simple_vert));
+            auto VS = simple_vert::getShader();
-            auto PS = gpu::Shader::createPixel(std::string(simple_textured_frag));
+            auto PS = simple_textured_frag::getShader();
-            auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_frag));
+            auto PSUnlit = simple_textured_unlit_frag::getShader();
             _simpleShader = gpu::Shader::createProgram(VS, PS);
             _unlitShader = gpu::Shader::createProgram(VS, PSUnlit);
     } else {
         static std::once_flag once;
         std::call_once(once, [&]() {
-            auto VS = gpu::Shader::createVertex(std::string(simple_fade_vert));
+            auto VS = simple_fade_vert::getShader();
-            auto PS = gpu::Shader::createPixel(std::string(simple_textured_fade_frag));
+            auto PS = simple_textured_fade_frag::getShader();
-            auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_fade_frag));
+            auto PSUnlit = simple_textured_unlit_fade_frag::getShader();
             _simpleFadeShader = gpu::Shader::createProgram(VS, PS);
             _unlitFadeShader = gpu::Shader::createProgram(VS, PSUnlit);