edl plugin names eng, fix segv for opengl brender, renderfarm rework strategy, perf...

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

diff --git a/cinelerra-5.1/plugins/interpolate/interpolate.C b/cinelerra-5.1/plugins/interpolate/interpolate.C
index cbb8fa7c2a745363ee47b599703babcc20bbf852..e7133ab1122307565a1e87c9e06138e656f5450b 100644 (file)
--- a/cinelerra-5.1/plugins/interpolate/interpolate.C
+++ b/cinelerra-5.1/plugins/interpolate/interpolate.C
@@ -167,7 +167,7 @@ InterpolatePixelsMain::~InterpolatePixelsMain()
        delete engine;
 }
 
-const char* InterpolatePixelsMain::plugin_title() { return _("Interpolate Bayer"); }
+const char* InterpolatePixelsMain::plugin_title() { return N_("Interpolate Bayer"); }
 int InterpolatePixelsMain::is_realtime() { return 1; }
 
 
@@ -327,19 +327,19 @@ int InterpolatePixelsMain::handle_opengl()
        get_output()->to_texture();
        get_output()->enable_opengl();
 
-       const char *shader_stack[] = { 0, 0, 0 };
-       int current_shader = 0;
-       INTERPOLATE_COMPILE(shader_stack, current_shader)
-       unsigned int frag = VFrame::make_shader(0,
-                                       shader_stack[0],
-                                       0);
-       if(frag > 0)
-       {
-               glUseProgram(frag);
-               glUniform1i(glGetUniformLocation(frag, "tex"), 0);
-               INTERPOLATE_UNIFORMS(frag)
-       }
+        const char *shader_stack[16];
+        memset(shader_stack,0, sizeof(shader_stack));
+        int current_shader = 0;
 
+       INTERPOLATE_COMPILE(shader_stack, current_shader);
+
+       shader_stack[current_shader] = 0;
+       unsigned int shader = VFrame::make_shader(shader_stack);
+       if( shader > 0 ) {
+               glUseProgram(shader);
+               glUniform1i(glGetUniformLocation(shader, "tex"), 0);
+               INTERPOLATE_UNIFORMS(shader);
+       }
 
        get_output()->init_screen();
        get_output()->bind_texture(0);