X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=0909263a6af99c40a65da72ab0aef3e204f3e060;hp=6214dbc1b16ef11ffd160fd1265230e9f13b77db;hb=b90558ce2296b46758be80d447f36bb0ed1be70a;hpb=9823bfb683591e2b0fd844fa206ac888a9fef01a diff --git a/test_util.cpp b/test_util.cpp index 6214dbc..0909263 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -59,7 +59,7 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned output_added(false), finalized(false) { - CHECK(init_movit(".", MOVIT_DEBUG_OFF)); + init_movit_for_test(); if (data != nullptr) { add_input(data, pixel_format, color_space, gamma_curve); @@ -89,7 +89,7 @@ Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_fo return input; } -Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height) +Input *EffectChainTester::add_input(const fp16_int_t *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height) { ImageFormat format; format.color_space = color_space; @@ -102,118 +102,107 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat input_height = height; } - FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height); - input->set_pixel_data(data); + FlatInput *input = new FlatInput(format, pixel_format, GL_HALF_FLOAT, input_width, input_height); + input->set_pixel_data_fp16(data); chain.add_input(input); return input; } -void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) -{ - internal_run(out_data, nullptr, nullptr, nullptr, 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) +Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height) { - internal_run(out_data, out_data2, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format); -} + ImageFormat format; + format.color_space = color_space; + format.gamma_curve = gamma_curve; -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, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format); -} + if (input_width == -1) { + input_width = width; + } + if (input_height == -1) { + input_height = height; + } -void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) -{ - internal_run(out_data, out_data2, out_data3, out_data4, GL_FLOAT, format, color_space, gamma_curve, alpha_format); + FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height); + input->set_pixel_data(data); + chain.add_input(input); + return input; } -void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, 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) +void EffectChainTester::run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, 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) +void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, out_data3, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format); } -void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, unsigned char *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, out_data3, out_data4, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, format, color_space, gamma_curve, alpha_format); } void EffectChainTester::run(uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format); } void EffectChainTester::run_10_10_10_2(uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format); } #ifdef HAVE_BENCHMARK void EffectChainTester::benchmark(benchmark::State &state, float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } -void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); + internal_run(out_data, format, color_space, gamma_curve, alpha_format, &state); } -void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::benchmark(benchmark::State &state, fp16_int_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, out_data3, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } -void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, out_data3, out_data4, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); + internal_run(out_data, format, color_space, gamma_curve, alpha_format, &state); } void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } -void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); -} - -void EffectChainTester::benchmark(benchmark::State &state, 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, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); -} - -void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, unsigned char *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) -{ - internal_run(out_data, out_data2, out_data3, out_data4, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); + internal_run(out_data, format, color_space, gamma_curve, alpha_format, &state); } void EffectChainTester::benchmark(benchmark::State &state, uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } void EffectChainTester::benchmark_10_10_10_2(benchmark::State &state, uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } #endif template -void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T *out_data4, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format +void EffectChainTester::internal_run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format #ifdef HAVE_BENCHMARK , benchmark::State *benchmark_state #endif @@ -228,6 +217,8 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T type = GL_UNSIGNED_BYTE; } else if (framebuffer_format == GL_RGBA16) { type = GL_UNSIGNED_SHORT; + } else if (framebuffer_format == GL_RGBA16F && sizeof(T) == 2) { + type = GL_HALF_FLOAT; } else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) { type = GL_FLOAT; } else if (framebuffer_format == GL_RGB10_A2) { @@ -237,46 +228,22 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T assert(false); } - unsigned num_outputs; - if (out_data4 != nullptr) { - num_outputs = 4; - } else if (out_data3 != nullptr) { - num_outputs = 3; - } else if (out_data2 != nullptr) { - num_outputs = 2; - } else { - num_outputs = 1; - } + glActiveTexture(GL_TEXTURE0); + check_error(); - GLuint fbo, texnum[4]; + vector textures; + for (unsigned i = 0; i < out_data.size(); ++i) { + GLuint texnum = chain.get_resource_pool()->create_2d_texture(framebuffer_format, width, height); + textures.push_back(EffectChain::DestinationTexture{texnum, framebuffer_format}); - glGenTextures(num_outputs, texnum); - check_error(); - for (unsigned i = 0; i < num_outputs; ++i) { - glBindTexture(GL_TEXTURE_2D, texnum[i]); + // The output texture needs to have valid state to be written to by a compute shader. + glBindTexture(GL_TEXTURE_2D, texnum); check_error(); - glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, nullptr); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); check_error(); } - glGenFramebuffers(1, &fbo); - check_error(); - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - 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, GL_COLOR_ATTACHMENT3 }; - glDrawBuffers(num_outputs, bufs); - - chain.render_to_fbo(fbo, width, height); + chain.render_to_texture(textures, width, height); #ifdef HAVE_BENCHMARK // If running benchmarks: Now we've warmed up everything, so let's run the @@ -285,7 +252,7 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T glFinish(); size_t iters = benchmark_state->max_iterations; for (auto _ : *benchmark_state) { - chain.render_to_fbo(fbo, width, height); + chain.render_to_texture(textures, width, height); if (--iters == 0) { glFinish(); } @@ -294,34 +261,30 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T } #endif - T *data[4] = { out_data, out_data2, out_data3, out_data4 }; - - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - check_error(); - for (unsigned i = 0; i < num_outputs; ++i) { - T *ptr = data[i]; - glReadBuffer(GL_COLOR_ATTACHMENT0 + i); + for (unsigned i = 0; i < out_data.size(); ++i) { + T *ptr = out_data[i]; + glBindTexture(GL_TEXTURE_2D, textures[i].texnum); + 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); + std::unique_ptr temp(new T[width * height * 4]); + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, type, temp.get()); check_error(); if (format == GL_ALPHA) { - for (unsigned i = 0; i < width * height; ++i) { - ptr[i] = temp[i * 4 + 3]; + for (unsigned j = 0; j < width * height; ++j) { + ptr[j] = temp[j * 4 + 3]; } } else if (format == GL_BLUE) { - for (unsigned i = 0; i < width * height; ++i) { - ptr[i] = temp[i * 4 + 2]; + for (unsigned j = 0; j < width * height; ++j) { + ptr[j] = temp[j * 4 + 2]; } } else { - for (unsigned i = 0; i < width * height; ++i) { - ptr[i] = temp[i * 4]; + for (unsigned j = 0; j < width * height; ++j) { + ptr[j] = temp[j * 4]; } } - delete[] temp; } else { - glReadPixels(0, 0, width, height, format, internal_format, ptr); + glGetTexImage(GL_TEXTURE_2D, 0, format, type, ptr); check_error(); } @@ -332,10 +295,9 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T } } - glDeleteFramebuffers(1, &fbo); - check_error(); - glDeleteTextures(num_outputs, texnum); - check_error(); + for (unsigned i = 0; i < out_data.size(); ++i) { + chain.get_resource_pool()->release_2d_texture(textures[i].texnum); + } } void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format)