REmove the crappy solution for drawing transparent texture into overlay by a proper shader

Sam Gateau committed 11 years ago

Commit 66cd17e1 parent 8421aaf6 files · +49 −8Browse files

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

Unified · Split

 #include "standardTransformPNTC_vert.h"
 #include "standardDrawTexture_frag.h"
+#include "gpu/StandardShaderLib.h"
 //#define WANT_DEBUG
 const int GeometryCache::UNKNOWN_ID = -1;
         auto state = std::make_shared<gpu::State>();
         // enable decal blend
         state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
         _standardDrawPipeline.reset(gpu::Pipeline::create(program, state));
         auto stateNoBlend = std::make_shared<gpu::State>();
-        stateNoBlend->setColorWriteMask(true, true, true, false);
+     //   stateNoBlend->setColorWriteMask(true, true, true, false);
-        stateNoBlend->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
+     //   stateNoBlend->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
-        _standardDrawPipelineNoBlend.reset(gpu::Pipeline::create(program, stateNoBlend));
+        auto programNoBlend = gpu::ShaderPointer(gpu::Shader::createProgram(vs, gpu::StandardShaderLib::getDrawTextureOpaquePS()));
+        gpu::Shader::makeProgram((*programNoBlend));
+        _standardDrawPipelineNoBlend.reset(gpu::Pipeline::create(programNoBlend, stateNoBlend));
     }
     if (noBlend) {
         batch.setPipeline(_standardDrawPipelineNoBlend);

Keyboard shortcuts