[Piglit] [PATCH 04/21] arb_internalformat_query2: test for SAMPLES and NUM_SAMPLE_COUNTS pnames
Alejandro Piñeiro
apinheiro at igalia.com
Fri Jan 22 08:05:51 PST 2016
For those pnames, it verify that the defined on the spec is fulfilled:
NUM_SAMPLE_COUNTS
<skip>
If <internalformat> is not color-renderable, depth-renderable, or
stencil-renderable (as defined in section 4.4.4), or if <target>
does not support multiple samples (ie other than
TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_MULTISAMPLE_ARRAY, or
RENDERBUFFER), 0 is returned.
SAMPLES
<skip>
If <internalformat> is not color-renderable, depth-renderable, or
stencil-renderable (as defined in section 4.4.4), or if <target>
does not support multiple samples (ie other than
TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_MULTISAMPLE_ARRAY, or
RENDERBUFFER), <params> is not modified.
This test is really similar to api-errors test at
arb_internalformat_query, with the difference that on that case an
error was defined, and here was "softed" to return some specific
values. It also covers query1 overrun test.
Those two tests fails on the following proprietary drivers:
* 4.5.13399 on AMD Radeon (TM) R9 380 Series
* 4.5.0 NVIDIA 352.55 on GeForce GTX 950/PCIe/SSE2
For NUM_SAMPLES_COUNTS, they report a value different of 0 (5 on the
NVIDIA, 4 on ATI) for target/internalformat that should return 0
(example: GL_TEXTURE_1D+GL_COMPRESSED_RGB). It is worth to note that
for those cases, INTERNALFORMAT_SUPPORTED returns TRUE. It is not
clear if they provide multi-sample capabilities for those targets.
That seems to suggest that the paragraph was C&P from query1, and it
is being too restrictive, when the purpose of the query2 itself is "a)
provide a mechanism for implementations to declare support *above* the
minimum required by the specification".
For the SAMPLES case, it changes the first element of <params>,
for cases where it should remain unmodified.
---
tests/all.py | 1 +
.../arb_internalformat_query2/CMakeLists.gl.txt | 1 +
tests/spec/arb_internalformat_query2/common.c | 76 ++++++
tests/spec/arb_internalformat_query2/common.h | 19 ++
.../arb_internalformat_query2/samples-pnames.c | 300 +++++++++++++++++++++
5 files changed, 397 insertions(+)
create mode 100644 tests/spec/arb_internalformat_query2/samples-pnames.c
diff --git a/tests/all.py b/tests/all.py
index 19754c6..28e9fd1 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -3638,6 +3638,7 @@ with profile.group_manager(
grouptools.join('spec', 'arb_internalformat_query2')) as g:
g(['arb_internalformat_query2-api-errors'], 'API error checks')
g(['arb_internalformat_query2-generic-pname-checks'], 'Individual most generic pname checks')
+ g(['arb_internalformat_query2-samples-pnames'], 'SAMPLES and NUM_SAMPLE_COUNTS pname checks')
with profile.group_manager(
PiglitGLTest, grouptools.join('spec', 'arb_map_buffer_range')) as g:
diff --git a/tests/spec/arb_internalformat_query2/CMakeLists.gl.txt b/tests/spec/arb_internalformat_query2/CMakeLists.gl.txt
index cd3b07e..a204fb5 100644
--- a/tests/spec/arb_internalformat_query2/CMakeLists.gl.txt
+++ b/tests/spec/arb_internalformat_query2/CMakeLists.gl.txt
@@ -10,5 +10,6 @@ link_libraries (
piglit_add_executable (arb_internalformat_query2-api-errors api-errors.c)
piglit_add_executable (arb_internalformat_query2-generic-pname-checks generic-pname-checks.c common.c)
+piglit_add_executable (arb_internalformat_query2-samples-pnames samples-pnames.c common.c)
# vim: ft=cmake:
diff --git a/tests/spec/arb_internalformat_query2/common.c b/tests/spec/arb_internalformat_query2/common.c
index 83dbd3d..0678857 100644
--- a/tests/spec/arb_internalformat_query2/common.c
+++ b/tests/spec/arb_internalformat_query2/common.c
@@ -105,6 +105,20 @@ test_data_execute(test_data *data,
data->params_size, data->params);
}
+/* Usually we want to call GetInternalformati*v with the size of the
+ * buffer, but there are some cases where we want to specify a
+ * different size */
+void
+test_data_execute_with_size(test_data *data,
+ const GLenum target,
+ const GLenum internalformat,
+ const GLenum pname,
+ int size)
+{
+ data->callback(target, internalformat, pname,
+ size, data->params);
+}
+
void
test_data_set_testing64(test_data *data,
const int testing64)
@@ -597,3 +611,65 @@ test_data_is_unsupported_response(test_data *data,
{
return test_data_value_at_index(data, 0) == get_unsupported_response(pname);
}
+
+/*
+ * Sets the value of @data params at @index to @value.
+ */
+void
+test_data_set_value_at_index(test_data *data,
+ const int index,
+ const GLint64 value)
+{
+ if (index > data->params_size || index < 0) {
+ fprintf(stderr, "ERROR: invalid index while setting"
+ " auxiliar test data\n");
+ return;
+ }
+
+ if (data->testing64) {
+ ((GLint64*)data->params)[index] = value;
+ } else {
+ ((GLint*)data->params)[index] = value;
+ }
+}
+
+bool
+test_data_equal_at_index(test_data *data,
+ test_data *data_copy,
+ unsigned index)
+{
+ if (data->testing64 != data_copy->testing64) {
+ fprintf(stderr, "ERROR: trying to compare imcompatible"
+ " auxiliar test data structures\n");
+ return false;
+ }
+ if (data->params_size != data_copy->params_size) {
+ fprintf(stderr, "ERROR: trying to compare imcompatible"
+ " auxiliar test data structures\n");
+ return false;
+ }
+ if (index > data->params_size || index < 0) {
+ fprintf(stderr, "ERROR: invalid index while setting"
+ " auxiliar test data\n");
+ return false;
+ }
+
+ return (test_data_value_at_index(data, index) ==
+ test_data_value_at_index(data_copy, index));
+}
+
+test_data*
+test_data_clone(test_data *data)
+{
+ test_data *clone;
+
+ clone = test_data_new(data->testing64, data->params_size);
+
+ return clone;
+}
+
+int
+test_data_get_params_size(test_data *data)
+{
+ return data->params_size;
+}
diff --git a/tests/spec/arb_internalformat_query2/common.h b/tests/spec/arb_internalformat_query2/common.h
index 5295c91..19c3e38 100644
--- a/tests/spec/arb_internalformat_query2/common.h
+++ b/tests/spec/arb_internalformat_query2/common.h
@@ -277,9 +277,20 @@ void test_data_execute(test_data *data,
const GLenum internalformat,
const GLenum pname);
+void
+test_data_execute_with_size(test_data *data,
+ const GLenum target,
+ const GLenum internalformat,
+ const GLenum pname,
+ int size);
+
void test_data_set_testing64(test_data *data,
const int testing64);
+bool test_data_equal_at_index(test_data *data,
+ test_data *data_copy,
+ const unsigned index);
+
bool test_data_check_supported(const test_data *data,
const GLenum target,
const GLenum internalformat);
@@ -291,6 +302,14 @@ bool test_data_check_possible_values(test_data *data,
GLint64 test_data_value_at_index(test_data *data,
const int index);
+void test_data_set_value_at_index(test_data *data,
+ const int index,
+ const GLint64 value);
+
+test_data* test_data_clone(test_data *data);
+
+int test_data_get_params_size(test_data *data);
+
bool try_basic(const GLenum *targets, unsigned num_targets,
const GLenum *internalformats, unsigned num_internalformats,
const GLenum pname,
diff --git a/tests/spec/arb_internalformat_query2/samples-pnames.c b/tests/spec/arb_internalformat_query2/samples-pnames.c
new file mode 100644
index 0000000..7ec2f96
--- /dev/null
+++ b/tests/spec/arb_internalformat_query2/samples-pnames.c
@@ -0,0 +1,300 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * \file samples-pnames.c
+ * Verify a handful of conditions required by the spec for
+ * NUM_SAMPLE_COUNTS and SAMPLES pnames.
+ *
+ * This cover query1 overrun test, plus query1 api-error.
+ */
+
+#include "common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+ config.window_visual = PIGLIT_GL_VISUAL_RGB;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static const GLenum without_multisample_targets[] = {
+ GL_TEXTURE_1D,
+ GL_TEXTURE_1D_ARRAY,
+ GL_TEXTURE_2D,
+ GL_TEXTURE_2D_ARRAY,
+ GL_TEXTURE_3D,
+ GL_TEXTURE_CUBE_MAP,
+ GL_TEXTURE_CUBE_MAP_ARRAY,
+ GL_TEXTURE_RECTANGLE,
+ GL_TEXTURE_BUFFER
+};
+
+static const GLenum non_renderable_internalformats[] = {
+ GL_COMPRESSED_RGB,
+ GL_COMPRESSED_RGBA,
+ GL_COMPRESSED_ALPHA,
+ GL_COMPRESSED_LUMINANCE,
+ GL_COMPRESSED_LUMINANCE_ALPHA,
+ GL_COMPRESSED_INTENSITY,
+ GL_COMPRESSED_SRGB,
+ GL_COMPRESSED_SRGB_ALPHA,
+ GL_COMPRESSED_SLUMINANCE,
+ GL_COMPRESSED_SLUMINANCE_ALPHA,
+ GL_COMPRESSED_RED,
+ GL_COMPRESSED_RG,
+ GL_COMPRESSED_RED_RGTC1,
+ GL_COMPRESSED_SIGNED_RED_RGTC1,
+ GL_COMPRESSED_RG_RGTC2,
+ GL_COMPRESSED_SIGNED_RG_RGTC2,
+ GL_COMPRESSED_RGBA_BPTC_UNORM_ARB,
+ GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB,
+ GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB,
+ GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB,
+ GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+ GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
+ GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
+ GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
+ GL_COMPRESSED_RGB_FXT1_3DFX,
+ GL_COMPRESSED_RGBA_FXT1_3DFX,
+ GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,
+ GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT,
+ GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT,
+ GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,
+ GL_COMPRESSED_LUMINANCE_LATC1_EXT,
+ GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT,
+ GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT,
+ GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT,
+ GL_YCBCR_MESA,
+ GL_GREEN_INTEGER_EXT,
+ GL_BLUE_INTEGER_EXT,
+ GL_ALPHA_INTEGER_EXT,
+ GL_RGB_INTEGER_EXT,
+ GL_RGBA_INTEGER_EXT,
+ GL_BGR_INTEGER_EXT,
+ GL_BGRA_INTEGER_EXT,
+ GL_LUMINANCE_INTEGER_EXT,
+ GL_LUMINANCE_ALPHA_INTEGER_EXT,
+ GL_RGB9_E5
+};
+
+enum piglit_result
+piglit_display(void)
+{
+ return PIGLIT_FAIL;
+}
+
+static void
+fill_data_and_copy(test_data *data,
+ test_data *data_copy)
+{
+ unsigned i;
+
+ for (i = 0; i < test_data_get_params_size(data); i++) {
+ /* It seems very unlikely that an implementation will
+ * support 0xDEADBEEF samples*/
+ test_data_set_value_at_index(data, i, 0xDEADBEEF);
+ test_data_set_value_at_index(data_copy, i, 0xDEADBEEF);
+ }
+}
+
+static bool
+check_params_unmodified(test_data *data,
+ test_data *data_copy)
+{
+ unsigned i;
+ bool result;
+
+ for (i = 0; i < test_data_get_params_size(data); i++) {
+ result = test_data_equal_at_index(data, data_copy, i);
+
+ if (!result)
+ break;
+ }
+
+ return result;
+}
+
+static bool
+try(const GLenum *targets, unsigned num_targets,
+ const GLenum *internalformats, unsigned num_internalformats,
+ GLenum pname, test_data *data)
+{
+ test_data *data_copy = test_data_clone(data);
+ bool pass = true;
+ unsigned i;
+ unsigned j;
+
+ for (i = 0; i < num_targets; i++) {
+ for (j = 0; j < num_internalformats; j++) {
+ bool error_test;
+ bool value_test;
+
+ /* Needed for to check if the data was unmodified */
+ fill_data_and_copy(data, data_copy);
+
+ /* First we try with size 0 */
+ test_data_execute_with_size(data, targets[i],
+ internalformats[j],
+ pname, 0);
+
+ error_test =
+ piglit_check_gl_error(GL_NO_ERROR);
+
+ value_test = check_params_unmodified(data, data_copy);
+
+ /* Now we try with a real size */
+ test_data_execute(data, targets[i], internalformats[j],
+ pname);
+
+ error_test = error_test &&
+ piglit_check_gl_error(GL_NO_ERROR);
+
+ if (pname == GL_NUM_SAMPLE_COUNTS) {
+ value_test = value_test &&
+ test_data_is_unsupported_response(data,
+ GL_NUM_SAMPLE_COUNTS);
+ } else {
+ value_test = value_test &&
+ check_params_unmodified(data, data_copy);
+ }
+
+ if (error_test && value_test)
+ continue;
+
+ print_failing_case(targets[i], internalformats[j], pname, data);
+
+ pass = false;
+ }
+ }
+
+ test_data_clear(&data_copy);
+
+ return pass;
+}
+
+static bool
+check_num_sample_counts(void)
+{
+ bool pass = true;
+ test_data *data = test_data_new(0, 64);
+ int testing64;
+
+ for (testing64 = 0; testing64 <= 1; testing64++) {
+ test_data_set_testing64(data, testing64);
+
+ /* The GL_ARB_internalformat_query2 spec says:
+ *
+ * - NUM_SAMPLE_COUNTS: The number of sample counts that would
+ * be returned by querying SAMPLES is returned in <params>.
+ * * If <internalformat> is not color-renderable,
+ * depth-renderable, or stencil-renderable (as defined
+ * in section 4.4.4) ...
+ */
+ pass = try(valid_targets, ARRAY_SIZE(valid_targets),
+ non_renderable_internalformats, ARRAY_SIZE(non_renderable_internalformats),
+ GL_NUM_SAMPLE_COUNTS, data)
+ && pass;
+
+ /*
+ * ... or if <target> does not support
+ * multiple samples (ie other than
+ * TEXTURE_2D_MULTISAMPLE,
+ * TEXTURE_2D_MULTISAMPLE_ARRAY, or RENDERBUFFER), 0 is
+ * returned.
+ */
+ pass = try(without_multisample_targets, ARRAY_SIZE(without_multisample_targets),
+ valid_internalformats, ARRAY_SIZE(valid_internalformats),
+ GL_NUM_SAMPLE_COUNTS, data)
+ && pass;
+ }
+
+ piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL,
+ "%s", piglit_get_gl_enum_name(GL_NUM_SAMPLE_COUNTS));
+
+ test_data_clear(&data);
+
+ return pass;
+}
+
+static bool
+check_samples(void)
+{
+ bool pass = true;
+ test_data *data = test_data_new(0, 64);
+ int testing64;
+
+ /*
+ * Note: Checking if we are getting a proper min and maximum
+ * value, and if the returned values are positive in
+ * descending order is done at minmax test, as that one needs
+ * to use SAMPLES and NUM_SAMPLES_COUNT combined. This test
+ * file is about testing each pname individually.
+ */
+
+ for (testing64 = 0; testing64 <= 1; testing64++) {
+ test_data_set_testing64(data, testing64);
+ /* The GL_ARB_internalformat_query2 spec for SAMPLES says:
+ *
+ * If <internalformat> is not color-renderable, depth-renderable, or
+ * stencil-renderable (as defined in section 4.4.4),
+ */
+
+ pass = try(valid_targets, ARRAY_SIZE(valid_targets),
+ non_renderable_internalformats, ARRAY_SIZE(non_renderable_internalformats),
+ GL_SAMPLES, data)
+ && pass;
+
+ /*
+ * or if <target> does not support multiple samples (ie other
+ * than TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_MULTISAMPLE_ARRAY,
+ * or RENDERBUFFER), <params> is not modified.
+ */
+
+ pass = try(without_multisample_targets, ARRAY_SIZE(without_multisample_targets),
+ valid_internalformats, ARRAY_SIZE(valid_internalformats),
+ GL_SAMPLES, data)
+ && pass;
+ }
+
+ piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL,
+ "%s", piglit_get_gl_enum_name(GL_SAMPLES));
+
+ test_data_clear(&data);
+
+ return pass;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass = true;
+
+ piglit_require_extension("GL_ARB_framebuffer_object");
+ piglit_require_extension("GL_ARB_internalformat_query2");
+
+ pass = check_num_sample_counts() && pass;
+ pass = check_samples() && pass;
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
--
2.1.4
More information about the Piglit
mailing list