aspect_denom(aspect_denom),
output_color_rgba(false),
num_output_color_ycbcr(0),
- dither_effect(NULL),
- ycbcr_conversion_effect_node(NULL),
+ dither_effect(nullptr),
+ ycbcr_conversion_effect_node(nullptr),
intermediate_format(GL_RGBA16F),
intermediate_transformation(NO_FRAMEBUFFER_TRANSFORMATION),
num_dither_bits(0),
finalized(false),
resource_pool(resource_pool),
do_phase_timing(false) {
- if (resource_pool == NULL) {
+ if (resource_pool == nullptr) {
this->resource_pool = new ResourcePool();
owns_resource_pool = true;
} else {
namespace {
template<class T>
-void extract_uniform_declarations(const vector<Uniform<T> > &effect_uniforms,
+void extract_uniform_declarations(const vector<Uniform<T>> &effect_uniforms,
const string &type_specifier,
const string &effect_id,
- vector<Uniform<T> > *phase_uniforms,
+ vector<Uniform<T>> *phase_uniforms,
string *glsl_string)
{
for (unsigned i = 0; i < effect_uniforms.size(); ++i) {
}
template<class T>
-void extract_uniform_array_declarations(const vector<Uniform<T> > &effect_uniforms,
+void extract_uniform_array_declarations(const vector<Uniform<T>> &effect_uniforms,
const string &type_specifier,
const string &effect_id,
- vector<Uniform<T> > *phase_uniforms,
+ vector<Uniform<T>> *phase_uniforms,
string *glsl_string)
{
for (unsigned i = 0; i < effect_uniforms.size(); ++i) {
}
template<class T>
-void collect_uniform_locations(GLuint glsl_program_num, vector<Uniform<T> > *phase_uniforms)
+void collect_uniform_locations(GLuint glsl_program_num, vector<Uniform<T>> *phase_uniforms)
{
for (unsigned i = 0; i < phase_uniforms->size(); ++i) {
Uniform<T> &uniform = (*phase_uniforms)[i];
{
string frag_shader_header;
if (phase->is_compute_shader) {
- frag_shader_header = read_file("header.compute");
+ frag_shader_header = read_file("header.comp");
} else {
frag_shader_header = read_version_dependent_file("header", "frag");
}
}
FILE *fp = fopen(filename, "w");
- if (fp == NULL) {
+ if (fp == nullptr) {
perror(filename);
exit(1);
}
if (nodes[i]->outgoing_links.empty() && !nodes[i]->disabled) {
// Output node.
- vector<string> labels = get_labels_for_edge(nodes[i], NULL);
+ vector<string> labels = get_labels_for_edge(nodes[i], nullptr);
output_dot_edge(fp, from_node_id, "output", labels);
}
}
{
vector<string> labels;
- if (to != NULL && to->effect->needs_texture_bounce()) {
+ if (to != nullptr && to->effect->needs_texture_bounce()) {
labels.push_back("needs_bounce");
}
if (from->effect->changes_output_size()) {
glBeginQuery(GL_TIME_ELAPSED, timer_query_object);
phase->timer_query_objects_running.push_back(timer_query_object);
}
+ bool render_to_texture = true;
if (phase_num == phases.size() - 1) {
// Last phase goes to the output the user specified.
glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo);
GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
assert(status == GL_FRAMEBUFFER_COMPLETE);
glViewport(x, y, width, height);
- if (dither_effect != NULL) {
+ render_to_texture = false;
+ if (dither_effect != nullptr) {
CHECK(dither_effect->set_int("output_width", width));
CHECK(dither_effect->set_int("output_height", height));
}
}
- bool last_phase = (phase_num == phases.size() - 1);
// Enable sRGB rendering for intermediates in case we are
// rendering to an sRGB format.
- bool needs_srgb = last_phase ? final_srgb : true;
+ bool needs_srgb = render_to_texture ? true : final_srgb;
if (needs_srgb && !current_srgb) {
glEnable(GL_FRAMEBUFFER_SRGB);
check_error();
current_srgb = true;
}
- execute_phase(phase, last_phase, &output_textures, &generated_mipmaps);
+ execute_phase(phase, render_to_texture, &output_textures, &generated_mipmaps);
if (do_phase_timing) {
glEndQuery(GL_TIME_ELAPSED);
}
}
- for (map<Phase *, GLuint>::const_iterator texture_it = output_textures.begin();
- texture_it != output_textures.end();
- ++texture_it) {
- resource_pool->release_2d_texture(texture_it->second);
+ for (const auto &phase_and_texnum : output_textures) {
+ resource_pool->release_2d_texture(phase_and_texnum.second);
}
glBindFramebuffer(GL_FRAMEBUFFER, 0);
// Get back the timer queries.
for (unsigned phase_num = 0; phase_num < phases.size(); ++phase_num) {
Phase *phase = phases[phase_num];
- for (std::list<GLuint>::iterator timer_it = phase->timer_query_objects_running.begin();
- timer_it != phase->timer_query_objects_running.end(); ) {
+ for (auto timer_it = phase->timer_query_objects_running.cbegin();
+ timer_it != phase->timer_query_objects_running.cend(); ) {
GLint timer_query_object = *timer_it;
GLint available;
glGetQueryObjectiv(timer_query_object, GL_QUERY_RESULT_AVAILABLE, &available);
printf("Total: %5.1f ms\n", total_time_ms);
}
-void EffectChain::execute_phase(Phase *phase, bool last_phase,
+void EffectChain::execute_phase(Phase *phase, bool render_to_texture,
map<Phase *, GLuint> *output_textures,
set<Phase *> *generated_mipmaps)
{
// Find a texture for this phase.
inform_input_sizes(phase);
- if (!last_phase) {
+ if (render_to_texture) {
find_output_size(phase);
GLuint tex_num = resource_pool->create_2d_texture(intermediate_format, phase->output_width, phase->output_height);
+ assert(tex_num != 0);
output_textures->insert(make_pair(phase, tex_num));
+
+ // The output texture needs to have valid state to be written to by a compute shader.
+ if (phase->is_compute_shader) {
+ glActiveTexture(GL_TEXTURE0);
+ check_error();
+ glBindTexture(GL_TEXTURE_2D, (*output_textures)[phase]);
+ check_error();
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ check_error();
+ }
}
// Set up RTT inputs for this phase.
glActiveTexture(GL_TEXTURE0 + sampler);
Phase *input = phase->inputs[sampler];
input->output_node->bound_sampler_num = sampler;
+ assert(output_textures->count(input));
glBindTexture(GL_TEXTURE_2D, (*output_textures)[input]);
check_error();
if (phase->input_needs_mipmaps && generated_mipmaps->count(input) == 0) {
// This is currently the only place where we use image units,
// so we can always use 0.
phase->outbuf_image_unit = 0;
+ assert(output_textures->count(phase));
glBindImageTexture(phase->outbuf_image_unit, (*output_textures)[phase], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA16F);
check_error();
phase->inv_output_size.x = 1.0f / phase->output_width;
phase->output_texcoord_adjust.x = 0.5f / phase->output_width;
phase->output_texcoord_adjust.y = 0.5f / phase->output_height;
} else {
- // (Already set up for us if it is the last phase.)
- if (!last_phase) {
+ // (Already set up for us if we are outputting to the user's FBO.)
+ if (render_to_texture) {
fbo = resource_pool->create_fbo((*output_textures)[phase]);
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
glViewport(0, 0, phase->output_width, phase->output_height);
// since they can be updated from there.
setup_uniforms(phase);
glDispatchCompute(x, y, z);
+ check_error();
+ glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_TEXTURE_UPDATE_BARRIER_BIT);
+ check_error();
} else {
// Uniforms need to come after set_gl_state(), since they can be updated
// from there.
resource_pool->unuse_glsl_program(instance_program_num);
- if (!last_phase && !phase->is_compute_shader) {
+ if (render_to_texture && !phase->is_compute_shader) {
resource_pool->release_fbo(fbo);
}
}
projects / movit / blobdiff