History

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
@@ -1946,8 +1946,8 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const · 1945 unmodified lines
19461946 static std::once_flag once;
19471947 std::call_once(once, [&] {
19481948 auto state = std::make_shared<gpu::State>();
1949− auto VS = gpu::Shader::createVertex(std::string(glowLine_vert));
1950− auto PS = gpu::Shader::createPixel(std::string(glowLine_frag));
1949+ auto VS = glowLine_vert::getShader();
1950+ auto PS = glowLine_frag::getShader();
19511951 auto program = gpu::Shader::createProgram(VS, PS);
19521952 state->setCullMode(gpu::State::CULL_NONE);
19531953 state->setDepthTest(true, false, gpu::LESS_EQUAL);
@@ -2002,8 +2002,8 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const · 48 unmodified lines
20022002
20032003 void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
20042004 if (!_standardDrawPipeline) {
2005− auto vs = gpu::Shader::createVertex(std::string(standardTransformPNTC_vert));
2006− auto ps = gpu::Shader::createPixel(std::string(standardDrawTexture_frag));
2005+ auto vs = standardTransformPNTC_vert::getShader();
2006+ auto ps = standardDrawTexture_frag::getShader();
20072007 auto program = gpu::Shader::createProgram(vs, ps);
20082008 gpu::Shader::makeProgram((*program));
20092009
@@ -2033,8 +2033,8 @@ void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) { · 23 unmodified lines
20332033
20342034 void GeometryCache::useGridPipeline(gpu::Batch& batch, GridBuffer gridBuffer, bool isLayered) {
20352035 if (!_gridPipeline) {
2036− auto vs = gpu::Shader::createVertex(std::string(standardTransformPNTC_vert));
2037− auto ps = gpu::Shader::createPixel(std::string(grid_frag));
2036+ auto vs = standardTransformPNTC_vert::getShader();
2037+ auto ps = grid_frag::getShader();
20382038 auto program = gpu::Shader::createProgram(vs, ps);
20392039 gpu::Shader::makeProgram((*program));
20402040 _gridSlot = program->getUniformBuffers().findLocation("gridBuffer");
@@ -2117,12 +2117,9 @@ inline bool operator==(const SimpleProgramKey& a, const SimpleProgramKey& b) { · 76 unmodified lines
21172117 return a.getRaw() == b.getRaw();
21182118 }
21192119
2120−static void buildWebShader(const std::string& vertShaderText, const std::string& fragShaderText, bool blendEnable,
2120+static void buildWebShader(const gpu::ShaderPointer& vertShader, const gpu::ShaderPointer& fragShader, bool blendEnable,
21212121 gpu::ShaderPointer& shaderPointerOut, gpu::PipelinePointer& pipelinePointerOut) {
2122− auto VS = gpu::Shader::createVertex(vertShaderText);
2123− auto PS = gpu::Shader::createPixel(fragShaderText);
2124−
2125− shaderPointerOut = gpu::Shader::createProgram(VS, PS);
2122+ shaderPointerOut = gpu::Shader::createProgram(vertShader, fragShader);
21262123
21272124 gpu::Shader::BindingSet slotBindings;
21282125 gpu::Shader::makeProgram(*shaderPointerOut, slotBindings);
@@ -2145,8 +2142,8 @@ void GeometryCache::bindWebBrowserProgram(gpu::Batch& batch, bool transparent) { · 16 unmodified lines
21452142 gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent) {
21462143 static std::once_flag once;
21472144 std::call_once(once, [&]() {
2148− buildWebShader(simple_vert, simple_opaque_web_browser_frag, false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
2149− buildWebShader(simple_vert, simple_transparent_web_browser_frag, true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
2145+ buildWebShader(simple_vert::getShader(), simple_opaque_web_browser_frag::getShader(), false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
2146+ buildWebShader(simple_vert::getShader(), simple_transparent_web_browser_frag::getShader(), true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
21502147 });
21512148
21522149 return transparent ? _simpleTransparentWebBrowserPipelineNoAA : _simpleOpaqueWebBrowserPipelineNoAA;
@@ -2175,9 +2172,9 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transp · 22 unmodified lines
21752172 if (!fading) {
21762173 static std::once_flag once;
21772174 std::call_once(once, [&]() {
2178− auto VS = gpu::Shader::createVertex(std::string(simple_vert));
2179− auto PS = gpu::Shader::createPixel(std::string(simple_textured_frag));
2180− auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_frag));
2175+ auto VS = simple_vert::getShader();
2176+ auto PS = simple_textured_frag::getShader();
2177+ auto PSUnlit = simple_textured_unlit_frag::getShader();
21812178
21822179 _simpleShader = gpu::Shader::createProgram(VS, PS);
21832180 _unlitShader = gpu::Shader::createProgram(VS, PSUnlit);
@@ -2190,9 +2187,9 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transp · 6 unmodified lines
21902187 } else {
21912188 static std::once_flag once;
21922189 std::call_once(once, [&]() {
2193− auto VS = gpu::Shader::createVertex(std::string(simple_fade_vert));
2194− auto PS = gpu::Shader::createPixel(std::string(simple_textured_fade_frag));
2195− auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_fade_frag));
2190+ auto VS = simple_fade_vert::getShader();
2191+ auto PS = simple_textured_fade_frag::getShader();
2192+ auto PSUnlit = simple_textured_unlit_fade_frag::getShader();
21962193
21972194 _simpleFadeShader = gpu::Shader::createProgram(VS, PS);
21982195 _unlitFadeShader = gpu::Shader::createProgram(VS, PSUnlit);