Now that we render to an FBO, we can do with a much smaller window for the test.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index c3776e85f605568a51ca61e221e826b87dbc2231..a6ed91d5f20a51e406fafc0e79894e0b3f5f2cb0 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -242,7 +242,18 @@ Phase *EffectChain::compile_glsl_program(
        }
        frag_shader += std::string("#define INPUT ") + effects.back()->effect_id + "\n";
        frag_shader.append(read_file("footer.frag"));
-       printf("%s\n", frag_shader.c_str());
+
+       // Output shader to a temporary file, for easier debugging.
+       static int compiled_shader_num = 0;
+       char filename[256];
+       sprintf(filename, "chain-%03d.frag", compiled_shader_num++);
+       FILE *fp = fopen(filename, "w");
+       if (fp == NULL) {
+               perror(filename);
+               exit(1);
+       }
+       fprintf(fp, "%s\n", frag_shader.c_str());
+       fclose(fp);
        
        GLuint glsl_program_num = glCreateProgram();
        GLuint vs_obj = compile_shader(read_file("vs.vert"), GL_VERTEX_SHADER);
@@ -718,7 +729,8 @@ bool EffectChain::node_needs_gamma_fix(Node *node)
        // This needs to be before everything else, since it could
        // even apply to inputs (if they are the only effect).
        if (node->outgoing_links.empty() &&
-           node->output_gamma_curve != output_format.gamma_curve) {
+           node->output_gamma_curve != output_format.gamma_curve &&
+           node->output_gamma_curve != GAMMA_LINEAR) {
                return true;
        }