Re: [Piglit] [PATCH 1/4] util: add an option to run an existing test with a compatibility profile

2017-10-31 Thread Jason Ekstrand
FYI, the new test fails on i965 with this:

Failed to compile vertex shader: 0:1(10): error: GLSL 1.40 is not
supported. Supported versions are: 1.10, 1.20, 1.30, 1.00 ES, and 3.00
ES


Is this expected?  I'm guessing it is since we don't support compat.

On Mon, Oct 23, 2017 at 5:31 AM, Marek Olšák  wrote:

> On Sat, Oct 21, 2017 at 7:57 PM, Ilia Mirkin  wrote:
> > On Sat, Oct 21, 2017 at 8:55 AM, Marek Olšák  wrote:
> >> From: Marek Olšák 
> >>
> >> and run one TBO test with it.
> >> ---
> >>  tests/all.py | 1 +
> >>  tests/util/piglit-framework-gl.c | 9 +
> >>  2 files changed, 10 insertions(+)
> >>
> >> diff --git a/tests/all.py b/tests/all.py
> >> index ff2ff1f..e25a5f6 100644
> >> --- a/tests/all.py
> >> +++ b/tests/all.py
> >> @@ -2581,20 +2581,21 @@ with profile.test_list.group_manager(
> >>  g(['arb_texture_buffer_object-unused-name'], 'unused-name')
> >>  g(['arb_texture_buffer_object-render-no-bo'], 'render-no-bo')
> >>
> >>  with profile.test_list.group_manager(
> >>  PiglitGLTest,
> >>  grouptools.join('spec', 'ARB_texture_buffer_range')) as g:
> >>  g(['arb_texture_buffer_range-dlist'], 'dlist')
> >>  g(['arb_texture_buffer_range-errors'], 'errors')
> >>  g(['arb_texture_buffer_range-ranges'], 'ranges')
> >>  g(['arb_texture_buffer_range-ranges-2'], 'ranges-2')
> >> +g(['arb_texture_buffer_range-ranges-2', '-compat'], 'ranges-2
> compat')
> >>
> >>  with profile.test_list.group_manager(
> >>  PiglitGLTest,
> >>  grouptools.join('spec', 'ARB_texture_rectangle')) as g:
> >>  g(['1-1-linear-texture'])
> >>  g(['texrect-many'], run_concurrent=False)
> >>  g(['getteximage-targets', 'RECT'])
> >>  g(['texrect_simple_arb_texrect'], run_concurrent=False)
> >>  g(['arb_texrect-texture-base-level-error'], run_concurrent=False)
> >>  g(['fbo-blit', 'rect'], run_concurrent=False)
> >> diff --git a/tests/util/piglit-framework-gl.c
> b/tests/util/piglit-framework-gl.c
> >> index a8e02d2..29e0e3a 100644
> >> --- a/tests/util/piglit-framework-gl.c
> >> +++ b/tests/util/piglit-framework-gl.c
> >> @@ -170,20 +170,29 @@ process_args(int *argc, char *argv[], unsigned
> *force_samples,
> >> "khr_no_error_support unknown "
> >> "skipping test!\n");
> >> piglit_report_result(PIGLIT_SKIP);
> >> } else if (config->khr_no_error_support ==
> >>PIGLIT_HAS_ERRORS) {
> >> piglit_report_result(PIGLIT_SKIP);
> >> } else {
> >> assert(config->khr_no_error_support ==
> >>PIGLIT_NO_ERRORS);
> >> }
> >> +   } else if (!strcmp(argv[j], "-compat")) {
> >> +   if (config->supports_gl_es_version) {
> >> +   fprintf(stderr,
> >> +   "-compat isn't allowed with ES
> tests!\n");
> >> +   piglit_report_result(PIGLIT_FAIL);
> >> +   }
> >> +   config->supports_gl_compat_version = 10;
> >> +   config->supports_gl_core_version = 0;
> >> +   puts("The compatibility profile forced.");
> >
> > Right now if a test specifies both gl_core and gl_compat, I believe
> > gl_core gets picked (not 100% sure). How about making -compat just set
> > gl_core to 0 and leave gl_compat alone?
>
> I think that won't work, gl_compat_version needs to be non-zero.
>
> Marek
> ___
> 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] arb_shader_ballot: Fix the test values for gl_SubGroupG{e, t}MaskARB

2017-10-31 Thread Matt Turner
Reviewed-by: Matt Turner 
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH 1/4] arb_internalformat_query2: minmax GL_ALPHA8 deprecated on 3.1+

2017-10-31 Thread Marek Olšák
On Fri, Oct 27, 2017 at 11:24 AM, Alejandro Piñeiro
 wrote:
> ---
>  tests/spec/arb_internalformat_query2/minmax.c | 14 --
>  1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/tests/spec/arb_internalformat_query2/minmax.c 
> b/tests/spec/arb_internalformat_query2/minmax.c
> index a2cf059928..fde03c1bd5 100644
> --- a/tests/spec/arb_internalformat_query2/minmax.c
> +++ b/tests/spec/arb_internalformat_query2/minmax.c
> @@ -46,6 +46,9 @@ PIGLIT_GL_TEST_CONFIG_END
>
>  /* These are all the formats that are required to be color-renderable
>   * by the OpenGL 3.0 spec.
> + *
> + * But note that GL_ALPHA8 was removed on 3.1 and beyond, so we need
> + * to take that into account.

Only when ARB_compatibility is missing or the context is Core.

Marek
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


[Piglit] [PATCH] arb_shader_ballot: Fix the test values for gl_SubGroupG{e, t}MaskARB

2017-10-31 Thread Neil Roberts
The previous comparison values were calculated by shifting ~0 by the
invocation index. This would end up including bits higher than
gl_SubGroupSizeARB.
---
 .../arb_shader_ballot/execution/fs-builtin-variables.shader_test | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/tests/spec/arb_shader_ballot/execution/fs-builtin-variables.shader_test 
b/tests/spec/arb_shader_ballot/execution/fs-builtin-variables.shader_test
index cd75bca..15987b6 100644
--- a/tests/spec/arb_shader_ballot/execution/fs-builtin-variables.shader_test
+++ b/tests/spec/arb_shader_ballot/execution/fs-builtin-variables.shader_test
@@ -16,6 +16,7 @@ void main() {
uint64_t active_set = ballotARB(true);
 
uint id = gl_SubGroupInvocationARB;
+   uint64_t group_mask = ~0ul >> (64u - gl_SubGroupSizeARB);
 
if (id >= gl_SubGroupSizeARB) {
outcolor = vec4(1.0, 0 / 255.0, id / 255.0, gl_SubGroupSizeARB 
/ 255.0);
@@ -27,12 +28,12 @@ void main() {
return;
}
 
-   if (gl_SubGroupGeMaskARB != (~0ul << id)) {
+   if (gl_SubGroupGeMaskARB != ((~0ul << id) & group_mask)) {
outcolor = vec4(1.0, 2 / 255.0, id / 255.0, 0.0);
return;
}
 
-   if (gl_SubGroupGtMaskARB != (~1ul << id)) {
+   if (gl_SubGroupGtMaskARB != ((~1ul << id) & group_mask)) {
outcolor = vec4(1.0, 2 / 255.0, id / 255.0, 0.0);
return;
}
-- 
2.9.5

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit