From d2050acb601e0d16bb33b1c1e7cf443dce2d3c93 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 16 Sep 2015 23:49:45 +0200 Subject: [PATCH] Make EffectChainTester capable of testing chains with multiple outputs. --- test_util.cpp | 132 ++++++++++++++++++++++++++++++++------------------ test_util.h | 8 ++- 2 files changed, 92 insertions(+), 48 deletions(-) diff --git a/test_util.cpp b/test_util.cpp index 199be45..ada84dc 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -100,16 +100,36 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, GL_FLOAT, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, NULL, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, GL_FLOAT, format, color_space, gamma_curve, alpha_format); } void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, NULL, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); } template -void EffectChainTester::internal_run(T *out_data, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { if (!finalized) { finalize_chain(color_space, gamma_curve, alpha_format); @@ -125,67 +145,87 @@ void EffectChainTester::internal_run(T *out_data, GLenum internal_format, GLenum assert(false); } - GLuint fbo, texnum; + unsigned num_outputs; + if (out_data3 != NULL) { + num_outputs = 3; + } else if (out_data2 != NULL) { + num_outputs = 2; + } else { + num_outputs = 1; + } - glGenTextures(1, &texnum); - check_error(); - glBindTexture(GL_TEXTURE_2D, texnum); - check_error(); - glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL); + GLuint fbo, texnum[3]; + + glGenTextures(num_outputs, texnum); check_error(); + for (unsigned i = 0; i < num_outputs; ++i) { + glBindTexture(GL_TEXTURE_2D, texnum[i]); + check_error(); + glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL); + check_error(); + } glGenFramebuffers(1, &fbo); check_error(); glBindFramebuffer(GL_FRAMEBUFFER, fbo); check_error(); - glFramebufferTexture2D( - GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0, - GL_TEXTURE_2D, - texnum, - 0); - check_error(); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - check_error(); + for (unsigned i = 0; i < num_outputs; ++i) { + glFramebufferTexture2D( + GL_FRAMEBUFFER, + GL_COLOR_ATTACHMENT0 + i, + GL_TEXTURE_2D, + texnum[i], + 0); + check_error(); + } + + GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 }; + glDrawBuffers(num_outputs, bufs); chain.render_to_fbo(fbo, width, height); + T *data[3] = { out_data, out_data2, out_data3 }; + glBindFramebuffer(GL_FRAMEBUFFER, fbo); check_error(); - if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { - // GLES will only read GL_RGBA. - T *temp = new T[width * height * 4]; - glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp); - check_error(); - 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]; + for (unsigned i = 0; i < num_outputs; ++i) { + T *ptr = data[i]; + glReadBuffer(GL_COLOR_ATTACHMENT0 + i); + if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { + // GLES will only read GL_RGBA. + T *temp = new T[width * height * 4]; + glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp); + check_error(); + if (format == GL_ALPHA) { + for (unsigned i = 0; i < width * height; ++i) { + ptr[i] = temp[i * 4 + 3]; + } + } else if (format == GL_BLUE) { + for (unsigned i = 0; i < width * height; ++i) { + ptr[i] = temp[i * 4 + 2]; + } + } else { + for (unsigned i = 0; i < width * height; ++i) { + ptr[i] = temp[i * 4]; + } } + delete[] temp; } else { - for (unsigned i = 0; i < width * height; ++i) { - out_data[i] = temp[i * 4]; - } + glReadPixels(0, 0, width, height, format, internal_format, ptr); + check_error(); + } + + if (format == GL_RGBA) { + vertical_flip(ptr, width * 4, height); + } else { + vertical_flip(ptr, width, height); } - delete[] temp; - } else { - glReadPixels(0, 0, width, height, format, internal_format, out_data); - check_error(); } glDeleteFramebuffers(1, &fbo); check_error(); - glDeleteTextures(1, &texnum); + glDeleteTextures(num_outputs, texnum); check_error(); - - if (format == GL_RGBA) { - width *= 4; - } - - vertical_flip(out_data, width, height); } void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format) @@ -194,9 +234,9 @@ void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat output_added = true; } -void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format) +void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting) { - chain.add_ycbcr_output(format, alpha_format, ycbcr_format); + chain.add_ycbcr_output(format, alpha_format, ycbcr_format, output_splitting); output_added = true; } diff --git a/test_util.h b/test_util.h index f786708..1f9e47f 100644 --- a/test_util.h +++ b/test_util.h @@ -22,15 +22,19 @@ public: Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width = -1, int input_height = -1); Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width = -1, int input_height = -1); void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void run(float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void run(float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void run(unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void add_output(const ImageFormat &format, OutputAlphaFormat alpha_format); - void add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format); + void add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting = YCBCR_OUTPUT_INTERLEAVED); private: void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format); template - void internal_run(T *out_data, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void internal_run(T *out_data, T *out_data2, T *out_data3, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); EffectChain chain; unsigned width, height; -- 2.39.2