#define GL_GLEXT_PROTOTYPES 1
-#include <stdio.h>
+#include <GL/glew.h>
+#include <assert.h>
+#include <locale.h>
#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <locale.h>
-#include <assert.h>
-#include <GL/glew.h>
-
#include <algorithm>
#include <set>
#include <stack>
#include <vector>
-#include "util.h"
-#include "effect_chain.h"
-#include "gamma_expansion_effect.h"
-#include "gamma_compression_effect.h"
-#include "colorspace_conversion_effect.h"
-#include "alpha_multiplication_effect.h"
#include "alpha_division_effect.h"
+#include "alpha_multiplication_effect.h"
+#include "colorspace_conversion_effect.h"
#include "dither_effect.h"
-#include "input.h"
+#include "effect.h"
+#include "effect_chain.h"
+#include "gamma_compression_effect.h"
+#include "gamma_expansion_effect.h"
#include "init.h"
+#include "input.h"
+#include "resource_pool.h"
+#include "util.h"
-EffectChain::EffectChain(float aspect_nom, float aspect_denom)
+EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *resource_pool)
: aspect_nom(aspect_nom),
aspect_denom(aspect_denom),
dither_effect(NULL),
- fbo(0),
num_dither_bits(0),
- finalized(false) {}
+ finalized(false),
+ resource_pool(resource_pool) {
+ if (resource_pool == NULL) {
+ this->resource_pool = new ResourcePool();
+ owns_resource_pool = true;
+ } else {
+ owns_resource_pool = false;
+ }
+}
EffectChain::~EffectChain()
{
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);
+ resource_pool->release_glsl_program(phases[i]->glsl_program_num);
delete phases[i];
}
- if (fbo != 0) {
- glDeleteFramebuffers(1, &fbo);
+ if (owns_resource_pool) {
+ delete resource_pool;
}
}
Input *EffectChain::add_input(Input *input)
{
+ assert(!finalized);
inputs.push_back(input);
add_node(input);
return input;
void EffectChain::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format)
{
+ assert(!finalized);
output_format = format;
output_alpha_format = alpha_format;
}
Node *EffectChain::add_node(Effect *effect)
{
+ for (unsigned i = 0; i < nodes.size(); ++i) {
+ assert(nodes[i]->effect != effect);
+ }
+
char effect_id[256];
sprintf(effect_id, "eff%u", (unsigned)nodes.size());
Effect *EffectChain::add_effect(Effect *effect, const std::vector<Effect *> &inputs)
{
+ assert(!finalized);
assert(inputs.size() == effect->num_inputs());
Node *node = add_node(effect);
for (unsigned i = 0; i < inputs.size(); ++i) {
frag_shader += std::string("#define INPUT ") + sorted_effects.back()->effect_id + "\n";
frag_shader.append(read_file("footer.frag"));
- if (movit_debug_level == MOVIT_DEBUG_ON) {
- // 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);
- GLuint fs_obj = compile_shader(frag_shader, GL_FRAGMENT_SHADER);
- glAttachShader(glsl_program_num, vs_obj);
- check_error();
- glAttachShader(glsl_program_num, fs_obj);
- check_error();
- glLinkProgram(glsl_program_num);
- check_error();
-
Phase *phase = new Phase;
- phase->glsl_program_num = glsl_program_num;
- phase->vertex_shader = vs_obj;
- phase->fragment_shader = fs_obj;
+ phase->glsl_program_num = resource_pool->compile_glsl_program(read_file("vs.vert"), frag_shader);
phase->input_needs_mipmaps = input_needs_mipmaps;
phase->inputs = true_inputs;
phase->effects = sorted_effects;
}
for (unsigned i = 0; i < phase->inputs.size(); ++i) {
Node *input = phase->inputs[i];
- input->output_width = input->phase->output_width;
- input->output_height = input->phase->output_height;
+ input->output_width = input->phase->virtual_output_width;
+ input->output_height = input->phase->virtual_output_height;
assert(input->output_width != 0);
assert(input->output_height != 0);
}
// If the last effect explicitly sets an output size, use that.
if (output_node->effect->changes_output_size()) {
- output_node->effect->get_output_size(&phase->output_width, &phase->output_height);
+ output_node->effect->get_output_size(&phase->output_width, &phase->output_height,
+ &phase->virtual_output_width, &phase->virtual_output_height);
return;
}
assert(input->phase->output_width != 0);
assert(input->phase->output_height != 0);
if (output_width == 0 && output_height == 0) {
- output_width = input->phase->output_width;
- output_height = input->phase->output_height;
- } else if (output_width != input->phase->output_width ||
- output_height != input->phase->output_height) {
+ output_width = input->phase->virtual_output_width;
+ output_height = input->phase->virtual_output_height;
+ } else if (output_width != input->phase->virtual_output_width ||
+ output_height != input->phase->virtual_output_height) {
all_inputs_same_size = false;
}
}
if (all_inputs_same_size) {
assert(output_width != 0);
assert(output_height != 0);
- phase->output_width = output_width;
- phase->output_height = output_height;
+ phase->virtual_output_width = phase->output_width = output_width;
+ phase->virtual_output_height = phase->output_height = output_height;
return;
}
}
assert(output_width != 0);
assert(output_height != 0);
- phase->output_width = output_width;
- phase->output_height = output_height;
+ phase->virtual_output_width = phase->output_width = output_width;
+ phase->virtual_output_height = phase->output_height = output_height;
}
void EffectChain::sort_all_nodes_topologically()
case Effect::OUTPUT_BLANK_ALPHA:
node->output_alpha_type = ALPHA_BLANK;
break;
- case Effect::INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED:
+ case Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA:
node->output_alpha_type = ALPHA_PREMULTIPLIED;
break;
- case Effect::OUTPUT_ALPHA_POSTMULTIPLIED:
+ case Effect::OUTPUT_POSTMULTIPLIED_ALPHA:
node->output_alpha_type = ALPHA_POSTMULTIPLIED;
break;
+ case Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK:
case Effect::DONT_CARE_ALPHA_TYPE:
default:
assert(false);
}
// Only inputs can have unconditional alpha output (OUTPUT_BLANK_ALPHA
- // or OUTPUT_ALPHA_POSTMULTIPLIED), and they have already been
+ // or OUTPUT_POSTMULTIPLIED_ALPHA), and they have already been
// taken care of above. Rationale: Even if you could imagine
// e.g. an effect that took in an image and set alpha=1.0
// unconditionally, it wouldn't make any sense to have it as
// got its input pre- or postmultiplied, so it wouldn't know
// whether to divide away the old alpha or not.
Effect::AlphaHandling alpha_handling = node->effect->alpha_handling();
- assert(alpha_handling == Effect::INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED ||
+ assert(alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA ||
+ alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK ||
alpha_handling == Effect::DONT_CARE_ALPHA_TYPE);
// If the node has multiple inputs, check that they are all valid and
continue;
}
- if (alpha_handling == Effect::INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED) {
+ if (alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA ||
+ alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK) {
// If the effect has asked for premultiplied alpha, check that it has got it.
if (any_postmultiplied) {
node->output_alpha_type = ALPHA_INVALID;
+ } else if (!any_premultiplied &&
+ alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK) {
+ // Blank input alpha, and the effect preserves blank alpha.
+ node->output_alpha_type = ALPHA_BLANK;
} else {
- // In some rare cases, it might be advantageous to say
- // that blank input alpha yields blank output alpha.
- // However, this would cause a more complex Effect interface
- // an effect would need to guarantee that it doesn't mess with
- // blank alpha), so this is the simplest.
node->output_alpha_type = ALPHA_PREMULTIPLIED;
}
} else {
return;
}
if (output->output_alpha_type == ALPHA_PREMULTIPLIED &&
- output_alpha_format == OUTPUT_ALPHA_POSTMULTIPLIED) {
+ output_alpha_format == OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED) {
Node *conversion = add_node(new AlphaDivisionEffect());
connect_nodes(output, conversion);
propagate_alpha();
propagate_gamma_and_color_space();
}
if (output->output_alpha_type == ALPHA_POSTMULTIPLIED &&
- output_alpha_format == OUTPUT_ALPHA_PREMULTIPLIED) {
+ output_alpha_format == OUTPUT_ALPHA_FORMAT_PREMULTIPLIED) {
Node *conversion = add_node(new AlphaMultiplicationEffect());
connect_nodes(output, conversion);
propagate_alpha();
// since otherwise this turns into an (albeit simple)
// register allocation problem.
if (phases.size() > 1) {
- glGenFramebuffers(1, &fbo);
-
for (unsigned i = 0; i < phases.size() - 1; ++i) {
inform_input_sizes(phases[i]);
find_output_size(phases[i]);
// Save original viewport.
GLuint x = 0, y = 0;
+ GLuint fbo = 0;
if (width == 0 && height == 0) {
GLint viewport[4];
glLoadIdentity();
if (phases.size() > 1) {
+ glGenFramebuffers(1, &fbo);
+ check_error();
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
check_error();
}
// Last phase goes to the output the user specified.
glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo);
check_error();
+ GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ assert(status == GL_FRAMEBUFFER_COMPLETE);
glViewport(x, y, width, height);
if (dither_effect != NULL) {
CHECK(dither_effect->set_int("output_width", width));
output_node->output_texture,
0);
check_error();
+ GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ assert(status == GL_FRAMEBUFFER_COMPLETE);
glViewport(0, 0, phases[phase]->output_width, phases[phase]->output_height);
}
node->effect->clear_gl_state();
}
}
+
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ check_error();
+
+ if (fbo != 0) {
+ glDeleteFramebuffers(1, &fbo);
+ check_error();
+ }
}
projects / movit / blobdiff