Convert another glReadPixels() to RGBA.

[movit] / effect_chain_test.cpp

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index cf725f1131bb1eae8a1722c1e2989893d8c178be..673e9cc3665fd1acac09d9815eaa84947d416e22 100644 (file)
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -223,7 +223,7 @@ private:
        GammaCurve overridden_gamma_curve;
 };
 
-TEST(EffectChainTester, HandlesInputChangingColorspace) {
+TEST(EffectChainTest, HandlesInputChangingColorspace) {
        const int size = 4;
 
        float data[size] = {
@@ -522,17 +522,27 @@ class MipmapNeedingEffect : public Effect {
 public:
        MipmapNeedingEffect() {}
        virtual bool needs_mipmaps() const { return true; }
+
+       // To be allowed to mess with the sampler state.
+       virtual bool needs_texture_bounce() const { return true; }
+
        virtual string effect_type_id() const { return "MipmapNeedingEffect"; }
        string output_fragment_shader() { return read_file("mipmap_needing_effect.frag"); }
+       virtual void inform_added(EffectChain *chain) { this->chain = chain; }
+
        void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
        {
-               glActiveTexture(GL_TEXTURE0);
+               Node *self = chain->find_node_for_effect(this);
+               glActiveTexture(chain->get_input_sampler(self, 0));
                check_error();
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
                check_error();
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
                check_error();
        }
+
+private:
+       EffectChain *chain;
 };
 
 TEST(EffectChainTest, MipmapGenerationWorks) {
@@ -973,7 +983,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
                0.75f, 1.0f, 1.0f,
                0.0f, 0.25f, 0.3f,
        };
-       float out_data[6];
+       float out_data[6], temp[6 * 4];
 
        EffectChain chain(width, height);
        movit_debug_level = MOVIT_DEBUG_ON;
@@ -992,7 +1002,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
        check_error();
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, height, 0, GL_RGBA, GL_FLOAT, NULL);
        check_error();
 
        glGenFramebuffers(1, &fbo);
@@ -1014,7 +1024,12 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
        chain.render_to_fbo(fbo, width, height);
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-       glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data);
+       check_error();
+       glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp);
+       check_error();
+       for (unsigned i = 0; i < 6; ++i) {
+               out_data[i] = temp[i * 4];
+       }
 
        expect_equal(expected_data, out_data, width, height);