]> git.sesse.net Git - movit/commitdiff
Fix non-float framebuffers in EffectChainTester.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 20 Mar 2014 20:46:32 +0000 (21:46 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 21 Mar 2014 01:06:26 +0000 (02:06 +0100)
Again, GLES fix.

test_util.cpp

index 27fac8fc4fa2582f6c27c5dc7b8331827d672250..a9f738d715754c70d2e6d06b73ed100409c28d89 100644 (file)
@@ -55,11 +55,21 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
                add_input(data, pixel_format, color_space, gamma_curve);
        }
 
                add_input(data, pixel_format, color_space, gamma_curve);
        }
 
+       GLuint type;
+       if (framebuffer_format == GL_RGBA8) {
+               type = GL_UNSIGNED_BYTE;
+       } else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) {
+               type = GL_FLOAT;
+       } else {
+               // Add more here as needed.
+               assert(false);
+       }
+
        glGenTextures(1, &texnum);
        check_error();
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
        glGenTextures(1, &texnum);
        check_error();
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_FLOAT, NULL);
+       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
        check_error();
 
        glGenFramebuffers(1, &fbo);
        check_error();
 
        glGenFramebuffers(1, &fbo);