[Piglit] [PATCH 08/17] ext_framebuffer_multisample: blit-multiple-rt also against RGBA16F/32F

[Topi Pohjolainen]

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
 tests/all.py                                                   |  5 +----
 .../blit-multiple-render-targets.cpp                           | 10 +++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 7e45a81c3..78de273c1 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2996,10 +2996,6 @@ with profile.test_list.group_manager(
     # non-multisampled framebuffers, so go ahead and test them with
     # num_samples==0 as well.
     for num_samples in ['0'] + MSAA_SAMPLE_COUNTS:
-        g(['ext_framebuffer_multisample-blit-multiple-render-targets',
-           num_samples],
-          'blit-multiple-render-targets {}'.format(num_samples))
-
         for test_type in ('non-centroid-disabled', 'centroid-disabled',
                           'centroid-edges', 'non-centroid-deriv',
                           'non-centroid-deriv-disabled', 'centroid-deriv',
@@ -3053,6 +3049,7 @@ with profile.test_list.group_manager(
                      'alpha-to-coverage-no-draw-buffer-zero-write',
                      'alpha-to-one-dual-src-blend',
                      'alpha-to-one-msaa-disabled',
+                     'blit-multiple-render-targets',
                      'bitmap', 'polygon-stipple']:
             for fmt in ('GL_RGBA', 'GL_RGBA16F', 'GL_RGBA32F'):
                g(['ext_framebuffer_multisample-{}'.format(test),
diff --git a/tests/spec/ext_framebuffer_multisample/blit-multiple-render-targets.cpp b/tests/spec/ext_framebuffer_multisample/blit-multiple-render-targets.cpp
index 4afb84cfe..c429b12f6 100644
--- a/tests/spec/ext_framebuffer_multisample/blit-multiple-render-targets.cpp
+++ b/tests/spec/ext_framebuffer_multisample/blit-multiple-render-targets.cpp
@@ -48,7 +48,7 @@ static Fbo multisample_fbo;
 void
 print_usage_and_exit(char *prog_name)
 {
-	printf("Usage: %s <num_samples>\n", prog_name);
+	printf("Usage: %s <num_samples> <format>\n", prog_name);
 	piglit_report_result(PIGLIT_FAIL);
 }
 
@@ -56,7 +56,7 @@ print_usage_and_exit(char *prog_name)
 extern "C" void
 piglit_init(int argc, char **argv)
 {
-	if (argc != 2)
+	if (argc != 3)
 		print_usage_and_exit(argv[0]);
 
 	/* 1st arg: num_samples */
@@ -65,6 +65,9 @@ piglit_init(int argc, char **argv)
 	if (endptr != argv[1] + strlen(argv[1]))
 		print_usage_and_exit(argv[0]);
 
+	const GLenum color_internal_format =
+		piglit_get_gl_enum_from_name(argv[2]);
+
 	piglit_require_extension("GL_ARB_framebuffer_object");
 
 	/* Skip the test if num_samples > GL_MAX_SAMPLES */
@@ -73,7 +76,8 @@ piglit_init(int argc, char **argv)
 	if (num_samples > max_samples)
 		piglit_report_result(PIGLIT_SKIP);
 
-	FboConfig Config(GL_RGBA, num_samples, piglit_width, piglit_height);
+	FboConfig Config(color_internal_format, num_samples,
+			 piglit_width, piglit_height);
 
 	/* Setup fbo with renderbuffer and texture attachments */
 	Config.num_rb_attachments = 2;
-- 
2.11.0