Do some more cleanups in anticipation of more flexible compute shader outputs.

Includes reverting back to last_phase instead of render_to_texture.

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 4afe415754fa40dc5486c182ca6377c76e48f5ca..091bda89ddf7d5f7c70fa1109861566cb3a626f4 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -1901,11 +1901,6 @@ void EffectChain::render(GLuint dest_fbo, const vector<DestinationTexture> &dest
                // We are rendering to a set of textures, so we can run the compute shader
                // directly and skip the dummy phase.
                --num_phases;
                // We are rendering to a set of textures, so we can run the compute shader
                // directly and skip the dummy phase.
                --num_phases;

-
-               // TODO: Support more than one destination.
-               output_textures[phases[num_phases - 1]] = destinations[0].texnum;
-               assert(destinations[0].format == GL_RGBA16F);
-               assert(destinations[0].texnum != 0);

        }
 
        for (unsigned phase_num = 0; phase_num < num_phases; ++phase_num) {
        }
 
        for (unsigned phase_num = 0; phase_num < num_phases; ++phase_num) {


@@ -1922,7 +1917,7 @@ void EffectChain::render(GLuint dest_fbo, const vector<DestinationTexture> &dest
                        glBeginQuery(GL_TIME_ELAPSED, timer_query_object);
                        phase->timer_query_objects_running.push_back(timer_query_object);
                }
                        glBeginQuery(GL_TIME_ELAPSED, timer_query_object);
                        phase->timer_query_objects_running.push_back(timer_query_object);
                }

-               bool render_to_texture = true;
+               bool last_phase = (phase_num == num_phases - 1);

                if (phase_num == num_phases - 1) {
                        // Last phase goes to the output the user specified.
                        if (!phase->is_compute_shader) {
                if (phase_num == num_phases - 1) {
                        // Last phase goes to the output the user specified.
                        if (!phase->is_compute_shader) {


@@ -1931,7 +1926,6 @@ void EffectChain::render(GLuint dest_fbo, const vector<DestinationTexture> &dest
                                GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
                                assert(status == GL_FRAMEBUFFER_COMPLETE);
                                glViewport(x, y, width, height);
                                GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
                                assert(status == GL_FRAMEBUFFER_COMPLETE);
                                glViewport(x, y, width, height);

-                               render_to_texture = false;

                        }
                        if (dither_effect != nullptr) {
                                CHECK(dither_effect->set_int("output_width", width));
                        }
                        if (dither_effect != nullptr) {
                                CHECK(dither_effect->set_int("output_width", width));


@@ -1942,7 +1936,7 @@ void EffectChain::render(GLuint dest_fbo, const vector<DestinationTexture> &dest
                // Enable sRGB rendering for intermediates in case we are
                // rendering to an sRGB format.
                // TODO: Support this for compute shaders.
                // Enable sRGB rendering for intermediates in case we are
                // rendering to an sRGB format.
                // TODO: Support this for compute shaders.

-               bool needs_srgb = render_to_texture ? true : final_srgb;
+               bool needs_srgb = last_phase ? final_srgb : true;

                if (needs_srgb && !current_srgb) {
                        glEnable(GL_FRAMEBUFFER_SRGB);
                        check_error();
                if (needs_srgb && !current_srgb) {
                        glEnable(GL_FRAMEBUFFER_SRGB);
                        check_error();


@@ -1953,16 +1947,36 @@ void EffectChain::render(GLuint dest_fbo, const vector<DestinationTexture> &dest
                        current_srgb = true;
                }
 
                        current_srgb = true;
                }
 

-               execute_phase(phase, render_to_texture, &output_textures, &generated_mipmaps);
+               // Find a texture for this phase.
+               inform_input_sizes(phase);
+               find_output_size(phase);
+               GLuint tex_num = 0;
+               if (!last_phase) {
+                       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.
+                       glActiveTexture(GL_TEXTURE0);
+                       check_error();
+                       glBindTexture(GL_TEXTURE_2D, tex_num);
+                       check_error();
+                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                       check_error();
+               } else if (phase->is_compute_shader) {
+                       // TODO: Support more than one destination.
+                       assert(!destinations.empty());
+                       tex_num = destinations[0].texnum;
+                       assert(destinations[0].format == GL_RGBA16F);
+                       assert(destinations[0].texnum != 0);
+               }
+
+               execute_phase(phase, output_textures, tex_num, &generated_mipmaps);

                if (do_phase_timing) {
                        glEndQuery(GL_TIME_ELAPSED);
                }
        }
 
                if (do_phase_timing) {
                        glEndQuery(GL_TIME_ELAPSED);
                }
        }
 

-       // Take out the destination textures from the list of temporary textures to be freed.
-       if (has_dummy_effect && !destinations.empty()) {
-               output_textures.erase(phases[num_phases - 1]);
-       }

        for (const auto &phase_and_texnum : output_textures) {
                resource_pool->release_2d_texture(phase_and_texnum.second);
        }
        for (const auto &phase_and_texnum : output_textures) {
                resource_pool->release_2d_texture(phase_and_texnum.second);
        }


@@ -2037,39 +2051,19 @@ void EffectChain::print_phase_timing()
        printf("Total:   %5.1f ms\n", total_time_ms);
 }
 
        printf("Total:   %5.1f ms\n", total_time_ms);
 }
 

-void EffectChain::execute_phase(Phase *phase, bool render_to_texture,
-                                map<Phase *, GLuint> *output_textures,
+void EffectChain::execute_phase(Phase *phase,
+                                const map<Phase *, GLuint> &output_textures,
+                                GLuint dest_texture,

                                 set<Phase *> *generated_mipmaps)
 {
                                 set<Phase *> *generated_mipmaps)
 {

-       GLuint fbo = 0;
-
-       // Find a texture for this phase.
-       inform_input_sizes(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.
        for (unsigned sampler = 0; sampler < phase->inputs.size(); ++sampler) {
                glActiveTexture(GL_TEXTURE0 + sampler);
                Phase *input = phase->inputs[sampler];
                input->output_node->bound_sampler_num = sampler;
        // Set up RTT inputs for this phase.
        for (unsigned sampler = 0; sampler < phase->inputs.size(); ++sampler) {
                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]);
+               const auto it = output_textures.find(input);
+               assert(it != output_textures.end());
+               glBindTexture(GL_TEXTURE_2D, it->second);

                check_error();
                if (phase->input_needs_mipmaps && generated_mipmaps->count(input) == 0) {
                        glGenerateMipmap(GL_TEXTURE_2D);
                check_error();
                if (phase->input_needs_mipmaps && generated_mipmaps->count(input) == 0) {
                        glGenerateMipmap(GL_TEXTURE_2D);


@@ -2084,24 +2078,23 @@ void EffectChain::execute_phase(Phase *phase, bool render_to_texture,
        check_error();
 
        // And now the output.
        check_error();
 
        // And now the output.

+       GLuint fbo = 0;

        if (phase->is_compute_shader) {
        if (phase->is_compute_shader) {

+               assert(dest_texture != 0);
+

                // This is currently the only place where we use image units,
                // so we can always use 0.
                phase->outbuf_image_unit = 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);
+               glBindImageTexture(phase->outbuf_image_unit, dest_texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA16F);

                check_error();
                phase->inv_output_size.x = 1.0f / phase->output_width;
                phase->inv_output_size.y = 1.0f / phase->output_height;
                phase->output_texcoord_adjust.x = 0.5f / phase->output_width;
                phase->output_texcoord_adjust.y = 0.5f / phase->output_height;
                check_error();
                phase->inv_output_size.x = 1.0f / phase->output_width;
                phase->inv_output_size.y = 1.0f / phase->output_height;
                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 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);
-               }
+       } else if (dest_texture != 0) {
+               fbo = resource_pool->create_fbo(dest_texture);
+               glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+               glViewport(0, 0, phase->output_width, phase->output_height);

        }
 
        // Give the required parameters to all the effects.
        }
 
        // Give the required parameters to all the effects.


@@ -2120,7 +2113,6 @@ void EffectChain::execute_phase(Phase *phase, bool render_to_texture,
                }
        }
 
                }
        }
 

-

        if (phase->is_compute_shader) {
                unsigned x, y, z;
                phase->output_node->effect->get_compute_dimensions(phase->output_width, phase->output_height, &x, &y, &z);
        if (phase->is_compute_shader) {
                unsigned x, y, z;
                phase->output_node->effect->get_compute_dimensions(phase->output_width, phase->output_height, &x, &y, &z);


@@ -2154,7 +2146,7 @@ void EffectChain::execute_phase(Phase *phase, bool render_to_texture,
 
        resource_pool->unuse_glsl_program(instance_program_num);
 
 
        resource_pool->unuse_glsl_program(instance_program_num);
 

-       if (render_to_texture && !phase->is_compute_shader) {
+       if (fbo != 0) {

                resource_pool->release_fbo(fbo);
        }
 }
                resource_pool->release_fbo(fbo);
        }
 }

diff --git a/effect_chain.h b/effect_chain.h
index 35931f8058fb1a7d763fdb7572ccd2f94bb4d945..ee387a954613edc8629b49762d720e339479d9ab 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -481,8 +481,11 @@ private:
                    unsigned x, unsigned y, unsigned width, unsigned height);
 
        // Execute one phase, ie. set up all inputs, effects and outputs, and render the quad.
                    unsigned x, unsigned y, unsigned width, unsigned height);
 
        // Execute one phase, ie. set up all inputs, effects and outputs, and render the quad.

-       void execute_phase(Phase *phase, bool render_to_texture,
-                          std::map<Phase *, GLuint> *output_textures,
+       // If dest_texture is 0, uses whatever output is current (and the phase must not be
+       // a compute shader).
+       void execute_phase(Phase *phase,
+                          const std::map<Phase *, GLuint> &output_textures,
+                          GLuint dest_texture,

                           std::set<Phase *> *generated_mipmaps);
 
        // Set up uniforms for one phase. The program must already be bound.
                           std::set<Phase *> *generated_mipmaps);
 
        // Set up uniforms for one phase. The program must already be bound.