opengl colorspace + BT2020

[goodguy/history.git] / cinelerra-5.1 / plugins / dissolve / dissolve.C

diff --git a/cinelerra-5.1/plugins/dissolve/dissolve.C b/cinelerra-5.1/plugins/dissolve/dissolve.C
index c0dbb7508dbd867cb1bd25f21ca21913f63235eb..6c04fa07a8081acd6fb89cc83609a4acc4f1ec3c 100644 (file)
--- a/cinelerra-5.1/plugins/dissolve/dissolve.C
+++ b/cinelerra-5.1/plugins/dissolve/dissolve.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "dissolve.h"
@@ -56,7 +56,7 @@ int DissolveMain::uses_gui() { return 0; }
 
 int DissolveMain::process_realtime(VFrame *incoming, VFrame *outgoing)
 {
-       fade = (float)PluginClient::get_source_position() / 
+       fade = (float)PluginClient::get_source_position() /
                        PluginClient::get_total_len();
 
 // Use hardware
@@ -69,7 +69,7 @@ int DissolveMain::process_realtime(VFrame *incoming, VFrame *outgoing)
 // Use software
        if(!overlayer) overlayer = new OverlayFrame(get_project_smp() + 1);
 
-       overlayer->overlay(outgoing, incoming, 
+       overlayer->overlay(outgoing, incoming,
                0, 0, incoming->get_w(), incoming->get_h(),
                0, 0, incoming->get_w(), incoming->get_h(),
                fade, TRANSFER_SRC, NEAREST_NEIGHBOR);
@@ -108,25 +108,20 @@ int DissolveMain::handle_opengl()
        src->bind_texture(0);
        dst->bind_texture(1);
 
-       const char *shader_stack[] = { 0, 0, 0 };
-       int current_shader = 0;
-       shader_stack[current_shader++] = blend_dissolve;
-
-       unsigned int shader_id = VFrame::make_shader(0,
-               shader_stack[0], shader_stack[1], shader_stack[2], 0);
-
-       glUseProgram(shader_id);
-       glUniform1f(glGetUniformLocation(shader_id, "fade"), fade);
-       glUniform1i(glGetUniformLocation(shader_id, "src_tex"), 0);
-       glUniform1i(glGetUniformLocation(shader_id, "dst_tex"), 1);
-       if(BC_CModels::is_yuv(dst->get_color_model()))
-               glUniform3f(glGetUniformLocation(shader_id, "chroma_offset"), 0.0, 0.5, 0.5);
-       else
-               glUniform3f(glGetUniformLocation(shader_id, "chroma_offset"), 0.0, 0.0, 0.0);
-       glUniform2f(glGetUniformLocation(shader_id, "dst_tex_dimensions"),
-               (float)dst->get_texture_w(),
-               (float)dst->get_texture_h());
-
+       unsigned int shader = VFrame::make_shader(0, blend_dissolve, 0);
+       if( shader > 0 ) {
+               glUseProgram(shader);
+               glUniform1f(glGetUniformLocation(shader, "fade"), fade);
+               glUniform1i(glGetUniformLocation(shader, "src_tex"), 0);
+               glUniform1i(glGetUniformLocation(shader, "dst_tex"), 1);
+               if(BC_CModels::is_yuv(dst->get_color_model()))
+                       glUniform3f(glGetUniformLocation(shader, "chroma_offset"), 0.0, 0.5, 0.5);
+               else
+                       glUniform3f(glGetUniformLocation(shader, "chroma_offset"), 0.0, 0.0, 0.0);
+               glUniform2f(glGetUniformLocation(shader, "dst_tex_dimensions"),
+                       (float)dst->get_texture_w(),
+                       (float)dst->get_texture_h());
+       }
        glDisable(GL_BLEND);
        src->draw_texture();
        glUseProgram(0);