EffectChain::EffectChain(float aspect_nom, float aspect_denom)
: aspect_nom(aspect_nom),
aspect_denom(aspect_denom),
+ fbo(0),
finalized(false) {}
+EffectChain::~EffectChain()
+{
+ for (unsigned i = 0; i < nodes.size(); ++i) {
+ if (nodes[i]->output_texture != 0) {
+ glDeleteTextures(1, &nodes[i]->output_texture);
+ }
+ delete nodes[i]->effect;
+ delete nodes[i];
+ }
+ for (unsigned i = 0; i < phases.size(); ++i) {
+ glDeleteProgram(phases[i]->glsl_program_num);
+ glDeleteShader(phases[i]->vertex_shader);
+ glDeleteShader(phases[i]->fragment_shader);
+ delete phases[i];
+ }
+ if (fbo != 0) {
+ glDeleteFramebuffers(1, &fbo);
+ }
+}
+
Input *EffectChain::add_input(Input *input)
{
inputs.push_back(input);
node->effect_id = effect_id;
node->output_color_space = COLORSPACE_INVALID;
node->output_gamma_curve = GAMMA_INVALID;
+ node->output_texture = 0;
nodes.push_back(node);
node_map[effect] = node;
for (unsigned i = 0; i < effects.size(); ++i) {
Node *node = effects[i];
if (node->effect->num_inputs() == 0) {
- node->effect->set_int("needs_mipmaps", input_needs_mipmaps);
+ CHECK(node->effect->set_int("needs_mipmaps", input_needs_mipmaps));
}
}
frag_shader += std::string("#define INPUT ") + effects.back()->effect_id + "\n";
Phase *phase = new Phase;
phase->glsl_program_num = glsl_program_num;
+ phase->vertex_shader = vs_obj;
+ phase->fragment_shader = fs_obj;
phase->input_needs_mipmaps = input_needs_mipmaps;
phase->inputs = true_inputs;
phase->effects = effects;
continue;
}
- ColorSpace color_space = node->incoming_links[0]->output_color_space;
+ Colorspace color_space = node->incoming_links[0]->output_color_space;
GammaCurve gamma_curve = node->incoming_links[0]->output_gamma_curve;
for (unsigned j = 1; j < node->incoming_links.size(); ++j) {
if (node->incoming_links[j]->output_color_space != color_space) {
// The conversion effects already have their outputs set correctly,
// so leave them alone.
- if (node->effect->effect_type_id() != "ColorSpaceConversionEffect") {
+ if (node->effect->effect_type_id() != "ColorspaceConversionEffect") {
node->output_color_space = color_space;
}
if (node->effect->effect_type_id() != "GammaCompressionEffect" &&
if (input->output_color_space == COLORSPACE_sRGB) {
continue;
}
- Node *conversion = add_node(new ColorSpaceConversionEffect());
- conversion->effect->set_int("source_space", input->output_color_space);
- conversion->effect->set_int("destination_space", COLORSPACE_sRGB);
+ Node *conversion = add_node(new ColorspaceConversionEffect());
+ CHECK(conversion->effect->set_int("source_space", input->output_color_space));
+ CHECK(conversion->effect->set_int("destination_space", COLORSPACE_sRGB));
conversion->output_color_space = COLORSPACE_sRGB;
insert_node_between(input, conversion, node);
}
{
Node *output = find_output_node();
if (output->output_color_space != output_format.color_space) {
- Node *conversion = add_node(new ColorSpaceConversionEffect());
- conversion->effect->set_int("source_space", output->output_color_space);
- conversion->effect->set_int("destination_space", output_format.color_space);
+ Node *conversion = add_node(new ColorspaceConversionEffect());
+ CHECK(conversion->effect->set_int("source_space", output->output_color_space));
+ CHECK(conversion->effect->set_int("destination_space", output_format.color_space));
conversion->output_color_space = output_format.color_space;
connect_nodes(output, conversion);
+ propagate_gamma_and_color_space();
}
}
}
for (unsigned i = 0; i < nonlinear_inputs.size(); ++i) {
- nonlinear_inputs[i]->effect->set_int("output_linear_gamma", 1);
+ CHECK(nonlinear_inputs[i]->effect->set_int("output_linear_gamma", 1));
nonlinear_inputs[i]->output_gamma_curve = GAMMA_LINEAR;
}
if (node->incoming_links.empty()) {
assert(node->outgoing_links.empty());
Node *conversion = add_node(new GammaExpansionEffect());
- conversion->effect->set_int("source_curve", node->output_gamma_curve);
+ CHECK(conversion->effect->set_int("source_curve", node->output_gamma_curve));
conversion->output_gamma_curve = GAMMA_LINEAR;
connect_nodes(node, conversion);
}
continue;
}
Node *conversion = add_node(new GammaExpansionEffect());
- conversion->effect->set_int("source_curve", input->output_gamma_curve);
+ CHECK(conversion->effect->set_int("source_curve", input->output_gamma_curve));
conversion->output_gamma_curve = GAMMA_LINEAR;
insert_node_between(input, conversion, node);
}
Node *output = find_output_node();
if (output->output_gamma_curve != output_format.gamma_curve) {
Node *conversion = add_node(new GammaCompressionEffect());
- conversion->effect->set_int("destination_curve", output_format.gamma_curve);
+ CHECK(conversion->effect->set_int("destination_curve", output_format.gamma_curve));
conversion->output_gamma_curve = output_format.gamma_curve;
connect_nodes(output, conversion);
}