2.0. - blend_modes are re-enabled.

[casparcg] / core / mixer / gpu / shader.cpp

diff --git a/core/mixer/gpu/shader.cpp b/core/mixer/gpu/shader.cpp
index b15942a5954ce54059ac215d546026be99d1fe6a..03f34dc2327b3f25f8ea27de87f8c2bcde09929e 100644 (file)
--- a/core/mixer/gpu/shader.cpp
+++ b/core/mixer/gpu/shader.cpp
@@ -91,12 +91,7 @@ public:
                        it = locations_.insert(std::make_pair(name, glGetUniformLocation(program_, name))).first;\r
                return it->second;\r
        }\r
-\r
-       void use()\r
-       {       \r
-               GL(glUseProgramObjectARB(program_));            \r
-       }\r
-\r
+       \r
        void set(const std::string& name, int value)\r
        {\r
                GL(glUniform1i(get_location(name.c_str()), value));\r
@@ -115,9 +110,9 @@ public:
 \r
 \r
 shader::shader(const std::string& vertex_source_str, const std::string& fragment_source_str) : impl_(new implementation(vertex_source_str, fragment_source_str)){}\r
-void shader::use(){impl_->use();}\r
 void shader::set(const std::string& name, int value){impl_->set(name, value);}\r
 void shader::set(const std::string& name, float value){impl_->set(name, value);}\r
 void shader::set(const std::string& name, double value){impl_->set(name, value);}\r
+int shader::id() const{return impl_->program_;}\r
 \r
 }}
\ No newline at end of file