Merge branch 'master' of https://github.com/highfidelity/hifi into rig

Howard Stearns committed 11 years ago

Commit 1663d092 parents cff7bb7 f3dc15944 files · +515 −226Browse files

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

Unified · Split

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

 #include "standardTransformPNTC_vert.h"
 #include "standardDrawTexture_frag.h"
+#include "gpu/StandardShaderLib.h"
 //#define WANT_DEBUG
 const int GeometryCache::UNKNOWN_ID = -1;
     return geometry.staticCast<Resource>();
 }
-void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch) {
+void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
     if (!_standardDrawPipeline) {
         auto vs = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(standardTransformPNTC_vert)));
         auto ps = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(standardDrawTexture_frag)));
         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>();
+        auto noBlendPS = gpu::StandardShaderLib::getDrawTextureOpaquePS();
+        auto programNoBlend = gpu::ShaderPointer(gpu::Shader::createProgram(vs, noBlendPS));
+        gpu::Shader::makeProgram((*programNoBlend));
+        _standardDrawPipelineNoBlend.reset(gpu::Pipeline::create(programNoBlend, stateNoBlend));
+    }
+    if (noBlend) {
+        batch.setPipeline(_standardDrawPipelineNoBlend);
+    } else {
+        batch.setPipeline(_standardDrawPipeline);
     }
-    batch.setPipeline(_standardDrawPipeline);
 }
 const float NetworkGeometry::NO_HYSTERESIS = -1.0f;