[Piglit] [PATCH] framework/test: allow to set extra args with PIGLIT_VKRUNNER_EXTRA_ARGS
vkrunner recently added a new option (--device-id=) for selecting the physical device. This is quite useful in a multi-GPU scenario. This allows to set some vkrunner options via vkrunner:extra_args in the configuration file or with PIGLIT_VKRUNNER_EXTRA_ARGS. Signed-off-by: Samuel Pitoiset --- framework/test/piglit_test.py | 9 - piglit.conf.example | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py index 166c2f792..152355e3d 100644 --- a/framework/test/piglit_test.py +++ b/framework/test/piglit_test.py @@ -243,15 +243,22 @@ class VkRunnerTest(PiglitBaseTest): vkrunner_bin = core.PIGLIT_CONFIG.safe_get( 'vkrunner', 'bin', fallback='vkrunner') +extra_args = os.environ.get('PIGLIT_VKRUNNER_EXTRA_ARGS') + +if extra_args is None: +extra_args = core.PIGLIT_CONFIG.safe_get( +'vkrunner', 'extra_args', fallback='') + super(VkRunnerTest, self).__init__( [vkrunner_bin], run_concurrent=True) self.filename = filename +self.extra_args = extra_args.split() @PiglitBaseTest.command.getter def command(self): # self._command is used because we don't want PiglitBaseTest # to prepend TEST_BIN_DIR so that it will look for vkrunner in # the search path. -return self._command + [os.path.join(ROOT_DIR, self.filename)] +return self._command + self.extra_args + [os.path.join(ROOT_DIR, self.filename)] diff --git a/piglit.conf.example b/piglit.conf.example index 1877187df..1fd9ebc48 100644 --- a/piglit.conf.example +++ b/piglit.conf.example @@ -190,6 +190,7 @@ run_test=./%(test_name)s [vkrunner] ; Path to the VkRunner executable ; bin=/home/neil/local/bin/vkrunner +; extra_args=--device-id=1 [expected-failures] ; Provide a list of test names that are expected to fail. These tests -- 2.21.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH v3] arb_bindless_texture: add test where we pass a handle through a function
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Thanks Karol. On 04/25/2018 12:09 PM, Karol Herbst wrote: currently fails in mesa with: ir_dereference_variable @ 0x1446830 specifies undeclared variable `wrongHandle' @ 0xffd1b0 v2: add image test convert to compiler test quote the spec v3: use inout Signed-off-by: Karol Herbst <kher...@redhat.com> --- .../compiler/images/func-call-uvec2-image.frag | 36 ++ .../samplers/func-call-uvec2-texture2D.frag| 35 + 2 files changed, 71 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag diff --git a/tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag b/tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag new file mode 100644 index 0..cfa3fbac1 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag @@ -0,0 +1,36 @@ +// [config] +// expect_result: pass +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +layout (bindless_image) writeonly uniform image2D img; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +// The ARB_bindless_texture spec says: +// +// "Replace Section 4.1.7 (Samplers), p. 25" +// +// "Samplers can be used as l-values, so can be assigned into and used as +// "out" and "inout" function parameters." + +void adjustImageHandle(inout writeonly image2D img) +{ + uvec2 handle = uvec2(img); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + img = image2D(handle + handleOffset); +} + +void main() +{ + writeonly image2D _img = img; + adjustImageHandle(_img); + imageStore(_img, ivec2(0, 0), vec4(1, 2, 3, 4)); +} diff --git a/tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag b/tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag new file mode 100644 index 0..9faf41000 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag @@ -0,0 +1,35 @@ +// [config] +// expect_result: pass +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require + +layout (bindless_sampler) uniform sampler2D tex; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +// The ARB_bindless_texture spec says: +// +// "Replace Section 4.1.7 (Samplers), p. 25" +// +// "Samplers can be used as l-values, so can be assigned into and used as +// "out" and "inout" function parameters." + +void adjustSamplerHandle(inout sampler2D s) +{ + uvec2 handle = uvec2(s); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + s = sampler2D(handle + handleOffset); +} + +void main() +{ + sampler2D s = tex; + adjustSamplerHandle(s); + finalColor = texture2D(s, vec2(0, 0)); +} ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH v2 5/5] arb_bindless_texture: add test for conversion of bound sampler or image to uvec2
Patches 1,2,3,5 are: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Sorry for the delay. On 04/12/2018 12:58 PM, Karol Herbst wrote: conversion of bounded sampler2D to uvec2 is legal with ARB_bindless_texture. Currently Mesa fails with an assert: ../src/compiler/glsl/opt_function_inlining.cpp:248: void ir_call::generate_inline(ir_instruction*): Assertion `deref' failed. v2: add image test convert to compiler test quote the spec Signed-off-by: Karol Herbst <kher...@redhat.com> --- .../compiler/images/arith-bound-image.frag | 33 ++ .../samplers/arith-bound-sampler-texture2D.frag| 32 + 2 files changed, 65 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/compiler/images/arith-bound-image.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/samplers/arith-bound-sampler-texture2D.frag diff --git a/tests/spec/arb_bindless_texture/compiler/images/arith-bound-image.frag b/tests/spec/arb_bindless_texture/compiler/images/arith-bound-image.frag new file mode 100644 index 0..1876081c9 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/arith-bound-image.frag @@ -0,0 +1,33 @@ +// [config] +// expect_result: pass +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +writeonly uniform image2D img; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +// The ARB_bindless_texture spec says: +// +// "Modify Section 5.4.1, Conversion and Scalar Constructors, p. 60" +// +// "(add the following constructors:)" +// +// "uvec2(any image type) // Converts an image type to a +// // pair of 32-bit unsigned integers +// any image type(uvec2) // Converts a pair of 32-bit unsigned integers to +// // an image type" + +void main() +{ + uvec2 handle = uvec2(img); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + imageStore(image2D(handle + handleOffset), ivec2(0, 0), vec4(1, 2, 3, 4)); +} diff --git a/tests/spec/arb_bindless_texture/compiler/samplers/arith-bound-sampler-texture2D.frag b/tests/spec/arb_bindless_texture/compiler/samplers/arith-bound-sampler-texture2D.frag new file mode 100644 index 0..cf6a625bf --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/samplers/arith-bound-sampler-texture2D.frag @@ -0,0 +1,32 @@ +// [config] +// expect_result: pass +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require + +uniform sampler2D tex; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +// The ARB_bindless_texture spec says: +// +// "Modify Section 5.4.1, Conversion and Scalar Constructors, p. 60" +// +// "(add the following constructors:)" +// +// "uvec2(any sampler type) // Converts a sampler type to a +// // pair of 32-bit unsigned integers +// any sampler type(uvec2) // Converts a pair of 32-bit unsigned integers to +// // a sampler type" + +void main() +{ + uvec2 handle = uvec2(tex); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + finalColor = texture2D(sampler2D(handle + handleOffset), vec2(0, 0)); +} ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH v2 4/5] arb_bindless_texture: add test where we pass a handle through a function
On 04/12/2018 12:58 PM, Karol Herbst wrote: currently fails in mesa with: ir_dereference_variable @ 0x1446830 specifies undeclared variable `wrongHandle' @ 0xffd1b0 v2: add image test convert to compiler test quote the spec Signed-off-by: Karol Herbst--- .../compiler/images/func-call-uvec2-image.frag | 34 ++ .../samplers/func-call-uvec2-texture2D.frag| 33 + 2 files changed, 67 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag diff --git a/tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag b/tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag new file mode 100644 index 0..a603440f2 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/func-call-uvec2-image.frag @@ -0,0 +1,34 @@ +// [config] +// expect_result: pass +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +layout (bindless_image) writeonly uniform image2D img; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +// The ARB_bindless_texture spec says: +// +// "Replace Section 4.1.7 (Samplers), p. 25" +// +// "Samplers can be used as l-values, so can be assigned into and used as +// "out" and "inout" function parameters." + +image2D adjustImageHandle(in writeonly image2D wrongHandle) "out" and "inout" and the test uses "in"? +{ + uvec2 handle = uvec2(wrongHandle); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + return image2D(handle + handleOffset); +} + +void main() +{ + imageStore(adjustImageHandle(img), ivec2(0, 0), vec4(1, 2, 3, 4)); +} diff --git a/tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag b/tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag new file mode 100644 index 0..4491dd515 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/samplers/func-call-uvec2-texture2D.frag @@ -0,0 +1,33 @@ +// [config] +// expect_result: pass +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require + +layout (bindless_sampler) uniform sampler2D tex; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +// The ARB_bindless_texture spec says: +// +// "Replace Section 4.1.7 (Samplers), p. 25" +// +// "Samplers can be used as l-values, so can be assigned into and used as +// "out" and "inout" function parameters." + +sampler2D adjustSamplerHandle(in sampler2D wrongHandle) +{ + uvec2 handle = uvec2(wrongHandle); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + return sampler2D(handle + handleOffset); +} + +void main() +{ + finalColor = texture2D(adjustSamplerHandle(tex), vec2(0, 0)); +} ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 3/3] arb_bindless_texture: rename vertex uniform test and add vertex attrib test
Same comment as the previous one. Images need to be tested. On 04/08/2018 10:56 PM, Karol Herbst wrote: Signed-off-by: Karol Herbst--- .../sampler-vertex-attrib-input-output.shader_test | 41 ++ ...ampler-vertex-uniform-input-output.shader_test} | 0 2 files changed, 41 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output.shader_test rename tests/spec/arb_bindless_texture/execution/samplers/{sampler-input-output.shader_test => sampler-vertex-uniform-input-output.shader_test} (100%) diff --git a/tests/spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output.shader_test b/tests/spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output.shader_test new file mode 100644 index 0..5187b --- /dev/null +++ b/tests/spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output.shader_test @@ -0,0 +1,41 @@ +# In this test, the sampler to use is selected in a vertex shader, passed +# to the fragment shader as a (flat) input, and then used for a texture +# lookup. +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_bindless_texture + +[vertex shader] +#version 330 +#extension GL_ARB_bindless_texture: require + +in sampler2D tex; +in vec4 piglit_vertex; + +flat out sampler2D sampler_vs; + +void main() +{ + gl_Position = piglit_vertex; + sampler_vs = tex; +} + +[fragment shader] +#version 330 +#extension GL_ARB_bindless_texture: require + +flat in sampler2D sampler_vs; +out vec4 color; + +void main() +{ + color = texture2D(sampler_vs, vec2(0, 0)); +} + +[test] +texture rgbw 0 (16, 16) +resident texture 0 +vertex attrib handle tex 0 +draw rect -1 -1 2 2 +relative probe rgb (0.0, 0.0) (1.0, 0.0, 0.0) diff --git a/tests/spec/arb_bindless_texture/execution/samplers/sampler-input-output.shader_test b/tests/spec/arb_bindless_texture/execution/samplers/sampler-vertex-uniform-input-output.shader_test similarity index 100% rename from tests/spec/arb_bindless_texture/execution/samplers/sampler-input-output.shader_test rename to tests/spec/arb_bindless_texture/execution/samplers/sampler-vertex-uniform-input-output.shader_test ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 2/3] arb_bindless_texture: add some uvec2 arithmetic test
Can you please write a similar test with bindless images? We usually have both tests. Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 04/08/2018 10:56 PM, Karol Herbst wrote: Signed-off-by: Karol Herbst <kher...@redhat.com> --- .../basic-arithmetic-uvec2-texture2D.shader_test | 37 ++ 1 file changed, 37 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-uvec2-texture2D.shader_test diff --git a/tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-uvec2-texture2D.shader_test b/tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-uvec2-texture2D.shader_test new file mode 100644 index 0..4d644b044 --- /dev/null +++ b/tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-uvec2-texture2D.shader_test @@ -0,0 +1,37 @@ +# Same as basic-texture2D.shader_test, but with some math on the handle +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_bindless_texture + +[vertex shader passthrough] + +[fragment shader] +#version 330 +#extension GL_ARB_bindless_texture: require + +layout (bindless_sampler) uniform sampler2D tex; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +void main() +{ + sampler2D fixedTex; + + uvec2 handle = uvec2(tex); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + + fixedTex = sampler2D(handle + handleOffset); + + finalColor = texture2D(fixedTex, vec2(0, 0)); +} + +[test] +texture rgbw 0 (16, 16) +resident texture 0 +uniform uvec2 handleOffset 0x12345678 0x9abcdef0 +uniform handle tex 0 +draw rect -1 -1 2 2 +relative probe rgb (0.0, 0.0) (1.0, 0.0, 0.0) ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/3] shader_runner: add vertex attrib command for setting bindless texture handles
On 04/08/2018 10:56 PM, Karol Herbst wrote: Signed-off-by: Karol Herbst <kher...@redhat.com> --- tests/shaders/shader_runner.c | 42 ++ 1 file changed, 42 insertions(+) diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index 700b11327..e07e7b3ca 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -1964,6 +1964,46 @@ set_uniform(const char *line, int ubo_array_index) return; } +static void +set_vertex_attrib(const char *line) +{ + char name[512], type[512]; + uint64_t uint64s[16]; + GLint loc; + + REQUIRE(parse_word_copy(line, type, sizeof(type), ) && + parse_word_copy(line, name, sizeof(name), ), + "Invalid set vertex attrib command at: %s\n", line); + + if (isdigit(name[0])) { + loc = strtol(name, NULL, 0); + } else { + GLuint prog; + + glGetIntegerv(GL_CURRENT_PROGRAM, (GLint *) ); + loc = glGetAttribLocation(prog, name); + if (loc < 0) { + printf("cannot get location of vertex attrib \"%s\"\n", + name); + piglit_report_result(PIGLIT_FAIL); + } +} + + if (parse_str(type, "handle", NULL)) { + check_unsigned_support(); + check_texture_handle_support(); + parse_uint64s(line, uint64s, 1, NULL); parse_uints() is enough because it's an index in the resident_handles array (where the max is 31). With that changed, patch is: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> + glVertexAttribL1ui64ARB(loc, get_resident_handle(uint64s[0])->handle); + return; + } + + printf("unknown vertex attrib type \"%s\"\n", type); + printf("use [vertex data] instead if possible\n"); + piglit_report_result(PIGLIT_FAIL); + + return; +} + static GLenum lookup_shader_type(GLuint idx) { switch (idx) { @@ -3817,6 +3857,8 @@ piglit_display(void) active_uniform(rest); } else if (parse_str(line, "verify program_interface_query ", )) { active_program_interface(rest); + } else if (parse_str(line, "vertex attrib ", )) { + set_vertex_attrib(rest); } else if ((line[0] != '\n') && (line[0] != '\0') && (line[0] != '#')) { printf("unknown command \"%s\"\n", line); ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] arb_bindless_texture: add test where we pass a handle through a function
Can you please reference the spec as much as possible? See other ARB_bindless_texture if you need an example. More comments below. On 04/10/2018 12:32 PM, Karol Herbst wrote: currently fails in mesa with: ir_dereference_variable @ 0x1446830 specifies undeclared variable `wrongHandle' @ 0xffd1b0 Signed-off-by: Karol Herbst--- ...rithmetic-func-call-uvec2-texture2D.shader_test | 37 ++ 1 file changed, 37 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-func-call-uvec2-texture2D.shader_test diff --git a/tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-func-call-uvec2-texture2D.shader_test b/tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-func-call-uvec2-texture2D.shader_test new file mode 100644 index 0..fd488c7cd --- /dev/null +++ b/tests/spec/arb_bindless_texture/execution/samplers/basic-arithmetic-func-call-uvec2-texture2D.shader_test @@ -0,0 +1,37 @@ +# Same as basic-texture2D.shader_test, but with some math on the handle +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_bindless_texture + +[vertex shader passthrough] + +[fragment shader] +#version 330 +#extension GL_ARB_bindless_texture: require + +layout (bindless_sampler) uniform sampler2D tex; +uniform uvec2 handleOffset; + +out vec4 finalColor; + +sampler2D adjustSamplerHandle(sampler2D wrongHandle) Isn't required to use the "in" qualifier here? Also, this is a compiler test, so you don't need to write a .shader_test and you should put it in tests/spec/arb_bindless_texture/compiler Same comments apply to "arb_bindless_texture: add test for conversion of bounded sampler2D to uvec2". +{ + uvec2 handle = uvec2(wrongHandle); + handle.x -= 0x12345678u; + handle.y -= 0x9abcdef0u; + return sampler2D(handle + handleOffset); +} + +void main() +{ + finalColor = texture2D(adjustSamplerHandle(tex), vec2(0, 0)); +} + +[test] +texture rgbw 0 (16, 16) +resident texture 0 +uniform uvec2 handleOffset 0x12345678 0x9abcdef0 +uniform handle tex 0 +draw rect -1 -1 2 2 +relative probe rgb (0.0, 0.0) (1.0, 0.0, 0.0) ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] ARB_shader_atomic_counter_ops: fix glsl version
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 11/01/2017 11:25 PM, Timothy Arceri wrote: --- tests/spec/arb_shader_atomic_counter_ops/compiler/functions.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_shader_atomic_counter_ops/compiler/functions.frag b/tests/spec/arb_shader_atomic_counter_ops/compiler/functions.frag index b991fe1c7..637fafa62 100644 --- a/tests/spec/arb_shader_atomic_counter_ops/compiler/functions.frag +++ b/tests/spec/arb_shader_atomic_counter_ops/compiler/functions.frag @@ -1,20 +1,20 @@ /* [config] * expect_result: pass * glsl_version: 1.40 * require_extensions: GL_ARB_shader_atomic_counter_ops * [end config] * * Check that the builtin functions defined by the extension * are present. */ -#version 150 +#version 140 #extension GL_ARB_shader_atomic_counters: require #extension GL_ARB_shader_atomic_counter_ops: require layout (binding=0) uniform atomic_uint c; out uvec4 fcolor; uniform uint data, comp; void main() { fcolor.x = atomicCounterAddARB(c, data) + ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] compute: add more tests for verifying inter-shader derived values
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 10/23/2017 02:20 AM, Ilia Mirkin wrote: In this case, the derived values are used in a shader that doesn't contain the main function. Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> --- .../execution/separate-global-id-2.shader_test | 77 ++ .../execution/separate-global-id-2.shader_test | 55 2 files changed, 132 insertions(+) create mode 100644 tests/spec/arb_compute_shader/execution/separate-global-id-2.shader_test create mode 100644 tests/spec/arb_compute_variable_group_size/execution/separate-global-id-2.shader_test diff --git a/tests/spec/arb_compute_shader/execution/separate-global-id-2.shader_test b/tests/spec/arb_compute_shader/execution/separate-global-id-2.shader_test new file mode 100644 index 0..14231e405 --- /dev/null +++ b/tests/spec/arb_compute_shader/execution/separate-global-id-2.shader_test @@ -0,0 +1,77 @@ +# Simple test that verifies gl_GlobalInvocationID values are +# functioning. Atomic counters are used as outputs. +# +# The additional twist is that the work is done in a different shader, +# which also has the layout declaration. + +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_compute_shader +GL_ARB_shader_atomic_counters + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: enable + +void go(); + +// When the go() function gets moved here, the gl_WorkGroupSize can stay +// behind in the other shader. + +void main() { + go(); +} + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: enable +#extension GL_ARB_shader_atomic_counters: require + +layout(local_size_x = 4, local_size_y = 2, local_size_z = 4) in; + +layout(binding = 0) uniform atomic_uint a0; +layout(binding = 0) uniform atomic_uint a1; +layout(binding = 0) uniform atomic_uint a2; +layout(binding = 0) uniform atomic_uint a3; +layout(binding = 0) uniform atomic_uint a4; +layout(binding = 0) uniform atomic_uint a5; +layout(binding = 0) uniform atomic_uint a6; +layout(binding = 0) uniform atomic_uint a7; + +void go() +{ +uint x = gl_GlobalInvocationID.x; +uint y = gl_GlobalInvocationID.y; +uint z = gl_GlobalInvocationID.z; + +if (((x & y) & z) == 0u) +atomicCounterIncrement(a0); +if (((x | y) | z) == 7u) +atomicCounterIncrement(a1); +if (x == y && y == z) +atomicCounterIncrement(a2); +if (x != y && y != z && x != z) +atomicCounterIncrement(a3); +if (((x & y) & z) == 2u) +atomicCounterIncrement(a4); +if (((x | y) | z) == 5u) +atomicCounterIncrement(a5); +if (x < 4u && y < 4u && z < 4u) +atomicCounterIncrement(a6); +if (x >= 4u || y >= 4u || z >= 4u) +atomicCounterIncrement(a7); +} + +[test] +atomic counters 8 + +compute 2 4 2 +probe atomic counter 0 == 343 +probe atomic counter 1 == 343 +probe atomic counter 2 == 8 +probe atomic counter 3 == 336 +probe atomic counter 4 == 49 +probe atomic counter 5 == 49 +probe atomic counter 6 == 64 +probe atomic counter 7 == 448 diff --git a/tests/spec/arb_compute_variable_group_size/execution/separate-global-id-2.shader_test b/tests/spec/arb_compute_variable_group_size/execution/separate-global-id-2.shader_test new file mode 100644 index 0..abc390b08 --- /dev/null +++ b/tests/spec/arb_compute_variable_group_size/execution/separate-global-id-2.shader_test @@ -0,0 +1,55 @@ +# Simple test that verifies gl_GlobalInvocationID derived values are +# computed properly, even when the main shader has no size layout. + +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_compute_shader +GL_ARB_compute_variable_group_size +GL_ARB_shader_storage_buffer_object + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: require +#extension GL_ARB_shader_storage_buffer_object: require +#extension GL_ARB_compute_variable_group_size: require + +layout(local_size_variable) in; + +layout(std430) +buffer SSBO { + uvec2 id[4]; +}; + +void go() { + uint g = gl_GlobalInvocationID.x; + uint l = gl_LocalInvocationID.x; + id[g] = uvec2(g, l); +} + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: require + +// no mention of variable group size in this shader + +void go(); + +void main() +{ + go(); +} + +[test] +ssbo 0 32 + +compute group size 2 1 1 2 1 1 + +probe ssbo uint 0 0 == 0 +probe ssbo uint 0 4 == 0 +probe ssbo uint 0 8 == 1 +probe ssbo uint 0 12 == 1 +probe ssbo uint 0 16 == 2 +probe ssbo uint 0 20 == 0 +probe ssbo uint 0 24 == 3 +probe ssbo uint 0 28 == 1 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] arb_compute_variable_group_size: ensure local size works with fixed
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 10/23/2017 12:12 AM, Ilia Mirkin wrote: The new gl_LocalGroupSizeARB variable is meant to work with fixed sizes as well. Test it. Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> --- .../execution/fixed-local-size.shader_test | 32 ++ 1 file changed, 32 insertions(+) create mode 100644 tests/spec/arb_compute_variable_group_size/execution/fixed-local-size.shader_test diff --git a/tests/spec/arb_compute_variable_group_size/execution/fixed-local-size.shader_test b/tests/spec/arb_compute_variable_group_size/execution/fixed-local-size.shader_test new file mode 100644 index 0..6d92aeaad --- /dev/null +++ b/tests/spec/arb_compute_variable_group_size/execution/fixed-local-size.shader_test @@ -0,0 +1,32 @@ +# Simple test that verifies gl_LocalGroupSizeARB values are +# functioning. Atomic counters are used as outputs. + +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_compute_variable_group_size +GL_ARB_shader_atomic_counters + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: enable +#extension GL_ARB_compute_variable_group_size: enable +#extension GL_ARB_shader_atomic_counters: require + +layout(binding = 0) uniform atomic_uint a; + +layout(local_size_x = 8, local_size_y = 4, local_size_z = 2) in; + +void main() +{ + if (gl_LocalGroupSizeARB.x == 8u && + gl_LocalGroupSizeARB.y == 4u && + gl_LocalGroupSizeARB.z == 2u) + atomicCounterIncrement(a); +} + +[test] +atomic counters 1 + +compute 1 1 1 +probe atomic counter 0 == 64 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] compute: add test variants for local_size decls in other shaders
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 10/22/2017 11:58 PM, Ilia Mirkin wrote: Only one shader is required to have a local_size layout, and it's not required to be the one with the main function. Add tests which verify that these derived values are properly computed in such a circumstance. Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> --- .../execution/separate-global-id.shader_test | 68 ++ .../execution/separate-global-id.shader_test | 49 2 files changed, 117 insertions(+) create mode 100644 tests/spec/arb_compute_shader/execution/separate-global-id.shader_test create mode 100644 tests/spec/arb_compute_variable_group_size/execution/separate-global-id.shader_test diff --git a/tests/spec/arb_compute_shader/execution/separate-global-id.shader_test b/tests/spec/arb_compute_shader/execution/separate-global-id.shader_test new file mode 100644 index 0..3352f1d81 --- /dev/null +++ b/tests/spec/arb_compute_shader/execution/separate-global-id.shader_test @@ -0,0 +1,68 @@ +# Simple test that verifies gl_GlobalInvocationID values are +# functioning. Atomic counters are used as outputs. +# +# The additional twist is that the layout (and thus gl_WorkGroupSize) +# is declared in a different shader. + +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_compute_shader +GL_ARB_shader_atomic_counters + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: enable + +layout(local_size_x = 4, local_size_y = 2, local_size_z = 4) in; + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: enable +#extension GL_ARB_shader_atomic_counters: require + +layout(binding = 0) uniform atomic_uint a0; +layout(binding = 0) uniform atomic_uint a1; +layout(binding = 0) uniform atomic_uint a2; +layout(binding = 0) uniform atomic_uint a3; +layout(binding = 0) uniform atomic_uint a4; +layout(binding = 0) uniform atomic_uint a5; +layout(binding = 0) uniform atomic_uint a6; +layout(binding = 0) uniform atomic_uint a7; + +void main() +{ +uint x = gl_GlobalInvocationID.x; +uint y = gl_GlobalInvocationID.y; +uint z = gl_GlobalInvocationID.z; + +if (((x & y) & z) == 0u) +atomicCounterIncrement(a0); +if (((x | y) | z) == 7u) +atomicCounterIncrement(a1); +if (x == y && y == z) +atomicCounterIncrement(a2); +if (x != y && y != z && x != z) +atomicCounterIncrement(a3); +if (((x & y) & z) == 2u) +atomicCounterIncrement(a4); +if (((x | y) | z) == 5u) +atomicCounterIncrement(a5); +if (x < 4u && y < 4u && z < 4u) +atomicCounterIncrement(a6); +if (x >= 4u || y >= 4u || z >= 4u) +atomicCounterIncrement(a7); +} + +[test] +atomic counters 8 + +compute 2 4 2 +probe atomic counter 0 == 343 +probe atomic counter 1 == 343 +probe atomic counter 2 == 8 +probe atomic counter 3 == 336 +probe atomic counter 4 == 49 +probe atomic counter 5 == 49 +probe atomic counter 6 == 64 +probe atomic counter 7 == 448 diff --git a/tests/spec/arb_compute_variable_group_size/execution/separate-global-id.shader_test b/tests/spec/arb_compute_variable_group_size/execution/separate-global-id.shader_test new file mode 100644 index 0..434eecf6a --- /dev/null +++ b/tests/spec/arb_compute_variable_group_size/execution/separate-global-id.shader_test @@ -0,0 +1,49 @@ +# Simple test that verifies gl_GlobalInvocationID derived values are +# computed properly. + +[require] +GL >= 3.3 +GLSL >= 3.30 +GL_ARB_compute_shader +GL_ARB_compute_variable_group_size +GL_ARB_shader_storage_buffer_object + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: require +#extension GL_ARB_compute_variable_group_size: require + +layout(local_size_variable) in; + +[compute shader] +#version 330 +#extension GL_ARB_compute_shader: require +#extension GL_ARB_shader_storage_buffer_object: require + +// no mention of variable group size in this shader + +layout(std430) +buffer SSBO { + uvec2 id[4]; +}; + +void main() +{ + uint g = gl_GlobalInvocationID.x; + uint l = gl_LocalInvocationID.x; + id[g] = uvec2(g, l); +} + +[test] +ssbo 0 32 + +compute group size 2 1 1 2 1 1 + +probe ssbo uint 0 0 == 0 +probe ssbo uint 0 4 == 0 +probe ssbo uint 0 8 == 1 +probe ssbo uint 0 12 == 1 +probe ssbo uint 0 16 == 2 +probe ssbo uint 0 20 == 0 +probe ssbo uint 0 24 == 3 +probe ssbo uint 0 28 == 1 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] draw-pixels: fix KHR_no_error logic
On 08/25/2017 06:08 AM, Timothy Arceri wrote: On 23/08/17 17:23, Samuel Pitoiset wrote: On 08/23/2017 06:11 AM, Timothy Arceri wrote: --- This was my fault. The flaw was in my suggestion from the code review. You probably need to use PIGLIT_HAS_ERRORS as well. I don't think so. This skips testing draws with invalid types, the test ran fine for me with this change. You are right, I misread the patch. Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> tests/general/draw-pixels.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index 40b4c0b0f..333bb7f86 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -730,22 +730,24 @@ piglit_display(void) glPixelStorei(GL_UNPACK_ALIGNMENT, 1); for (i = 0; i < ARRAY_SIZE(data_types); i++) { for (k = 0; k < ARRAY_SIZE(pixel_ops); k++) { for (j = 0; j < ARRAY_SIZE(pixel_formats); j++) { format = pixel_formats[j]; type = data_types[i]; - if (!piglit_khr_no_error && - is_format_type_mismatch(format, type)) { + if (is_format_type_mismatch(format, type)) { + if (piglit_khr_no_error) + continue; + glDrawPixels(piglit_width, piglit_height, format, type, pixels); /* Here GL_INVALID_OPERATION is an * expected GL error */ pass = piglit_check_gl_error( GL_INVALID_OPERATION) && pass; continue; } ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] draw-pixels: fix KHR_no_error logic
On 08/23/2017 06:11 AM, Timothy Arceri wrote: --- This was my fault. The flaw was in my suggestion from the code review. You probably need to use PIGLIT_HAS_ERRORS as well. tests/general/draw-pixels.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index 40b4c0b0f..333bb7f86 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -730,22 +730,24 @@ piglit_display(void) glPixelStorei(GL_UNPACK_ALIGNMENT, 1); for (i = 0; i < ARRAY_SIZE(data_types); i++) { for (k = 0; k < ARRAY_SIZE(pixel_ops); k++) { for (j = 0; j < ARRAY_SIZE(pixel_formats); j++) { format = pixel_formats[j]; type = data_types[i]; -if (!piglit_khr_no_error && - is_format_type_mismatch(format, type)) { + if (is_format_type_mismatch(format, type)) { + if (piglit_khr_no_error) + continue; + glDrawPixels(piglit_width, piglit_height, format, type, pixels); /* Here GL_INVALID_OPERATION is an * expected GL error */ pass = piglit_check_gl_error( GL_INVALID_OPERATION) && pass; continue; } ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 50/50] general: add missing KHR_no_error status
On 08/22/2017 06:45 AM, Timothy Arceri wrote: On 11/08/17 01:22, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/general/draw-pixels.c | 2 ++ tests/general/geterror-inside-begin.c | 2 ++ tests/general/geterror-invalid-enum.c | 2 ++ tests/general/masked-clear.c | 1 + tests/general/roundmode-pixelstore.c | 10 +++--- tests/general/select.c | 2 ++ tests/general/tex-errors.c | 2 ++ tests/general/texunits.c | 24 ++-- 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index 65f512266..a6c06c4d9 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -57,6 +57,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; I think you should just add a !piglit_khr_no_error to the is_format_type_mismatch(format, type) test rather than skipping the whole thing. Yeah, thanks for the review. :) With that 46-50 are: Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 44/50] gl-2.0: set KHR_no_error status
On 08/22/2017 02:15 AM, Timothy Arceri wrote: On 11/08/17 01:22, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/gl-2.0/api/active-sampler-conflict.c | 1 + tests/spec/gl-2.0/api/clip-flag-behavior.c | 33 ++--- You missed: getattriblocation-conventional.c attrib-assignments.c There are also some more that need to be updated in the parent dir: tests/spec/gl-2.0/ Right, fixed! 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/tests/spec/gl-2.0/api/active-sampler-conflict.c b/tests/spec/gl-2.0/api/active-sampler-conflict.c index 74aed3689..848122ace 100644 --- a/tests/spec/gl-2.0/api/active-sampler-conflict.c +++ b/tests/spec/gl-2.0/api/active-sampler-conflict.c @@ -61,6 +61,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 25d7b4efd..c0e031e97 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -146,25 +147,27 @@ piglit_init(int argc, char **argv) pass = check_enable_state(enum_name, enum_value, false) && pass; } - /* Check behavior of GL_CLIP_PLANE0 + n where n == max_clip_planes */ - enum_value = GL_CLIP_PLANE0 + max_clip_planes; - sprintf(enum_name, "GL_CLIP_PLANE0 + %d", max_clip_planes); + if (!piglit_khr_no_error) { + /* Check behavior of GL_CLIP_PLANE0 + n where n == max_clip_planes */ + enum_value = GL_CLIP_PLANE0 + max_clip_planes; + sprintf(enum_name, "GL_CLIP_PLANE0 + %d", max_clip_planes); - printf("Trying glIsEnabled(%s): ", enum_name); - b = glIsEnabled(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glIsEnabled(%s): ", enum_name); + b = glIsEnabled(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glGetBooleanv(%s): ", enum_name); - glGetBooleanv(enum_value, ); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glGetBooleanv(%s): ", enum_name); + glGetBooleanv(enum_value, ); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glEnable(%s): ", enum_name); - glEnable(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glEnable(%s): ", enum_name); + glEnable(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glDisable(%s): ", enum_name); - glDisable(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glDisable(%s): ", enum_name); + glDisable(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 42/50] arb_texture_view: set KHR_no_error status
On 08/22/2017 02:06 AM, Timothy Arceri wrote: On 11/08/17 01:22, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_view/clear-into-view-2d-array.c | 1 + tests/spec/arb_texture_view/clear-into-view-2d.c | 1 + tests/spec/arb_texture_view/clear-into-view-layered.c | 1 + tests/spec/arb_texture_view/copytexsubimage-layers.c | 1 + tests/spec/arb_texture_view/cubemap-view.c | 1 + tests/spec/arb_texture_view/formats.c | 12 tests/spec/arb_texture_view/getteximage-srgb.c | 1 + tests/spec/arb_texture_view/max-level.c | 1 + tests/spec/arb_texture_view/mipgen.c | 2 ++ tests/spec/arb_texture_view/params.c | 1 + tests/spec/arb_texture_view/queries.c | 1 + tests/spec/arb_texture_view/rendering-formats.c | 1 + tests/spec/arb_texture_view/rendering-r32ui.c | 1 + tests/spec/arb_texture_view/rendering_layers.c | 1 + tests/spec/arb_texture_view/rendering_levels.c | 1 + tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c | 1 + .../arb_texture_view/sampling-2d-array-as-cubemap-array.c | 1 + tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c | 1 + tests/spec/arb_texture_view/targets.c | 1 + tests/spec/arb_texture_view/texsubimage-layers.c | 1 + tests/spec/arb_texture_view/texsubimage-levels.c | 1 + tests/spec/arb_texture_view/texture-immutable-levels.c | 1 + 22 files changed, 30 insertions(+), 4 deletions(-) diff --git a/tests/spec/arb_texture_view/clear-into-view-2d-array.c b/tests/spec/arb_texture_view/clear-into-view-2d-array.c index 7f3a5bf36..4ab68b1c5 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d-array.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d-array.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/clear-into-view-2d.c b/tests/spec/arb_texture_view/clear-into-view-2d.c index b211386f7..cdb605972 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/clear-into-view-layered.c b/tests/spec/arb_texture_view/clear-into-view-layered.c index d6405f221..b134d7d44 100644 --- a/tests/spec/arb_texture_view/clear-into-view-layered.c +++ b/tests/spec/arb_texture_view/clear-into-view-layered.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; /* for layered rendering */ config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/copytexsubimage-layers.c b/tests/spec/arb_texture_view/copytexsubimage-layers.c index 19f8b28f8..7d374fc0e 100644 --- a/tests/spec/arb_texture_view/copytexsubimage-layers.c +++ b/tests/spec/arb_texture_view/copytexsubimage-layers.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/cubemap-view.c b/tests/spec/arb_texture_view/cubemap-view.c index 1a2e44460..96372062c 100644 --- a/tests/spec/arb_texture_view/cubemap-view.c +++ b/tests/spec/arb_texture_view/cubemap-view.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/formats.c b/tests/spec/arb_texture_view/formats.c index 1db244523..56415db52 100644 --- a/tests/spec/arb_texture_view/formats.c +++ b/tests/spec/arb_texture_view/formats.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -306,10 +307,13 @@ test_format_errors(GLenum format_class) pass = check_format_array(GL_NO_ERROR, numFormats, legalF
Re: [Piglit] [PATCH 33/50] arb_occlusion_query2: set KHR_no_error status
On 08/21/2017 09:38 AM, Timothy Arceri wrote: On 11/08/17 01:22, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_occlusion_query2/api.c| 34 +--- tests/spec/arb_occlusion_query2/render.c | 1 + 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/spec/arb_occlusion_query2/api.c b/tests/spec/arb_occlusion_query2/api.c index 429b6b3f8..2ba6877a3 100644 --- a/tests/spec/arb_occlusion_query2/api.c +++ b/tests/spec/arb_occlusion_query2/api.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = (PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH); +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -52,10 +53,14 @@ test_error_begin_while_other_active(void) glBeginQuery(GL_SAMPLES_PASSED, oq[0]); if (!piglit_check_gl_error(0)) pass = false; -glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]); -if (!piglit_check_gl_error(GL_INVALID_OPERATION)) -pass = false; -glEndQuery(GL_ANY_SAMPLES_PASSED); + +if (!piglit_khr_no_error) { +glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]); +if (!piglit_check_gl_error(GL_INVALID_OPERATION)) +pass = false; +glEndQuery(GL_ANY_SAMPLES_PASSED); +} + You can drop this change. glEndQuery(GL_SAMPLES_PASSED); piglit_reset_gl_error(); @@ -66,10 +71,14 @@ test_error_begin_while_other_active(void) glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[0]); if (!piglit_check_gl_error(0)) pass = false; -glBeginQuery(GL_SAMPLES_PASSED, oq[1]); -if (!piglit_check_gl_error(GL_INVALID_OPERATION)) -pass = false; -glEndQuery(GL_SAMPLES_PASSED); + +if (!piglit_khr_no_error) { +glBeginQuery(GL_SAMPLES_PASSED, oq[1]); +if (!piglit_check_gl_error(GL_INVALID_OPERATION)) +pass = false; +glEndQuery(GL_SAMPLES_PASSED); +} + And this change. glEndQuery(GL_ANY_SAMPLES_PASSED); piglit_reset_gl_error(); @@ -269,9 +278,12 @@ piglit_display(void) pass = test_counter_bits() && pass; pass = test_current_query() && pass; -pass = test_error_begin_wrong_target() && pass; -pass = test_error_end_wrong_target() && pass; -pass = test_error_begin_while_other_active() && pass; + +if (!piglit_khr_no_error) { +pass = test_error_begin_wrong_target() && pass; +pass = test_error_end_wrong_target() && pass; +pass = test_error_begin_while_other_active() && pass; Because you are skipping calling the function here. With that change: Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> Right, fixed locally. Thanks! +} piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); diff --git a/tests/spec/arb_occlusion_query2/render.c b/tests/spec/arb_occlusion_query2/render.c index 2d593fbfe..14eabdd44 100644 --- a/tests/spec/arb_occlusion_query2/render.c +++ b/tests/spec/arb_occlusion_query2/render.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] glsl-4.50: add test that makes sure extra semicolons are forbidden
Only allowed with GLSL 4.60. Cc: Ilia Mirkin <imir...@alum.mit.edu> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../glsl-4.50/compiler/extra-semilons-at-global-scope.frag | 12 1 file changed, 12 insertions(+) create mode 100644 tests/spec/glsl-4.50/compiler/extra-semilons-at-global-scope.frag diff --git a/tests/spec/glsl-4.50/compiler/extra-semilons-at-global-scope.frag b/tests/spec/glsl-4.50/compiler/extra-semilons-at-global-scope.frag new file mode 100644 index 0..29b0e1cb5 --- /dev/null +++ b/tests/spec/glsl-4.50/compiler/extra-semilons-at-global-scope.frag @@ -0,0 +1,12 @@ +// [config] +// expect_result: fail +// glsl_version: 4.50 +// [end config] + +#version 450 + +uniform int i;; + +void main() +{ +} -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 2/2] glsl-4.60: add a test that allows extra semicolons at global scope
On 08/10/2017 07:04 PM, Ilia Mirkin wrote: And an identical test to make sure it's disallowed at earlier GLSL versions? I see no such test already. I can do that yeah. On Thu, Aug 10, 2017 at 12:44 PM, Samuel Pitoiset <samuel.pitoi...@gmail.com> wrote: Cc: Ian Romanick <ian.d.roman...@intel.com> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../compiler/extra-semilons-at-global-scope.frag| 17 + 1 file changed, 17 insertions(+) create mode 100644 tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag diff --git a/tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag b/tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag new file mode 100644 index 0..9da6ade08 --- /dev/null +++ b/tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag @@ -0,0 +1,17 @@ +// [config] +// expect_result: pass +// glsl_version: 4.60 +// [end config] + +#version 460 + +// From the GLSL 4.60 spec, section 1.2.1 (Summary of Changes from Revision 7 +// of GLSL Version 4.50): +// +// "Private Bug 16070: Allow extra semi-colons at global scope" + +uniform int i;; + +void main() +{ +} -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 2/2] glsl-4.60: add a test that allows extra semicolons at global scope
Cc: Ian Romanick <ian.d.roman...@intel.com> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../compiler/extra-semilons-at-global-scope.frag| 17 + 1 file changed, 17 insertions(+) create mode 100644 tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag diff --git a/tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag b/tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag new file mode 100644 index 0..9da6ade08 --- /dev/null +++ b/tests/spec/glsl-4.60/compiler/extra-semilons-at-global-scope.frag @@ -0,0 +1,17 @@ +// [config] +// expect_result: pass +// glsl_version: 4.60 +// [end config] + +#version 460 + +// From the GLSL 4.60 spec, section 1.2.1 (Summary of Changes from Revision 7 +// of GLSL Version 4.50): +// +// "Private Bug 16070: Allow extra semi-colons at global scope" + +uniform int i;; + +void main() +{ +} -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 47/50] gl-3.2: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/gl-3.2/adj-prims.c | 1 + tests/spec/gl-3.2/basevertex-vertexid.c | 1 + tests/spec/gl-3.2/clear-no-buffers.c | 1 + tests/spec/gl-3.2/depth-tex-sampling.c| 11 +++ tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c | 1 + tests/spec/gl-3.2/get-buffer-parameter-i64v.c | 1 + tests/spec/gl-3.2/get-integer-64iv.c | 1 + tests/spec/gl-3.2/get-integer-64v.c | 1 + .../gl-coord-replace-doesnt-eliminate-frag-tex-coords.c | 2 ++ tests/spec/gl-3.2/glsl-resource-not-bound.c | 2 ++ tests/spec/gl-3.2/minmax.c| 1 + tests/spec/gl-3.2/pointsprite-coord.c | 1 + tests/spec/gl-3.2/pointsprite-origin.c| 1 + tests/spec/gl-3.2/texture-border-deprecated.c | 1 + 14 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tests/spec/gl-3.2/adj-prims.c b/tests/spec/gl-3.2/adj-prims.c index 9d2f121f2..794ab3dc9 100644 --- a/tests/spec/gl-3.2/adj-prims.c +++ b/tests/spec/gl-3.2/adj-prims.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_height = 200; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.2/basevertex-vertexid.c b/tests/spec/gl-3.2/basevertex-vertexid.c index 90b8f02ca..9094800f1 100644 --- a/tests/spec/gl-3.2/basevertex-vertexid.c +++ b/tests/spec/gl-3.2/basevertex-vertexid.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.2/clear-no-buffers.c b/tests/spec/gl-3.2/clear-no-buffers.c index 0d6718acb..29f384e7e 100644 --- a/tests/spec/gl-3.2/clear-no-buffers.c +++ b/tests/spec/gl-3.2/clear-no-buffers.c @@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.2/depth-tex-sampling.c b/tests/spec/gl-3.2/depth-tex-sampling.c index c41f1769a..a74f600df 100644 --- a/tests/spec/gl-3.2/depth-tex-sampling.c +++ b/tests/spec/gl-3.2/depth-tex-sampling.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -77,10 +78,12 @@ make_depth_texture(void) piglit_report_result(PIGLIT_FAIL); } - /* this call should generate an error in the core profile */ - glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY); - if (!piglit_check_gl_error(GL_INVALID_ENUM)) { - piglit_report_result(PIGLIT_FAIL); + if (!piglit_khr_no_error) { + /* this call should generate an error in the core profile */ + glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY); + if (!piglit_check_gl_error(GL_INVALID_ENUM)) { + piglit_report_result(PIGLIT_FAIL); + } } return tex; diff --git a/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c b/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c index 7c247ba1d..b523b6ae4 100644 --- a/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c +++ b/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c @@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.2/get-buffer-parameter-i64v.c b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c index 70ac18905..e7c79e9dc 100644 --- a/tests/spec/gl-3.2/get-buffer-parameter-i64v.c +++ b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.supports_gl_compat_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.2/get-integer-64iv.c b/tests/spec/gl-3.2/get-integer-64iv.c index 4b994f9e6..6a07e9802 100644 --- a/tests/spec/gl-3.2/get-integer-64iv.c +++ b
[Piglit] [PATCH 48/50] gl-3.3: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/gl-3.3/minmax.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/gl-3.3/minmax.c b/tests/spec/gl-3.3/minmax.c index 964e49964..2eae411b5 100644 --- a/tests/spec/gl-3.3/minmax.c +++ b/tests/spec/gl-3.3/minmax.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 33; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 43/50] arb_vertex_attrib_64bit: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../execution/check-explicit-location.c| 2 ++ .../execution/double_attribs.c | 22 +- .../execution/getactiveattrib.c| 1 + .../execution/max-vertex-attrib.c | 1 + .../execution/overlapping-locations.c | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c b/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c index 509f60bc3..860fc6cdb 100644 --- a/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c +++ b/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c @@ -39,6 +39,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END const char *vs_text = diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c b/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c index afde27001..fc3f9eb57 100644 --- a/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c +++ b/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c @@ -36,6 +36,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const char *TestName = "double_attribs"; @@ -217,15 +219,17 @@ test_attrib_array(void) } } - for (i = 0; i < ARRAY_SIZE(badTypes); i++) { - glVertexAttribLPointer(index, size, badTypes[i], stride, data); - err = glGetError(); - if (err != GL_INVALID_ENUM) { - fprintf(stderr, - "%s: glVertexAttribLPointer(type=0x%x) failed to generate " - "GL_INVALID_ENUM\n", - TestName, badTypes[i]); - return GL_FALSE; + if (!piglit_khr_no_error) { + for (i = 0; i < ARRAY_SIZE(badTypes); i++) { + glVertexAttribLPointer(index, size, badTypes[i], stride, data); + err = glGetError(); + if (err != GL_INVALID_ENUM) { +fprintf(stderr, +"%s: glVertexAttribLPointer(type=0x%x) failed to generate " +"GL_INVALID_ENUM\n", +TestName, badTypes[i]); +return GL_FALSE; + } } } diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c b/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c index 4b2241cc5..fd4454a30 100644 --- a/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c +++ b/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END struct attribute { diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c b/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c index 8da82388e..bd88227a5 100644 --- a/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c +++ b/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END static int test = 0; diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c b/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c index 05936f3de..cb367b946 100644 --- a/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c +++ b/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c @@ -52,6 +52,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 128; config.window_height = 128; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static bool locations_in_shader; -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 50/50] general: add missing KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/general/draw-pixels.c | 2 ++ tests/general/geterror-inside-begin.c | 2 ++ tests/general/geterror-invalid-enum.c | 2 ++ tests/general/masked-clear.c | 1 + tests/general/roundmode-pixelstore.c | 10 +++--- tests/general/select.c| 2 ++ tests/general/tex-errors.c| 2 ++ tests/general/texunits.c | 24 ++-- 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index 65f512266..a6c06c4d9 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -57,6 +57,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END const GLuint idx0 = 0, idx1 = 1, idx2 = 2, idx3 = 3; diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c index 1d59a2336..5efba2962 100644 --- a/tests/general/geterror-inside-begin.c +++ b/tests/general/geterror-inside-begin.c @@ -41,6 +41,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c index 143c7c420..f0d65c9ab 100644 --- a/tests/general/geterror-invalid-enum.c +++ b/tests/general/geterror-invalid-enum.c @@ -28,6 +28,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/general/masked-clear.c b/tests/general/masked-clear.c index e205fa961..d7c496536 100644 --- a/tests/general/masked-clear.c +++ b/tests/general/masked-clear.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DOUBLE); config.requires_displayed_window = true; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c index 9284f4354..8a029b257 100644 --- a/tests/general/roundmode-pixelstore.c +++ b/tests/general/roundmode-pixelstore.c @@ -46,6 +46,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result @@ -90,9 +92,11 @@ piglit_init(int argc, char **argv) pass = test(-0.1, 0) && pass; pass = piglit_check_gl_error(GL_NO_ERROR) && pass; - printf("Setting row length -0.9, and expecting error\n"); - glPixelStoref(GL_UNPACK_ROW_LENGTH, -0.9); - pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + if (!piglit_khr_no_error) { + printf("Setting row length -0.9, and expecting error\n"); + glPixelStoref(GL_UNPACK_ROW_LENGTH, -0.9); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } diff --git a/tests/general/select.c b/tests/general/select.c index 879a1e9c1..c71fe2041 100644 --- a/tests/general/select.c +++ b/tests/general/select.c @@ -39,6 +39,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END GLuint ReferenceHitEntries[3][64]; diff --git a/tests/general/tex-errors.c b/tests/general/tex-errors.c index c63007a0e..211bed812 100644 --- a/tests/general/tex-errors.c +++ b/tests/general/tex-errors.c @@ -36,6 +36,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END void diff --git a/tests/general/texunits.c b/tests/general/texunits.c index d0cbbb3d1..b68dcf71c 100644 --- a/tests/general/texunits.c +++ b/tests/general/texunits.c @@ -36,6 +36,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END #define MAX_UNITS 256 @@ -144,8 +146,8 @@ test_rasterpos(void) return GL_FALSE; } - /* this should generate an error */ - { + if (!piglit_khr_no_error) { + /* this should generate an error */ GLfloat v[4];
[Piglit] [PATCH 49/50] gl-4.5: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c | 2 ++ tests/spec/gl-4.5/named-framebuffer-draw-buffers-errors.c | 2 ++ tests/spec/gl-4.5/named-framebuffer-read-buffer-errors.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c b/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c index a5985bfcd..10c9eb907 100644 --- a/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c +++ b/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c @@ -75,6 +75,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END /* diff --git a/tests/spec/gl-4.5/named-framebuffer-draw-buffers-errors.c b/tests/spec/gl-4.5/named-framebuffer-draw-buffers-errors.c index 8bfb57285..b6ed58a79 100644 --- a/tests/spec/gl-4.5/named-framebuffer-draw-buffers-errors.c +++ b/tests/spec/gl-4.5/named-framebuffer-draw-buffers-errors.c @@ -60,6 +60,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END /* diff --git a/tests/spec/gl-4.5/named-framebuffer-read-buffer-errors.c b/tests/spec/gl-4.5/named-framebuffer-read-buffer-errors.c index 173f5197c..433cfac3a 100644 --- a/tests/spec/gl-4.5/named-framebuffer-read-buffer-errors.c +++ b/tests/spec/gl-4.5/named-framebuffer-read-buffer-errors.c @@ -59,6 +59,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const GLenum table_17_4[] = { -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 46/50] gl-3.1: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/gl-3.1/default-vao.c | 1 + tests/spec/gl-3.1/draw-buffers-errors.c | 1 + tests/spec/gl-3.1/enable-vertex-array.c | 16 ++-- tests/spec/gl-3.1/genned-names.c | 1 + tests/spec/gl-3.1/glsl-link-empty-prog.c | 2 ++ tests/spec/gl-3.1/minmax.c| 1 + tests/spec/gl-3.1/mixed-int-float-fbo.c | 1 + tests/spec/gl-3.1/primitive-restart-xfb.c | 1 + tests/spec/gl-3.1/vao-broken-attrib.c | 1 + 9 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/spec/gl-3.1/default-vao.c b/tests/spec/gl-3.1/default-vao.c index 95c7322d9..16cd8e1c4 100644 --- a/tests/spec/gl-3.1/default-vao.c +++ b/tests/spec/gl-3.1/default-vao.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END void diff --git a/tests/spec/gl-3.1/draw-buffers-errors.c b/tests/spec/gl-3.1/draw-buffers-errors.c index bab644d75..90e60446c 100644 --- a/tests/spec/gl-3.1/draw-buffers-errors.c +++ b/tests/spec/gl-3.1/draw-buffers-errors.c @@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.1/enable-vertex-array.c b/tests/spec/gl-3.1/enable-vertex-array.c index dc95c980c..034114bd5 100644 --- a/tests/spec/gl-3.1/enable-vertex-array.c +++ b/tests/spec/gl-3.1/enable-vertex-array.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -133,13 +134,16 @@ piglit_display(void) glBindVertexArray(triangle_fan_vao); - // This call should be illegal and raise an error with core profile. - // If it actually works, it may trigger a failed assertion in Mesa. - glEnable(GL_VERTEX_ARRAY); + if (!piglit_khr_no_error) { + // This call should be illegal and raise an error with core + // profile. If it actually works, it may trigger a failed + // assertion in Mesa. + glEnable(GL_VERTEX_ARRAY); - if (!piglit_check_gl_error(GL_INVALID_ENUM)) { - printf("Failed to detect invalid glEnable(GL_VERTEX_ARRAY)\n"); - pass = false; + if (!piglit_check_gl_error(GL_INVALID_ENUM)) { + printf("Failed to detect invalid glEnable(GL_VERTEX_ARRAY)\n"); + pass = false; + } } // This is the correct call to use: diff --git a/tests/spec/gl-3.1/genned-names.c b/tests/spec/gl-3.1/genned-names.c index f484997b0..3e04deae1 100644 --- a/tests/spec/gl-3.1/genned-names.c +++ b/tests/spec/gl-3.1/genned-names.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 0; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.1/glsl-link-empty-prog.c b/tests/spec/gl-3.1/glsl-link-empty-prog.c index 1f3f9bb91..7d828e995 100644 --- a/tests/spec/gl-3.1/glsl-link-empty-prog.c +++ b/tests/spec/gl-3.1/glsl-link-empty-prog.c @@ -38,6 +38,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END void diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c index f1445c206..c07792f1b 100644 --- a/tests/spec/gl-3.1/minmax.c +++ b/tests/spec/gl-3.1/minmax.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.1/mixed-int-float-fbo.c b/tests/spec/gl-3.1/mixed-int-float-fbo.c index 53d8b555b..d2d7aeb65 100644 --- a/tests/spec/gl-3.1/mixed-int-float-fbo.c +++ b/tests/spec/gl-3.1/mixed-int-float-fbo.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const char *vs_text = diff --git a/tests/spec/gl-3.1/primitive-restart-xfb.c b/tests/spec/gl-3.1/primitive-restart-xfb.c index f9cbe3e52..e700142cb 100644 --- a/tests/spec/gl-3.1/primitive-restart-xfb.c +++ b/t
[Piglit] [PATCH 38/50] arb_sync: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_sync/ClientWaitSync-errors.c | 1 + tests/spec/arb_sync/ClientWaitSync-timeout.c | 1 + tests/spec/arb_sync/DeleteSync.c | 9 ++--- tests/spec/arb_sync/FenceSync-errors.c | 1 + tests/spec/arb_sync/GetSynciv-errors.c | 1 + tests/spec/arb_sync/IsSync.c | 1 + tests/spec/arb_sync/WaitSync-errors.c| 1 + tests/spec/arb_sync/repeat-wait.c| 1 + tests/spec/arb_sync/sync-initialize.c| 1 + tests/spec/arb_sync/timeout-zero.c | 1 + 10 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/spec/arb_sync/ClientWaitSync-errors.c b/tests/spec/arb_sync/ClientWaitSync-errors.c index add5af340..5f31098c6 100644 --- a/tests/spec/arb_sync/ClientWaitSync-errors.c +++ b/tests/spec/arb_sync/ClientWaitSync-errors.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/ClientWaitSync-timeout.c b/tests/spec/arb_sync/ClientWaitSync-timeout.c index 4030a3fcc..41866fa67 100644 --- a/tests/spec/arb_sync/ClientWaitSync-timeout.c +++ b/tests/spec/arb_sync/ClientWaitSync-timeout.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/DeleteSync.c b/tests/spec/arb_sync/DeleteSync.c index 02ad0c3d2..d9cd49643 100644 --- a/tests/spec/arb_sync/DeleteSync.c +++ b/tests/spec/arb_sync/DeleteSync.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -71,9 +72,11 @@ piglit_init(int argc, char **argv) /* Check if sync was deleted */ pass = !glIsSync(sync) && pass; - /* Test for unsuccessful function calls */ - glDeleteSync(invalid); - pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + if (!piglit_khr_no_error) { + /* Test for unsuccessful function calls */ + glDeleteSync(invalid); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } diff --git a/tests/spec/arb_sync/FenceSync-errors.c b/tests/spec/arb_sync/FenceSync-errors.c index c7addc175..ab8e797d6 100644 --- a/tests/spec/arb_sync/FenceSync-errors.c +++ b/tests/spec/arb_sync/FenceSync-errors.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/GetSynciv-errors.c b/tests/spec/arb_sync/GetSynciv-errors.c index c75c08628..5a507f523 100644 --- a/tests/spec/arb_sync/GetSynciv-errors.c +++ b/tests/spec/arb_sync/GetSynciv-errors.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/IsSync.c b/tests/spec/arb_sync/IsSync.c index fa8eb61c9..61292b7f5 100644 --- a/tests/spec/arb_sync/IsSync.c +++ b/tests/spec/arb_sync/IsSync.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/WaitSync-errors.c b/tests/spec/arb_sync/WaitSync-errors.c index b5bbb2c19..86a78 100644 --- a/tests/spec/arb_sync/WaitSync-errors.c +++ b/tests/spec/arb_sync/WaitSync-errors.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/repeat-wait.c b/tests/spec/arb_sync/repeat-wait.c index ac653bbc6..6580bef3a 100644 --- a/tests/spec/arb_sync/repeat-wait.c +++ b/tests/spec/arb_sync/repeat-wait.c @@ -50,6 +50,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 10; config.window_height = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_sync/sync-initialize.c b/tests/spec/arb_sync/sync-initialize.c index 65646bb5e..a18a86696 100644
[Piglit] [PATCH 35/50] arb_provoking_vertex: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_provoking_vertex/provoking-vertex-control.c | 1 + tests/spec/arb_provoking_vertex/provoking-vertex-initial.c | 1 + tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c | 1 + tests/spec/arb_provoking_vertex/render.c| 1 + tests/spec/arb_provoking_vertex/xfb-before-flatshading.c| 1 + 5 files changed, 5 insertions(+) diff --git a/tests/spec/arb_provoking_vertex/provoking-vertex-control.c b/tests/spec/arb_provoking_vertex/provoking-vertex-control.c index 5240afc74..ed45dae58 100644 --- a/tests/spec/arb_provoking_vertex/provoking-vertex-control.c +++ b/tests/spec/arb_provoking_vertex/provoking-vertex-control.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c b/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c index 576ff08e0..d4031a8c9 100644 --- a/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c +++ b/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c b/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c index 57d2b11b2..b3e463883 100644 --- a/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c +++ b/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_provoking_vertex/render.c b/tests/spec/arb_provoking_vertex/render.c index d5e513677..45c758310 100644 --- a/tests/spec/arb_provoking_vertex/render.c +++ b/tests/spec/arb_provoking_vertex/render.c @@ -30,6 +30,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c b/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c index 41967d7c2..12470b458 100644 --- a/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c +++ b/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c @@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 45/50] gl-3.0: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../gl-3.0/api/bindfragdata-invalid-parameters.c | 1 + tests/spec/gl-3.0/api/bindfragdata-link-error.c| 1 + .../gl-3.0/api/bindfragdata-nonexistent-variable.c | 1 + tests/spec/gl-3.0/api/clearbuffer-common.c | 1 + tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c | 1 + .../gl-3.0/api/clearbuffer-invalid-drawbuffer.c| 1 + tests/spec/gl-3.0/api/forward-compatible-bit.c | 1 + tests/spec/gl-3.0/api/genmipmap-errors.c | 1 + tests/spec/gl-3.0/api/getfragdatalocation.c| 32 -- tests/spec/gl-3.0/api/integer-errors.c | 1 + tests/spec/gl-3.0/bound-resource-limits.c | 1 + tests/spec/gl-3.0/minmax.c | 2 ++ tests/spec/gl-3.0/multidrawarrays-vertexid.c | 1 + tests/spec/gl-3.0/render-integer.c | 1 + .../required-renderbuffer-attachment-formats.c | 1 + tests/spec/gl-3.0/required-sized-texture-formats.c | 1 + .../gl-3.0/required-texture-attachment-formats.c | 1 + tests/spec/gl-3.0/texture-integer.c| 1 + tests/spec/gl-3.0/vertexattribipointer.c | 1 + 19 files changed, 37 insertions(+), 14 deletions(-) diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c index bbfe1c51c..f9ae11fcd 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c +++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c index c25ca67e0..63dbbf237 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c +++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c @@ -31,6 +31,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c index b91cc23ba..1cae692b4 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c +++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c index 6f6261baa..be4c70b25 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-common.c +++ b/tests/spec/gl-3.0/api/clearbuffer-common.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c index b487af689..103bff69a 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c index 752d74973..c311e20a3 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3.0/api/forward-compatible-bit.c b/tests/spec/gl-3.0/api/forward-compatible-bit.c index 24faff9f1..23284849d 100644 --- a/tests/spec/gl-3.0/api/forward-compatible-bit.c +++ b/tests/spec/gl-3.0/api/forward-compatible-bit.c @@ -52,6 +52,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.require_forward_compatible_context = expect_fwd_compat; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-3
[Piglit] [PATCH 36/50] arb_shader_objects: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c | 2 ++ tests/spec/arb_shader_objects/clear-with-deleted.c| 8 ++-- tests/spec/arb_shader_objects/delete-repeat.c | 8 ++-- tests/spec/arb_shader_objects/getactiveuniform-beginend.c | 2 ++ tests/spec/arb_shader_objects/getuniform.c| 2 ++ .../getuniformlocation-array-of-struct-of-array.c | 2 ++ 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c index 937a37c26..8ff42bf98 100644 --- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c +++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c @@ -39,6 +39,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const GLchar *vertShaderText = diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c b/tests/spec/arb_shader_objects/clear-with-deleted.c index 0b8875370..4e3949638 100644 --- a/tests/spec/arb_shader_objects/clear-with-deleted.c +++ b/tests/spec/arb_shader_objects/clear-with-deleted.c @@ -38,6 +38,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const char *vs_source = @@ -111,8 +113,10 @@ piglit_display(void) /* Now, disable the program and it should be finally deleted. */ glUseProgram(0); - glGetProgramiv(prog, GL_DELETE_STATUS, ); - pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + if (!piglit_khr_no_error) { + glGetProgramiv(prog, GL_DELETE_STATUS, ); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + } piglit_present_results(); diff --git a/tests/spec/arb_shader_objects/delete-repeat.c b/tests/spec/arb_shader_objects/delete-repeat.c index a72c35363..b80994588 100644 --- a/tests/spec/arb_shader_objects/delete-repeat.c +++ b/tests/spec/arb_shader_objects/delete-repeat.c @@ -35,6 +35,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const char *vs_source = @@ -90,8 +92,10 @@ piglit_display(void) /* Now, disable the program and it should be finally deleted. */ glUseProgram(0); - glGetProgramiv(prog, GL_DELETE_STATUS, ); - pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + if (!piglit_khr_no_error) { + glGetProgramiv(prog, GL_DELETE_STATUS, ); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + } piglit_present_results(); diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c index 7390b991d..1efd435db 100644 --- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c +++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c @@ -38,6 +38,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/spec/arb_shader_objects/getuniform.c b/tests/spec/arb_shader_objects/getuniform.c index d2a7d23f3..1596a935b 100644 --- a/tests/spec/arb_shader_objects/getuniform.c +++ b/tests/spec/arb_shader_objects/getuniform.c @@ -34,6 +34,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c index e3e5cc552..b395c8714 100644 --- a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c +++ b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c @@ -37,6 +37,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const char *vs_code = -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 44/50] gl-2.0: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/gl-2.0/api/active-sampler-conflict.c | 1 + tests/spec/gl-2.0/api/clip-flag-behavior.c | 33 ++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/tests/spec/gl-2.0/api/active-sampler-conflict.c b/tests/spec/gl-2.0/api/active-sampler-conflict.c index 74aed3689..848122ace 100644 --- a/tests/spec/gl-2.0/api/active-sampler-conflict.c +++ b/tests/spec/gl-2.0/api/active-sampler-conflict.c @@ -61,6 +61,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 25d7b4efd..c0e031e97 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -146,25 +147,27 @@ piglit_init(int argc, char **argv) pass = check_enable_state(enum_name, enum_value, false) && pass; } - /* Check behavior of GL_CLIP_PLANE0 + n where n == max_clip_planes */ - enum_value = GL_CLIP_PLANE0 + max_clip_planes; - sprintf(enum_name, "GL_CLIP_PLANE0 + %d", max_clip_planes); + if (!piglit_khr_no_error) { + /* Check behavior of GL_CLIP_PLANE0 + n where n == max_clip_planes */ + enum_value = GL_CLIP_PLANE0 + max_clip_planes; + sprintf(enum_name, "GL_CLIP_PLANE0 + %d", max_clip_planes); - printf("Trying glIsEnabled(%s): ", enum_name); - b = glIsEnabled(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glIsEnabled(%s): ", enum_name); + b = glIsEnabled(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glGetBooleanv(%s): ", enum_name); - glGetBooleanv(enum_value, ); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glGetBooleanv(%s): ", enum_name); + glGetBooleanv(enum_value, ); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glEnable(%s): ", enum_name); - glEnable(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glEnable(%s): ", enum_name); + glEnable(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glDisable(%s): ", enum_name); - glDisable(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glDisable(%s): ", enum_name); + glDisable(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 33/50] arb_occlusion_query2: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_occlusion_query2/api.c| 34 +--- tests/spec/arb_occlusion_query2/render.c | 1 + 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/spec/arb_occlusion_query2/api.c b/tests/spec/arb_occlusion_query2/api.c index 429b6b3f8..2ba6877a3 100644 --- a/tests/spec/arb_occlusion_query2/api.c +++ b/tests/spec/arb_occlusion_query2/api.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = (PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH); + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -52,10 +53,14 @@ test_error_begin_while_other_active(void) glBeginQuery(GL_SAMPLES_PASSED, oq[0]); if (!piglit_check_gl_error(0)) pass = false; - glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]); - if (!piglit_check_gl_error(GL_INVALID_OPERATION)) - pass = false; - glEndQuery(GL_ANY_SAMPLES_PASSED); + + if (!piglit_khr_no_error) { + glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]); + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) + pass = false; + glEndQuery(GL_ANY_SAMPLES_PASSED); + } + glEndQuery(GL_SAMPLES_PASSED); piglit_reset_gl_error(); @@ -66,10 +71,14 @@ test_error_begin_while_other_active(void) glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[0]); if (!piglit_check_gl_error(0)) pass = false; - glBeginQuery(GL_SAMPLES_PASSED, oq[1]); - if (!piglit_check_gl_error(GL_INVALID_OPERATION)) - pass = false; - glEndQuery(GL_SAMPLES_PASSED); + + if (!piglit_khr_no_error) { + glBeginQuery(GL_SAMPLES_PASSED, oq[1]); + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) + pass = false; + glEndQuery(GL_SAMPLES_PASSED); + } + glEndQuery(GL_ANY_SAMPLES_PASSED); piglit_reset_gl_error(); @@ -269,9 +278,12 @@ piglit_display(void) pass = test_counter_bits() && pass; pass = test_current_query() && pass; - pass = test_error_begin_wrong_target() && pass; - pass = test_error_end_wrong_target() && pass; - pass = test_error_begin_while_other_active() && pass; + + if (!piglit_khr_no_error) { + pass = test_error_begin_wrong_target() && pass; + pass = test_error_end_wrong_target() && pass; + pass = test_error_begin_while_other_active() && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); diff --git a/tests/spec/arb_occlusion_query2/render.c b/tests/spec/arb_occlusion_query2/render.c index 2d593fbfe..14eabdd44 100644 --- a/tests/spec/arb_occlusion_query2/render.c +++ b/tests/spec/arb_occlusion_query2/render.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 30/50] arb_framebuffer_no_attachments: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_framebuffer_no_attachments/atomic.c | 1 + tests/spec/arb_framebuffer_no_attachments/minmax.c | 1 + tests/spec/arb_framebuffer_no_attachments/params.c | 1 + tests/spec/arb_framebuffer_no_attachments/query.c | 1 + tests/spec/arb_framebuffer_no_attachments/roundup-samples.c | 1 + 5 files changed, 5 insertions(+) diff --git a/tests/spec/arb_framebuffer_no_attachments/atomic.c b/tests/spec/arb_framebuffer_no_attachments/atomic.c index 382c93804..019f87167 100644 --- a/tests/spec/arb_framebuffer_no_attachments/atomic.c +++ b/tests/spec/arb_framebuffer_no_attachments/atomic.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_framebuffer_no_attachments/minmax.c b/tests/spec/arb_framebuffer_no_attachments/minmax.c index a228b73a8..be75c2559 100644 --- a/tests/spec/arb_framebuffer_no_attachments/minmax.c +++ b/tests/spec/arb_framebuffer_no_attachments/minmax.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_framebuffer_no_attachments/params.c b/tests/spec/arb_framebuffer_no_attachments/params.c index 667778781..b9b3ecdf0 100644 --- a/tests/spec/arb_framebuffer_no_attachments/params.c +++ b/tests/spec/arb_framebuffer_no_attachments/params.c @@ -58,6 +58,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_framebuffer_no_attachments/query.c b/tests/spec/arb_framebuffer_no_attachments/query.c index 36a4b592e..8482ccbec 100644 --- a/tests/spec/arb_framebuffer_no_attachments/query.c +++ b/tests/spec/arb_framebuffer_no_attachments/query.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_framebuffer_no_attachments/roundup-samples.c b/tests/spec/arb_framebuffer_no_attachments/roundup-samples.c index 26ab300df..2374c25b2 100644 --- a/tests/spec/arb_framebuffer_no_attachments/roundup-samples.c +++ b/tests/spec/arb_framebuffer_no_attachments/roundup-samples.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 28/50] arb_debug_output: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_debug_output/api_error.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/spec/arb_debug_output/api_error.c b/tests/spec/arb_debug_output/api_error.c index 596092f45..43294fbfb 100644 --- a/tests/spec/arb_debug_output/api_error.c +++ b/tests/spec/arb_debug_output/api_error.c @@ -31,6 +31,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END #define USER_PARAM ((void*)(intptr_t)12345678) -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 42/50] arb_texture_view: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_view/clear-into-view-2d-array.c | 1 + tests/spec/arb_texture_view/clear-into-view-2d.c | 1 + tests/spec/arb_texture_view/clear-into-view-layered.c| 1 + tests/spec/arb_texture_view/copytexsubimage-layers.c | 1 + tests/spec/arb_texture_view/cubemap-view.c | 1 + tests/spec/arb_texture_view/formats.c| 12 tests/spec/arb_texture_view/getteximage-srgb.c | 1 + tests/spec/arb_texture_view/max-level.c | 1 + tests/spec/arb_texture_view/mipgen.c | 2 ++ tests/spec/arb_texture_view/params.c | 1 + tests/spec/arb_texture_view/queries.c| 1 + tests/spec/arb_texture_view/rendering-formats.c | 1 + tests/spec/arb_texture_view/rendering-r32ui.c| 1 + tests/spec/arb_texture_view/rendering_layers.c | 1 + tests/spec/arb_texture_view/rendering_levels.c | 1 + tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c | 1 + .../arb_texture_view/sampling-2d-array-as-cubemap-array.c| 1 + tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c | 1 + tests/spec/arb_texture_view/targets.c| 1 + tests/spec/arb_texture_view/texsubimage-layers.c | 1 + tests/spec/arb_texture_view/texsubimage-levels.c | 1 + tests/spec/arb_texture_view/texture-immutable-levels.c | 1 + 22 files changed, 30 insertions(+), 4 deletions(-) diff --git a/tests/spec/arb_texture_view/clear-into-view-2d-array.c b/tests/spec/arb_texture_view/clear-into-view-2d-array.c index 7f3a5bf36..4ab68b1c5 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d-array.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d-array.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/clear-into-view-2d.c b/tests/spec/arb_texture_view/clear-into-view-2d.c index b211386f7..cdb605972 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/clear-into-view-layered.c b/tests/spec/arb_texture_view/clear-into-view-layered.c index d6405f221..b134d7d44 100644 --- a/tests/spec/arb_texture_view/clear-into-view-layered.c +++ b/tests/spec/arb_texture_view/clear-into-view-layered.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; /* for layered rendering */ config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/copytexsubimage-layers.c b/tests/spec/arb_texture_view/copytexsubimage-layers.c index 19f8b28f8..7d374fc0e 100644 --- a/tests/spec/arb_texture_view/copytexsubimage-layers.c +++ b/tests/spec/arb_texture_view/copytexsubimage-layers.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/cubemap-view.c b/tests/spec/arb_texture_view/cubemap-view.c index 1a2e44460..96372062c 100644 --- a/tests/spec/arb_texture_view/cubemap-view.c +++ b/tests/spec/arb_texture_view/cubemap-view.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_view/formats.c b/tests/spec/arb_texture_view/formats.c index 1db244523..56415db52 100644 --- a/tests/spec/arb_texture_view/formats.c +++ b/tests/spec/arb_texture_view/formats.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -306,10 +307,13 @@ test_format_errors(GLenum format_class) pass = check_format_array(GL_NO_ERROR, numFormats, legalFormats, target, tex, levels, layers) &
[Piglit] [PATCH 39/50] arb_texture_cube_map_array: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_cube_map_array/cubemap-lod.c | 1 + tests/spec/arb_texture_cube_map_array/cubemap.c | 1 + tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c | 1 + tests/spec/arb_texture_cube_map_array/get.c | 2 ++ tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c | 1 + tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c | 1 + 6 files changed, 7 insertions(+) diff --git a/tests/spec/arb_texture_cube_map_array/cubemap-lod.c b/tests/spec/arb_texture_cube_map_array/cubemap-lod.c index 2816f9ee5..4ee556901 100644 --- a/tests/spec/arb_texture_cube_map_array/cubemap-lod.c +++ b/tests/spec/arb_texture_cube_map_array/cubemap-lod.c @@ -47,6 +47,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = (64 * 6 + PAD * 9) * 2; config.window_height = 200*NUM_LAYERS; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_cube_map_array/cubemap.c b/tests/spec/arb_texture_cube_map_array/cubemap.c index 1cef33aa2..275bfb913 100644 --- a/tests/spec/arb_texture_cube_map_array/cubemap.c +++ b/tests/spec/arb_texture_cube_map_array/cubemap.c @@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = (64 * 6 + PAD * 9) * 2; config.window_height = 400*NUM_LAYERS; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c index a6c97fc88..b6c959321 100644 --- a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c +++ b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c @@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 200; config.window_height = 100; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_cube_map_array/get.c b/tests/spec/arb_texture_cube_map_array/get.c index 8669e6c67..77bb450ff 100644 --- a/tests/spec/arb_texture_cube_map_array/get.c +++ b/tests/spec/arb_texture_cube_map_array/get.c @@ -36,6 +36,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; +config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c index 70c74d087..95eeb04df 100644 --- a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c +++ b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 400; config.window_height = 300; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c b/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c index 19d821b7c..eebcd0ea5 100644 --- a/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c +++ b/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width= 32; config.window_height = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; +config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 41/50] arb_texture_storage_multisample: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_storage_multisample/tex-param.c | 2 ++ tests/spec/arb_texture_storage_multisample/tex-storage.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/spec/arb_texture_storage_multisample/tex-param.c b/tests/spec/arb_texture_storage_multisample/tex-param.c index 9b52fb56b..8aa3df339 100644 --- a/tests/spec/arb_texture_storage_multisample/tex-param.c +++ b/tests/spec/arb_texture_storage_multisample/tex-param.c @@ -30,6 +30,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END /* Exercises GetTexParameter/TexParameter with multisample textures */ diff --git a/tests/spec/arb_texture_storage_multisample/tex-storage.c b/tests/spec/arb_texture_storage_multisample/tex-storage.c index 4fbecd799..77f604648 100644 --- a/tests/spec/arb_texture_storage_multisample/tex-storage.c +++ b/tests/spec/arb_texture_storage_multisample/tex-storage.c @@ -28,6 +28,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 40/50] arb_texture_rectangle: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_rectangle/texrect-simple.c | 1 + tests/spec/arb_texture_rectangle/texture-base-level-error.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/arb_texture_rectangle/texrect-simple.c b/tests/spec/arb_texture_rectangle/texrect-simple.c index ac19cb994..817feee60 100644 --- a/tests/spec/arb_texture_rectangle/texrect-simple.c +++ b/tests/spec/arb_texture_rectangle/texrect-simple.c @@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_height = WINDOW_SIZE; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_rectangle/texture-base-level-error.c b/tests/spec/arb_texture_rectangle/texture-base-level-error.c index 6c8ba5685..cec5f01bf 100644 --- a/tests/spec/arb_texture_rectangle/texture-base-level-error.c +++ b/tests/spec/arb_texture_rectangle/texture-base-level-error.c @@ -91,6 +91,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.supports_gl_compat_version = 10; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 29/50] arb_explicit_uniform_location: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_explicit_uniform_location/array-elements.c| 1 + tests/spec/arb_explicit_uniform_location/inactive-uniform.c | 1 + tests/spec/arb_explicit_uniform_location/loc-boundaries.c| 1 + tests/spec/arb_explicit_uniform_location/minmax.c| 1 + tests/spec/arb_explicit_uniform_location/use-of-unused-loc.c | 1 + 5 files changed, 5 insertions(+) diff --git a/tests/spec/arb_explicit_uniform_location/array-elements.c b/tests/spec/arb_explicit_uniform_location/array-elements.c index ed2f31166..67e342cf9 100644 --- a/tests/spec/arb_explicit_uniform_location/array-elements.c +++ b/tests/spec/arb_explicit_uniform_location/array-elements.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_explicit_uniform_location/inactive-uniform.c b/tests/spec/arb_explicit_uniform_location/inactive-uniform.c index 17a213e9f..038806c5d 100644 --- a/tests/spec/arb_explicit_uniform_location/inactive-uniform.c +++ b/tests/spec/arb_explicit_uniform_location/inactive-uniform.c @@ -49,6 +49,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_explicit_uniform_location/loc-boundaries.c b/tests/spec/arb_explicit_uniform_location/loc-boundaries.c index f98587d85..f62211b73 100644 --- a/tests/spec/arb_explicit_uniform_location/loc-boundaries.c +++ b/tests/spec/arb_explicit_uniform_location/loc-boundaries.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_explicit_uniform_location/minmax.c b/tests/spec/arb_explicit_uniform_location/minmax.c index 102f1ba77..77374b923 100644 --- a/tests/spec/arb_explicit_uniform_location/minmax.c +++ b/tests/spec/arb_explicit_uniform_location/minmax.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_explicit_uniform_location/use-of-unused-loc.c b/tests/spec/arb_explicit_uniform_location/use-of-unused-loc.c index a70df258c..65e0c86bb 100644 --- a/tests/spec/arb_explicit_uniform_location/use-of-unused-loc.c +++ b/tests/spec/arb_explicit_uniform_location/use-of-unused-loc.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 34/50] arb_occlusion_query: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../spec/arb_occlusion_query/gen_delete_while_active.c | 18 +++--- tests/spec/arb_occlusion_query/occlusion_query.c | 1 + .../spec/arb_occlusion_query/occlusion_query_conform.c | 2 ++ .../occlusion_query_meta_no_fragments.c| 1 + .../arb_occlusion_query/occlusion_query_meta_save.c| 1 + tests/spec/arb_occlusion_query/occlusion_query_order.c | 1 + 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/spec/arb_occlusion_query/gen_delete_while_active.c b/tests/spec/arb_occlusion_query/gen_delete_while_active.c index fcf98933e..df3709162 100644 --- a/tests/spec/arb_occlusion_query/gen_delete_while_active.c +++ b/tests/spec/arb_occlusion_query/gen_delete_while_active.c @@ -41,6 +41,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result @@ -87,14 +89,16 @@ piglit_display(void) return PIGLIT_FAIL; } - printf ("Testing that glEndQuery on deleted query (expecting error).\n"); - { - /* And ensure that we get an error if we try to end a deleted -* query. */ - glEndQuery(GL_SAMPLES_PASSED); + if (!piglit_khr_no_error) { + printf ("Testing that glEndQuery on deleted query (expecting error).\n"); + { + /* And ensure that we get an error if we try to end a deleted +* query. */ + glEndQuery(GL_SAMPLES_PASSED); - if (!piglit_check_gl_error(GL_INVALID_OPERATION)) - return PIGLIT_FAIL; + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) + return PIGLIT_FAIL; + } } return PIGLIT_PASS; diff --git a/tests/spec/arb_occlusion_query/occlusion_query.c b/tests/spec/arb_occlusion_query/occlusion_query.c index c71c81041..d28699813 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query.c +++ b/tests/spec/arb_occlusion_query/occlusion_query.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 180; config.window_height = 100; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_occlusion_query/occlusion_query_conform.c b/tests/spec/arb_occlusion_query/occlusion_query_conform.c index 14b9a46e9..8d692d1be 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_conform.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_conform.c @@ -48,6 +48,8 @@ config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static GLuint find_unused_id(void) { diff --git a/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c b/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c index ff98adb3a..b3ba8a914 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c b/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c index cf08de699..15bd56e5d 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_occlusion_query/occlusion_query_order.c b/tests/spec/arb_occlusion_query/occlusion_query_order.c index ea4c8405d..97ce1f00e 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_order.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_order.c @@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freede
[Piglit] [PATCH 37/50] arb_shading_language_420pack: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../arb_shading_language_420pack/execution/active-sampler-conflict.c| 2 ++ tests/spec/arb_shading_language_420pack/execution/binding-layout.c | 1 + .../arb_shading_language_420pack/execution/multiple-layout-qualifiers.c | 1 + 3 files changed, 4 insertions(+) diff --git a/tests/spec/arb_shading_language_420pack/execution/active-sampler-conflict.c b/tests/spec/arb_shading_language_420pack/execution/active-sampler-conflict.c index c7866365d..dd00bfa94 100644 --- a/tests/spec/arb_shading_language_420pack/execution/active-sampler-conflict.c +++ b/tests/spec/arb_shading_language_420pack/execution/active-sampler-conflict.c @@ -46,6 +46,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const char *vs_code_binding_0 = diff --git a/tests/spec/arb_shading_language_420pack/execution/binding-layout.c b/tests/spec/arb_shading_language_420pack/execution/binding-layout.c index acbb8f4dd..94d868dc7 100644 --- a/tests/spec/arb_shading_language_420pack/execution/binding-layout.c +++ b/tests/spec/arb_shading_language_420pack/execution/binding-layout.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 100; config.window_height = 100; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c b/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c index c58295f5f..ffc0f81e8 100644 --- a/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c +++ b/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 10; config.window_height = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 26/50] arb_texture_stencil8: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_stencil8/draw.c| 1 + tests/spec/arb_texture_stencil8/fbo-stencil8.c| 1 + tests/spec/arb_texture_stencil8/getteximage.c | 1 + tests/spec/arb_texture_stencil8/stencil-texture.c | 23 ++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tests/spec/arb_texture_stencil8/draw.c b/tests/spec/arb_texture_stencil8/draw.c index 82c5bc0f4..244ffcf8d 100644 --- a/tests/spec/arb_texture_stencil8/draw.c +++ b/tests/spec/arb_texture_stencil8/draw.c @@ -55,6 +55,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; config.window_width = 256 + 3; config.window_height = 256 * 2 + 3; diff --git a/tests/spec/arb_texture_stencil8/fbo-stencil8.c b/tests/spec/arb_texture_stencil8/fbo-stencil8.c index 13e07f521..8e3fad8b8 100644 --- a/tests/spec/arb_texture_stencil8/fbo-stencil8.c +++ b/tests/spec/arb_texture_stencil8/fbo-stencil8.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_stencil8/getteximage.c b/tests/spec/arb_texture_stencil8/getteximage.c index 09e81de63..87d338930 100644 --- a/tests/spec/arb_texture_stencil8/getteximage.c +++ b/tests/spec/arb_texture_stencil8/getteximage.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_stencil8/stencil-texture.c b/tests/spec/arb_texture_stencil8/stencil-texture.c index 8936a9152..7db66c400 100644 --- a/tests/spec/arb_texture_stencil8/stencil-texture.c +++ b/tests/spec/arb_texture_stencil8/stencil-texture.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -64,12 +65,14 @@ try_TexImage(GLenum internalFormat) GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, NULL); pass = piglit_check_gl_error(GL_NO_ERROR) && pass; - /* 3D texture is not in the list of supported STENCIL_INDEX */ - glBindTexture(GL_TEXTURE_3D, tex[2]); - glTexImage3D(GL_TEXTURE_3D, 0, internalFormat, -8, 8, 8, 0, -GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, NULL); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + if (!piglit_khr_no_error) { + /* 3D texture is not in the list of supported STENCIL_INDEX */ + glBindTexture(GL_TEXTURE_3D, tex[2]); + glTexImage3D(GL_TEXTURE_3D, 0, internalFormat, +8, 8, 8, 0, +GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, NULL); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } glBindTexture(GL_TEXTURE_CUBE_MAP, tex[3]); @@ -137,9 +140,11 @@ try_TexStorage(GLenum internalFormat) glTexStorage2D(GL_TEXTURE_2D, 1, internalFormat, 16, 16); pass = piglit_check_gl_error(GL_NO_ERROR) && pass; - glBindTexture(GL_TEXTURE_3D, tex[2]); - glTexStorage3D(GL_TEXTURE_3D, 1, internalFormat, 8, 8, 8); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + if (!piglit_khr_no_error) { + glBindTexture(GL_TEXTURE_3D, tex[2]); + glTexStorage3D(GL_TEXTURE_3D, 1, internalFormat, 8, 8, 8); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } glBindTexture(GL_TEXTURE_CUBE_MAP, tex[3]); glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, internalFormat, 16, 16); -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 31/50] arb_gpu_shader_fp64: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c | 1 + .../arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c | 1 + tests/spec/arb_gpu_shader_fp64/execution/fs-getuniformdv.c | 1 + tests/spec/arb_gpu_shader_fp64/execution/gs-getuniformdv.c | 1 + tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved-aligned.c| 1 + tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved.c| 1 + tests/spec/arb_gpu_shader_fp64/execution/tf-separate.c | 1 + tests/spec/arb_gpu_shader_fp64/execution/uniform-invalid-operation.c | 1 + tests/spec/arb_gpu_shader_fp64/execution/vs-getuniformdv.c | 1 + tests/spec/arb_gpu_shader_fp64/execution/wrong-type-setter.c | 1 + tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-alu.c | 1 + tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-const.c | 1 + tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-packing.c | 1 + tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-ssbo.c| 1 + tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-ubo.c | 1 + .../arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-mixed-shader.c | 1 + .../spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-shader.c | 1 + .../arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-mixed-shader.c | 1 + .../spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-shader.c | 1 + tests/spec/arb_gpu_shader_fp64/vs-non-uniform-control-flow-packing.c | 1 + tests/spec/arb_gpu_shader_fp64/vs-non-uniform-control-flow-ssbo.c| 1 + tests/spec/arb_gpu_shader_fp64/vs-non-uniform-control-flow-ubo.c | 1 + 22 files changed, 22 insertions(+) diff --git a/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c b/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c index 7a109c55b..e6bb84eac 100644 --- a/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c +++ b/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c @@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 33; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c index 36b0a2d67..88f9a8dab 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_gpu_shader_fp64/execution/fs-getuniformdv.c b/tests/spec/arb_gpu_shader_fp64/execution/fs-getuniformdv.c index fcd50319a..5056f23cb 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/fs-getuniformdv.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/fs-getuniformdv.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static char *TestName = "fs-getuniformdv"; diff --git a/tests/spec/arb_gpu_shader_fp64/execution/gs-getuniformdv.c b/tests/spec/arb_gpu_shader_fp64/execution/gs-getuniformdv.c index 9179c804e..44a297960 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/gs-getuniformdv.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/gs-getuniformdv.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static char *TestName = "gs-getuniformdv"; diff --git a/tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved-aligned.c b/tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved-aligned.c index 4615e3c38..b27800973 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved-aligned.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved-aligned.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved.c b/tests/spec/arb_gpu_shader_fp64/execution/tf-interleaved.c index 1520a7d6f..a2773f0
[Piglit] [PATCH 23/50] arb_get_program_binary: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_get_program_binary/api-errors.c | 1 + tests/spec/arb_get_program_binary/overrun.c | 1 + tests/spec/arb_get_program_binary/retrievable_hint.c | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/spec/arb_get_program_binary/api-errors.c b/tests/spec/arb_get_program_binary/api-errors.c index bd4e0f6fc..5b104bb43 100644 --- a/tests/spec/arb_get_program_binary/api-errors.c +++ b/tests/spec/arb_get_program_binary/api-errors.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_get_program_binary/overrun.c b/tests/spec/arb_get_program_binary/overrun.c index dd7ba6360..1f11ed336 100644 --- a/tests/spec/arb_get_program_binary/overrun.c +++ b/tests/spec/arb_get_program_binary/overrun.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_get_program_binary/retrievable_hint.c b/tests/spec/arb_get_program_binary/retrievable_hint.c index 9263a8913..a81a9f63b 100644 --- a/tests/spec/arb_get_program_binary/retrievable_hint.c +++ b/tests/spec/arb_get_program_binary/retrievable_hint.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 22/50] arb_program_interface_query: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../spec/arb_program_interface_query/compare-with-shader-subroutine.c | 1 + tests/spec/arb_program_interface_query/getprograminterfaceiv.c| 1 + tests/spec/arb_program_interface_query/getprogramresourceindex.c | 1 + tests/spec/arb_program_interface_query/getprogramresourceiv.c | 4 +++- tests/spec/arb_program_interface_query/getprogramresourcename.c | 1 + tests/spec/arb_program_interface_query/resource-location.c| 1 + tests/spec/arb_program_interface_query/resource-query.c | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c b/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c index 361df299a..f27c31dd5 100644 --- a/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c +++ b/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c @@ -73,6 +73,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_program_interface_query/getprograminterfaceiv.c b/tests/spec/arb_program_interface_query/getprograminterfaceiv.c index 1d2ca0837..bada68a78 100755 --- a/tests/spec/arb_program_interface_query/getprograminterfaceiv.c +++ b/tests/spec/arb_program_interface_query/getprograminterfaceiv.c @@ -89,6 +89,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_program_interface_query/getprogramresourceindex.c b/tests/spec/arb_program_interface_query/getprogramresourceindex.c index b19b0a20e..2933a7fdb 100755 --- a/tests/spec/arb_program_interface_query/getprogramresourceindex.c +++ b/tests/spec/arb_program_interface_query/getprogramresourceindex.c @@ -78,6 +78,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_program_interface_query/getprogramresourceiv.c b/tests/spec/arb_program_interface_query/getprogramresourceiv.c index 42a425c26..2727a6c87 100755 --- a/tests/spec/arb_program_interface_query/getprogramresourceiv.c +++ b/tests/spec/arb_program_interface_query/getprogramresourceiv.c @@ -278,6 +278,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -1189,7 +1190,8 @@ piglit_display(void) bool pass = true; int i; - test_error_cases(); + if (!piglit_khr_no_error) + test_error_cases(); /* run all the getprogramresourceiv tests */ for (i = 0; i < sizeof(subtests) / sizeof(struct subtest_t); i++) { diff --git a/tests/spec/arb_program_interface_query/getprogramresourcename.c b/tests/spec/arb_program_interface_query/getprogramresourcename.c index f2736d710..92ed8ceeb 100755 --- a/tests/spec/arb_program_interface_query/getprogramresourcename.c +++ b/tests/spec/arb_program_interface_query/getprogramresourcename.c @@ -84,6 +84,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_program_interface_query/resource-location.c b/tests/spec/arb_program_interface_query/resource-location.c index b7cfa2bb8..b1e2ef73b 100755 --- a/tests/spec/arb_program_interface_query/resource-location.c +++ b/tests/spec/arb_program_interface_query/resource-location.c @@ -62,6 +62,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_program_interface_query/resource-query.c b/tests/spec/arb_program_interface_query/resource-query.c index c4d190c89..a0bc3b700 100755 --- a/tests/spec/arb_program_interface_query/resource-query.c +++ b/tests/spec/arb_program_interface_query/resource-query.c @@ -128,6 +128,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 24/50] khr_debug: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/khr_debug/debug-object-label.c | 1 + tests/spec/khr_debug/debug-push-pop-group.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/khr_debug/debug-object-label.c b/tests/spec/khr_debug/debug-object-label.c index 7e89bd50f..65d733e41 100644 --- a/tests/spec/khr_debug/debug-object-label.c +++ b/tests/spec/khr_debug/debug-object-label.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN #endif config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/khr_debug/debug-push-pop-group.c b/tests/spec/khr_debug/debug-push-pop-group.c index 8fa4474c2..d4c08cd09 100644 --- a/tests/spec/khr_debug/debug-push-pop-group.c +++ b/tests/spec/khr_debug/debug-push-pop-group.c @@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN #endif config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 32/50] arb_internalformat_query2: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_internalformat_query2/api-errors.c | 1 + tests/spec/arb_internalformat_query2/color-encoding.c | 1 + tests/spec/arb_internalformat_query2/filter.c | 1 + tests/spec/arb_internalformat_query2/format-components.c | 1 + tests/spec/arb_internalformat_query2/generic-pname-checks.c| 1 + tests/spec/arb_internalformat_query2/image-format-compatibility-type.c | 1 + tests/spec/arb_internalformat_query2/image-texture.c | 1 + tests/spec/arb_internalformat_query2/internalformat-size-checks.c | 1 + tests/spec/arb_internalformat_query2/internalformat-type-checks.c | 1 + tests/spec/arb_internalformat_query2/max-dimensions.c | 1 + tests/spec/arb_internalformat_query2/minmax.c | 1 + tests/spec/arb_internalformat_query2/samples-pnames.c | 1 + tests/spec/arb_internalformat_query2/texture-compressed-block.c| 1 + 13 files changed, 13 insertions(+) diff --git a/tests/spec/arb_internalformat_query2/api-errors.c b/tests/spec/arb_internalformat_query2/api-errors.c index e88480c30..055fa1e23 100644 --- a/tests/spec/arb_internalformat_query2/api-errors.c +++ b/tests/spec/arb_internalformat_query2/api-errors.c @@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/color-encoding.c b/tests/spec/arb_internalformat_query2/color-encoding.c index d38c7ed26..3485264d9 100644 --- a/tests/spec/arb_internalformat_query2/color-encoding.c +++ b/tests/spec/arb_internalformat_query2/color-encoding.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/filter.c b/tests/spec/arb_internalformat_query2/filter.c index 6d25b0e61..502eea94c 100644 --- a/tests/spec/arb_internalformat_query2/filter.c +++ b/tests/spec/arb_internalformat_query2/filter.c @@ -51,6 +51,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/format-components.c b/tests/spec/arb_internalformat_query2/format-components.c index bcd1c78cf..a484e01f2 100644 --- a/tests/spec/arb_internalformat_query2/format-components.c +++ b/tests/spec/arb_internalformat_query2/format-components.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/generic-pname-checks.c b/tests/spec/arb_internalformat_query2/generic-pname-checks.c index 97f7d49dc..e521fac31 100644 --- a/tests/spec/arb_internalformat_query2/generic-pname-checks.c +++ b/tests/spec/arb_internalformat_query2/generic-pname-checks.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/image-format-compatibility-type.c b/tests/spec/arb_internalformat_query2/image-format-compatibility-type.c index b59084e91..28bf2926a 100644 --- a/tests/spec/arb_internalformat_query2/image-format-compatibility-type.c +++ b/tests/spec/arb_internalformat_query2/image-format-compatibility-type.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/image-texture.c b/tests/spec/arb_internalformat_query2/image-texture.c index f20d0aab9..735f7e1a4 100644 --- a/tests/spec/arb_internalformat_query2/image-texture.c +++ b/tests/spec/arb_internalformat_query2/image-texture.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_internalformat_query2/internalformat-size-checks.c b/tests/spec/arb_internalformat_query2/internalformat-size-checks.c index 38cd440c7..bbccbd6d1 100644 --- a/tests/spec/arb_internalformat_
[Piglit] [PATCH 20/50] arb_clear_buffer_object: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_clear_buffer_object/formats.c | 1 + tests/spec/arb_clear_buffer_object/invalid-internal-format.c | 1 + tests/spec/arb_clear_buffer_object/invalid-size.c| 1 + tests/spec/arb_clear_buffer_object/mapped.c | 1 + tests/spec/arb_clear_buffer_object/no-bound-buffer.c | 1 + tests/spec/arb_clear_buffer_object/null-data.c | 1 + tests/spec/arb_clear_buffer_object/sub-invalid-size.c| 1 + tests/spec/arb_clear_buffer_object/sub-mapped.c | 1 + tests/spec/arb_clear_buffer_object/sub-overlap.c | 1 + tests/spec/arb_clear_buffer_object/sub-simple.c | 1 + tests/spec/arb_clear_buffer_object/unaligned.c | 1 + tests/spec/arb_clear_buffer_object/zero-size.c | 1 + 12 files changed, 12 insertions(+) diff --git a/tests/spec/arb_clear_buffer_object/formats.c b/tests/spec/arb_clear_buffer_object/formats.c index 7fbf5696b..4a053eb24 100644 --- a/tests/spec/arb_clear_buffer_object/formats.c +++ b/tests/spec/arb_clear_buffer_object/formats.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/invalid-internal-format.c b/tests/spec/arb_clear_buffer_object/invalid-internal-format.c index 06d628869..952e8b85a 100644 --- a/tests/spec/arb_clear_buffer_object/invalid-internal-format.c +++ b/tests/spec/arb_clear_buffer_object/invalid-internal-format.c @@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/invalid-size.c b/tests/spec/arb_clear_buffer_object/invalid-size.c index b8e0dbcd4..7f8ae791f 100644 --- a/tests/spec/arb_clear_buffer_object/invalid-size.c +++ b/tests/spec/arb_clear_buffer_object/invalid-size.c @@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/mapped.c b/tests/spec/arb_clear_buffer_object/mapped.c index 59cf4f8e1..7b95d6a4e 100644 --- a/tests/spec/arb_clear_buffer_object/mapped.c +++ b/tests/spec/arb_clear_buffer_object/mapped.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/no-bound-buffer.c b/tests/spec/arb_clear_buffer_object/no-bound-buffer.c index 040a0f51f..418d8fb4f 100644 --- a/tests/spec/arb_clear_buffer_object/no-bound-buffer.c +++ b/tests/spec/arb_clear_buffer_object/no-bound-buffer.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/null-data.c b/tests/spec/arb_clear_buffer_object/null-data.c index bab72654a..df6da4338 100644 --- a/tests/spec/arb_clear_buffer_object/null-data.c +++ b/tests/spec/arb_clear_buffer_object/null-data.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/sub-invalid-size.c b/tests/spec/arb_clear_buffer_object/sub-invalid-size.c index ddd573056..386990c05 100644 --- a/tests/spec/arb_clear_buffer_object/sub-invalid-size.c +++ b/tests/spec/arb_clear_buffer_object/sub-invalid-size.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/sub-mapped.c b/tests/spec/arb_clear_buffer_object/sub-mapped.c index ed6b30268..9ed7c9403 100644 --- a/tests/spec/arb_clear_buffer_object/sub-mapped.c +++ b/tests/spec/arb_clear_buffer_object/sub-mapped.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_buffer_object/sub-overlap.c b/tests/spec/arb_clear_buffer_object/sub-overlap.c index 7e887c0e0..a9eb946f8 100644 --- a/test
[Piglit] [PATCH 12/50] ext_texture_array: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/ext_texture_array/errors.c | 1 + tests/spec/ext_texture_array/gen-mipmap.c | 1 + tests/spec/ext_texture_array/maxlayers.c | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/spec/ext_texture_array/errors.c b/tests/spec/ext_texture_array/errors.c index 4f7d51f1b..b05684361 100644 --- a/tests/spec/ext_texture_array/errors.c +++ b/tests/spec/ext_texture_array/errors.c @@ -30,6 +30,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_texture_array/gen-mipmap.c b/tests/spec/ext_texture_array/gen-mipmap.c index f54be0809..6d01ab9ca 100644 --- a/tests/spec/ext_texture_array/gen-mipmap.c +++ b/tests/spec/ext_texture_array/gen-mipmap.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_texture_array/maxlayers.c b/tests/spec/ext_texture_array/maxlayers.c index 05fbc27c2..808c51f08 100644 --- a/tests/spec/ext_texture_array/maxlayers.c +++ b/tests/spec/ext_texture_array/maxlayers.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 16/50] arb_transform_feedback3: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_transform_feedback3/begin_end.c | 1 + .../arb_transform_feedback3/bind_buffer_invalid_index.c | 1 + .../draw_using_invalid_stream_index.c| 1 + .../arb_transform_feedback3/end_query_with_name_zero.c | 1 + .../arb_transform_feedback3/ext_interleaved_two_bufs.c | 1 + .../arb_transform_feedback3/query_with_invalid_index.c | 16 +++- .../spec/arb_transform_feedback3/set_invalid_varyings.c | 1 + .../set_varyings_with_invalid_args.c | 1 + 8 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/spec/arb_transform_feedback3/begin_end.c b/tests/spec/arb_transform_feedback3/begin_end.c index 8cedf874d..e95c6e657 100644 --- a/tests/spec/arb_transform_feedback3/begin_end.c +++ b/tests/spec/arb_transform_feedback3/begin_end.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c index 1e396df1a..fc762a384 100644 --- a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c +++ b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c index 70e863043..7087c28d2 100644 --- a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c +++ b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c index 4d405944d..9e19d4f10 100644 --- a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c +++ b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c index 89c11bc79..3f724454f 100644 --- a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c +++ b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c @@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c index 21972207c..541983094 100644 --- a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c +++ b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -81,8 +82,11 @@ piglit_init(int argc, char **argv) pass = false; } - glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, max_streams, queries[1]); - pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + if (!piglit_khr_no_error) { + glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, max_streams, + queries[1]); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + } glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, max_streams - 1, queries[2]); @@ -92,9 +96,11 @@ piglit_init(int argc, char **argv) pass = false; } - glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, - max_streams, queries[3]); - pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + if (!piglit_khr_no_error) { + glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, + max_streams, queries[3]); + pass = piglit_check_gl_e
[Piglit] [PATCH 18/50] arb_tessellation_shader: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_tessellation_shader/get-tcs-params.c | 1 + tests/spec/arb_tessellation_shader/get-tes-params.c | 1 + tests/spec/arb_tessellation_shader/invalid-get-program-params.c | 1 + tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c | 1 + tests/spec/arb_tessellation_shader/invalid-primitive.c| 1 + tests/spec/arb_tessellation_shader/large-uniforms.c | 1 + tests/spec/arb_tessellation_shader/layout-mismatch.c | 1 + tests/spec/arb_tessellation_shader/minmax.c | 1 + 8 files changed, 8 insertions(+) diff --git a/tests/spec/arb_tessellation_shader/get-tcs-params.c b/tests/spec/arb_tessellation_shader/get-tcs-params.c index 75ddd11c2..223d309b0 100644 --- a/tests/spec/arb_tessellation_shader/get-tcs-params.c +++ b/tests/spec/arb_tessellation_shader/get-tcs-params.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/get-tes-params.c b/tests/spec/arb_tessellation_shader/get-tes-params.c index 77bea0b4e..ca37da488 100644 --- a/tests/spec/arb_tessellation_shader/get-tes-params.c +++ b/tests/spec/arb_tessellation_shader/get-tes-params.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/invalid-get-program-params.c b/tests/spec/arb_tessellation_shader/invalid-get-program-params.c index c3347d852..eac612152 100644 --- a/tests/spec/arb_tessellation_shader/invalid-get-program-params.c +++ b/tests/spec/arb_tessellation_shader/invalid-get-program-params.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c b/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c index ffd8b707f..2343d3455 100644 --- a/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c +++ b/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/invalid-primitive.c b/tests/spec/arb_tessellation_shader/invalid-primitive.c index d81e553a3..f2d8836e7 100644 --- a/tests/spec/arb_tessellation_shader/invalid-primitive.c +++ b/tests/spec/arb_tessellation_shader/invalid-primitive.c @@ -47,6 +47,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/large-uniforms.c b/tests/spec/arb_tessellation_shader/large-uniforms.c index a5aea893e..91bd30fc5 100644 --- a/tests/spec/arb_tessellation_shader/large-uniforms.c +++ b/tests/spec/arb_tessellation_shader/large-uniforms.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/layout-mismatch.c b/tests/spec/arb_tessellation_shader/layout-mismatch.c index e75d36678..988d26cfc 100644 --- a/tests/spec/arb_tessellation_shader/layout-mismatch.c +++ b/tests/spec/arb_tessellation_shader/layout-mismatch.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_tessellation_shader/minmax.c b/tests/spec/arb_tessellation_shader/minmax.c index 46549c8c6..e96b131d4 100644 --- a/tests/spec/arb_tessellation_shader/minmax.c +++ b/tests/spec/arb_tessellation_shader/minmax.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 27/50] arb_clear_texture: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_clear_texture/3d.c | 2 ++ tests/spec/arb_clear_texture/base-formats.c| 2 ++ tests/spec/arb_clear_texture/clear-max-level.c | 1 + tests/spec/arb_clear_texture/cube.c| 1 + tests/spec/arb_clear_texture/depth-stencil.c | 2 ++ tests/spec/arb_clear_texture/error.c | 2 ++ tests/spec/arb_clear_texture/float.c | 2 ++ tests/spec/arb_clear_texture/integer.c | 2 ++ tests/spec/arb_clear_texture/multisample.c | 2 ++ tests/spec/arb_clear_texture/rg.c | 2 ++ tests/spec/arb_clear_texture/simple.c | 1 + tests/spec/arb_clear_texture/sized-formats.c | 2 ++ tests/spec/arb_clear_texture/srgb.c| 2 ++ tests/spec/arb_clear_texture/stencil.c | 2 ++ tests/spec/arb_clear_texture/texview.c | 1 + 15 files changed, 26 insertions(+) diff --git a/tests/spec/arb_clear_texture/3d.c b/tests/spec/arb_clear_texture/3d.c index 4de1ff1ef..f88ec64fc 100644 --- a/tests/spec/arb_clear_texture/3d.c +++ b/tests/spec/arb_clear_texture/3d.c @@ -42,6 +42,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const float green[3] = {0.0, 1.0, 0.0}; diff --git a/tests/spec/arb_clear_texture/base-formats.c b/tests/spec/arb_clear_texture/base-formats.c index db4fdbf33..338cf712e 100644 --- a/tests/spec/arb_clear_texture/base-formats.c +++ b/tests/spec/arb_clear_texture/base-formats.c @@ -34,6 +34,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const struct format diff --git a/tests/spec/arb_clear_texture/clear-max-level.c b/tests/spec/arb_clear_texture/clear-max-level.c index 91e50142d..532d2d2cd 100644 --- a/tests/spec/arb_clear_texture/clear-max-level.c +++ b/tests/spec/arb_clear_texture/clear-max-level.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 14; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_texture/cube.c b/tests/spec/arb_clear_texture/cube.c index 65b076d8c..0e6003943 100644 --- a/tests/spec/arb_clear_texture/cube.c +++ b/tests/spec/arb_clear_texture/cube.c @@ -66,6 +66,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 20; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clear_texture/depth-stencil.c b/tests/spec/arb_clear_texture/depth-stencil.c index 999341ee0..715f1be6a 100644 --- a/tests/spec/arb_clear_texture/depth-stencil.c +++ b/tests/spec/arb_clear_texture/depth-stencil.c @@ -35,6 +35,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END void diff --git a/tests/spec/arb_clear_texture/error.c b/tests/spec/arb_clear_texture/error.c index 3ab17fa9d..404f318f0 100644 --- a/tests/spec/arb_clear_texture/error.c +++ b/tests/spec/arb_clear_texture/error.c @@ -35,6 +35,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static bool diff --git a/tests/spec/arb_clear_texture/float.c b/tests/spec/arb_clear_texture/float.c index e43ce4151..daabe0795 100644 --- a/tests/spec/arb_clear_texture/float.c +++ b/tests/spec/arb_clear_texture/float.c @@ -34,6 +34,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END static const struct format diff --git a/tests/spec/arb_clear_texture/integer.c b/tests/spec/arb_clear_texture/integer.c index ccdb7a844..44d4342fb 100644 --- a/tests/spec/arb_clear_texture/integer.c +++ b/tests/spec/arb_clear_texture/integer.c @@ -43,6 +43,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END /* Values to try clearing the texture to. The number of bytes used diff --git a/tests/spec/arb_clear_texture/multisample.c b/tests/spec/arb_clear_texture/multisample.c index ef167f467..e366f0a16 100644 --- a/tests/spec/arb_clear_texture/multisample.c +++ b/tests/spec/arb_clear_texture/multisample.c @@ -55,6 +55,8 @@ PIGLIT_GL_TEST_CONFIG
[Piglit] [PATCH 15/50] arb_transform_feedback_overflow_query: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_transform_feedback_overflow_query/basic.c | 1 + tests/spec/arb_transform_feedback_overflow_query/errors.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/arb_transform_feedback_overflow_query/basic.c b/tests/spec/arb_transform_feedback_overflow_query/basic.c index 9fb3c0c7b..017335c98 100644 --- a/tests/spec/arb_transform_feedback_overflow_query/basic.c +++ b/tests/spec/arb_transform_feedback_overflow_query/basic.c @@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.subtests = overflow_query_subtests; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback_overflow_query/errors.c b/tests/spec/arb_transform_feedback_overflow_query/errors.c index 148b66065..0ec4bb826 100644 --- a/tests/spec/arb_transform_feedback_overflow_query/errors.c +++ b/tests/spec/arb_transform_feedback_overflow_query/errors.c @@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 25/50] nv_conditional_render: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/nv_conditional_render/begin-while-active.c | 1 + tests/spec/nv_conditional_render/begin-zero.c | 1 + tests/spec/nv_conditional_render/bitmap.c | 1 + tests/spec/nv_conditional_render/blitframebuffer.c| 1 + tests/spec/nv_conditional_render/clear.c | 1 + tests/spec/nv_conditional_render/copypixels.c | 1 + tests/spec/nv_conditional_render/copyteximage.c | 1 + tests/spec/nv_conditional_render/copytexsubimage.c| 1 + tests/spec/nv_conditional_render/dlist.c | 1 + tests/spec/nv_conditional_render/drawpixels.c | 1 + tests/spec/nv_conditional_render/generatemipmap.c | 1 + tests/spec/nv_conditional_render/vertex_array.c | 1 + 12 files changed, 12 insertions(+) diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c index 450bc1bc7..f80409a5d 100644 --- a/tests/spec/nv_conditional_render/begin-while-active.c +++ b/tests/spec/nv_conditional_render/begin-while-active.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c index c7b9768c1..c96cccdb6 100644 --- a/tests/spec/nv_conditional_render/begin-zero.c +++ b/tests/spec/nv_conditional_render/begin-zero.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c index 7f0d4b669..dc1c58a47 100644 --- a/tests/spec/nv_conditional_render/bitmap.c +++ b/tests/spec/nv_conditional_render/bitmap.c @@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c index cfb98605f..06e5c7d81 100644 --- a/tests/spec/nv_conditional_render/blitframebuffer.c +++ b/tests/spec/nv_conditional_render/blitframebuffer.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c index 90a1736a5..e6136e633 100644 --- a/tests/spec/nv_conditional_render/clear.c +++ b/tests/spec/nv_conditional_render/clear.c @@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c index 11f6c4772..5a6c30d99 100644 --- a/tests/spec/nv_conditional_render/copypixels.c +++ b/tests/spec/nv_conditional_render/copypixels.c @@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c index b8cd594ec..2a00c0293 100644 --- a/tests/spec/nv_conditional_render/copyteximage.c +++ b/tests/spec/nv_conditional_render/copyteximage.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c index 9967a51b5..da8fc3ca9 100644 --- a/tests/spec/nv_conditional_render/copytexsubimage.c +++ b/tests/spec/nv_conditional_render/copytexsubimage.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/d
[Piglit] [PATCH 21/50] arb_timer_query: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_timer_query/timestamp-get.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/arb_timer_query/timestamp-get.c b/tests/spec/arb_timer_query/timestamp-get.c index 9ff6ee7c3..39676c692 100644 --- a/tests/spec/arb_timer_query/timestamp-get.c +++ b/tests/spec/arb_timer_query/timestamp-get.c @@ -47,6 +47,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 11/50] ext_packet_float: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c | 1 + tests/spec/ext_packed_float/pack.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c index 34f8d2a5c..0eadc0b28 100644 --- a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c +++ b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c @@ -77,6 +77,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_packed_float/pack.c b/tests/spec/ext_packed_float/pack.c index cfbabd8c7..60413a7dc 100644 --- a/tests/spec/ext_packed_float/pack.c +++ b/tests/spec/ext_packed_float/pack.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 19/50] arb_texture_buffer_range: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_buffer_range/dlist.c| 1 + tests/spec/arb_texture_buffer_range/errors.c | 1 + tests/spec/arb_texture_buffer_range/ranges-2.c | 1 + tests/spec/arb_texture_buffer_range/ranges.c | 1 + 4 files changed, 4 insertions(+) diff --git a/tests/spec/arb_texture_buffer_range/dlist.c b/tests/spec/arb_texture_buffer_range/dlist.c index 8c1f8cd13..4d2b643ab 100644 --- a/tests/spec/arb_texture_buffer_range/dlist.c +++ b/tests/spec/arb_texture_buffer_range/dlist.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_buffer_range/errors.c b/tests/spec/arb_texture_buffer_range/errors.c index a5e9cbec6..9aeace720 100644 --- a/tests/spec/arb_texture_buffer_range/errors.c +++ b/tests/spec/arb_texture_buffer_range/errors.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_buffer_range/ranges-2.c b/tests/spec/arb_texture_buffer_range/ranges-2.c index 2f641b238..e2bd4f3fa 100644 --- a/tests/spec/arb_texture_buffer_range/ranges-2.c +++ b/tests/spec/arb_texture_buffer_range/ranges-2.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_buffer_range/ranges.c b/tests/spec/arb_texture_buffer_range/ranges.c index 3081fc2f8..13c09c7f5 100644 --- a/tests/spec/arb_texture_buffer_range/ranges.c +++ b/tests/spec/arb_texture_buffer_range/ranges.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 17/50] arb_texture_storage: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_texture_storage/attach-before-storage.c | 1 + tests/spec/arb_texture_storage/texture-storage.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/arb_texture_storage/attach-before-storage.c b/tests/spec/arb_texture_storage/attach-before-storage.c index fb6c93044..7c7ebf068 100644 --- a/tests/spec/arb_texture_storage/attach-before-storage.c +++ b/tests/spec/arb_texture_storage/attach-before-storage.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END /* Dummy */ diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c index 393c0a06a..118d4dbac 100644 --- a/tests/spec/arb_texture_storage/texture-storage.c +++ b/tests/spec/arb_texture_storage/texture-storage.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 05/50] arb_multisample: fix KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_multisample/beginend.c | 2 ++ tests/spec/arb_multisample/pushpop.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/spec/arb_multisample/beginend.c b/tests/spec/arb_multisample/beginend.c index 5d2a5b40b..015a3fb9a 100644 --- a/tests/spec/arb_multisample/beginend.c +++ b/tests/spec/arb_multisample/beginend.c @@ -39,6 +39,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/spec/arb_multisample/pushpop.c b/tests/spec/arb_multisample/pushpop.c index a17043129..e6d8cf34d 100644 --- a/tests/spec/arb_multisample/pushpop.c +++ b/tests/spec/arb_multisample/pushpop.c @@ -57,6 +57,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 14/50] arb_vertex_array_bgra: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_vertex_array_bgra/api-errors.c | 1 + tests/spec/arb_vertex_array_bgra/get.c| 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/arb_vertex_array_bgra/api-errors.c b/tests/spec/arb_vertex_array_bgra/api-errors.c index ce42d8392..b31f6ba23 100644 --- a/tests/spec/arb_vertex_array_bgra/api-errors.c +++ b/tests/spec/arb_vertex_array_bgra/api-errors.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END void diff --git a/tests/spec/arb_vertex_array_bgra/get.c b/tests/spec/arb_vertex_array_bgra/get.c index b3f8256d2..55b99232b 100644 --- a/tests/spec/arb_vertex_array_bgra/get.c +++ b/tests/spec/arb_vertex_array_bgra/get.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END void -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 01/50] arb_draw_elements_base_vertex: fix KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_draw_elements_base_vertex/dlist.c | 1 + tests/spec/arb_draw_elements_base_vertex/multidrawelements.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist.c b/tests/spec/arb_draw_elements_base_vertex/dlist.c index 08b652908..74817a19c 100644 --- a/tests/spec/arb_draw_elements_base_vertex/dlist.c +++ b/tests/spec/arb_draw_elements_base_vertex/dlist.c @@ -58,6 +58,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c b/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c index 49e942352..a18d77d37 100644 --- a/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c +++ b/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c @@ -60,6 +60,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 200; config.window_height = 200; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 02/50] arb_draw_instanced: fix KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_draw_instanced/execution/dlist.c | 1 + tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c | 1 + tests/spec/arb_draw_instanced/execution/negative-elements-type.c | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/spec/arb_draw_instanced/execution/dlist.c b/tests/spec/arb_draw_instanced/execution/dlist.c index 8705bfdd7..8d6ecc507 100644 --- a/tests/spec/arb_draw_instanced/execution/dlist.c +++ b/tests/spec/arb_draw_instanced/execution/dlist.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c index 5361c6cba..c7635743a 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c +++ b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c @@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c index 1885fb80b..6a220756e 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c +++ b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 04/50] arb_map_buffer_range: fix KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c | 2 ++ tests/spec/arb_map_buffer_range/map_buffer_range_test.c| 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c index 683b2533b..bcb759d26 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c @@ -34,6 +34,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c index 213209226..2f5d2a39d 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c @@ -33,6 +33,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END uint8_t data[1 << 20]; -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 08/50] ext_texture_swizzle: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/ext_texture_swizzle/api.c | 12 +++- .../ext_texture_swizzle/depth_texture_mode_and_swizzle.c | 1 + tests/spec/ext_texture_swizzle/swizzle.c | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/spec/ext_texture_swizzle/api.c b/tests/spec/ext_texture_swizzle/api.c index 19486f278..3ead58e02 100644 --- a/tests/spec/ext_texture_swizzle/api.c +++ b/tests/spec/ext_texture_swizzle/api.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -61,11 +62,12 @@ test_api(void) static const GLint swz[4] = { GL_BLUE, GL_GREEN, GL_ALPHA, GL_ZERO }; GLint swzOut[4]; - /* test bad param value */ - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R_EXT, GL_RGBA); - - if (!piglit_check_gl_error(GL_INVALID_ENUM)) - return false; + if (!piglit_khr_no_error) { + /* test bad param value */ + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R_EXT, GL_RGBA); + if (!piglit_check_gl_error(GL_INVALID_ENUM)) + return false; + } /* test good param values */ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R_EXT, GL_ONE); diff --git a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c index 47a85e03c..6f9d7f38c 100644 --- a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c +++ b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c @@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 170; config.window_height= 30; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_texture_swizzle/swizzle.c b/tests/spec/ext_texture_swizzle/swizzle.c index 7a33e570a..063343be7 100644 --- a/tests/spec/ext_texture_swizzle/swizzle.c +++ b/tests/spec/ext_texture_swizzle/swizzle.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 07/50] arb_transform_feedback2: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_transform_feedback2/api-queries.c | 1 + .../spec/arb_transform_feedback2/cannot-bind-when-active.c | 13 + .../arb_transform_feedback2/change-objects-while-paused.c | 1 + tests/spec/arb_transform_feedback2/gen-names-only.c| 14 ++ tests/spec/arb_transform_feedback2/istransformfeedback.c | 1 + tests/spec/arb_transform_feedback2/pause-counting.c| 1 + 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/spec/arb_transform_feedback2/api-queries.c b/tests/spec/arb_transform_feedback2/api-queries.c index 61be114b6..c7cf6585d 100644 --- a/tests/spec/arb_transform_feedback2/api-queries.c +++ b/tests/spec/arb_transform_feedback2/api-queries.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c index c4ef636b0..754b48dac 100644 --- a/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c +++ b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -101,8 +102,10 @@ void piglit_init(int argc, char **argv) pass = piglit_check_gl_error(0) && pass; - glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + if (!piglit_khr_no_error) { + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } /* Make the transform feedback object inactive by calling * EndTransformFeedback. Then try (again) to bind the other object. @@ -130,8 +133,10 @@ void piglit_init(int argc, char **argv) glResumeTransformFeedback(); pass = piglit_check_gl_error(0) && pass; - glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + if (!piglit_khr_no_error) { + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } /* Make the second object non-active, and restore the default object. * This should work. diff --git a/tests/spec/arb_transform_feedback2/change-objects-while-paused.c b/tests/spec/arb_transform_feedback2/change-objects-while-paused.c index 448ec7359..b81fbd87a 100644 --- a/tests/spec/arb_transform_feedback2/change-objects-while-paused.c +++ b/tests/spec/arb_transform_feedback2/change-objects-while-paused.c @@ -50,6 +50,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN #error "Cannot build this." #endif config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_transform_feedback2/gen-names-only.c b/tests/spec/arb_transform_feedback2/gen-names-only.c index cacac8ea8..9c7b67b6e 100644 --- a/tests/spec/arb_transform_feedback2/gen-names-only.c +++ b/tests/spec/arb_transform_feedback2/gen-names-only.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -60,15 +61,20 @@ void piglit_init(int argc, char **argv) glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0); pass = piglit_check_gl_error(0) && pass; - glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id + 1); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + if (!piglit_khr_no_error) { + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id + 1); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id); pass = piglit_check_gl_error(0) && pass; glDeleteTransformFeedbacks(1, ); - glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + + if (!piglit_khr_no_error) { + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } diff --git a/tests/spec/arb_transform_feedba
[Piglit] [PATCH 03/50] arb_instanced_arrays: fix KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c b/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c index b41912c47..4e4bc542c 100644 --- a/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c +++ b/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.supports_gl_compat_version = 20; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 06/50] arb_robustness: fix KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_robustness/client-mem-bounds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/arb_robustness/client-mem-bounds.c b/tests/spec/arb_robustness/client-mem-bounds.c index cbc0923e7..b67907cd7 100644 --- a/tests/spec/arb_robustness/client-mem-bounds.c +++ b/tests/spec/arb_robustness/client-mem-bounds.c @@ -30,6 +30,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 320; config.window_height = 320; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.14.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] arb_direct_state_access: adapt to spec fixes in OpenGL 4.6
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 08/09/2017 09:27 AM, Iago Toral Quiroga wrote: TextureStorage* functions should produce INVALID_OPERATION instead of INVALID_ENUM when the target is not valid. --- tests/spec/arb_direct_state_access/getcompressedtextureimage.c | 2 +- tests/spec/arb_direct_state_access/gettextureimage-targets.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/spec/arb_direct_state_access/getcompressedtextureimage.c b/tests/spec/arb_direct_state_access/getcompressedtextureimage.c index 7c4a92739..4206a4714 100644 --- a/tests/spec/arb_direct_state_access/getcompressedtextureimage.c +++ b/tests/spec/arb_direct_state_access/getcompressedtextureimage.c @@ -175,7 +175,7 @@ getTexImage(bool doPBO, GLenum target, GLubyte *data, glTextureStorage3D(name, 1, internalformat, IMAGE_WIDTH, IMAGE_HEIGHT, num_faces); - pass &= piglit_check_gl_error(GL_INVALID_ENUM); + pass &= piglit_check_gl_error(GL_INVALID_OPERATION); } glTextureStorage2D(name, 1, internalformat, IMAGE_WIDTH, IMAGE_HEIGHT); diff --git a/tests/spec/arb_direct_state_access/gettextureimage-targets.c b/tests/spec/arb_direct_state_access/gettextureimage-targets.c index a0f48d2d2..4ebb73f59 100644 --- a/tests/spec/arb_direct_state_access/gettextureimage-targets.c +++ b/tests/spec/arb_direct_state_access/gettextureimage-targets.c @@ -135,7 +135,7 @@ getTexImage(bool doPBO, GLenum target, GLubyte data[][IMAGE_SIZE], glTextureStorage3D(name, 1, internalformat, IMAGE_WIDTH, IMAGE_HEIGHT, num_faces); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass; + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; } /* This is legal. */ glTextureStorage2D(name, 1, internalformat, ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCHi V2] ext_memory_object: add some basic api error checks
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 08/06/2017 06:48 AM, Timothy Arceri wrote: This only tests for errors when is 0, but its a start. v2: - make use of piglit_check_gl_error() - shorten spec quote Cc: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- Please note the patch to update gl.xml was too big for the list so I just went ahead and pushed it. tests/all.py | 6 + tests/spec/CMakeLists.txt | 1 + tests/spec/ext_memory_object/CMakeLists.gl.txt | 14 ++ tests/spec/ext_memory_object/CMakeLists.txt| 1 + tests/spec/ext_memory_object/api-errors.c | 235 + 5 files changed, 257 insertions(+) create mode 100644 tests/spec/ext_memory_object/CMakeLists.gl.txt create mode 100644 tests/spec/ext_memory_object/CMakeLists.txt create mode 100644 tests/spec/ext_memory_object/api-errors.c diff --git a/tests/all.py b/tests/all.py index 177957b0b..521a0fc50 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2361,20 +2361,26 @@ with profile.test_list.group_manager( g(['khr_debug-push-pop-group_gles2'], 'push-pop-group_gles2') g(['khr_debug-push-pop-group_gles3'], 'push-pop-group_gles3') # Group ARB_occlusion_query2 with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_occlusion_query2')) as g: g(['arb_occlusion_query2-api'], 'api') g(['arb_occlusion_query2-render'], 'render') +# Group EXT_memory_object tests +with profile.test_list.group_manager( +PiglitGLTest, +grouptools.join('spec', 'EXT_memory_object')) as g: +g(['ext_memory_object-api-errors'], 'api-errors') + # Group EXT_texture_format_BGRA tests with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'EXT_texture_format_BGRA')) as g: g(['ext_texture_format_bgra-api-errors'], 'api-errors') with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_pixel_buffer_object')) as g: g(['cubemap', 'pbo']) diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index fea256163..28d2bb26e 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -78,20 +78,21 @@ add_subdirectory (arb_timer_query) add_subdirectory (arb_transform_feedback2) add_subdirectory (arb_transform_feedback3) add_subdirectory (arb_transform_feedback_overflow_query) add_subdirectory (arb_viewport_array) add_subdirectory (ati_envmap_bumpmap) add_subdirectory (ext_depth_bounds_test) add_subdirectory (ext_frag_depth) add_subdirectory (ext_fog_coord) add_subdirectory (ext_framebuffer_multisample) add_subdirectory (ext_framebuffer_multisample_blit_scaled) +add_subdirectory (ext_memory_object) add_subdirectory (ext_packed_depth_stencil) add_subdirectory (ext_packed_float) add_subdirectory (ext_shader_samples_identical) add_subdirectory (ext_texture_swizzle) add_subdirectory (ext_timer_query) add_subdirectory (ext_transform_feedback) add_subdirectory (nv_conditional_render) add_subdirectory (nv_fill_rectangle) add_subdirectory (nv_image_formats) add_subdirectory (nv_texture_barrier) diff --git a/tests/spec/ext_memory_object/CMakeLists.gl.txt b/tests/spec/ext_memory_object/CMakeLists.gl.txt new file mode 100644 index 0..3a714e6af --- /dev/null +++ b/tests/spec/ext_memory_object/CMakeLists.gl.txt @@ -0,0 +1,14 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} +) + +piglit_add_executable (ext_memory_object-api-errors api-errors.c) + + +# vim: ft=cmake: diff --git a/tests/spec/ext_memory_object/CMakeLists.txt b/tests/spec/ext_memory_object/CMakeLists.txt new file mode 100644 index 0..144a306f4 --- /dev/null +++ b/tests/spec/ext_memory_object/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/ext_memory_object/api-errors.c b/tests/spec/ext_memory_object/api-errors.c new file mode 100644 index 0..df413c5ed --- /dev/null +++ b/tests/spec/ext_memory_object/api-errors.c @@ -0,0 +1,235 @@ +/* + * Copyright (c) 2017 Timothy Arceri + * + * 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 + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, 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 &qu
Re: [Piglit] [PATCH 2/2] ext_memory_object: add some basic api error checks
On 08/04/2017 03:43 AM, Timothy Arceri wrote: This only tests for errors when is 0, but its a start. --- tests/all.py | 6 + tests/spec/CMakeLists.txt | 1 + tests/spec/ext_memory_object/CMakeLists.gl.txt | 14 ++ tests/spec/ext_memory_object/CMakeLists.txt| 1 + tests/spec/ext_memory_object/api-errors.c | 241 + 5 files changed, 263 insertions(+) create mode 100644 tests/spec/ext_memory_object/CMakeLists.gl.txt create mode 100644 tests/spec/ext_memory_object/CMakeLists.txt create mode 100644 tests/spec/ext_memory_object/api-errors.c diff --git a/tests/all.py b/tests/all.py index 177957b0b..521a0fc50 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2361,20 +2361,26 @@ with profile.test_list.group_manager( g(['khr_debug-push-pop-group_gles2'], 'push-pop-group_gles2') g(['khr_debug-push-pop-group_gles3'], 'push-pop-group_gles3') # Group ARB_occlusion_query2 with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_occlusion_query2')) as g: g(['arb_occlusion_query2-api'], 'api') g(['arb_occlusion_query2-render'], 'render') +# Group EXT_memory_object tests +with profile.test_list.group_manager( +PiglitGLTest, +grouptools.join('spec', 'EXT_memory_object')) as g: +g(['ext_memory_object-api-errors'], 'api-errors') + # Group EXT_texture_format_BGRA tests with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'EXT_texture_format_BGRA')) as g: g(['ext_texture_format_bgra-api-errors'], 'api-errors') with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_pixel_buffer_object')) as g: g(['cubemap', 'pbo']) diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index fea256163..28d2bb26e 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -78,20 +78,21 @@ add_subdirectory (arb_timer_query) add_subdirectory (arb_transform_feedback2) add_subdirectory (arb_transform_feedback3) add_subdirectory (arb_transform_feedback_overflow_query) add_subdirectory (arb_viewport_array) add_subdirectory (ati_envmap_bumpmap) add_subdirectory (ext_depth_bounds_test) add_subdirectory (ext_frag_depth) add_subdirectory (ext_fog_coord) add_subdirectory (ext_framebuffer_multisample) add_subdirectory (ext_framebuffer_multisample_blit_scaled) +add_subdirectory (ext_memory_object) add_subdirectory (ext_packed_depth_stencil) add_subdirectory (ext_packed_float) add_subdirectory (ext_shader_samples_identical) add_subdirectory (ext_texture_swizzle) add_subdirectory (ext_timer_query) add_subdirectory (ext_transform_feedback) add_subdirectory (nv_conditional_render) add_subdirectory (nv_fill_rectangle) add_subdirectory (nv_image_formats) add_subdirectory (nv_texture_barrier) diff --git a/tests/spec/ext_memory_object/CMakeLists.gl.txt b/tests/spec/ext_memory_object/CMakeLists.gl.txt new file mode 100644 index 0..3a714e6af --- /dev/null +++ b/tests/spec/ext_memory_object/CMakeLists.gl.txt @@ -0,0 +1,14 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} +) + +piglit_add_executable (ext_memory_object-api-errors api-errors.c) + + +# vim: ft=cmake: diff --git a/tests/spec/ext_memory_object/CMakeLists.txt b/tests/spec/ext_memory_object/CMakeLists.txt new file mode 100644 index 0..144a306f4 --- /dev/null +++ b/tests/spec/ext_memory_object/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/ext_memory_object/api-errors.c b/tests/spec/ext_memory_object/api-errors.c new file mode 100644 index 0..58694b9fa --- /dev/null +++ b/tests/spec/ext_memory_object/api-errors.c @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2017 Timothy Arceri + * + * 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 + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, 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 + * NON-INFRINGEMENT. IN NO EVENT SHALL VMWARE AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
Re: [Piglit] [PATCH 2/2] ext_memory_object: add some basic api error checks
1/2 got lost? On 08/04/2017 03:43 AM, Timothy Arceri wrote: This only tests for errors when is 0, but its a start. --- tests/all.py | 6 + tests/spec/CMakeLists.txt | 1 + tests/spec/ext_memory_object/CMakeLists.gl.txt | 14 ++ tests/spec/ext_memory_object/CMakeLists.txt| 1 + tests/spec/ext_memory_object/api-errors.c | 241 + 5 files changed, 263 insertions(+) create mode 100644 tests/spec/ext_memory_object/CMakeLists.gl.txt create mode 100644 tests/spec/ext_memory_object/CMakeLists.txt create mode 100644 tests/spec/ext_memory_object/api-errors.c diff --git a/tests/all.py b/tests/all.py index 177957b0b..521a0fc50 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2361,20 +2361,26 @@ with profile.test_list.group_manager( g(['khr_debug-push-pop-group_gles2'], 'push-pop-group_gles2') g(['khr_debug-push-pop-group_gles3'], 'push-pop-group_gles3') # Group ARB_occlusion_query2 with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_occlusion_query2')) as g: g(['arb_occlusion_query2-api'], 'api') g(['arb_occlusion_query2-render'], 'render') +# Group EXT_memory_object tests +with profile.test_list.group_manager( +PiglitGLTest, +grouptools.join('spec', 'EXT_memory_object')) as g: +g(['ext_memory_object-api-errors'], 'api-errors') + # Group EXT_texture_format_BGRA tests with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'EXT_texture_format_BGRA')) as g: g(['ext_texture_format_bgra-api-errors'], 'api-errors') with profile.test_list.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_pixel_buffer_object')) as g: g(['cubemap', 'pbo']) diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index fea256163..28d2bb26e 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -78,20 +78,21 @@ add_subdirectory (arb_timer_query) add_subdirectory (arb_transform_feedback2) add_subdirectory (arb_transform_feedback3) add_subdirectory (arb_transform_feedback_overflow_query) add_subdirectory (arb_viewport_array) add_subdirectory (ati_envmap_bumpmap) add_subdirectory (ext_depth_bounds_test) add_subdirectory (ext_frag_depth) add_subdirectory (ext_fog_coord) add_subdirectory (ext_framebuffer_multisample) add_subdirectory (ext_framebuffer_multisample_blit_scaled) +add_subdirectory (ext_memory_object) add_subdirectory (ext_packed_depth_stencil) add_subdirectory (ext_packed_float) add_subdirectory (ext_shader_samples_identical) add_subdirectory (ext_texture_swizzle) add_subdirectory (ext_timer_query) add_subdirectory (ext_transform_feedback) add_subdirectory (nv_conditional_render) add_subdirectory (nv_fill_rectangle) add_subdirectory (nv_image_formats) add_subdirectory (nv_texture_barrier) diff --git a/tests/spec/ext_memory_object/CMakeLists.gl.txt b/tests/spec/ext_memory_object/CMakeLists.gl.txt new file mode 100644 index 0..3a714e6af --- /dev/null +++ b/tests/spec/ext_memory_object/CMakeLists.gl.txt @@ -0,0 +1,14 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} +) + +piglit_add_executable (ext_memory_object-api-errors api-errors.c) + + +# vim: ft=cmake: diff --git a/tests/spec/ext_memory_object/CMakeLists.txt b/tests/spec/ext_memory_object/CMakeLists.txt new file mode 100644 index 0..144a306f4 --- /dev/null +++ b/tests/spec/ext_memory_object/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/ext_memory_object/api-errors.c b/tests/spec/ext_memory_object/api-errors.c new file mode 100644 index 0..58694b9fa --- /dev/null +++ b/tests/spec/ext_memory_object/api-errors.c @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2017 Timothy Arceri + * + * 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 + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, 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 + * NON-INFRINGEMENT. IN NO EVENT SHALL VMWARE AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
[Piglit] [PATCH] arb_bindless_texture: add a test which sets mixed texture units/handles
This test currently fails to return the correct 64-bit handle value with Mesa. This is because it ends up by performing the slower convert-and-copy process instead of just memcpy'ing the value. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_bindless_texture/uniform.c | 89 +++ 1 file changed, 89 insertions(+) diff --git a/tests/spec/arb_bindless_texture/uniform.c b/tests/spec/arb_bindless_texture/uniform.c index 393b1dab5..aa3e0ec81 100644 --- a/tests/spec/arb_bindless_texture/uniform.c +++ b/tests/spec/arb_bindless_texture/uniform.c @@ -27,6 +27,8 @@ * glUniformHandleui*64ARB(), glGetActiveUniform(), etc. */ +#include + #include "common.h" static struct piglit_gl_test_config *piglit_config; @@ -355,6 +357,87 @@ check_Uniform_with_implicit_bound_image(void *data) return PIGLIT_PASS; } +static bool +check_uniform_int(GLuint prog, int loc, int expect) +{ +int v = 0xdeadcafe; + +glGetUniformiv(prog, loc, ); +if (v != expect) { +fprintf(stderr, "Invalid value for uniform %d\n" +" Expected: %d\n" +" Observed: %d\n", +loc, expect, v); +return false; +} +return piglit_check_gl_error(GL_NO_ERROR); +} + +static bool +check_uniform_handle(GLuint prog, int loc, GLuint64 expect) +{ +GLuint64 v = 0xdeadcafedeadcafe; + +glGetUniformui64vARB(prog, loc, ); +if (v != expect) { +fprintf(stderr, "Invalid value for uniform %d\n" +" Expected: %"PRIx64"\n" +" Observed: %"PRIx64"\n", +loc, expect, v); +return false; +} +return piglit_check_gl_error(GL_NO_ERROR); +} + +static enum piglit_result +check_Uniform_with_texture_units_and_handles(void *data) +{ + const char *fs_src = + "#version 330\n" + "#extension GL_ARB_bindless_texture: require\n" + "\n" + "layout (bindless_sampler) uniform sampler2D texs[5];\n" + "uniform int i;\n" + "out vec4 color;\n" + "\n" + "void main()\n" + "{\n" + " color = texture(texs[i], vec2(0, 0));\n" + "}\n"; + int units[5] = { 4, 7, 8, 1, 5 }; + GLuint64 handle = 0x1004002010040020; + GLuint vs, fs, prog; + bool pass = true; + GLint loc; + + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, passthrough_vs_src); + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_src); + prog = piglit_link_simple_program(vs, fs); + glUseProgram(prog); + + loc = glGetUniformLocation(prog, "texs"); + if (loc == -1) + return PIGLIT_FAIL; + + /* Check setting an array of texture units. */ + glUniform1iv(loc, 5, units); + + for (int i = 0; i < 5; i++) { + pass &= check_uniform_int(prog, loc + i, units[i]); + } + + /* Check setting a texture handle. */ + glUniformHandleui64ARB(loc, handle); + pass &= check_uniform_handle(prog, loc, handle); + + /* Make sure setting the handle didn't overwrite other values. */ + for (int i = 1; i < 5; i++) { + pass &= check_uniform_int(prog, loc + i, units[i]); + } + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} + static enum piglit_result use_glGetActiveUniform_with_sampler(void *data) { @@ -464,6 +547,12 @@ static const struct piglit_subtest subtests[] = { NULL }, { + "Check glUniform*() with mixed texture units/handles", + "check_Uniform_with_texture_units_and_handles", + check_Uniform_with_texture_units_and_handles, + NULL + }, + { "Use glGetActiveUniform with a sampler type", "use_glGetActiveUniform_with_sampler", use_glGetActiveUniform_with_sampler, -- 2.13.3 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/8] ext_framebuffer_multisample: set KHR_no_error status
Thanks! For the series: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 07/06/2017 05:53 AM, Timothy Arceri wrote: --- .../spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c | 1 + .../ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp | 1 + .../alpha-to-coverage-no-draw-buffer-zero-write.cpp | 1 + .../alpha-to-coverage-no-draw-buffer-zero.cpp | 1 + .../spec/ext_framebuffer_multisample/alpha-to-one-dual-src-blend.cpp | 1 + tests/spec/ext_framebuffer_multisample/alpha-to-one-msaa-disabled.cpp | 1 + .../ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp | 1 + tests/spec/ext_framebuffer_multisample/bitmap.cpp | 1 + tests/spec/ext_framebuffer_multisample/blit-flipped.cpp | 1 + tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp| 1 + tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp| 1 + tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp | 1 + .../spec/ext_framebuffer_multisample/blit-multiple-render-targets.cpp | 1 + tests/spec/ext_framebuffer_multisample/clear.cpp | 1 + tests/spec/ext_framebuffer_multisample/clip-and-scissor-blit.cpp | 1 + tests/spec/ext_framebuffer_multisample/dlist.c| 1 + .../ext_framebuffer_multisample/draw-buffers-alpha-to-coverage.cpp| 1 + tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-one.cpp | 1 + tests/spec/ext_framebuffer_multisample/enable-flag.cpp| 1 + tests/spec/ext_framebuffer_multisample/fast-clear.c | 4 tests/spec/ext_framebuffer_multisample/formats.cpp| 1 + .../int-draw-buffers-alpha-to-coverage.cpp| 1 + .../ext_framebuffer_multisample/int-draw-buffers-alpha-to-one.cpp | 1 + tests/spec/ext_framebuffer_multisample/interpolation.cpp | 1 + tests/spec/ext_framebuffer_multisample/line-smooth.cpp| 1 + tests/spec/ext_framebuffer_multisample/minmax.c | 1 + tests/spec/ext_framebuffer_multisample/multisample-blit.cpp | 1 + tests/spec/ext_framebuffer_multisample/negative-copypixels.c | 1 + tests/spec/ext_framebuffer_multisample/negative-copyteximage.c| 1 + tests/spec/ext_framebuffer_multisample/negative-max-samples.c | 1 + tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c | 1 + tests/spec/ext_framebuffer_multisample/negative-readpixels.c | 1 + tests/spec/ext_framebuffer_multisample/no-color.cpp | 1 + tests/spec/ext_framebuffer_multisample/point-smooth.cpp | 1 + tests/spec/ext_framebuffer_multisample/polygon-smooth.cpp | 1 + tests/spec/ext_framebuffer_multisample/polygon-stipple.cpp| 1 + tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c | 1 + tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c | 1 + tests/spec/ext_framebuffer_multisample/sample-alpha-to-coverage.cpp | 1 + tests/spec/ext_framebuffer_multisample/sample-alpha-to-one.cpp| 1 + tests/spec/ext_framebuffer_multisample/sample-coverage.cpp| 1 + tests/spec/ext_framebuffer_multisample/samples.c | 1 + tests/spec/ext_framebuffer_multisample/turn-on-off.cpp| 1 + tests/spec/ext_framebuffer_multisample/unaligned-blit.cpp | 1 + tests/spec/ext_framebuffer_multisample/upsample.cpp | 1 + 45 files changed, 48 insertions(+) diff --git a/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c b/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c index a654f9f..816b634 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c +++ b/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c @@ -47,6 +47,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp b/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp index 777af0c..34bbfa7 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp +++ b/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 512; config.window_height = 256; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONF
Re: [Piglit] [PATCH] arb_texture_buffer_object: set KHR_no_error support
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 07/06/2017 06:41 AM, Timothy Arceri wrote: Here we also move some of the config setup to the top of the file as this is the layout of piglit tests everywhere else in piglit. --- tests/spec/arb_texture_buffer_object/bufferstorage.c| 11 ++- tests/spec/arb_texture_buffer_object/data-sync.c| 1 + tests/spec/arb_texture_buffer_object/dlist.c| 1 + tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c | 13 +++-- tests/spec/arb_texture_buffer_object/formats.c | 1 + tests/spec/arb_texture_buffer_object/get.c | 1 + tests/spec/arb_texture_buffer_object/max-size.c | 11 ++- tests/spec/arb_texture_buffer_object/minmax.c | 1 + tests/spec/arb_texture_buffer_object/negative-bad-bo.c | 1 + tests/spec/arb_texture_buffer_object/negative-bad-format.c | 1 + tests/spec/arb_texture_buffer_object/negative-bad-target.c | 1 + tests/spec/arb_texture_buffer_object/negative-unsupported.c | 1 + tests/spec/arb_texture_buffer_object/render-no-bo.c | 13 +++-- tests/spec/arb_texture_buffer_object/subdata-sync.c | 1 + tests/spec/arb_texture_buffer_object/unused-name.c | 1 + 15 files changed, 37 insertions(+), 22 deletions(-) diff --git a/tests/spec/arb_texture_buffer_object/bufferstorage.c b/tests/spec/arb_texture_buffer_object/bufferstorage.c index c46c70d..16e4dcd 100644 --- a/tests/spec/arb_texture_buffer_object/bufferstorage.c +++ b/tests/spec/arb_texture_buffer_object/bufferstorage.c @@ -27,6 +27,12 @@ #include "piglit-util-gl.h" +PIGLIT_GL_TEST_CONFIG_BEGIN + config.supports_gl_core_version = 31; + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; +PIGLIT_GL_TEST_CONFIG_END + static const float green[4] = {0, 1, 0, 0}; static const float red[4] = {1, 0, 0, 0}; static float *map; @@ -138,8 +144,3 @@ piglit_init(int argc, char **argv) GL_FALSE, 0, NULL); glEnableVertexAttribArray(vertex_location); } - -PIGLIT_GL_TEST_CONFIG_BEGIN - config.supports_gl_core_version = 31; - config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; -PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_buffer_object/data-sync.c b/tests/spec/arb_texture_buffer_object/data-sync.c index 5542734..511690d 100644 --- a/tests/spec/arb_texture_buffer_object/data-sync.c +++ b/tests/spec/arb_texture_buffer_object/data-sync.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END enum piglit_result diff --git a/tests/spec/arb_texture_buffer_object/dlist.c b/tests/spec/arb_texture_buffer_object/dlist.c index ea15f61..565dc24 100644 --- a/tests/spec/arb_texture_buffer_object/dlist.c +++ b/tests/spec/arb_texture_buffer_object/dlist.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c index c9aa6c4..c0e3976 100644 --- a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c +++ b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c @@ -39,6 +39,13 @@ #include "piglit-util-gl.h" +PIGLIT_GL_TEST_CONFIG_BEGIN + config.supports_gl_compat_version = 10; + config.supports_gl_core_version = 31; + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; +PIGLIT_GL_TEST_CONFIG_END + enum piglit_result piglit_display(void) { @@ -113,9 +120,3 @@ piglit_init(int argc, char **argv) if (piglit_get_gl_version() < 31) piglit_require_extension("GL_ARB_texture_buffer_object"); } - -PIGLIT_GL_TEST_CONFIG_BEGIN - config.supports_gl_compat_version = 10; - config.supports_gl_core_version = 31; - config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; -PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c index fad657d..f2960cd 100644 --- a/tests/spec/arb_texture_buffer_object/formats.c +++ b/tests/spec/arb_texture_buffer_object/formats.c @@ -719,4 +719,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 200; config.window_height = 500; config.window_visual = PIGLIT_G
Re: [Piglit] [PATCH 01/10] arb_shader_atomic_counters: fix KHR_no_error support for buffer binding test
For the series: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 07/05/2017 07:23 AM, Timothy Arceri wrote: --- tests/spec/arb_shader_atomic_counters/buffer-binding.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/spec/arb_shader_atomic_counters/buffer-binding.c b/tests/spec/arb_shader_atomic_counters/buffer-binding.c index 7eeaae9..de4e9d1 100644 --- a/tests/spec/arb_shader_atomic_counters/buffer-binding.c +++ b/tests/spec/arb_shader_atomic_counters/buffer-binding.c @@ -141,10 +141,12 @@ piglit_init(int argc, char **argv) "implementation limit", run_test_bind_at, ls.bindings - 1); -atomic_counters_subtest(, GL_NONE, -"Atomic buffer binding above the " -"implementation limit", -!run_test_bind_at, ls.bindings); +if (!piglit_khr_no_error) { +atomic_counters_subtest(, GL_NONE, +"Atomic buffer binding above the " +"implementation limit", +!run_test_bind_at, ls.bindings); +} atomic_counters_subtest(, GL_NONE, "Atomic buffer range binding", ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] bugs: set KHR_no_error support for remaining bugs tests
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/29/2017 07:39 AM, Timothy Arceri wrote: --- tests/bugs/crash-cubemap-order.c| 1 + tests/bugs/crash-texparameter-before-teximage.c | 1 + tests/bugs/drawbuffer-modes.c | 1 + tests/bugs/fdo10370.c | 1 + tests/bugs/fdo14575.c | 1 + tests/bugs/fdo20701.c | 1 + tests/bugs/fdo23489.c | 1 + tests/bugs/fdo23670-depth_test.c| 1 + tests/bugs/fdo23670-drawpix_stencil.c | 1 + tests/bugs/fdo24066.c | 1 + tests/bugs/fdo25614-genmipmap.c | 1 + tests/bugs/fdo28551.c | 1 + tests/bugs/fdo31934.c | 1 + tests/bugs/point-sprite.c | 1 + tests/bugs/r300-readcache.c | 1 + tests/bugs/tex1d-2dborder.c | 1 + tests/bugs/tri-tex-crash.c | 1 + tests/bugs/vbo-buffer-unmap.c | 1 + 18 files changed, 18 insertions(+) diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c index c6b3882..7b733be 100644 --- a/tests/bugs/crash-cubemap-order.c +++ b/tests/bugs/crash-cubemap-order.c @@ -13,6 +13,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c index 1842f81..0fd4a9e 100644 --- a/tests/bugs/crash-texparameter-before-teximage.c +++ b/tests/bugs/crash-texparameter-before-teximage.c @@ -14,6 +14,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c index 3fbda26..94d9796 100644 --- a/tests/bugs/drawbuffer-modes.c +++ b/tests/bugs/drawbuffer-modes.c @@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; config.requires_displayed_window = true; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/fdo10370.c b/tests/bugs/fdo10370.c index 7826543..322f94d 100644 --- a/tests/bugs/fdo10370.c +++ b/tests/bugs/fdo10370.c @@ -10,6 +10,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/fdo14575.c b/tests/bugs/fdo14575.c index a6125dc..3215942 100644 --- a/tests/bugs/fdo14575.c +++ b/tests/bugs/fdo14575.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c index b06d815..6f3c3f1 100644 --- a/tests/bugs/fdo20701.c +++ b/tests/bugs/fdo20701.c @@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c index e1bd95c..848a190 100644 --- a/tests/bugs/fdo23489.c +++ b/tests/bugs/fdo23489.c @@ -12,6 +12,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 250; config.window_height = 250; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c index 86b792f..3e9dfad 100644 --- a/tests/bugs/fdo23670-depth_test.c +++ b/tests/bugs/fdo23670-depth_test.c @@ -31,6 +31,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c index 95cd9ac..4dcb9e0 100644 --- a/tests/bugs/fdo23670-drawpix_stencil.c +++ b/tests/bugs/fdo23670-drawpix_stencil.c @@ -31,6 +31,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISU
Re: [Piglit] [PATCH] gl-1.0: set KHR_no_error support for remaining gl-1.0 tests
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/29/2017 08:07 AM, Timothy Arceri wrote: --- tests/spec/gl-1.0/blend.c | 1 + tests/spec/gl-1.0/dlist-bitmap.c| 1 + tests/spec/gl-1.0/dlist-shademodel.c| 1 + tests/spec/gl-1.0/drawpixels-color-index.c | 1 + tests/spec/gl-1.0/edgeflag-const.c | 1 + tests/spec/gl-1.0/edgeflag-quads.c | 1 + tests/spec/gl-1.0/edgeflag.c| 1 + tests/spec/gl-1.0/fpexceptions.c| 1 + tests/spec/gl-1.0/front-invalidate-back.c | 1 + tests/spec/gl-1.0/logicop.c | 1 + tests/spec/gl-1.0/long-dlist.c | 1 + tests/spec/gl-1.0/no-op-paths.c | 15 ++- tests/spec/gl-1.0/orthpos.c | 1 + tests/spec/gl-1.0/polygon-line-aa.c | 1 + tests/spec/gl-1.0/push-no-attribs.c | 1 + tests/spec/gl-1.0/rastercolor.c | 1 + tests/spec/gl-1.0/readpix.c | 1 + tests/spec/gl-1.0/readpixels-oob.c | 1 + tests/spec/gl-1.0/scissor-bitmap.c | 1 + tests/spec/gl-1.0/scissor-clear.c | 1 + tests/spec/gl-1.0/scissor-copypixels.c | 1 + tests/spec/gl-1.0/scissor-depth-clear-negative-xy.c | 1 + tests/spec/gl-1.0/scissor-depth-clear.c | 1 + tests/spec/gl-1.0/scissor-many.c| 1 + tests/spec/gl-1.0/scissor-offscreen.c | 1 + tests/spec/gl-1.0/scissor-polygon.c | 1 + tests/spec/gl-1.0/scissor-stencil-clear.c | 1 + tests/spec/gl-1.0/simple-readbuffer.c | 1 + tests/spec/gl-1.0/spot-light.c | 1 + tests/spec/gl-1.0/swapbuffers-behavior.c| 1 + 30 files changed, 39 insertions(+), 5 deletions(-) diff --git a/tests/spec/gl-1.0/blend.c b/tests/spec/gl-1.0/blend.c index 68f3fc4..c1796a5 100644 --- a/tests/spec/gl-1.0/blend.c +++ b/tests/spec/gl-1.0/blend.c @@ -80,6 +80,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-1.0/dlist-bitmap.c b/tests/spec/gl-1.0/dlist-bitmap.c index 203a9d9..512fde7 100644 --- a/tests/spec/gl-1.0/dlist-bitmap.c +++ b/tests/spec/gl-1.0/dlist-bitmap.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; config.window_width = 900; config.window_height = 300; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-1.0/dlist-shademodel.c b/tests/spec/gl-1.0/dlist-shademodel.c index 1be193f..9af4072 100644 --- a/tests/spec/gl-1.0/dlist-shademodel.c +++ b/tests/spec/gl-1.0/dlist-shademodel.c @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-1.0/drawpixels-color-index.c b/tests/spec/gl-1.0/drawpixels-color-index.c index b9572a5..275d022 100644 --- a/tests/spec/gl-1.0/drawpixels-color-index.c +++ b/tests/spec/gl-1.0/drawpixels-color-index.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-1.0/edgeflag-const.c b/tests/spec/gl-1.0/edgeflag-const.c index e3ea927..60fc00d 100644 --- a/tests/spec/gl-1.0/edgeflag-const.c +++ b/tests/spec/gl-1.0/edgeflag-const.c @@ -28,6 +28,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-1.0/edgeflag-quads.c b/tests/spec/gl-1.0/edgeflag-quads.c index dd8d4a2..0b0285f 100644 --- a/tests/spec/gl-1.0/edgeflag-quads.c +++ b/tests/spec/gl-1.0/edgeflag-quads.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-1.0/edgeflag.c b/tests/spec/gl-1.0/edgeflag.c index bd9845c..c9cfc77 100644 --- a/tests/spec/gl-1.0/edgeflag.c +++ b/tests/spec/gl-1.0/edgeflag.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG
Re: [Piglit] [PATCH] ARB_blend_func_extended: set KHR_no_error status
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/29/2017 08:24 AM, Timothy Arceri wrote: --- .../api/bindfragdataindexed-invalid-parameters.c | 1 + tests/spec/arb_blend_func_extended/api/blend-api.c| 1 + tests/spec/arb_blend_func_extended/api/builtins.c | 1 + .../spec/arb_blend_func_extended/api/error-at-begin.c | 1 + .../arb_blend_func_extended/api/getfragdataindex.c| 19 +++ .../arb_blend_func_extended/api/output-location.c | 1 + .../execution/fbo-extended-blend-explicit.c | 1 + .../execution/fbo-extended-blend-pattern.c| 1 + .../execution/fbo-extended-blend.c| 1 + 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c index c4a8d53..27ae062 100644 --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 30; #endif config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-api.c index 4c34bc7..9160862 100644 --- a/tests/spec/arb_blend_func_extended/api/blend-api.c +++ b/tests/spec/arb_blend_func_extended/api/blend-api.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 20; #endif config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_blend_func_extended/api/builtins.c b/tests/spec/arb_blend_func_extended/api/builtins.c index 7525244..f4eac95 100644 --- a/tests/spec/arb_blend_func_extended/api/builtins.c +++ b/tests/spec/arb_blend_func_extended/api/builtins.c @@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 20; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_blend_func_extended/api/error-at-begin.c b/tests/spec/arb_blend_func_extended/api/error-at-begin.c index da09501..7acf333 100644 --- a/tests/spec/arb_blend_func_extended/api/error-at-begin.c +++ b/tests/spec/arb_blend_func_extended/api/error-at-begin.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c index a30263e..3c0efd0 100644 --- a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c +++ b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 30; #endif config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -132,18 +133,20 @@ void piglit_init(int argc, char **argv) * OPERATION is generated. If name is not a varying out variable, * or if an error occurs, -1 will be returned." */ - printf("Querying index before linking...\n"); + if (!piglit_khr_no_error) { + printf("Querying index before linking...\n"); #ifdef PIGLIT_USE_OPENGL - idx = glGetFragDataIndex(prog, "v"); + idx = glGetFragDataIndex(prog, "v"); #else // PIGLIT_USE_OPENGLES3 - idx = glGetFragDataIndexEXT(prog, "v"); + idx = glGetFragDataIndexEXT(prog, "v"); #endif - if (!piglit_check_gl_error(GL_INVALID_OPERATION)) - piglit_report_result(PIGLIT_FAIL); + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) + piglit_report_result(PIGLIT_FAIL); - if (idx != -1) { - fprintf(stderr, "Expected index = -1, got %d\n", idx); - piglit_report_result(PIGLIT_FAIL); + if (idx != -1) { + fprintf(stderr, "Expected index = -1, got %d\n", idx); + piglit_report_result(PIGLIT_FAIL); + } } glLinkProgram(prog); diff --git a/tests/spec/arb_blend_func_extended/api/output-location.c b/tests/spec/arb_blend_func_extended/api/o
[Piglit] [PATCH] ext_packed_depth_stencil: set KHR_no_error compatibility
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c | 1 + tests/spec/ext_packed_depth_stencil/errors.c| 8 ++-- tests/spec/ext_packed_depth_stencil/getteximage.c | 1 + tests/spec/ext_packed_depth_stencil/readdrawpixels.c| 1 + tests/spec/ext_packed_depth_stencil/readpixels-24_8.c | 1 + tests/spec/ext_packed_depth_stencil/texsubimage.c | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c b/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c index 62f461a47..64c1893f6 100644 --- a/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c +++ b/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c @@ -53,6 +53,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN #endif config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_packed_depth_stencil/errors.c b/tests/spec/ext_packed_depth_stencil/errors.c index 74d40cca8..d1e51c1e1 100644 --- a/tests/spec/ext_packed_depth_stencil/errors.c +++ b/tests/spec/ext_packed_depth_stencil/errors.c @@ -33,6 +33,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = (PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL); + config.khr_no_error_support = PIGLIT_NO_ERRORS; + PIGLIT_GL_TEST_CONFIG_END @@ -93,8 +95,10 @@ piglit_init(int argc, char **argv) piglit_require_extension("GL_EXT_packed_depth_stencil"); - pass = test_drawpixels() && pass; - pass = test_readpixels() && pass; + if (!piglit_khr_no_error) { + pass = test_drawpixels() && pass; + pass = test_readpixels() && pass; + } /* The EXT_packed_depth_stencil spec says: * diff --git a/tests/spec/ext_packed_depth_stencil/getteximage.c b/tests/spec/ext_packed_depth_stencil/getteximage.c index 2302e6f82..40a12af4c 100644 --- a/tests/spec/ext_packed_depth_stencil/getteximage.c +++ b/tests/spec/ext_packed_depth_stencil/getteximage.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; config.window_visual = PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_packed_depth_stencil/readdrawpixels.c b/tests/spec/ext_packed_depth_stencil/readdrawpixels.c index 10c8a6182..7be6664c5 100644 --- a/tests/spec/ext_packed_depth_stencil/readdrawpixels.c +++ b/tests/spec/ext_packed_depth_stencil/readdrawpixels.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = (PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL); + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c index 7fb9ad8ac..db71dba8b 100644 --- a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c +++ b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/ext_packed_depth_stencil/texsubimage.c b/tests/spec/ext_packed_depth_stencil/texsubimage.c index 6b9a917ab..999d2e0bc 100644 --- a/tests/spec/ext_packed_depth_stencil/texsubimage.c +++ b/tests/spec/ext_packed_depth_stencil/texsubimage.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 13; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.13.2 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] fbo: set KHR_no_error compatibility for remaining fbo tests
On 06/27/2017 02:19 AM, Timothy Arceri wrote: On 26/06/17 19:04, Samuel Pitoiset wrote: Looks like you forgot to update fbo-storage-formats.c. It's updated. Did you mean something else? I meant, there is a GL_INVALID_ENUM which is not handled correctly, no? With that fixed, patch is: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Thanks! On 06/26/2017 08:00 AM, Timothy Arceri wrote: --- tests/fbo/fbo-1d.c | 1 + tests/fbo/fbo-3d.c | 1 + tests/fbo/fbo-alpha.c | 1 + tests/fbo/fbo-alphatest-formats.c | 1 + tests/fbo/fbo-alphatest-nocolor-ff.c | 1 + tests/fbo/fbo-alphatest-nocolor.c | 1 + tests/fbo/fbo-array.c | 1 + tests/fbo/fbo-bind-renderbuffer.c | 9 -- tests/fbo/fbo-blending-formats.c | 1 + tests/fbo/fbo-blit-d24s8.c | 1 + tests/fbo/fbo-blit-stretch.cpp | 1 + tests/fbo/fbo-blit.c | 1 + tests/fbo/fbo-clear-formats.c | 1 + tests/fbo/fbo-clearmipmap.c| 1 + tests/fbo/fbo-colormask-formats.c | 1 + tests/fbo/fbo-copypix.c| 1 + tests/fbo/fbo-copyteximage-simple.c| 1 + tests/fbo/fbo-copyteximage.c | 1 + tests/fbo/fbo-cubemap.c| 1 + tests/fbo/fbo-depth-array.c| 1 + tests/fbo/fbo-depth-tex1d.c| 1 + tests/fbo/fbo-depth.c | 1 + tests/fbo/fbo-depthtex.c | 1 + tests/fbo/fbo-deriv.c | 1 + tests/fbo/fbo-draw-buffers-blend.c | 1 + tests/fbo/fbo-drawbuffers-arbfp.c | 1 + tests/fbo/fbo-drawbuffers-blend-add.c | 1 + tests/fbo/fbo-drawbuffers-fragcolor.c | 1 + tests/fbo/fbo-drawbuffers-maxtargets.c | 1 + tests/fbo/fbo-drawbuffers.c| 1 + tests/fbo/fbo-drawbuffers2-blend.c | 1 + tests/fbo/fbo-drawbuffers2-colormask.c | 1 + tests/fbo/fbo-finish-deleted.c | 1 + tests/fbo/fbo-flushing-2.c | 1 + tests/fbo/fbo-flushing.c | 1 + tests/fbo/fbo-fragcoord.c | 1 + tests/fbo/fbo-fragcoord2.c | 1 + tests/fbo/fbo-generatemipmap-filtering.c | 1 + tests/fbo/fbo-generatemipmap-formats.c | 1 + tests/fbo/fbo-generatemipmap-noimage.c | 1 + tests/fbo/fbo-generatemipmap-nonsquare.c | 1 + tests/fbo/fbo-generatemipmap-npot.c| 1 + tests/fbo/fbo-generatemipmap-scissor.c | 1 + tests/fbo/fbo-generatemipmap-swizzle.c | 1 + tests/fbo/fbo-generatemipmap-viewport.c| 1 + tests/fbo/fbo-generatemipmap.c | 1 + .../fbo/fbo-getframebufferattachmentparameter-01.c | 36 +- tests/fbo/fbo-gl_pointcoord.c | 1 + tests/fbo/fbo-incomplete-invalid-texture.c | 1 + tests/fbo/fbo-incomplete-texture-01.c | 1 + tests/fbo/fbo-incomplete-texture-02.c | 1 + tests/fbo/fbo-incomplete-texture-03.c | 1 + tests/fbo/fbo-incomplete-texture-04.c | 1 + tests/fbo/fbo-incomplete.cpp | 1 + tests/fbo/fbo-integer.c| 1 + tests/fbo/fbo-luminance-alpha.c| 1 + tests/fbo/fbo-maxsize.c| 1 + tests/fbo/fbo-mipmap-copypix.c | 1 + tests/fbo/fbo-mrt-alphatest.c | 1 + tests/fbo/fbo-mrt-new-bind.c | 1 + tests/fbo/fbo-nodepth-test.c | 1 + tests/fbo/fbo-nostencil-test.c | 1 + tests/fbo/fbo-pbo-readpixels-small.c | 1 + tests/fbo/fbo-readdrawpix.c| 1 + tests/fbo/fbo-readpixels-depth-formats.c | 1 + tests/fbo/fbo-readpixels.c | 1 + tests/fbo/fbo-rg.c | 1 + tests/fbo/fbo-scissor-bitmap.c | 1 + tests/fbo/fbo-scissor-blit.c | 1 + tests/fbo/fbo-srgb.c | 1 + tests/fbo/fbo-stencil.c| 1 + tests/fbo/fbo-storage-completeness.c | 5 +-- tests/fbo/fbo-storage-formats.c| 5 +-- tests/fbo/fbo-sys-blit.c | 1 + tests/fbo/fbo-sys-sub-blit.c | 1 + tests/fbo/fbo-view
Re: [Piglit] [PATCH] fbo: set KHR_no_error compatibility for remaining fbo tests
Looks like you forgot to update fbo-storage-formats.c. With that fixed, patch is: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Thanks! On 06/26/2017 08:00 AM, Timothy Arceri wrote: --- tests/fbo/fbo-1d.c | 1 + tests/fbo/fbo-3d.c | 1 + tests/fbo/fbo-alpha.c | 1 + tests/fbo/fbo-alphatest-formats.c | 1 + tests/fbo/fbo-alphatest-nocolor-ff.c | 1 + tests/fbo/fbo-alphatest-nocolor.c | 1 + tests/fbo/fbo-array.c | 1 + tests/fbo/fbo-bind-renderbuffer.c | 9 -- tests/fbo/fbo-blending-formats.c | 1 + tests/fbo/fbo-blit-d24s8.c | 1 + tests/fbo/fbo-blit-stretch.cpp | 1 + tests/fbo/fbo-blit.c | 1 + tests/fbo/fbo-clear-formats.c | 1 + tests/fbo/fbo-clearmipmap.c| 1 + tests/fbo/fbo-colormask-formats.c | 1 + tests/fbo/fbo-copypix.c| 1 + tests/fbo/fbo-copyteximage-simple.c| 1 + tests/fbo/fbo-copyteximage.c | 1 + tests/fbo/fbo-cubemap.c| 1 + tests/fbo/fbo-depth-array.c| 1 + tests/fbo/fbo-depth-tex1d.c| 1 + tests/fbo/fbo-depth.c | 1 + tests/fbo/fbo-depthtex.c | 1 + tests/fbo/fbo-deriv.c | 1 + tests/fbo/fbo-draw-buffers-blend.c | 1 + tests/fbo/fbo-drawbuffers-arbfp.c | 1 + tests/fbo/fbo-drawbuffers-blend-add.c | 1 + tests/fbo/fbo-drawbuffers-fragcolor.c | 1 + tests/fbo/fbo-drawbuffers-maxtargets.c | 1 + tests/fbo/fbo-drawbuffers.c| 1 + tests/fbo/fbo-drawbuffers2-blend.c | 1 + tests/fbo/fbo-drawbuffers2-colormask.c | 1 + tests/fbo/fbo-finish-deleted.c | 1 + tests/fbo/fbo-flushing-2.c | 1 + tests/fbo/fbo-flushing.c | 1 + tests/fbo/fbo-fragcoord.c | 1 + tests/fbo/fbo-fragcoord2.c | 1 + tests/fbo/fbo-generatemipmap-filtering.c | 1 + tests/fbo/fbo-generatemipmap-formats.c | 1 + tests/fbo/fbo-generatemipmap-noimage.c | 1 + tests/fbo/fbo-generatemipmap-nonsquare.c | 1 + tests/fbo/fbo-generatemipmap-npot.c| 1 + tests/fbo/fbo-generatemipmap-scissor.c | 1 + tests/fbo/fbo-generatemipmap-swizzle.c | 1 + tests/fbo/fbo-generatemipmap-viewport.c| 1 + tests/fbo/fbo-generatemipmap.c | 1 + .../fbo/fbo-getframebufferattachmentparameter-01.c | 36 +- tests/fbo/fbo-gl_pointcoord.c | 1 + tests/fbo/fbo-incomplete-invalid-texture.c | 1 + tests/fbo/fbo-incomplete-texture-01.c | 1 + tests/fbo/fbo-incomplete-texture-02.c | 1 + tests/fbo/fbo-incomplete-texture-03.c | 1 + tests/fbo/fbo-incomplete-texture-04.c | 1 + tests/fbo/fbo-incomplete.cpp | 1 + tests/fbo/fbo-integer.c| 1 + tests/fbo/fbo-luminance-alpha.c| 1 + tests/fbo/fbo-maxsize.c| 1 + tests/fbo/fbo-mipmap-copypix.c | 1 + tests/fbo/fbo-mrt-alphatest.c | 1 + tests/fbo/fbo-mrt-new-bind.c | 1 + tests/fbo/fbo-nodepth-test.c | 1 + tests/fbo/fbo-nostencil-test.c | 1 + tests/fbo/fbo-pbo-readpixels-small.c | 1 + tests/fbo/fbo-readdrawpix.c| 1 + tests/fbo/fbo-readpixels-depth-formats.c | 1 + tests/fbo/fbo-readpixels.c | 1 + tests/fbo/fbo-rg.c | 1 + tests/fbo/fbo-scissor-bitmap.c | 1 + tests/fbo/fbo-scissor-blit.c | 1 + tests/fbo/fbo-srgb.c | 1 + tests/fbo/fbo-stencil.c| 1 + tests/fbo/fbo-storage-completeness.c | 5 +-- tests/fbo/fbo-storage-formats.c| 5 +-- tests/fbo/fbo-sys-blit.c | 1 + tests/fbo/fbo-sys-sub-blit.c | 1 + tests/fbo/fbo-viewport.c | 1 + 76 files changed, 105 insertions(+), 22 deletions(-) diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index 63f36be..dfb9567 100644 --- a/tests/fbo/fbo-1d.c +++ b/tests/fbo/fbo-1d.c @@ -40,6
[Piglit] [PATCH 2/3] amd_vertex_shader_viewport_index: set KHR_no_error compatibility
--- tests/spec/amd_vertex_shader_viewport_index/render.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/amd_vertex_shader_viewport_index/render.c b/tests/spec/amd_vertex_shader_viewport_index/render.c index a5c59c96b..a08cbe931 100644 --- a/tests/spec/amd_vertex_shader_viewport_index/render.c +++ b/tests/spec/amd_vertex_shader_viewport_index/render.c @@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.13.1 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 1/3] arb_clip_control: set KHR_no_error compatibility
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../clip-control-depth-precision.c | 1 + tests/spec/arb_clip_control/clip-control.c | 24 -- tests/spec/arb_clip_control/viewport.c | 1 + 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/tests/spec/arb_clip_control/clip-control-depth-precision.c b/tests/spec/arb_clip_control/clip-control-depth-precision.c index 87d928e69..61282a0ad 100644 --- a/tests/spec/arb_clip_control/clip-control-depth-precision.c +++ b/tests/spec/arb_clip_control/clip-control-depth-precision.c @@ -60,6 +60,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_clip_control/clip-control.c b/tests/spec/arb_clip_control/clip-control.c index 7b5108b39..020ea0aa2 100644 --- a/tests/spec/arb_clip_control/clip-control.c +++ b/tests/spec/arb_clip_control/clip-control.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -86,17 +87,18 @@ state_test(void) glClipControl(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE); pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass; - /* Check bailing out on invalid input */ - glClipControl(GL_RGB, GL_NEGATIVE_ONE_TO_ONE); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass; - piglit_reset_gl_error(); - pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass; - - glClipControl(GL_LOWER_LEFT, GL_RGB); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass; - piglit_reset_gl_error(); - pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass; - + if (!piglit_khr_no_error) { + /* Check bailing out on invalid input */ + glClipControl(GL_RGB, GL_NEGATIVE_ONE_TO_ONE); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass; + piglit_reset_gl_error(); + pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass; + + glClipControl(GL_LOWER_LEFT, GL_RGB); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass; + piglit_reset_gl_error(); + pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass; + } /* Check push/pop */ glClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE); diff --git a/tests/spec/arb_clip_control/viewport.c b/tests/spec/arb_clip_control/viewport.c index 9d41ae94f..763e5c134 100644 --- a/tests/spec/arb_clip_control/viewport.c +++ b/tests/spec/arb_clip_control/viewport.c @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END -- 2.13.1 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] Revert "arb_get_texture_sub_image-errors: Fix expected error values"
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/22/2017 05:50 PM, Juan A. Suarez Romero wrote: In commit aec149c we test that glGetTextureSubImage() and glGetCompressedTextureSubImage() returns INVALID_VALUE when the texture is not the name of an existing texture object. Nevertheless, this is a bug in the OpenGL 4.5 spec itself, that has been fixed, but not released yet. In the fix the expected error value for this case is INVALID_OPERATION. This reverts commit aec149c836bcd29d4764c8f459fdc45613d18c8c. --- tests/spec/arb_get_texture_sub_image/errors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/spec/arb_get_texture_sub_image/errors.c b/tests/spec/arb_get_texture_sub_image/errors.c index e6f7972..34fec4a 100644 --- a/tests/spec/arb_get_texture_sub_image/errors.c +++ b/tests/spec/arb_get_texture_sub_image/errors.c @@ -47,7 +47,7 @@ test_texture_id(void) 8, 8, 1, /* size */ GL_RGBA, GL_UNSIGNED_BYTE, sizeof(buffer), buffer); - if (!piglit_check_gl_error(GL_INVALID_VALUE)) + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) pass = false; /* Test compressed get with bad texture ID */ @@ -55,7 +55,7 @@ test_texture_id(void) 0, 0, 0, /* offset */ 8, 8, 1, /* size */ sizeof(buffer), buffer); - if (!piglit_check_gl_error(GL_INVALID_VALUE)) + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) pass = false; /* Test get with undefined texture */ ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] arb_bindless_texture: set KHR_no_error compatibility
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/spec/arb_bindless_texture/border-color.c | 7 +++ tests/spec/arb_bindless_texture/conversions.c| 1 + tests/spec/arb_bindless_texture/errors.c | 1 + tests/spec/arb_bindless_texture/handles.c| 16 tests/spec/arb_bindless_texture/illegal.c| 1 + tests/spec/arb_bindless_texture/legal.c | 1 + tests/spec/arb_bindless_texture/limit.c | 1 + tests/spec/arb_bindless_texture/uint64_attribs.c | 1 + tests/spec/arb_bindless_texture/uniform.c| 13 + 9 files changed, 42 insertions(+) diff --git a/tests/spec/arb_bindless_texture/border-color.c b/tests/spec/arb_bindless_texture/border-color.c index 2cd37ade2..da366a19e 100644 --- a/tests/spec/arb_bindless_texture/border-color.c +++ b/tests/spec/arb_bindless_texture/border-color.c @@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN piglit_config = config.supports_gl_compat_version = 33; config.supports_gl_core_version = 33; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -91,6 +92,9 @@ check_invalid_integer_border_colors(void *data) GLuint sampler, texture; GLint i; + if (piglit_khr_no_error) + return PIGLIT_SKIP; + texture = piglit_integer_texture(GL_RGBA32I, 16, 16, 0, 0); sampler = new_sampler(); glBindTexture(GL_TEXTURE_2D, 0); @@ -147,6 +151,9 @@ check_invalid_float_border_colors(void *data) GLuint sampler, texture; GLint i; + if (piglit_khr_no_error) + return PIGLIT_SKIP; + texture = piglit_rgbw_texture(GL_RGBA32F, 16, 16, GL_FALSE, GL_FALSE, GL_UNSIGNED_NORMALIZED); sampler = new_sampler(); diff --git a/tests/spec/arb_bindless_texture/conversions.c b/tests/spec/arb_bindless_texture/conversions.c index 4d5f83a6c..7947a73be 100644 --- a/tests/spec/arb_bindless_texture/conversions.c +++ b/tests/spec/arb_bindless_texture/conversions.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN piglit_config = config.supports_gl_core_version = 33; config.supports_gl_compat_version = 33; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_bindless_texture/errors.c b/tests/spec/arb_bindless_texture/errors.c index d80ba26d0..fa66c9f2c 100644 --- a/tests/spec/arb_bindless_texture/errors.c +++ b/tests/spec/arb_bindless_texture/errors.c @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN piglit_config = config.supports_gl_compat_version = 33; config.supports_gl_core_version = 33; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/arb_bindless_texture/handles.c b/tests/spec/arb_bindless_texture/handles.c index eafb4e569..054fccb03 100644 --- a/tests/spec/arb_bindless_texture/handles.c +++ b/tests/spec/arb_bindless_texture/handles.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN piglit_config = config.supports_gl_compat_version = 33; config.supports_gl_core_version = 33; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -45,6 +46,9 @@ check_GetTextureHandle_zero_handle(void *data) bool pass = true; GLuint64 handle; + if (piglit_khr_no_error) + return PIGLIT_SKIP; + /* The ARB_bindless_texture spec says: * * "If an error occurs, a handle of zero is returned." @@ -173,6 +177,9 @@ delete_texture_sampler_while_handle_is_allocated(void *data) GLuint texture, sampler; GLuint64 handle; + if (piglit_khr_no_error) + return PIGLIT_SKIP; + /* The ARB_bindless_texture spec says: * * "(5) Is there a way to release a texture or image handle after it @@ -222,6 +229,9 @@ delete_texture_sampler_while_handle_is_resident(void *data) GLuint64 handle; GLboolean ret; + if (piglit_khr_no_error) + return PIGLIT_SKIP; + /* The ARB_bindless_texture_spec says: * * "(7) What happens if you try to delete a texture or sampler object @@ -288,6 +298,9 @@ check_GetImageHandle_zero_handle(void *data) if (!piglit_is_extension_supported("GL_ARB_shader_image_load_store")) return PIGLIT_SKIP; + if (piglit_khr_no_error) + return PIGLIT_SKIP; + /* The ARB_bindless_texture spec says: * * "A 64-bit unsigned integer handle is returned if the command @@ -411,6 +424,9 @@ delete_texture_while_image_handle_resident(void *data) if (!piglit_is_extension_supported("GL_ARB_shader_image_load_store")) return PIGLIT_SKIP; + if (piglit_khr_no_error) + return PIGLIT_SKIP; +
Re: [Piglit] [PATCH] arb_bindless_texture: add new compiler tests for struct with image arrays
ping? On 05/25/2017 08:02 PM, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../nested-struct-arrays-mismatch-format.frag | 27 .../nested-struct-with-arrays-no-qualifiers.frag | 29 ++ .../images/struct-with-arrays-mismatch-format.frag | 22 .../images/struct-with-arrays-no-qualifiers.frag | 24 ++ 4 files changed, 102 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag diff --git a/tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag new file mode 100644 index 0..dfb518f80 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag @@ -0,0 +1,27 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable +#extension GL_ARB_arrays_of_arrays: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "It is a compile-time error to declare an image variable where the format +// qualifier does not match the image variable type." + +struct S_inner { + layout (r32i) image2D img; +}; + +struct { + S_inner si[2][2]; +} s; + +void main() +{ +} diff --git a/tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag new file mode 100644 index 0..5fbec1386 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag @@ -0,0 +1,29 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable +#extension GL_ARB_arrays_of_arrays: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "Uniforms not qualified with writeonly must have a format layout qualifier." +// +// Because GL_ARB_bindless_texture allows to declare images insides structures, +// this rule applies and this test should fail. + +struct S_inner { + image2D img; +}; + +struct { + S_inner si[2][2]; +} s; + +void main() +{ +} diff --git a/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag new file mode 100644 index 0..b9981de77 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag @@ -0,0 +1,22 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "It is a compile-time error to declare an image variable where the format +// qualifier does not match the image variable type." + +struct { + layout (r32i) image2D imgs[6]; +} s; + +void main() +{ +} diff --git a/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag new file mode 100644 index 0..bb29340fb --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag @@ -0,0 +1,24 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "Uniforms not qualified with writeonly must have a format layout qualifier." +// +// Because GL_ARB_bindless_texture allows to declare images insides structures, +// this rule applies and this test should fail. + +struct
Re: [Piglit] [PATCH 4/4] TexSubImage1D tests: set KHR_no_error status
Thanks for this patchset Tim. Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/05/2017 02:19 AM, Timothy Arceri wrote: --- tests/fbo/fbo-generatemipmap-1d.c | 1 + tests/spec/arb_texture_view/lifetime_format.c | 1 + tests/spec/arb_texture_view/rendering_target.c | 1 + tests/texturing/max-texture-size.c | 1 + tests/texturing/teximage-errors.c | 1 + 5 files changed, 5 insertions(+) diff --git a/tests/fbo/fbo-generatemipmap-1d.c b/tests/fbo/fbo-generatemipmap-1d.c index 8561bb1..8aab390 100644 --- a/tests/fbo/fbo-generatemipmap-1d.c +++ b/tests/fbo/fbo-generatemipmap-1d.c @@ -31,20 +31,21 @@ #include "piglit-util-gl.h" #define TEX_SIZE 128 #define TEX_LEVELS 8 PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const char *fs_1d = "uniform sampler1D tex; \n" "void main() \n" "{ \n" " gl_FragColor = texture1D(tex, gl_TexCoord[0].x); \n" "} \n"; diff --git a/tests/spec/arb_texture_view/lifetime_format.c b/tests/spec/arb_texture_view/lifetime_format.c index 2879c03..62f3dd0 100644 --- a/tests/spec/arb_texture_view/lifetime_format.c +++ b/tests/spec/arb_texture_view/lifetime_format.c @@ -31,20 +31,21 @@ #include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END /* Texture formats. The format_list variable has these fields: */ struct format_desc { const char *name; GLenum internalfmt; GLenum storagefmt; GLenum imagefmt; GLenum imagetype; diff --git a/tests/spec/arb_texture_view/rendering_target.c b/tests/spec/arb_texture_view/rendering_target.c index af050b2..44a6a3f 100644 --- a/tests/spec/arb_texture_view/rendering_target.c +++ b/tests/spec/arb_texture_view/rendering_target.c @@ -31,20 +31,21 @@ #include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; config.supports_gl_es_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const char *TestName = "arb_texture_view-rendering-target"; static int prog3D, prog2Darray, prog2D, prog1D; /** * Simple views of textures; test rendering with various texture view targets */ static bool diff --git a/tests/texturing/max-texture-size.c b/tests/texturing/max-texture-size.c index e9f5c6b..4dc97f2 100644 --- a/tests/texturing/max-texture-size.c +++ b/tests/texturing/max-texture-size.c @@ -42,20 +42,21 @@ */ #include "piglit-util-gl.h" #define COLOR_COMPONENTS 4 /*GL_RGBA*/ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const GLenum target[] = { GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE, GL_TEXTURE_CUBE_MAP, GL_TEXTURE_3D, }; diff --git a/tests/texturing/teximage-errors.c b/tests/texturing/teximage-errors.c index fe95c82..444ef34 100644 --- a/tests/texturing/teximage-errors.c +++ b/tests/texturing/teximage-errors.c @@ -27,20 +27,21 @@ * Tests glTexImage functions for invalid values, error reporting. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGB; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END struct format_desc { GLenum internalformat; GLenum format; GLenum type; }; static const struct format_desc formats_allowed[] = { ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 3/4] texturing/tex3d-maxsize: set KHR_no_error status
On 06/05/2017 04:26 AM, Timothy Arceri wrote: On 05/06/17 10:19, Timothy Arceri wrote: --- tests/texturing/tex3d-maxsize.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c index 60c9c63..781ac27 100644 --- a/tests/texturing/tex3d-maxsize.c +++ b/tests/texturing/tex3d-maxsize.c @@ -26,20 +26,21 @@ * Tests 3D textures. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; +config.khr_no_error_support = PIGLIT_NO_ERRORS There is a missing ; here. Fixed locally. Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> PIGLIT_GL_TEST_CONFIG_END static GLint MaxSize; /** * Compute size (in megabytes) of a texture of the given dimensions and ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 2/4] gl-3.2/layered-rendering: set KHR_no_error status
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/05/2017 02:19 AM, Timothy Arceri wrote: --- tests/spec/gl-3.2/layered-rendering/blit.c | 1 + tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c| 1 + .../layered-rendering/clear-color-mismatched-layer-count.c | 1 + tests/spec/gl-3.2/layered-rendering/clear-color.c | 1 + tests/spec/gl-3.2/layered-rendering/clear-depth.c | 1 + .../layered-rendering/framebuffer-layer-attachment-mismatch.c | 1 + .../spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c | 1 + .../layered-rendering/framebuffer-layer-count-mismatch.c | 1 + .../gl-3.2/layered-rendering/framebuffer-layered-attachments.c | 1 + .../layered-rendering/framebuffertexture-buffer-textures.c | 10 +++--- .../gl-3.2/layered-rendering/framebuffertexture-defaults.c | 1 + tests/spec/gl-3.2/layered-rendering/framebuffertexture.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c| 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-render.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer.c | 1 + tests/spec/gl-3.2/layered-rendering/readpixels.c | 1 + 19 files changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/spec/gl-3.2/layered-rendering/blit.c b/tests/spec/gl-3.2/layered-rendering/blit.c index e5d865e..db17124 100644 --- a/tests/spec/gl-3.2/layered-rendering/blit.c +++ b/tests/spec/gl-3.2/layered-rendering/blit.c @@ -49,20 +49,21 @@ * *---*---* */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END /* Values Set in piglit init */ static const int texWidth = 32; static const int texHeight = 32; static const int texDepth = 2; static const float srcColors[2][3] = { {0.5, 0.4, 0.3}, {0, 1, 0} diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c index 403bc04..bc1d0fd 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c @@ -64,20 +64,21 @@ #define TEX_LEVELS 6 #define TEX_SIZE (1 << (TEX_LEVELS - 1)) #define TEX_DEPTH 4 PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static GLenum texture_type; static int num_layers; static int layer_height; static GLuint probe_fbo = 0; static bool mipmapped; static int num_miplevels; diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c index 63a43f3..d9b2cd5 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c @@ -47,20 +47,21 @@ #include "piglit-util-gl.h" #include "piglit-util.h" #define TEX_SIZE 128 PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static void check_completeness(const char *when, GLenum target) { GLenum fbstatus = glCheckFramebufferStatus(target); if (fbstatus != GL_FRAMEBUFFER_COMPLETE) { printf("Framebuffer incomplete when %s: %s\n", when, diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color.c b/tests/spec/gl-3.2/layered-rendering/clear-color.c index 31233e3..32572b0 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color.c @@ -43,20 +43,21 @@ */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static GLuint fbo[2]; static GLuint texture[2]; static const int layers
Re: [Piglit] [PATCH 1/4] ARB_invalidate_subdata: set KHR_no_error status
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 06/05/2017 02:19 AM, Timothy Arceri wrote: --- tests/spec/arb_invalidate_subdata/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/arb_invalidate_subdata/buffer.c b/tests/spec/arb_invalidate_subdata/buffer.c index 637596a..dedb937 100644 --- a/tests/spec/arb_invalidate_subdata/buffer.c +++ b/tests/spec/arb_invalidate_subdata/buffer.c @@ -28,20 +28,21 @@ * No-op is a conforming implementation of glInvalidateBuffer(Sub)Data, so * this test only checks error conditions. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END /* * Section 6.5 (Invalidating Buffer Data) of the OpenGL 4.5 (Compatibility * Profile) spec: * * * An INVALID_VALUE error is generated if buffer is zero or is not the * name of an existing buffer object. * * An INVALID_VALUE error is generated if offset or length is negative, ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] arb_bindless_texture: add new compiler tests for struct with image arrays
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../nested-struct-arrays-mismatch-format.frag | 27 .../nested-struct-with-arrays-no-qualifiers.frag | 29 ++ .../images/struct-with-arrays-mismatch-format.frag | 22 .../images/struct-with-arrays-no-qualifiers.frag | 24 ++ 4 files changed, 102 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag create mode 100644 tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag diff --git a/tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag new file mode 100644 index 0..dfb518f80 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-arrays-mismatch-format.frag @@ -0,0 +1,27 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable +#extension GL_ARB_arrays_of_arrays: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "It is a compile-time error to declare an image variable where the format +// qualifier does not match the image variable type." + +struct S_inner { + layout (r32i) image2D img; +}; + +struct { + S_inner si[2][2]; +} s; + +void main() +{ +} diff --git a/tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag new file mode 100644 index 0..5fbec1386 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/nested-struct-with-arrays-no-qualifiers.frag @@ -0,0 +1,29 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable +#extension GL_ARB_arrays_of_arrays: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "Uniforms not qualified with writeonly must have a format layout qualifier." +// +// Because GL_ARB_bindless_texture allows to declare images insides structures, +// this rule applies and this test should fail. + +struct S_inner { + image2D img; +}; + +struct { + S_inner si[2][2]; +} s; + +void main() +{ +} diff --git a/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag new file mode 100644 index 0..b9981de77 --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-mismatch-format.frag @@ -0,0 +1,22 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "It is a compile-time error to declare an image variable where the format +// qualifier does not match the image variable type." + +struct { + layout (r32i) image2D imgs[6]; +} s; + +void main() +{ +} diff --git a/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag new file mode 100644 index 0..bb29340fb --- /dev/null +++ b/tests/spec/arb_bindless_texture/compiler/images/struct-with-arrays-no-qualifiers.frag @@ -0,0 +1,24 @@ +// [config] +// expect_result: fail +// glsl_version: 3.30 +// require_extensions: GL_ARB_bindless_texture GL_ARB_shader_image_load_store +// [end config] + +#version 330 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +// From Section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec: +// +// "Uniforms not qualified with writeonly must have a format layout qualifier." +// +// Because GL_ARB_bindless_texture allows to declare images insides structures, +// this rule applies and this test should fail. + +struct { + image2D imgs[6]; +} s; + +void main() +{ +} -- 2.13.0
Re: [Piglit] [PATCH 7/7] arb_shader_storage_buffer_object: set KHR_no_error compatibility
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 05/18/2017 04:00 AM, Timothy Arceri wrote: --- .../array-ssbo-binding.c | 1 + .../deletebuffers.c| 1 + .../getintegeri_v.c| 13 +--- .../layout-std140-write-shader.c | 1 + .../layout-std430-write-shader.c | 1 + .../max-ssbo-size.c| 1 + .../arb_shader_storage_buffer_object/maxblocks.c | 1 + .../spec/arb_shader_storage_buffer_object/minmax.c | 1 + .../program-interface-query.c | 1 + .../arb_shader_storage_buffer_object/rendering.c | 1 + .../ssbo-binding.c | 39 -- 11 files changed, 39 insertions(+), 22 deletions(-) diff --git a/tests/spec/arb_shader_storage_buffer_object/array-ssbo-binding.c b/tests/spec/arb_shader_storage_buffer_object/array-ssbo-binding.c index f3c7d15..d98795d 100644 --- a/tests/spec/arb_shader_storage_buffer_object/array-ssbo-binding.c +++ b/tests/spec/arb_shader_storage_buffer_object/array-ssbo-binding.c @@ -29,20 +29,21 @@ */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.window_width = 100; config.window_height = 100; config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END #define SSBO_SIZE 4 static const char vs_pass_thru_text[] = "#version 330\n" "#extension GL_ARB_shader_storage_buffer_object : require\n" "\n" "layout(std140, binding=2) buffer ssbo {\n" diff --git a/tests/spec/arb_shader_storage_buffer_object/deletebuffers.c b/tests/spec/arb_shader_storage_buffer_object/deletebuffers.c index 947bca9..653228d 100644 --- a/tests/spec/arb_shader_storage_buffer_object/deletebuffers.c +++ b/tests/spec/arb_shader_storage_buffer_object/deletebuffers.c @@ -28,20 +28,21 @@ * usual glBindBuffer() binding. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END void piglit_init(int argc, char **argv) { bool pass = true; GLuint bo[2]; GLint binding; diff --git a/tests/spec/arb_shader_storage_buffer_object/getintegeri_v.c b/tests/spec/arb_shader_storage_buffer_object/getintegeri_v.c index 9e7617f..e304397 100644 --- a/tests/spec/arb_shader_storage_buffer_object/getintegeri_v.c +++ b/tests/spec/arb_shader_storage_buffer_object/getintegeri_v.c @@ -37,20 +37,21 @@ * Based on ARB_uniform_buffer_object's getintegeri_v.c */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static bool pass = true; static void test_index(int line, GLenum e, int index, int expected) { GLint val; @@ -98,24 +99,28 @@ piglit_init(int argc, char **argv) test_range(__LINE__, 0, bo[0], 0, 1); test_range(__LINE__, 1, bo[1], 2 * alignment, 3); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, bo[1]); test_range(__LINE__, 1, bo[1], 0, 0); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, 0); test_range(__LINE__, 0, 0, 0, 0); /* Test the error condition. */ - glGetIntegerv(GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS, _bindings); - glGetIntegeri_v(GL_SHADER_STORAGE_BUFFER_BINDING, max_bindings, ); - if (!piglit_check_gl_error(GL_INVALID_VALUE)) - pass = false; + if (!piglit_khr_no_error) { + glGetIntegerv(GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS, + _bindings); + glGetIntegeri_v(GL_SHADER_STORAGE_BUFFER_BINDING, + max_bindings, ); + if (!piglit_check_gl_error(GL_INVALID_VALUE)) + pass = false; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } enum piglit_result piglit_display(void) { /* UNREACHED */ return PIGLIT_FAIL; } diff --git a/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c b/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c index 1eaba37..c67248e 100644 --- a/tests/spec/arb_shader_storage_buffer_object/layout-std140-wr
Re: [Piglit] [PATCH 6/7] arb_shader_atomic_counters: set KHR_no_error compatibility
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 05/18/2017 04:00 AM, Timothy Arceri wrote: --- .../arb_shader_atomic_counters/active-counters.c | 29 +- .../arb_shader_atomic_counters/array-indexing.c| 1 + .../arb_shader_atomic_counters/buffer-binding.c| 13 ++ .../arb_shader_atomic_counters/default-partition.c | 1 + .../arb_shader_atomic_counters/fragment-discard.c | 1 + .../arb_shader_atomic_counters/function-argument.c | 1 + .../spec/arb_shader_atomic_counters/max-counters.c | 1 + tests/spec/arb_shader_atomic_counters/minmax.c | 1 + .../arb_shader_atomic_counters/multiple-defs.c | 1 + .../arb_shader_atomic_counters/respecify-buffer.c | 1 + tests/spec/arb_shader_atomic_counters/semantics.c | 1 + tests/spec/arb_shader_atomic_counters/unique-id.c | 1 + .../arb_shader_atomic_counters/unused-result.c | 1 + 13 files changed, 36 insertions(+), 17 deletions(-) diff --git a/tests/spec/arb_shader_atomic_counters/active-counters.c b/tests/spec/arb_shader_atomic_counters/active-counters.c index 06ba2e7..976b858 100644 --- a/tests/spec/arb_shader_atomic_counters/active-counters.c +++ b/tests/spec/arb_shader_atomic_counters/active-counters.c @@ -30,20 +30,21 @@ #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_width = 1; config.window_height = 1; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const char *fs_source = "#version 140\n" "#extension GL_ARB_shader_atomic_counters : enable\n" "\n" "out ivec4 fcolor;\n" "\n" "layout(binding=0) uniform atomic_uint x0[2];\n" "layout(binding=0) uniform atomic_uint x1;\n" @@ -155,34 +156,38 @@ piglit_init(int argc, char **argv) piglit_report_result(PIGLIT_FAIL); } glGetProgramiv(prog, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, ); if (n != 4) { fprintf(stderr, "Unexpected number of active counter " "buffers.\n"); piglit_report_result(PIGLIT_FAIL); } -ret = 0xdeadbeef; -glGetActiveAtomicCounterBufferiv( -prog, n, GL_ATOMIC_COUNTER_BUFFER_BINDING, ); +if (!piglit_khr_no_error) { +ret = 0xdeadbeef; +glGetActiveAtomicCounterBufferiv( +prog, n, GL_ATOMIC_COUNTER_BUFFER_BINDING, ); -if (!piglit_check_gl_error(GL_INVALID_VALUE)) { -fprintf(stderr, "glGetActiveAtomicCounterBufferiv should have " -"failed when trying to query a non-existent buffer.\n"); -piglit_report_result(PIGLIT_FAIL); -} +if (!piglit_check_gl_error(GL_INVALID_VALUE)) { +fprintf(stderr, "glGetActiveAtomicCounterBufferiv " +"should have failed when trying to query a " +"non-existent buffer.\n"); +piglit_report_result(PIGLIT_FAIL); +} -if (ret != 0xdeadbeef) { -fprintf(stderr, "Failed call to glGetActiveAtomicCounterBufferiv" -"didn't preserve the output parameter contents.\n"); -piglit_report_result(PIGLIT_FAIL); +if (ret != 0xdeadbeef) { +fprintf(stderr, "Failed call to " +"glGetActiveAtomicCounterBufferiv didn't " +"preserve the output parameter contents.\n"); +piglit_report_result(PIGLIT_FAIL); +} } for (i = 0; i < n; ++i) { const struct buffer_info *binfo; int binding, data_size, num_counters, ref; GLuint counters[4]; glGetActiveAtomicCounterBufferiv( prog, i, GL_ATOMIC_COUNTER_BUFFER_BINDING, ); if (!piglit_check_gl_error(GL_NO_ERROR)) { diff --git a/tests/spec/arb_shader_atomic_counters/array-indexing.c b/tests/spec/arb_shader_atomic_counters/array-indexing.c index c35da2a..e1a816d 100644 --- a/tests/spec/arb_shader_atomic_counters/array-indexing.c +++ b/tests/spec/arb_shader_atomic_counters/array-indexing.c @@ -29,20 +29,21 @@ #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_width = 1; config.window_height = 1; config.wind
[Piglit] [PATCH 1/2] shaders: set missing blue color to glsl-const-builtin-distance.shader_test
Since b741bc770 ("parser_utils: do not overwrite value when no digits are found "), the blue color has to be explicitly initialized to zero. Cc: Mark Janes <mark.a.ja...@intel.com> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/shaders/glsl-const-builtin-distance.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shaders/glsl-const-builtin-distance.shader_test b/tests/shaders/glsl-const-builtin-distance.shader_test index 460313c25..3ca9f8943 100644 --- a/tests/shaders/glsl-const-builtin-distance.shader_test +++ b/tests/shaders/glsl-const-builtin-distance.shader_test @@ -19,4 +19,4 @@ void main() [test] draw rect -1 -1 2 2 -probe all rgb 0.73087868591526 0.73087868591526 +probe all rgb 0.73087868591526 0.73087868591526 0.0 -- 2.13.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 2/2] arb_gpu_shader_fp64: set missing 'w' component to glsl-uniform-initializer-4
Since b741bc770 ("parser_utils: do not overwrite value when no digits are found "), the 'w' component has to be explicitly initialized to zero. Cc: Mark Janes <mark.a.ja...@intel.com> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../execution/glsl-uniform-initializer-4.shader_test| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_gpu_shader_fp64/execution/glsl-uniform-initializer-4.shader_test b/tests/spec/arb_gpu_shader_fp64/execution/glsl-uniform-initializer-4.shader_test index 83c3be19a..6a92d4887 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/glsl-uniform-initializer-4.shader_test +++ b/tests/spec/arb_gpu_shader_fp64/execution/glsl-uniform-initializer-4.shader_test @@ -20,6 +20,6 @@ void main() } [test] -uniform dvec4 color 1.0 0.0 0.5 +uniform dvec4 color 1.0 0.0 0.5 0.0 draw rect -1 -1 2 2 probe all rgba 0.0 1.0 0.5 0.0 -- 2.13.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 5/7] arb_indirect_parameters: set KHR_no_error compatibility
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 05/18/2017 04:00 AM, Timothy Arceri wrote: --- tests/spec/arb_indirect_parameters/tf-count-arrays.c | 1 + tests/spec/arb_indirect_parameters/tf-count-elements.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/spec/arb_indirect_parameters/tf-count-arrays.c b/tests/spec/arb_indirect_parameters/tf-count-arrays.c index e88a7ba..f70209c 100644 --- a/tests/spec/arb_indirect_parameters/tf-count-arrays.c +++ b/tests/spec/arb_indirect_parameters/tf-count-arrays.c @@ -20,20 +20,21 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const char *vs_tf = "#version 140\n" "out int tf;\n" "uniform int tf_val;\n" "void main() { gl_Position = vec4(0); tf = tf_val; }\n"; static const char *vs_draw = diff --git a/tests/spec/arb_indirect_parameters/tf-count-elements.c b/tests/spec/arb_indirect_parameters/tf-count-elements.c index 6ba646f..b8ea084 100644 --- a/tests/spec/arb_indirect_parameters/tf-count-elements.c +++ b/tests/spec/arb_indirect_parameters/tf-count-elements.c @@ -20,20 +20,21 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const char *vs_tf = "#version 140\n" "out int tf;\n" "uniform int tf_val;\n" "void main() { gl_Position = vec4(0); tf = tf_val; }\n"; static const char *vs_draw = ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 3/7] arb_uniform_buffer_object: set KHR_no_error compatibility
As discussed offline, I missed the HAS_ERRORS bits. On 05/19/2017 11:18 AM, Samuel Pitoiset wrote: Few comments below, you missed all negative-* tests. With those fixed, patch is: Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> On 05/18/2017 04:00 AM, Timothy Arceri wrote: --- .../bindbuffer-general-point.c | 1 + .../arb_uniform_buffer_object/buffer-targets.c | 1 + .../spec/arb_uniform_buffer_object/bufferstorage.c | 1 + .../spec/arb_uniform_buffer_object/deletebuffers.c | 1 + tests/spec/arb_uniform_buffer_object/dlist.c | 1 + ...tactiveuniformblockiv-uniform-block-data-size.c | 1 + .../getactiveuniformblockname.c| 37 --- .../getactiveuniformname.c | 37 --- .../getactiveuniformsiv-uniform-array-stride.c | 1 + .../getactiveuniformsiv-uniform-block-index.c | 1 + .../getactiveuniformsiv-uniform-matrix-stride.c| 1 + .../getactiveuniformsiv-uniform-type.c | 1 + .../spec/arb_uniform_buffer_object/getintegeri_v.c | 11 +++-- .../spec/arb_uniform_buffer_object/getprogramiv.c | 1 + .../getuniformblockindex.c | 17 --- .../arb_uniform_buffer_object/getuniformindices.c | 54 -- .../arb_uniform_buffer_object/getuniformlocation.c | 1 + .../layout-std140-base-size-and-alignment.c| 1 + .../link-mismatch-blocks.c | 1 + tests/spec/arb_uniform_buffer_object/maxblocks.c | 1 + .../maxuniformblocksize.c | 1 + tests/spec/arb_uniform_buffer_object/minmax.c | 1 + .../negative-bindbuffer-index.c| 1 + .../negative-bindbuffer-target.c | 1 + .../negative-bindbufferrange-range.c | 1 + .../negative-getactiveuniformblockiv.c | 1 + .../negative-getactiveuniformsiv.c | 1 + .../referenced-by-shader.c | 1 + .../arb_uniform_buffer_object/rendering-array.c| 1 + .../spec/arb_uniform_buffer_object/rendering-dsa.c | 1 + tests/spec/arb_uniform_buffer_object/rendering.c | 1 + tests/spec/arb_uniform_buffer_object/row-major.c | 1 + .../uniformblockbinding.c | 17 --- 33 files changed, 124 insertions(+), 76 deletions(-) diff --git a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c index c9e81c2..5d8498b 100644 --- a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c +++ b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c @@ -26,20 +26,21 @@ * Tests that the glBindBuffer* entrypoints also bind to the general * binding point. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END void piglit_init(int argc, char **argv) { bool pass = true; GLuint bo[2]; GLint binding; diff --git a/tests/spec/arb_uniform_buffer_object/buffer-targets.c b/tests/spec/arb_uniform_buffer_object/buffer-targets.c index 28924bc..beb2055 100644 --- a/tests/spec/arb_uniform_buffer_object/buffer-targets.c +++ b/tests/spec/arb_uniform_buffer_object/buffer-targets.c @@ -34,20 +34,21 @@ * * UNIFORM_BUFFER" */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END void piglit_init(int argc, char **argv) { bool pass = true; GLuint bo; uint8_t in_data[1] = {0xaa}; uint8_t out_data[1] = {0xd0}; diff --git a/tests/spec/arb_uniform_buffer_object/bufferstorage.c b/tests/spec/arb_uniform_buffer_object/bufferstorage.c index 52e20e0..e3e1383 100644 --- a/tests/spec/arb_uniform_buffer_object/bufferstorage.c +++ b/tests/spec/arb_uniform_buffer_object/bufferstorage.c @@ -28,20 +28,21 @@ * from UBOs. Same as rendering.c, except that the UBOs are * persistently mapped. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; +config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const char vert_shader_text[] = "#extension GL_ARB_uniform_buffer_object : require\n" "\n" "layout(std140) uniform;\n" "uniform ub_pos_size { vec2 pos; float size; };\n" "uniform ub_rot {float rotation; };\n" "\n" diff
[Piglit] [PATCH] parser_utils: do not overwrite value when no digits are found
"If there were no digits at all, strtol() stores the original value of nptr in *endptr (and returns 0)." If the parsing helper functions are used inside a loop like the "fb tex 2d x" command, the parsed value is overwritten with zero and this ends up by reporting "No texture bound at 0". Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- tests/shaders/parser_utils.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/shaders/parser_utils.c b/tests/shaders/parser_utils.c index 3b1400c47..79984ad6c 100644 --- a/tests/shaders/parser_utils.c +++ b/tests/shaders/parser_utils.c @@ -56,9 +56,10 @@ parse_ints(const char *s, int *i, unsigned n, const char **rest) unsigned j; for (j = 0; j < n; j++) { - i[j] = strtoll(s = end, (char **), 0); + int v = strtoll(s = end, (char **), 0); if (s == end) break; + i[j] = v; } if (rest) @@ -74,9 +75,10 @@ parse_uints(const char *s, unsigned *u, unsigned n, const char **rest) unsigned j; for (j = 0; j < n; j++) { - u[j] = strtoul(s = end, (char **), 0); + unsigned v = strtoul(s = end, (char **), 0); if (s == end) break; + u[j] = v; } if (rest) @@ -92,9 +94,10 @@ parse_int64s(const char *s, int64_t *i, unsigned n, const char **rest) unsigned j; for (j = 0; j < n; j++) { - i[j] = strtoll(s = end, (char **), 0); + int64_t v = strtoll(s = end, (char **), 0); if (s == end) break; + i[j] = v; } if (rest) @@ -110,9 +113,10 @@ parse_uint64s(const char *s, uint64_t *u, unsigned n, const char **rest) unsigned j; for (j = 0; j < n; j++) { - u[j] = strtoull(s = end, (char **), 0); + uint64_t v = strtoull(s = end, (char **), 0); if (s == end) break; + u[j] = v; } if (rest) @@ -128,9 +132,10 @@ parse_floats(const char *s, float *f, unsigned n, const char **rest) unsigned j; for (j = 0; j < n; j++) { - f[j] = strtof_hex(s = end, (char **)); + float v = strtof_hex(s = end, (char **)); if (s == end) break; + f[j] = v; } if (rest) @@ -146,9 +151,10 @@ parse_doubles(const char *s, double *d, unsigned n, const char **rest) unsigned j; for (j = 0; j < n; j++) { - d[j] = strtod_hex(s = end, (char **)); + double v = strtod_hex(s = end, (char **)); if (s == end) break; + d[j] = v; } if (rest) -- 2.13.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 3/4] arb_bindless_texture: add new explicit-image-binding.shader_test
Similar to explicit-sampler-binding.shader_test but that one exercices the explicit binding layout qualifier with bound/bindless images. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- .../images/explicit-image-binding.shader_test | 58 ++ 1 file changed, 58 insertions(+) create mode 100644 tests/spec/arb_bindless_texture/execution/images/explicit-image-binding.shader_test diff --git a/tests/spec/arb_bindless_texture/execution/images/explicit-image-binding.shader_test b/tests/spec/arb_bindless_texture/execution/images/explicit-image-binding.shader_test new file mode 100644 index 0..d1be50c23 --- /dev/null +++ b/tests/spec/arb_bindless_texture/execution/images/explicit-image-binding.shader_test @@ -0,0 +1,58 @@ +# In this test, perform an image store with a bound image, then create a +# resident image and pass the handle through the OpenGL API. +[require] +GL >= 4.2 +GLSL >= 4.20 +GL_ARB_bindless_texture +GL_ARB_shader_image_load_store + +[vertex shader passthrough] + +[fragment shader] +#version 420 +#extension GL_ARB_bindless_texture: require +#extension GL_ARB_shader_image_load_store: enable + +uniform vec4 color; +layout (bindless_image, binding = 5) writeonly uniform image2D tex; +out vec4 outcolor; + +void main() +{ + imageStore(tex, ivec2(gl_FragCoord.xy), color); + outcolor = vec4(0.0, 0.0, 0.0, 1.0); +} + +[test] +# Test with a bound image. +# Texture 5 is the imageStore output. +texture rgbw 5 (16, 16) GL_RGBA8 +image texture 5 GL_RGBA8 + +# Texture 1 is the rendering output. We don't care about this. +texture rgbw 1 (16, 16) GL_RGBA8 + +# Store red using imageStore +uniform vec4 color 1.0 0.0 0.0 1.0 +fb tex 2d 1 +draw rect -1 -1 2 2 + +# Test the result of imageStore +memory barrier GL_FRAMEBUFFER_BARRIER_BIT +fb tex 2d 5 +probe all rgba 1.0 0.0 0.0 1.0 + +# Test with a bindless image. +texture rgbw 3 (16, 16) GL_RGBA8 +resident image texture 3 GL_RGBA8 +uniform handle tex 3 + +# Store blue using imageStore +uniform vec4 color 0.0 1.0 0.0 1.0 +fb tex 2d 1 +draw rect -1 -1 2 2 + +# Test the result of imageStore +memory barrier GL_FRAMEBUFFER_BARRIER_BIT +fb tex 2d 3 +probe all rgba 0.0 1.0 0.0 1.0 -- 2.13.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit