Add some check_error() for shaders miscompiling.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index a5cd44cf251ed514697c79d567b15f037b620aa7..2073bc2d6d3e31550dc6657c77d8664253203739 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -47,7 +47,7 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
                                      MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
                                      GLenum framebuffer_format)
-       : chain(width, height, get_static_pool()), width(width), height(height), finalized(false)
+       : chain(width, height, get_static_pool()), width(width), height(height), output_added(false), finalized(false)
 {
        CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
@@ -55,11 +55,21 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
                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();
-       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);
@@ -133,13 +143,23 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
        check_error();
-       if (!epoxy_is_desktop_gl() && format == GL_RED) {
+       if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) {
                // GLES will only read GL_RGBA.
                float *temp = new float[width * height * 4];
                glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp);
                check_error();
-               for (int i = 0; i < width * height; ++i) {
-                       out_data[i] = temp[i * 4];
+               if (format == GL_ALPHA) {
+                       for (unsigned i = 0; i < width * height; ++i) {
+                               out_data[i] = temp[i * 4 + 3];
+                       }
+               } else if (format == GL_BLUE) {
+                       for (unsigned i = 0; i < width * height; ++i) {
+                               out_data[i] = temp[i * 4 + 2];
+                       }
+               } else {
+                       for (unsigned i = 0; i < width * height; ++i) {
+                               out_data[i] = temp[i * 4];
+                       }
                }
                delete[] temp;
        } else {
@@ -164,13 +184,23 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
        check_error();
-       if (!epoxy_is_desktop_gl() && format == GL_RED) {
+       if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) {
                // GLES will only read GL_RGBA.
                unsigned char *temp = new unsigned char[width * height * 4];
                glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, temp);
                check_error();
-               for (int i = 0; i < width * height; ++i) {
-                       out_data[i] = temp[i * 4];
+               if (format == GL_ALPHA) {
+                       for (unsigned i = 0; i < width * height; ++i) {
+                               out_data[i] = temp[i * 4 + 3];
+                       }
+               } else if (format == GL_BLUE) {
+                       for (unsigned i = 0; i < width * height; ++i) {
+                               out_data[i] = temp[i * 4 + 2];
+                       }
+               } else {
+                       for (unsigned i = 0; i < width * height; ++i) {
+                               out_data[i] = temp[i * 4];
+                       }
                }
                delete[] temp;
        } else {
@@ -185,13 +215,28 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
        vertical_flip(out_data, width, height);
 }
 
+void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format)
+{
+       chain.add_output(format, alpha_format);
+       output_added = true;
+}
+
+void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format)
+{
+       chain.add_ycbcr_output(format, alpha_format, ycbcr_format);
+       output_added = true;
+}
+
 void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
        assert(!finalized);
-       ImageFormat image_format;
-       image_format.color_space = color_space;
-       image_format.gamma_curve = gamma_curve;
-       chain.add_output(image_format, alpha_format);
+       if (!output_added) {
+               ImageFormat image_format;
+               image_format.color_space = color_space;
+               image_format.gamma_curve = gamma_curve;
+               chain.add_output(image_format, alpha_format);
+               output_added = true;
+       }
        chain.finalize();
        finalized = true;
 }