Re: [Piglit] [PATCH 1/2] shader_runner: fix error checking on MapBuffer gles workaround

[Eric Engestrom]

On Thursday, 2019-04-11 11:14:41 +0200, Alejandro Piñeiro wrote:
> ---
>  tests/shaders/shader_runner_gles_workarounds.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/shaders/shader_runner_gles_workarounds.h 
> b/tests/shaders/shader_runner_gles_workarounds.h
> index d3ab77506..77956f6b9 100644
> --- a/tests/shaders/shader_runner_gles_workarounds.h
> +++ b/tests/shaders/shader_runner_gles_workarounds.h
> @@ -79,7 +79,7 @@ glMapBuffer(GLenum target, GLbitfield access)
>   GLsizeiptr length = 0;
>  
>   glGetBufferParameteri64v(target, GL_BUFFER_SIZE, (GLint64*) );
> - if (piglit_check_gl_error(GL_NO_ERROR))
> + if (!piglit_check_gl_error(GL_NO_ERROR))

This patch is:
Reviewed-by: Eric Engestrom 

>   piglit_report_result(PIGLIT_FAIL);
>  
>   return glMapBufferRange(target, 0, length, access);
> -- 
> 2.19.1
> 
> ___
> 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] editorconfig: Add max_line_length property

[Eric Engestrom]

On Monday, 2019-02-25 18:45:01 +0200, Andres Gomez wrote:
> On Fri, 2019-02-22 at 18:15 +0000, Eric Engestrom wrote:
> > 
> > On February 22, 2019 2:51:28 PM UTC, Andres Gomez  wrote:
> > > The property is supported by most of the editors, but not all:
> > > https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#max_line_length
> > > 
> > > Cc: Eric Engestrom 
> > > Cc: Eric Anholt 
> > > Signed-off-by: Andres Gomez 
> > > ---
> > >  .editorconfig | 4 
> > >  1 file changed, 4 insertions(+)
> > > 
> > > diff --git a/.editorconfig b/.editorconfig
> > > index c614fcca7..e0f13a949 100644
> > > --- a/.editorconfig
> > > +++ b/.editorconfig
> > > @@ -4,15 +4,19 @@ root = true
> > >  indent_style = space
> > >  indent_size = 4
> > >  trim_trailing_whitespace = true
> > > +max_line_length = 79
> > 
> > I'm assuming that's a "78" typo?
> 
> Not really. Python code has its own rules:
> https://gitlab.freedesktop.org/mesa/piglit/blob/master/HACKING#L133
> 
> And, as you can see, it is 79:
> https://www.python.org/dev/peps/pep-0008/#maximum-line-length

Wasn't aware, thanks!

> 
> > Anyway:
> > Acked-by: Eric Engestrom 
> 
> Can I still have your Ack-b?

Of course :)

> 
> > If the idea is to have it everywhere though, just put it once in a [*] 
> > section.
> 
> Python is special and, in the rest of sections, the other values are
> also individual so I'm being coherent.
> 
> > 
> > >  
> > >  [*.{c,cpp,h,hpp}]
> > >  indent_style = tab
> > >  tab_width = 8
> > > +max_line_length = 78
> > >  
> > >  [*.{cmake,txt}]
> > >  indent_style = tab
> > >  tab_width = 8
> > > +max_line_length = 78
> > >  
> > >  [{README,HACKING}]
> > >  indent_style = tab
> > >  tab_width = 8
> > > +max_line_length = 78
> -- 
> Br,
> 
> Andres
> 
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH piglit] egl: add test for EGL_MESA_query_driver

[Eric Engestrom]

On Tuesday, 2019-01-22 15:29:44 +, Eric Engestrom wrote:
> On Tuesday, 2019-01-22 13:43:07 +, Emil Velikov wrote:
> > Hi Eric,
> > 
> > Thanks for writing this up.
> > 
> > On Tue, 22 Jan 2019 at 12:43, Eric Engestrom  
> > wrote:
> > >
> > > Cc: Veluri Mithun 
> > > Cc: Emil Velikov 
> > > Cc: Rob Clark 
> > > Cc: Nicolai Hähnle 
> > > Signed-off-by: Eric Engestrom 
> > > ---
> > > The extension is currently in development in this MR:
> > > https://gitlab.freedesktop.org/mesa/mesa/merge_requests/47
> > >
> > > Veluri will send updated versions of this test if the spec changes.
> > 
> > > +
> > > +   piglit_require_egl_extension(EGL_NO_DISPLAY, 
> > > "EGL_MESA_query_driver");
> > > +
> > AFAICT we need an valid/initialized display here. EGL_NO_DISPLAY is
> > for _client_ EGL extensions and EGL_MESA_query_driver is not one.
> 
> Good point, indeed.
> 
> > 
> > 
> > > +   egl_error = eglGetError();
> > > +   if (driver_name || egl_error != EGL_BAD_DISPLAY) {
> > > +   printf("eglGetDisplayDriverName() should have failed with 
> > > EGL_BAD_DISPLAY\n");
> > > +   printf("Instead, it returned %s and with error %s\n",
> > > +  driver_name, piglit_get_egl_error_name(egl_error));
> > > +   piglit_report_result(PIGLIT_FAIL);
> > > +   }
> > > +
> > This hunk seems to be an open-coded piglit_check_egl_error(), use the
> > helper instead?
> > Suggestion applies for the whole file.
> 
> Yup, didn't know about the helper :)
> 
> > 
> > > +   printf("Driver name: %s\n", driver_name);
> > > +   printf("Driver config: %s\n", driver_config);
> > > +   free(driver_config);
> > > +
> > I'd add a "TODO: add basic xml config validation/printing based on the
> > example in the spec."
> 
> That would be good in theory, but:
> - we'd need to write a proper DTD, which we don't have right now
> - xml parsing is not trivial (we'd need a library, it's not something
>   one should do by hand), and I'm not sure we want to add that kind of
>   beast to piglit.
> 
> If we decide to do this, I'm happy to write the DTD.

Actually, after thinking about this a bit more, I think we really should
have a DTD, and it should be part of the extension spec.

I've started writing it, but I don't have much time left today. I'll
send it once it's done.
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH piglit v2] egl: add test for EGL_MESA_query_driver

[Eric Engestrom]

Cc: Veluri Mithun 
Cc: Emil Velikov 
Cc: Rob Clark 
Cc: Nicolai Hähnle 
Signed-off-by: Eric Engestrom 
---
The extension is currently in development in this MR:
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/47

Veluri will send updated versions of this test if the spec changes.
---
 tests/egl/spec/CMakeLists.txt |   1 +
 .../CMakeLists.no_api.txt |   7 ++
 .../spec/egl_mesa_query_driver/CMakeLists.txt |   1 +
 .../egl_mesa_query_driver.c   | 100 ++
 tests/opengl.py   |   6 ++
 5 files changed, 115 insertions(+)
 create mode 100644 tests/egl/spec/egl_mesa_query_driver/CMakeLists.no_api.txt
 create mode 100644 tests/egl/spec/egl_mesa_query_driver/CMakeLists.txt
 create mode 100644 tests/egl/spec/egl_mesa_query_driver/egl_mesa_query_driver.c

diff --git a/tests/egl/spec/CMakeLists.txt b/tests/egl/spec/CMakeLists.txt
index f38a4f62b6d4139719fb..378c8d7257518a4cc773 100644
--- a/tests/egl/spec/CMakeLists.txt
+++ b/tests/egl/spec/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory (egl_khr_fence_sync)
 add_subdirectory (egl_khr_surfaceless_context)
 add_subdirectory (egl_mesa_device_software)
 add_subdirectory (egl_mesa_platform_surfaceless)
+add_subdirectory (egl_mesa_query_driver)
 
 if (PIGLIT_HAS_X11)
add_subdirectory (egl_chromium_sync_control)
diff --git a/tests/egl/spec/egl_mesa_query_driver/CMakeLists.no_api.txt 
b/tests/egl/spec/egl_mesa_query_driver/CMakeLists.no_api.txt
new file mode 100644
index ..d6f97ba5d294e930d050
--- /dev/null
+++ b/tests/egl/spec/egl_mesa_query_driver/CMakeLists.no_api.txt
@@ -0,0 +1,7 @@
+link_libraries(
+   piglitutil
+)
+
+piglit_add_executable(egl_mesa_query_driver egl_mesa_query_driver.c)
+
+# vim: ft=cmake:
diff --git a/tests/egl/spec/egl_mesa_query_driver/CMakeLists.txt 
b/tests/egl/spec/egl_mesa_query_driver/CMakeLists.txt
new file mode 100644
index ..144a306f4e7d38ba7da8
--- /dev/null
+++ b/tests/egl/spec/egl_mesa_query_driver/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/egl/spec/egl_mesa_query_driver/egl_mesa_query_driver.c 
b/tests/egl/spec/egl_mesa_query_driver/egl_mesa_query_driver.c
new file mode 100644
index ..63d3217607ceac2516d5
--- /dev/null
+++ b/tests/egl/spec/egl_mesa_query_driver/egl_mesa_query_driver.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2016 Red Hat, Inc.
+ * Copyright 2015 Intel Corporation
+ * Copyright 2018 Collabora, Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "piglit-util.h"
+#include "piglit-util-egl.h"
+
+#ifndef EGL_MESA_query_driver
+typedef char *PFNEGLGETDISPLAYDRIVERCONFIGPROC(EGLDisplay disp);
+typedef const char *PFNEGLGETDISPLAYDRIVERNAMEPROC(EGLDisplay disp);
+#endif
+
+int
+main(void)
+{
+   EGLDisplay egl_display = EGL_NO_DISPLAY;
+   EGLint egl_major, egl_minor;
+   EGLint egl_error;
+   const char *driver_name;
+   char *driver_config;
+
+   egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+
+   piglit_require_egl_extension(egl_display, "EGL_MESA_query_driver");
+
+   PFNEGLGETDISPLAYDRIVERNAMEPROC *GetDisplayDriverName =
+   (void *)eglGetProcAddress("eglGetDisplayDriverName");
+   PFNEGLGETDISPLAYDRIVERCONFIGPROC *GetDisplayDriverconfig =
+   (void *)eglGetProcAddress("eglGetDisplayDriverconfig");
+
+   if (!GetDisplayDriverName || !GetDisplayDriverconfig) {
+   printf("Query driver entrypoints missing\n");
+   piglit_report_result(PIGLIT_FAIL);
+   }
+
+   driver_name = GetDisplayDriverName(EGL_NO_DISPLAY);
+   if (!piglit_check_egl_error(EGL_BAD_DISPLAY))
+   piglit_report_result(PIGLIT_FAIL);
+
+   driver_config = GetDisplayD

Re: [Piglit] [PATCH piglit] egl: add test for EGL_MESA_query_driver

[Eric Engestrom]

On Tuesday, 2019-01-22 13:43:07 +, Emil Velikov wrote:
> Hi Eric,
> 
> Thanks for writing this up.
> 
> On Tue, 22 Jan 2019 at 12:43, Eric Engestrom  wrote:
> >
> > Cc: Veluri Mithun 
> > Cc: Emil Velikov 
> > Cc: Rob Clark 
> > Cc: Nicolai Hähnle 
> > Signed-off-by: Eric Engestrom 
> > ---
> > The extension is currently in development in this MR:
> > https://gitlab.freedesktop.org/mesa/mesa/merge_requests/47
> >
> > Veluri will send updated versions of this test if the spec changes.
> 
> > +
> > +   piglit_require_egl_extension(EGL_NO_DISPLAY, 
> > "EGL_MESA_query_driver");
> > +
> AFAICT we need an valid/initialized display here. EGL_NO_DISPLAY is
> for _client_ EGL extensions and EGL_MESA_query_driver is not one.

Good point, indeed.

> 
> 
> > +   egl_error = eglGetError();
> > +   if (driver_name || egl_error != EGL_BAD_DISPLAY) {
> > +   printf("eglGetDisplayDriverName() should have failed with 
> > EGL_BAD_DISPLAY\n");
> > +   printf("Instead, it returned %s and with error %s\n",
> > +  driver_name, piglit_get_egl_error_name(egl_error));
> > +   piglit_report_result(PIGLIT_FAIL);
> > +   }
> > +
> This hunk seems to be an open-coded piglit_check_egl_error(), use the
> helper instead?
> Suggestion applies for the whole file.

Yup, didn't know about the helper :)

> 
> > +   printf("Driver name: %s\n", driver_name);
> > +   printf("Driver config: %s\n", driver_config);
> > +   free(driver_config);
> > +
> I'd add a "TODO: add basic xml config validation/printing based on the
> example in the spec."

That would be good in theory, but:
- we'd need to write a proper DTD, which we don't have right now
- xml parsing is not trivial (we'd need a library, it's not something
  one should do by hand), and I'm not sure we want to add that kind of
  beast to piglit.

If we decide to do this, I'm happy to write the DTD.
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] tests: only run rounding tests if FE_UPWARD is present

[Eric Engestrom]

On Friday, 2018-11-30 18:31:16 +, Burton, Ross wrote:
> On Fri, 30 Nov 2018 at 17:44, Eric Engestrom  wrote:
> > On Friday, 2018-11-30 16:33:23 +, Ross Burton wrote:
> > > On ARM, musl does not define FE_* when the architecture does not have VFP 
> > > (which
> > > is the right interpretation).
> > >
> > > As these tests depend on calling fesetround(), skip the test if FE_UPWARD 
> > > isn't
> > > available.
> > >
> > > Signed-off-by: Ross Burton 
> >
> > Maybe add to the commit message when pushing:
> >
> >   From the fesetround(3) man page:
> >   > Each of the macros FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, and
> >   > FE_TOWARDZERO is defined when the implementation supports getting
> >   > and setting the corresponding rounding direction.
> >
> > Reviewed-by: Eric Engestrom 
> 
> I can revise the message and re-submit, but I can't push to piglit.

It's fine, I'll do that when I push it on Monday, unless someone beats
me to it :P

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

Re: [Piglit] [PATCH] tests: only run rounding tests if FE_UPWARD is present

[Eric Engestrom]

On Friday, 2018-11-30 16:33:23 +, Ross Burton wrote:
> On ARM, musl does not define FE_* when the architecture does not have VFP 
> (which
> is the right interpretation).
> 
> As these tests depend on calling fesetround(), skip the test if FE_UPWARD 
> isn't
> available.
> 
> Signed-off-by: Ross Burton 

Maybe add to the commit message when pushing:

  From the fesetround(3) man page:
  > Each of the macros FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, and
  > FE_TOWARDZERO is defined when the implementation supports getting
  > and setting the corresponding rounding direction.

Reviewed-by: Eric Engestrom 

> ---
>  tests/general/roundmode-getintegerv.c | 12 
>  tests/general/roundmode-pixelstore.c  | 12 
>  2 files changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/general/roundmode-getintegerv.c 
> b/tests/general/roundmode-getintegerv.c
> index 28ecfaf55..aa99044a1 100644
> --- a/tests/general/roundmode-getintegerv.c
> +++ b/tests/general/roundmode-getintegerv.c
> @@ -79,13 +79,17 @@ test(float val, int expect)
>  void
>  piglit_init(int argc, char **argv)
>  {
> - int ret;
>   bool pass = true;
> - ret = fesetround(FE_UPWARD);
> - if (ret != 0) {
> - printf("Couldn't set rounding mode\n");
> +
> +#ifdef FE_UPWARD
> + if (fesetround(FE_UPWARD) != 0) {
> + printf("Setting rounding mode failed\n");
>   piglit_report_result(PIGLIT_SKIP);
>   }
> +#else
> + printf("Cannot set rounding mode\n");
> + piglit_report_result(PIGLIT_SKIP);
> +#endif
>  
>   pass = test(2.2, 2) && pass;
>   pass = test(2.8, 3) && pass;
> diff --git a/tests/general/roundmode-pixelstore.c 
> b/tests/general/roundmode-pixelstore.c
> index 8a029b257..57ec11c09 100644
> --- a/tests/general/roundmode-pixelstore.c
> +++ b/tests/general/roundmode-pixelstore.c
> @@ -79,13 +79,17 @@ test(float val, int expect)
>  void
>  piglit_init(int argc, char **argv)
>  {
> - int ret;
>   bool pass = true;
> - ret = fesetround(FE_UPWARD);
> - if (ret != 0) {
> - printf("Couldn't set rounding mode\n");
> +
> +#ifdef FE_UPWARD
> + if (fesetround(FE_UPWARD) != 0) {
> + printf("Setting rounding mode failed\n");
>   piglit_report_result(PIGLIT_SKIP);
>   }
> +#else
> + printf("Cannot set rounding mode\n");
> + piglit_report_result(PIGLIT_SKIP);
> +#endif
>  
>   pass = test(2.2, 2) && pass;
>   pass = test(2.8, 3) && pass;
> -- 
> 2.11.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

Re: [Piglit] [PATCH V2] arb_texture_view: fix security format warnings

[Eric Engestrom]

On Friday, 2018-11-30 15:50:51 +, Ross Burton wrote:
> If built with -Werror=format-security then Piglit fails to build:
> 
> /tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
> error: format not a string literal and no format arguments 
> [-Werror=format-security]
>  (desc)); \
>  ^~
> 
> In this case test->uniform_type is being turned into a string using snprintf()
> and then passed to piglit_report_subtest_result() which takes a format string,
> but GCC can't verify the format.
> 
> As _subtest_report() takes a format string, we can just remove the snprintf()
> and let it construct the label.
> 
> Also as X is used once and doesn't make the code clearer, just inline it.
> 
> Signed-off-by: Ross Burton 

Thanks :)
Reviewed-by: Eric Engestrom 

> ---
>  tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++-
>  1 file changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c 
> b/tests/spec/arb_texture_view/rendering-layers-image.c
> index 415b01657..86148075b 100644
> --- a/tests/spec/arb_texture_view/rendering-layers-image.c
> +++ b/tests/spec/arb_texture_view/rendering-layers-image.c
> @@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test)
>   return pass;
>  }
>  
> -#define X(f, desc) \
> - do { \
> - const bool subtest_pass = (f); \
> - piglit_report_subtest_result(subtest_pass \
> -  ? PIGLIT_PASS : PIGLIT_FAIL, \
> -  (desc)); \
> - pass = pass && subtest_pass; \
> - } while (0)
> -
>  enum piglit_result
>  piglit_display(void)
>  {
>   bool pass = true;
>   for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
>   const struct test_info *test = [test_idx];
> - char test_name[128];
> - snprintf(test_name, sizeof(test_name), "layers rendering of 
> %s", test->uniform_type);
> - X(test_render_layers(test), test_name);
> +
> + const bool subtest_pass = test_render_layers(test);
> +
> + piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : 
> PIGLIT_FAIL,
> +  "layers rendering of %s", 
> test->uniform_type);
> + pass = pass && subtest_pass;
>   }
> -#undef X
>   pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
>   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
>  }
> -- 
> 2.11.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 piglit 2/2] ext_image_dma_buf_import/unsupported_format has no reason to be intel-only

[Eric Engestrom]

Signed-off-by: Eric Engestrom 
---
 tests/opengl.py   |  3 +--
 .../ext_image_dma_buf_import/CMakeLists.gles1.txt |  2 +-
 ...ntel_unsupported_format.c => unsupported_format.c} | 11 +--
 3 files changed, 3 insertions(+), 13 deletions(-)
 rename tests/spec/ext_image_dma_buf_import/{intel_unsupported_format.c => 
unsupported_format.c} (90%)

diff --git a/tests/opengl.py b/tests/opengl.py
index e4e37148613858c806b4..96e92ae7b642d58ba523 100644
--- a/tests/opengl.py
+++ b/tests/opengl.py
@@ -3013,8 +3013,7 @@ def f(name, format, p1=None, p2=None):
 g(['ext_image_dma_buf_import-invalid_attributes'], run_concurrent=False)
 g(['ext_image_dma_buf_import-missing_attributes'], run_concurrent=False)
 g(['ext_image_dma_buf_import-ownership_transfer'], run_concurrent=False)
-g(['ext_image_dma_buf_import-intel_unsupported_format'],
-  run_concurrent=False)
+g(['ext_image_dma_buf_import-unsupported_format'], run_concurrent=False)
 g(['ext_image_dma_buf_import-intel_external_sampler_only'],
   run_concurrent=False)
 g(['ext_image_dma_buf_import-refcount'])
diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt 
b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt
index 39a2b292dbb612ea653b..0099f5bece34b9e1ca0d 100644
--- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt
+++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt
@@ -21,7 +21,7 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS)
piglit_add_executable(ext_image_dma_buf_import-invalid_attributes 
invalid_attributes.c image_common.c)
piglit_add_executable(ext_image_dma_buf_import-missing_attributes 
missing_attributes.c image_common.c)
piglit_add_executable(ext_image_dma_buf_import-ownership_transfer 
ownership_transfer.c image_common.c)
-   piglit_add_executable(ext_image_dma_buf_import-intel_unsupported_format 
intel_unsupported_format.c image_common.c)
+   piglit_add_executable(ext_image_dma_buf_import-unsupported_format 
unsupported_format.c image_common.c)

piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_only 
intel_external_sampler_only.c image_common.c)
 endif()
 
diff --git a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c 
b/tests/spec/ext_image_dma_buf_import/unsupported_format.c
similarity index 90%
rename from tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
rename to tests/spec/ext_image_dma_buf_import/unsupported_format.c
index 448274a48aa765a9ee98..408999a14f6f601bfc6d 100644
--- a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
+++ b/tests/spec/ext_image_dma_buf_import/unsupported_format.c
@@ -26,7 +26,7 @@
 #include "image_common.h"
 
 /**
- * @file intel_unsupported_format.c
+ * @file unsupported_format.c
  *
  * From the EXT_image_dma_buf_import spec:
  *
@@ -102,17 +102,8 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-   static const char intel_id[] = "Intel Open Source Technology Center";
-   const char *vendor_str;
EGLDisplay egl_dpy = eglGetCurrentDisplay();
 
piglit_require_egl_extension(egl_dpy, "EGL_EXT_image_dma_buf_import");
piglit_require_egl_extension(egl_dpy, "EGL_KHR_image_base");
-
-   vendor_str = (const char *)glGetString(GL_VENDOR);
-
-   if (strncmp(vendor_str, intel_id, sizeof(intel_id) - 1) != 0) {
-   printf("Test requires intel gpu\n");
-   piglit_report_result(PIGLIT_SKIP);
-   }
 }
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit 1/2] make sure 'unsupported format' test always uses an unsupported format

[Eric Engestrom]

Instead of using the fact this one driver currently doesn't support this
one format, let's just use a format that will never be supported by
anyone.

Signed-off-by: Eric Engestrom 
---
 .../ext_image_dma_buf_import/intel_unsupported_format.c| 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c 
b/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
index 8373e903891a3865dd65..448274a48aa765a9ee98 100644
--- a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
+++ b/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
@@ -41,13 +41,18 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 PIGLIT_GL_TEST_CONFIG_END
 
+/* added in libdrm 2.4.95 */
+#ifndef DRM_FORMAT_INVALID
+#define DRM_FORMAT_INVALID 0
+#endif
+
 static EGLImageKHR
 create_image(unsigned w, unsigned h, int fd, unsigned stride, unsigned offset)
 {
EGLint attr[] = {
EGL_WIDTH, w,
EGL_HEIGHT, h,
-   EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_RGB332,
+   EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_INVALID,
EGL_DMA_BUF_PLANE0_FD_EXT, fd,
EGL_DMA_BUF_PLANE0_OFFSET_EXT, offset,
EGL_DMA_BUF_PLANE0_PITCH_EXT, stride,
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit] fix macro redefinition with libdrm>=2.4.95

[Eric Engestrom]

DRM_FORMAT_INVALID was meant to be an nonexistent format but ironically,
the name does exist now, so let's just rename it to what it really means.

Signed-off-by: Eric Engestrom 
---
 tests/spec/ext_image_dma_buf_import/invalid_attributes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/spec/ext_image_dma_buf_import/invalid_attributes.c 
b/tests/spec/ext_image_dma_buf_import/invalid_attributes.c
index e4bc78f7deaef1850412..d1f34f7eb35e30739e63 100644
--- a/tests/spec/ext_image_dma_buf_import/invalid_attributes.c
+++ b/tests/spec/ext_image_dma_buf_import/invalid_attributes.c
@@ -51,7 +51,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 PIGLIT_GL_TEST_CONFIG_END
 
-#define DRM_FORMAT_INVALID fourcc_code('F', 'O', 'O', '0')
+#define DRM_FORMAT_NONEXISTENT fourcc_code('F', 'O', 'O', '0')
 
 static bool
 test_excess_attributes(unsigned w, unsigned h, int fd, unsigned stride,
@@ -155,7 +155,7 @@ test_invalid_format(unsigned w, unsigned h, int fd, 
unsigned stride,
EGLint attr[] = {
EGL_WIDTH, w,
EGL_HEIGHT, h,
-   EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_INVALID,
+   EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_NONEXISTENT,
EGL_DMA_BUF_PLANE0_FD_EXT, fd,
EGL_DMA_BUF_PLANE0_OFFSET_EXT, offset,
EGL_DMA_BUF_PLANE0_PITCH_EXT, stride,
-- 
Cheers,
  Eric

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

Re: [Piglit] [PATCH 3/3] arb_texture_view: fix security format warnings

[Eric Engestrom]

On Friday, 2018-11-30 10:45:06 +, Ross Burton wrote:
> If built with -Werror=format-security then Piglit fails to build:
> 
> /tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
> error: format not a string literal and no format arguments 
> [-Werror=format-security]
>  (desc)); \
>  ^~
> 
> In this case test->uniform_type is being turned into a string using snprintf()
> and then passed to piglit_report_subtest_result() which takes a format string,
> but GCC can't verify the format.
> 
> As _subtest_report() takes a format string, we can just remove the snprintf()
> and let it construct the label.
> 
> Signed-off-by: Ross Burton 

This patch is:
Reviewed-by: Eric Engestrom 

I'm not sure this macro has any reason to exist though, it's only used once,
doesn't do any macro magic, uses each of its params exactly once...
I would really recommend dropping it.

> ---
>  tests/spec/arb_texture_view/rendering-layers-image.c | 8 +++-
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c 
> b/tests/spec/arb_texture_view/rendering-layers-image.c
> index 415b01657..070e29a68 100644
> --- a/tests/spec/arb_texture_view/rendering-layers-image.c
> +++ b/tests/spec/arb_texture_view/rendering-layers-image.c
> @@ -142,12 +142,12 @@ test_render_layers(const struct test_info *test)
>   return pass;
>  }
>  
> -#define X(f, desc) \
> +#define X(f, test_type) \
>   do { \
>   const bool subtest_pass = (f); \
>   piglit_report_subtest_result(subtest_pass \
>? PIGLIT_PASS : PIGLIT_FAIL, \
> -  (desc)); \
> +  "layers rendering of %s", 
> (test_type)); \
>   pass = pass && subtest_pass; \
>   } while (0)
>  
> @@ -157,9 +157,7 @@ piglit_display(void)
>   bool pass = true;
>   for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
>   const struct test_info *test = [test_idx];
> - char test_name[128];
> - snprintf(test_name, sizeof(test_name), "layers rendering of 
> %s", test->uniform_type);
> - X(test_render_layers(test), test_name);
> + X(test_render_layers(test), test->uniform_type);
>   }
>  #undef X
>   pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> -- 
> 2.11.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

Re: [Piglit] [PATCH 2/3] tests: Use FE_UPWARD only if its defined in fenv.h

[Eric Engestrom]

On Friday, 2018-11-30 10:45:05 +, Ross Burton wrote:
> From: Khem Raj 
> 
> On ARM, musl does not define FE_* when arch does not have
> VFP, (which is right interpretation), therefore check if
> it is defined before using it.
> 
> Fixes errors like:
> 
> tests/general/roundmode-pixelstore.c:82:19: error: 'FE_UPWARD' undeclared 
> (first use in this function)
>   ret = fesetround(FE_UPWARD);
>^
> 
> Signed-off-by: Khem Raj 
> ---
>  tests/general/roundmode-getintegerv.c | 2 ++
>  tests/general/roundmode-pixelstore.c  | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/tests/general/roundmode-getintegerv.c 
> b/tests/general/roundmode-getintegerv.c
> index 28ecfaf55..5c275797b 100644
> --- a/tests/general/roundmode-getintegerv.c
> +++ b/tests/general/roundmode-getintegerv.c
> @@ -81,7 +81,9 @@ piglit_init(int argc, char **argv)
>  {
>   int ret;
>   bool pass = true;
> +#ifdef FE_UPWARD
>   ret = fesetround(FE_UPWARD);
> +#endif
>   if (ret != 0) {

You'll need a #else that sets ret, otherwise you're pretty obviously
going to jump based on an uninitialised variable here :/

>   printf("Couldn't set rounding mode\n");
>   piglit_report_result(PIGLIT_SKIP);
> diff --git a/tests/general/roundmode-pixelstore.c 
> b/tests/general/roundmode-pixelstore.c
> index 8a029b257..51951a0d9 100644
> --- a/tests/general/roundmode-pixelstore.c
> +++ b/tests/general/roundmode-pixelstore.c
> @@ -81,7 +81,9 @@ piglit_init(int argc, char **argv)
>  {
>   int ret;
>   bool pass = true;
> +#ifdef FE_UPWARD
>   ret = fesetround(FE_UPWARD);
> +#endif
>   if (ret != 0) {
>   printf("Couldn't set rounding mode\n");
>   piglit_report_result(PIGLIT_SKIP);
> -- 
> 2.11.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

Re: [Piglit] [PATCH v2] EGL_EXT_image_dma_buf_import: add AYUV format support

[Eric Engestrom]

On Friday, 2018-11-09 17:27:15 +, Lionel Landwerlin wrote:
> v2: Forgot to add the new test to opengl.py
> Drop some code to deal with alpha channel
> 
> Signed-off-by: Lionel Landwerlin 
> ---
>  tests/opengl.py   |  2 ++
>  .../ext_image_dma_buf_import/sample_yuv.c | 26 ++-
>  .../piglit-framework-gl/piglit_drm_dma_buf.c  |  1 +
>  3 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/opengl.py b/tests/opengl.py
> index b74606be1..e01f3e6e7 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3029,6 +3029,8 @@ with profile.test_list.group_manager(
>'ext_image_dma_buf_import-sample_yuv420', run_concurrent=False)
>  g(['ext_image_dma_buf_import-sample_yuv', '-fmt=YV12', '-alpha-one'],
>'ext_image_dma_buf_import-sample_yvu420', run_concurrent=False)
> +g(['ext_image_dma_buf_import-sample_yuv', '-fmt=AYUV'],
> +  'ext_image_dma_buf_import-sample_ayuv', run_concurrent=False)
>  g(['ext_image_dma_buf_import-transcode-nv12-as-r8-gr88'],
>'ext_image_dma_buf_import-transcode-nv12-as-r8-gr88',
>run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/sample_yuv.c 
> b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> index a314bc56f..bb9997102 100644
> --- a/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> +++ b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> @@ -77,9 +77,30 @@ piglit_display(void)
>   /* U */
>   120, 140,
>   120, 140,
> + }, ayuv[] = {
> + /* AYUV (TODO: find a way to test alpha channel) */
> + 130, 120,  50, 255,
> + 130, 127,  70, 255,
> + 130, 133,  90, 255,
> + 130, 140, 110, 255,
> +
> + 140, 120,  50, 255,
> + 140, 127,  70, 255,
> + 140, 133,  90, 255,
> + 140, 140, 110, 255,
> +
> + 150, 120,  50, 255,
> + 150, 127,  70, 255,
> + 150, 133,  90, 255,
> + 150, 140, 110, 255,
> +
> + 160, 120,  50, 255,
> + 160, 127,  70, 255,
> + 160, 133,  90, 255,
> + 160, 140, 110, 255,
>   };
>  
> - static const unsigned char expected[4 * 4 * 4] = {
> + unsigned char expected[4 * 4 * 4] = {

I assume that wasn't meant to be committed?

>44,  41,  25, 255,
>67,  64,  48, 255,
>90,  79, 111, 255,
> @@ -114,6 +135,9 @@ piglit_display(void)
>   case DRM_FORMAT_YVU420:
>   t = yvu420;
>   break;
> + case DRM_FORMAT_AYUV:
> + t = ayuv;
> + break;
>   default:
>   return PIGLIT_SKIP;
>   }
> diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c 
> b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> index 869d9db7d..13bf883f2 100644
> --- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> +++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> @@ -154,6 +154,7 @@ piglit_intel_buf_create(unsigned w, unsigned h, unsigned 
> fourcc,
>   case DRM_FORMAT_ABGR:
>   case DRM_FORMAT_RGBA:
>   case DRM_FORMAT_BGRA:
> + case DRM_FORMAT_AYUV:
>   cpp = 4;
>   break;
>   case DRM_FORMAT_NV12:
> -- 
> 2.19.1
> 
> ___
> 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] egl_ext_device_drm: Fix format warning.

[Eric Engestrom]

On Thursday, 2018-11-01 16:51:52 +, Vinson Lee wrote:
> egl_ext_device_drm.c: In function ‘main’:
> egl_ext_device_drm.c:165:52: warning: format ‘%s’ expects a matching ‘char *’ 
> argument [-Wformat=]
> printf("Make sure you have permissions to open %s\n");
>~^
> 
> Fixes: 039bbe4a61d1 ("egl_ext_device_drm: don't fail the test if 
> open("/dev/dri/cardX") errors")
> Signed-off-by: Vinson Lee 

Yeah saw that too, thanks for typing up the fix!
Reviewed-by: Eric Engestrom 

> ---
>  tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c 
> b/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c
> index 954ac60c8161..9fced9b35805 100644
> --- a/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c
> +++ b/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c
> @@ -162,7 +162,8 @@ main(void)
>   if (fd < 0) {
>   printf("Failed to open drm device file %s: %s\n",
>   devstring, strerror(errno));
> - printf("Make sure you have permissions to open %s\n");
> + printf("Make sure you have permissions to open %s\n",
> + devstring);
>   result = PIGLIT_WARN;
>   eglTerminate(dpy1);
>   continue;
> -- 
> 2.17.1
> 
> ___
> 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 v2 2/7] egl-context-preemption: Add check for high priority contexts.

[Eric Engestrom]

On Monday, 2018-10-29 10:16:30 -0700, Rafael Antognolli wrote:
> Check if we can create high priority contexts, otherwise just fail the
> test immediately. There's no reason to test for preemption if we can't
> create high priority contexts.
> 
> v2: Require configless context (Tapani)
> ---
>  tests/egl/egl-context-preemption.c | 58 ++
>  1 file changed, 58 insertions(+)
> 
> diff --git a/tests/egl/egl-context-preemption.c 
> b/tests/egl/egl-context-preemption.c
> index 82a698aa1..5265bccc4 100644
> --- a/tests/egl/egl-context-preemption.c
> +++ b/tests/egl/egl-context-preemption.c
> @@ -58,6 +58,40 @@ struct test_profile {
>  static bool small = false;
>  static int total_objects = 0;
>  
> +static EGLint
> +check_priority(EGLDisplay dpy, EGLContext ctx, EGLint *expected)
> +{
> + EGLint value;
> + EGLBoolean status =
> + eglQueryContext(dpy, ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, 
> );
> +
> + if (status == EGL_FALSE) {
> + piglit_loge("eglQueryContext failed\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + if (expected && value != *expected) {
> + piglit_loge("%s fail: priority value 0x%x, expected 0x%x\n",
> + __func__, value, *expected);
> + piglit_loge("Can't create high priority context.\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + return value;
> +}
> +
> +static EGLContext
> +create_context(EGLDisplay dpy, EGLint *attr)
> +{
> + EGLContext ctx =
> + eglCreateContext(dpy, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, attr);
> +
> + if (ctx == EGL_NO_CONTEXT) {
> + piglit_loge("could not create EGL context, attr 0x%x\n", 
> attr[1]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + return ctx;
> +}
> +
>  static const char *vs_text =
>   "#version 330 core\n"
>   "layout (location = 0) in vec3 aPos;\n"
> @@ -304,6 +338,27 @@ piglit_display(void)
>   return result;
>  }
>  
> +static void
> +check_high_context_priority_creation(EGLDisplay dpy)
> +{
> + EGLint attr[] = {
> + EGL_CONTEXT_PRIORITY_LEVEL_IMG,
> + EGL_CONTEXT_PRIORITY_HIGH_IMG,
> + EGL_NONE
> + };
> + EGLContext ctx = create_context(dpy, attr);
> + if (ctx == EGL_NO_CONTEXT) {
> + piglit_loge("failed to create context");
> + piglit_check_egl_error(EGL_SUCCESS);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + EGLint expected = EGL_CONTEXT_PRIORITY_HIGH_IMG;
> + check_priority(dpy, ctx, );
> +
> + eglDestroyContext(dpy, ctx);
> +}
> +
>  void
>  piglit_init(int argc, char **argv)
>  {
> @@ -311,6 +366,9 @@ piglit_init(int argc, char **argv)
>  
>   dpy = eglGetCurrentDisplay();
>   piglit_require_egl_extension(dpy, "EGL_IMG_context_priority");
> + piglit_require_egl_extension(dpy, "EGL_MESA_configless_context");

FYI this extension was uptreamed as EGL_KHR_no_config_context, so we
should require either one of them if we want piglit to work with
non-Mesa drivers.

Similarly, the EGL_NO_CONFIG_MESA token was renamed EGL_NO_CONFIG_KHR
in the process, since the former only exists in Mesa's EGL headers.

> +
> + check_high_context_priority_creation(dpy);
>  
>   if (piglit_strip_arg(, argv, "small"))
>   small = true;
> -- 
> 2.19.1
> 
> ___
> 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 v2] framework/wflinfo: use x11_egl for gles with mixed_glx_egl

[Eric Engestrom]

On Friday, 2018-10-05 09:06:24 -0700, Dylan Baker wrote:
> Because wflinfo returns GL legacy (non-profile) for gles on glx.
> 
> v2: - If the platform is pure GLX then warn that things aren't going to
>   work.
> ---
>  framework/wflinfo.py | 21 +++--
>  1 file changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/framework/wflinfo.py b/framework/wflinfo.py
> index a568bc344..1655aa0ee 100644
> --- a/framework/wflinfo.py
> +++ b/framework/wflinfo.py
> @@ -1,4 +1,4 @@
> -# Copyright (c) 2015-2016 Intel Corporation
> +# Copyright (c) 2015-2016,2018 Intel Corporation
>  
>  # Permission is hereby granted, free of charge, to any person obtaining a 
> copy
>  # of this software and associated documentation files (the "Software"), to 
> deal
> @@ -26,6 +26,7 @@ import os
>  import subprocess
>  import sys
>  import threading
> +import warnings
>  
>  import six
>  
> @@ -103,7 +104,23 @@ class WflInfo(object):
>  # to something that wflinfo understands.
>  platform = OPTIONS.env['PIGLIT_PLATFORM']
>  if platform == "mixed_glx_egl":
> -platform = "glx"
> +if 'gles2' in opts or 'gles3'in opts:
Space still missing :P   ~~~^

(although I just tested, and python seems to not care, but positive and
negative work fine, so...)

> +platform = "x11_egl"
> +else:
> +platform = "glx"
> +if platform == 'glx' and 'gles2' in opts or 'gles3' in opts:
> +# There is a bug in waffle Which causes it to return
> +# a legacy (non-profile) OpenGL instead of OpenGL ES when
> +# using the GLX platform (not for mixed_glx_egl). If the
> +# user explicitly asks for GLX then the tests are going 
> to
> +# skip whether we fast skip them or if we let them run.
> +# Since they're going to skip (even if it's wrong), let's
> +# skip them quickly.
> +#
> +# https://github.com/waffle-gl/waffle/issues/50
> +warnings.warn(
> +'Fast skipping for GLES may not work correctly with '
> +'pure GLX.')
>  
>  if sys.platform in ['windows', 'cygwin']:
>  bin = 'wflinfo.exe'
> -- 
> 2.19.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 piglit] idTech: fix extensions string list

[Eric Engestrom]

From: Eric Engestrom 

CID: 1439995
Fixes: f787ad0b60869f969f02d "Add tests for GL_EXTENSION_STRING vs. old
  idTech2 / idTech3 games"
Cc: Ian Romanick 
Signed-off-by: Eric Engestrom 
---
 tests/general/idtech-extension-strings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/general/idtech-extension-strings.c 
b/tests/general/idtech-extension-strings.c
index 83eaed8ce36a21ee5ecc..194ee5e144f1d105acef 100644
--- a/tests/general/idtech-extension-strings.c
+++ b/tests/general/idtech-extension-strings.c
@@ -79,7 +79,7 @@ const char *const q3demo_list[] = {
 const char *const star_trek_voyager_list[] = {
"GL_S3_s3tc",
"GL_EXT_texture_compression_s3tc",
-   "GL_EXT_texture_env_add"
+   "GL_EXT_texture_env_add",
"GL_EXT_texture_filter_anisotropic",
"GL_EXT_texture_edge_clamp",
"GL_ARB_multitexture",
-- 
Cheers,
  Eric

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

Re: [Piglit] [PATCH] framework/wflinfo: use x11_egl for gles with mixed_glx_egl

[Eric Engestrom]

On Thursday, 2018-10-04 11:28:22 -0700, Dylan Baker wrote:
> Because wflinfo returns GL legacy (non-profile) for gles on glx.
> ---
>  framework/wflinfo.py | 8 +++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/framework/wflinfo.py b/framework/wflinfo.py
> index a568bc344..eb75e8514 100644
> --- a/framework/wflinfo.py
> +++ b/framework/wflinfo.py
> @@ -103,7 +103,13 @@ class WflInfo(object):
>  # to something that wflinfo understands.
>  platform = OPTIONS.env['PIGLIT_PLATFORM']
>  if platform == "mixed_glx_egl":
> -platform = "glx"
> +if 'gles2' in opts or 'gles3'in opts:
Missing space~~~^

> +platform = "x11_egl"
> +else:
> +platform = "glx"
> +if platform == 'glx' and 'gles2' in opts or 'gles3' in opts:
> +# There is a wflinfo bug, which makes

Unfinished sentence?

> +raise StopWflinfo('Called')
>  
>  if sys.platform in ['windows', 'cygwin']:
>  bin = 'wflinfo.exe'
> -- 
> 2.19.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

Re: [Piglit] [PATCH piglit] egl_khr_create_context: Proper invalid attributes for EGL 1.5

[Eric Engestrom]

On Thursday, 2018-08-30 12:56:03 -0700, Miguel Angel Vico wrote:
> Any takers?
> 
> Thanks!
> 
> 
> On Wed, 22 Aug 2018 07:34:09 -0700
> "Miguel A. Vico"  wrote:
> 
> > When EGL_KHR_create_context was originally written,
> > EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR was an invalid
> > attribute for OpenGL ES.
> > 
> > After moving the extension to core EGL 1.5, the aforementioned
> > attribute was made valid for both OpenGL and OpenGL ES.
> > 
> > Check whether the EGL version is lower than 1.5 before checking
> > EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR is an invalid
> > attribute.
> > 
> > Signed-off-by: Miguel A Vico Moya 
> > ---
> >  .../egl/spec/egl_khr_create_context/common.c  |  5 ++--
> >  .../egl/spec/egl_khr_create_context/common.h  |  8 +++
> >  .../invalid-attribute-gles.c  | 24 +++
> >  3 files changed, 35 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tests/egl/spec/egl_khr_create_context/common.c 
> > b/tests/egl/spec/egl_khr_create_context/common.c
> > index a443ced97..ba0311bff 100644
> > --- a/tests/egl/spec/egl_khr_create_context/common.c
> > +++ b/tests/egl/spec/egl_khr_create_context/common.c
> > @@ -27,6 +27,8 @@
> >  
> >  static Display *dpy = NULL;
> >  EGLDisplay egl_dpy;
> > +EGLint egl_major;
> > +EGLint egl_minor;
> >  EGLConfig cfg;
> >  EGLContext ctx;
> >  
> > @@ -87,7 +89,6 @@ EGL_KHR_create_context_setup(EGLint renderable_type_mask)
> > EGL_NONE
> > };
> > EGLint count;
> > -   EGLint major, minor;
> >  
> > dpy = XOpenDisplay(NULL);
> > if (dpy == NULL) {
> > @@ -101,7 +102,7 @@ EGL_KHR_create_context_setup(EGLint 
> > renderable_type_mask)
> > piglit_report_result(PIGLIT_FAIL);
> > }
> >  
> > -   if (!eglInitialize(egl_dpy, , )) {
> > +   if (!eglInitialize(egl_dpy, _major, _minor)) {
> > fprintf(stderr, "eglInitialize() failed\n");
> > piglit_report_result(PIGLIT_FAIL);
> > }
> > diff --git a/tests/egl/spec/egl_khr_create_context/common.h 
> > b/tests/egl/spec/egl_khr_create_context/common.h
> > index f4f42760c..269610f01 100644
> > --- a/tests/egl/spec/egl_khr_create_context/common.h
> > +++ b/tests/egl/spec/egl_khr_create_context/common.h
> > @@ -51,6 +51,8 @@
> >  #endif
> >  
> >  extern EGLDisplay egl_dpy;
> > +extern EGLint egl_major;
> > +extern EGLint egl_minor;
> >  extern EGLConfig cfg;
> >  extern EGLContext ctx;
> >  
> > @@ -75,3 +77,9 @@ version_is_valid_for_context(int ctx_major, int major, 
> > int minor)
> > }
> > return false;
> >  }
> > +
> > +static inline bool
> > +check_egl_version(int major, int minor)

I would maybe add `_at_least` to the function name, but other than this
nit-pick, this looks all good to me:
Reviewed-by: Eric Engestrom 

> > +{
> > +   return ((egl_major > major) || ((egl_major == major) && (egl_minor >= 
> > minor)));
> > +}
> > diff --git a/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c 
> > b/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c
> > index 7d23e5673..d2b98818c 100644
> > --- a/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c
> > +++ b/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c
> > @@ -79,6 +79,22 @@ int main(int argc, char **argv)
> >  *attribute is only meaningful for OpenGL contexts, and specifying 
> > it
> >  *for other types of contexts, including OpenGL ES contexts, will
> >  *generate an error."
> > +*
> > +* However, after making the extension part of core EGL 1.5,
> > +* EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR was made a valid
> > +* attribute for OpenGL ES contexts:
> > +*
> > +*"The attribute EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY
> > +*specifies reset notification behavior for a context supporting
> > +*robust buffer access.  The attribute value may be either
> > +*EGL_NO_RESET_NOTIFICATION or EGL_LOSE_CONTEXT_ON_RESET, which
> > +*respectively result in reset notification behavior of
> > +*GL_NO_RESET_NOTIFICATION_ARB and GL_LOSE_CONTEXT_ON_RESET_ARB, as
> > +*described by the OpenGL GL_ARB_robustness extension, or by
> > +*equivalent functionality.
> > +*
> > +*This attribute is

[Piglit] [PATCH piglit] util: stop overallocating shader memory

[Eric Engestrom]

Fixes: 606e40b2659ad7fc4ae8e "util: Add utilities to handle shader_test files"
Cc: Alejandro Piñeiro 
Signed-off-by: Eric Engestrom 
---
 tests/util/piglit-shader-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/util/piglit-shader-test.c b/tests/util/piglit-shader-test.c
index f11ee8ab5383080ae090..1db6aa2eb203a50ca93e 100644
--- a/tests/util/piglit-shader-test.c
+++ b/tests/util/piglit-shader-test.c
@@ -143,7 +143,7 @@ piglit_load_source_from_shader_test(const char *filename,
text_size = line - first_line + 1;
 
if (output_source) {
-   *output_source = malloc(sizeof(char*) * text_size);
+   *output_source = malloc(sizeof(char) * text_size);
snprintf(*output_source, line - first_line + 1, "%s", 
first_line);
}
 
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit] util: avoid leaking memory when caller doesn't ask for it

[Eric Engestrom]

It doesn't happen anywhere right now, but a caller could say it doesn't
want the source, only its size, and in that case we would just leak that
memory.
Let's only actually allocate it when the caller wants it and will take
ownership of that memory.

Suggested-by: Caio Marcelo de Oliveira Filho 
Signed-off-by: Eric Engestrom 
---
 tests/util/piglit-shader-test.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/util/piglit-shader-test.c b/tests/util/piglit-shader-test.c
index 4802983e56d1037be079..f11ee8ab5383080ae090 100644
--- a/tests/util/piglit-shader-test.c
+++ b/tests/util/piglit-shader-test.c
@@ -101,7 +101,6 @@ piglit_load_source_from_shader_test(const char *filename,
unsigned *output_source_size)
 {
char group_name[4096];
-   char *source = NULL;
unsigned text_size;
char *line = NULL;
char *first_line = NULL;
@@ -142,11 +141,11 @@ piglit_load_source_from_shader_test(const char *filename,
}
 
text_size = line - first_line + 1;
-   source = malloc(sizeof(char*) * text_size);
-   snprintf(source, line - first_line + 1, "%s", first_line);
 
-   if (output_source)
-   *output_source = source;
+   if (output_source) {
+   *output_source = malloc(sizeof(char*) * text_size);
+   snprintf(*output_source, line - first_line + 1, "%s", 
first_line);
+   }
 
if (output_source_size)
*output_source_size = text_size;
-- 
Cheers,
  Eric

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

Re: [Piglit] [PATCH piglit 2/4] util: fix memory leak

[Eric Engestrom]

On Wednesday, 2018-08-22 09:58:16 -0700, Caio Marcelo de Oliveira Filho wrote:
> On Wed, Aug 22, 2018 at 12:38:40PM +0100, Eric Engestrom wrote:
> > CovID: 1438469 (RESOURCE_LEAK)
> > Fixes: 606e40b2659ad7fc4ae8e "util: Add utilities to handle shader_test 
> > files"
> > Signed-off-by: Eric Engestrom 
> > ---
> >  tests/util/piglit-shader-test.c | 1 +
> >  1 file changed, 1 insertion(+)
> 
> This patch is
> 
> Reviewed-by: Caio Marcelo de Oliveira Filho 

Thanks; I just pushed the series.

> 
> 
> 
> > diff --git a/tests/util/piglit-shader-test.c 
> > b/tests/util/piglit-shader-test.c
> > index 6aeb5a521a25b2d62301..4802983e56d1037be079 100644
> > --- a/tests/util/piglit-shader-test.c
> > +++ b/tests/util/piglit-shader-test.c
> > @@ -137,6 +137,7 @@ piglit_load_source_from_shader_test(const char 
> > *filename,
> > if (first_line == NULL) {
> > fprintf(stderr, "Could not find groupname \"%s\" on file 
> > \"%s\"\n",
> > group_name, filename);
> > +   free(text);
> > return false;
> > }
> 
> Since you are touching this file, a patch suggestion.  A few lines
> below there is
> 
>   text_size = line - first_line + 1;
>   source = malloc(sizeof(char*) * text_size);
>   snprintf(source, line - first_line + 1, "%s", first_line);
> 
>   if (output_source)
>   *output_source = source;
> 
> There's a leak lurking there (we don't currently hit it, though) in
> case output_source == NULL, source is ignored.  Maybe just move the
> malloc/snprintf to inside the block?

Good catch, making that patch now ;)

> 
> 
> Thanks,
> Caio
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH piglit 3/4] egl: fix uninitialised counter

[Eric Engestrom]

CovID: 1438470 (UNINIT)
Fixes: 6c08c9fab326a526b41e1 "egl: Add basic EGL_EXT_device_drm test"
Signed-off-by: Eric Engestrom 
---
 tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c 
b/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c
index 3877d57d231800869ac1..537c8b60f83be03570e6 100644
--- a/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c
+++ b/tests/egl/spec/egl_ext_device_drm/egl_ext_device_drm.c
@@ -39,7 +39,7 @@ main(void)
EGLDisplay dpy1, dpy2, dpy3;
enum piglit_result result = PIGLIT_PASS;
EGLDeviceEXT devs[NDEVS];
-   EGLint i, numdevs, drmdevs;
+   EGLint i, numdevs, drmdevs = 0;
EGLDeviceEXT device = EGL_NO_DEVICE_EXT;
EGLAttrib attr;
const char *devstring = NULL;
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit 4/4] egl: fix uninitialised counter

[Eric Engestrom]

CovID: 1438468 (UNINIT)
Fixes: e49d4479d6cabce970bb9 egl: Add basic EGL_MESA_device_software test"
Signed-off-by: Eric Engestrom 
---
 .../spec/egl_mesa_device_software/egl_mesa_device_software.c| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/egl/spec/egl_mesa_device_software/egl_mesa_device_software.c 
b/tests/egl/spec/egl_mesa_device_software/egl_mesa_device_software.c
index 5004f0c60c7152c7aee6..cdfa94680c0895cb2232 100644
--- a/tests/egl/spec/egl_mesa_device_software/egl_mesa_device_software.c
+++ b/tests/egl/spec/egl_mesa_device_software/egl_mesa_device_software.c
@@ -33,7 +33,7 @@ main(void)
 {
enum piglit_result result = PIGLIT_PASS;
EGLDeviceEXT devs[NDEVS];
-   EGLint i, numdevs, swdevs;
+   EGLint i, numdevs, swdevs = 0;
EGLDeviceEXT device = EGL_NO_DEVICE_EXT;
EGLAttrib attr;
const char *devstring = NULL;
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit 2/4] util: fix memory leak

[Eric Engestrom]

CovID: 1438469 (RESOURCE_LEAK)
Fixes: 606e40b2659ad7fc4ae8e "util: Add utilities to handle shader_test files"
Signed-off-by: Eric Engestrom 
---
 tests/util/piglit-shader-test.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/util/piglit-shader-test.c b/tests/util/piglit-shader-test.c
index 6aeb5a521a25b2d62301..4802983e56d1037be079 100644
--- a/tests/util/piglit-shader-test.c
+++ b/tests/util/piglit-shader-test.c
@@ -137,6 +137,7 @@ piglit_load_source_from_shader_test(const char *filename,
if (first_line == NULL) {
fprintf(stderr, "Could not find groupname \"%s\" on file 
\"%s\"\n",
group_name, filename);
+   free(text);
return false;
}
 
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit 1/4] arb_gpu_shader5: fix memory leak

[Eric Engestrom]

CovID: 1438471 (RESOURCE_LEAK)
Fixes: 7ec9b1734b66ee41c2700 "arb_gpu_shader5: Add support for testing
  spirv with XFB streams"
Signed-off-by: Eric Engestrom 
---
 .../execution/xfb-streams-without-invocations.c   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c 
b/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
index b604fd9732ebb26e5eb8..1c6f76c0cb631e4c7437 100644
--- a/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
+++ b/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
@@ -117,8 +117,10 @@ build_glsl_program()
 
if (!piglit_load_source_from_shader_test(shader_source_filename,
 GL_VERTEX_SHADER, false,
-_pass_thru_text, NULL))
+_pass_thru_text, NULL)) {
+   free(gs_text);
return 0;
+   }
 
 
prog = piglit_build_simple_program_multiple_shaders(
-- 
Cheers,
  Eric

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

[Piglit] [PATCH piglit] dispatch: add missing break

[Eric Engestrom]

Cc: Emil Velikov 
Fixes: 7356bdd050b8475ed13c "dispatch: fallback to eglGetProcAddress for
 core functions"
Signed-off-by: Eric Engestrom 
---
 tests/util/piglit-dispatch-init.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/util/piglit-dispatch-init.c 
b/tests/util/piglit-dispatch-init.c
index fc6b561ca0362e5d8bd3..3d9772d9b8b50b738739 100644
--- a/tests/util/piglit-dispatch-init.c
+++ b/tests/util/piglit-dispatch-init.c
@@ -225,8 +225,10 @@ get_core_proc_address(const char *function_name, int 
gl_10x_version)
switch (gl_10x_version) {
case 11:
p = do_dlsym(_handle, GLES1_LIB, function_name);
+   break;
case 20:
p = do_dlsym(_handle, GLES2_LIB, function_name);
+   break;
case 10:
default:
/* We query the address of core OpenGL functions as if they
-- 
Cheers,
  Eric

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

Re: [Piglit] [PATCH 1/2] tox: Remove testing of end-of-life Python 3.3

[Eric Engestrom]

On Friday, 2018-07-20 09:41:12 +0300, Andres Gomez wrote:
> On Mon, 2018-06-11 at 12:15 +0100, Eric Engestrom wrote:
> > On Monday, 2018-06-11 06:39:46 -0400, Rhys Kidd wrote:
> > > On 11 June 2018 at 05:40, Eric Engestrom  wrote:
> > > 
> > > > On Saturday, 2018-06-09 15:45:36 -0400, Rhys Kidd wrote:
> > > > > 
> 
> ...
> 
> > > > 
> > > > Is there another canonical travis instance of piglit, and I should
> > > > remove the one I just set up?
> > > > 
> > > 
> > > That's as canonical as any other; I believe the Travis CI functionality
> > > was added originally for individual developers to have the option of 
> > > testing
> > > their own patches. Having it run against the mesa3d GitHub read only
> > > mirror is good though.
> 
> That's right. In Igalia we also have our own GitHub forks and Travis CI
> testing [0][1].
> 
> I was just wondering if it would be worth that Juan and I join the
> mesa3d organization in GitHub ... maybe we can make use of the Travis
> CI there too but suppose we will still be using our own setting,
> mostly.

You'll have to ask DanielS for that :)

> 
> > > The question of porting this testing functionality over to GitLab's CI is 
> > > a
> > > separate, but worthwhile, discussion to have.
> > 
> > Agreed, and until then I'll just leave the Travis instance of the Github
> > mirror running as is.
> 
> Juan has been already working on that for a while ... let's hope we'll
> start sending patches soon.
> 
> In any case, this is:
> 
> Reviewed-by: Andres Gomez 
> 
> [0] https://github.com/Igalia/piglit
> [1] https://travis-ci.org/Igalia/piglit
> -- 
> Br,
> 
> Andres
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH 1/2] tox: Remove testing of end-of-life Python 3.3

[Eric Engestrom]

On Monday, 2018-06-11 06:39:46 -0400, Rhys Kidd wrote:
> On 11 June 2018 at 05:40, Eric Engestrom  wrote:
> 
> > On Saturday, 2018-06-09 15:45:36 -0400, Rhys Kidd wrote:
> > > Python 3.3 reached end-of-life in September 2017 [0].
> > >
> > > Continuous integration testing has identified a number of dependencies
> > are
> > > now failing on python 3.3, such as:
> > >
> > >   Collecting wheel
> > >   wheel requires Python '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*' but
> > the running Python is 3.3.6
> > >   ...
> > >   OSError: Command /home/travis/build/E...generator/bin/python -
> > setuptools pip wheel failed with error code 1
> > >
> > > [0] https://www.python.org/dev/peps/pep-0398/#x-end-of-life
> > >
> > > Signed-off-by: Rhys Kidd 
> >
> > I just set up the travis build for the github mirror of piglit [1] an
> > hour ago, and noticed this issue.
> >
> > Reviewed-by: Eric Engestrom 
> >
> > Have you also noticed the other issues [2] (asserts firing up)?
> >
> 
> Yes, have seen those. Those asserts() were the next thing I was going to
> dig into.

Brilliant, thanks :)

> 
> 
> >
> > Is there another canonical travis instance of piglit, and I should
> > remove the one I just set up?
> >
> 
> That's as canonical as any other; I believe the Travis CI functionality
> was added originally for individual developers to have the option of testing
> their own patches. Having it run against the mesa3d GitHub read only
> mirror is good though.
> 
> The question of porting this testing functionality over to GitLab's CI is a
> separate, but worthwhile, discussion to have.

Agreed, and until then I'll just leave the Travis instance of the Github
mirror running as is.

> 
> 
> >
> > [1] https://travis-ci.org/mesa3d/piglit
> > [2] https://travis-ci.org/mesa3d/piglit/builds/390672919
> >
> > > ---
> > >  .travis.yml | 2 --
> > >  tox.ini | 6 +++---
> > >  2 files changed, 3 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/.travis.yml b/.travis.yml
> > > index b4cbcca49..b6e8136e8 100644
> > > --- a/.travis.yml
> > > +++ b/.travis.yml
> > > @@ -15,8 +15,6 @@ matrix:
> > >include:
> > >  - python: 2.7
> > >env: TOX_ENV="py27-{generator,noaccel,accel-nix,streams}"
> > > -- python: 3.3
> > > -  env: TOX_ENV="py33-{generator,noaccel,accel-nix,streams}"
> > >  - python: 3.4
> > >env: TOX_ENV="py34-{generator,noaccel,accel-nix,streams}"
> > >  - python: 3.5
> > > diff --git a/tox.ini b/tox.ini
> > > index 12e8abd9f..411972873 100644
> > > --- a/tox.ini
> > > +++ b/tox.ini
> > > @@ -1,5 +1,5 @@
> > >  [tox]
> > > -envlist = py{27,33,34,35,36}-{generator,noaccel},
> > py{27,33,34,35,36}-accel-{win,nix}, py{27,33,34,35,36}-streams
> > > +envlist = py{27,34,35,36}-{generator,noaccel},
> > py{27,34,35,36}-accel-{win,nix}, py{27,34,35,36}-streams
> > >  skipsdist = True
> > >
> > >  [pytest]
> > > @@ -16,7 +16,7 @@ deps =
> > >  accel: simplejson
> > >  generator: numpy==1.7.0
> > >  mock==1.0.1
> > > -py27-accel-nix,py{33,34,35,36}-{accel,noaccel}: psutil
> > > +py27-accel-nix,py{34,35,36}-{accel,noaccel}: psutil
> > >  py27-accel-nix: backports.lzma
> > >  py27-accel-nix: subprocess32
> > >  py{35,36}: mako==1.0.2
> > > @@ -26,7 +26,7 @@ deps =
> > >  pytest-raises
> > >  pytest-warnings
> > >  pytest-timeout
> > > -py{27,33,34}: mako==0.8.0
> > > +py{27,34}: mako==0.8.0
> > >  six==1.5.2
> > >  {accel,noaccel,streams}: jsonschema
> > >  streams: jsonstreams>=0.4.1
> > > --
> > > 2.17.1
> > >
> > > ___
> > > 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 1/2] tox: Remove testing of end-of-life Python 3.3

[Eric Engestrom]

On Saturday, 2018-06-09 15:45:36 -0400, Rhys Kidd wrote:
> Python 3.3 reached end-of-life in September 2017 [0].
> 
> Continuous integration testing has identified a number of dependencies are
> now failing on python 3.3, such as:
> 
>   Collecting wheel
>   wheel requires Python '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*' but the 
> running Python is 3.3.6
>   ...
>   OSError: Command /home/travis/build/E...generator/bin/python - setuptools 
> pip wheel failed with error code 1
> 
> [0] https://www.python.org/dev/peps/pep-0398/#x-end-of-life
> 
> Signed-off-by: Rhys Kidd 

I just set up the travis build for the github mirror of piglit [1] an
hour ago, and noticed this issue.

Reviewed-by: Eric Engestrom 

Have you also noticed the other issues [2] (asserts firing up)?

Is there another canonical travis instance of piglit, and I should
remove the one I just set up?

[1] https://travis-ci.org/mesa3d/piglit
[2] https://travis-ci.org/mesa3d/piglit/builds/390672919

> ---
>  .travis.yml | 2 --
>  tox.ini | 6 +++---
>  2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index b4cbcca49..b6e8136e8 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -15,8 +15,6 @@ matrix:
>include:
>  - python: 2.7
>env: TOX_ENV="py27-{generator,noaccel,accel-nix,streams}"
> -- python: 3.3
> -  env: TOX_ENV="py33-{generator,noaccel,accel-nix,streams}"
>  - python: 3.4
>env: TOX_ENV="py34-{generator,noaccel,accel-nix,streams}"
>  - python: 3.5
> diff --git a/tox.ini b/tox.ini
> index 12e8abd9f..411972873 100644
> --- a/tox.ini
> +++ b/tox.ini
> @@ -1,5 +1,5 @@
>  [tox]
> -envlist = py{27,33,34,35,36}-{generator,noaccel}, 
> py{27,33,34,35,36}-accel-{win,nix}, py{27,33,34,35,36}-streams
> +envlist = py{27,34,35,36}-{generator,noaccel}, 
> py{27,34,35,36}-accel-{win,nix}, py{27,34,35,36}-streams
>  skipsdist = True
>  
>  [pytest]
> @@ -16,7 +16,7 @@ deps =
>  accel: simplejson
>  generator: numpy==1.7.0
>  mock==1.0.1
> -py27-accel-nix,py{33,34,35,36}-{accel,noaccel}: psutil
> +py27-accel-nix,py{34,35,36}-{accel,noaccel}: psutil
>  py27-accel-nix: backports.lzma
>  py27-accel-nix: subprocess32
>  py{35,36}: mako==1.0.2
> @@ -26,7 +26,7 @@ deps =
>  pytest-raises
>  pytest-warnings
>  pytest-timeout
> -py{27,33,34}: mako==0.8.0
> +py{27,34}: mako==0.8.0
>  six==1.5.2
>  {accel,noaccel,streams}: jsonschema
>  streams: jsonstreams>=0.4.1
> -- 
> 2.17.1
> 
> ___
> 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] [Mesa-dev] GitLab migration of Piglit

[Eric Engestrom]

On Tuesday, 2018-06-05 17:52:17 +0100, Daniel Stone wrote:
> Hi Eric,
> 
> On 5 June 2018 at 17:49, Eric Engestrom  wrote:
> > On Tuesday, 2018-06-05 09:11:58 -0700, Jason Ekstrand wrote:
> >> Given the discussion below, I think we'll make piglit a sub-project of
> >> mesa.  Those who need commit access to piglit but not mesa can be added
> >> directly to the piglit project.
> >>
> >> Unless someone objects strongly, I'll plan to migrate piglit on Thursday
> >> along with all the other mesa repos.
> >
> > "all the other mesa repos"
> > -> could we get a list? :)
> >
> > I assume that's now mesa, libdrm, piglit, shader-db, crucible, kmscube,
> > mesa-demos; what about igt? Anything else?
> 
> We currently have under /git/mesa:
> clover.git
> crucible.git
> demos.git
> drm-gralloc.git
> drm.git
> glu.git
> glut.git
> glw.git
> kmscube.git
> libwsbm.git
> linux-agp-compat.git
> llvm.git
> mesa-test.git
> mesa.git
> r600_demo.git
> rbug-gui
> shader-db.git
> tasks.git
> vkpipeline-db.git
> vmwgfx.git

This might just be my outsider impression, but aren't most of those
dead/no longer maintained?

> 
> Of those, kmscube and crucible have already been migrated.
> 
> Cheers,
> Daniel
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] GitLab migration of Piglit

[Eric Engestrom]

On Tuesday, 2018-06-05 09:11:58 -0700, Jason Ekstrand wrote:
> Given the discussion below, I think we'll make piglit a sub-project of
> mesa.  Those who need commit access to piglit but not mesa can be added
> directly to the piglit project.
> 
> Unless someone objects strongly, I'll plan to migrate piglit on Thursday
> along with all the other mesa repos.

"all the other mesa repos"
-> could we get a list? :)

I assume that's now mesa, libdrm, piglit, shader-db, crucible, kmscube,
mesa-demos; what about igt? Anything else?

> 
> On Mon, Jun 4, 2018 at 3:29 PM, Eric Anholt  wrote:
> 
> > Jason Ekstrand  writes:
> >
> > > All,
> > >
> > > Sorry for the mess of GitLab e-mails but there are a lot of questions to
> > > ask as this process moves forward.  Today, we're discussing piglit.  I've
> > > included both the mesa and piglit list in the hopes that people will
> > > actually see this e-mail.
> > >
> > > Honestly, I expect the migration of piglit to have much less impact on
> > most
> > > people's daily lives than moving the mesa repo.
> > >
> > > The biggest question I have is whether we actually want to continue to
> > have
> > > a separate "piglit" group.  With GitLab, we can already give someone
> > > developer access to piglit without giving them developer access to mesa.
> > > Mostly, this is a question of whether we consider piglit to be it's own
> > > project on freedesktop or a sub-project of mesa.  I don't know the answer
> > > to that question.
> >
> > So far, having it be a separate group has just been a pain in getting
> > people to contribute to piglit, when we mistakenly forget to add mesa
> > devs to it.  I don't think we need it to be a separate committer group.
> >

> ___
> 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 1/8] README: Fix spelling mistake

[Eric Engestrom]

On Mon, Apr 04, 2016 at 11:16:54AM -0700, Dylan Baker wrote:
> Do you have commit access or do you need someone to push these for you?
> 
> For the series:
> Reviewed-by: Dylan Baker 

Somehow I completely missed your reply, sorry about that.
I don't have access, someone else will have to push it :]

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

[Piglit] [PATCH 5/8] piglit: Fix spelling mistakes

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 piglit | 2 +-
 piglit-resume.py   | 2 +-
 piglit-run.py  | 2 +-
 piglit-summary-html.py | 2 +-
 piglit-summary.py  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/piglit b/piglit
index cc05bcc..e3c1f51 100755
--- a/piglit
+++ b/piglit
@@ -23,7 +23,7 @@
 """ Wrapper for piglit executables
 
 This imports functions from the framework and calls them with the argument
-parts that the parser defined here doesn't konw how to parse.
+parts that the parser defined here doesn't know how to parse.
 
 It is very important that the final parser not generate a help message
 (add_help=False in the constructor arguments), otherwise this parser will
diff --git a/piglit-resume.py b/piglit-resume.py
index c8f0fe2..43db8fa 100755
--- a/piglit-resume.py
+++ b/piglit-resume.py
@@ -22,7 +22,7 @@
 
 """ Resume an interupted piglit run
 
-Deprecated compatability wrapper
+Deprecated compatibility wrapper
 
 """
 
diff --git a/piglit-run.py b/piglit-run.py
index 7f6cf1a..d1bd69d 100755
--- a/piglit-run.py
+++ b/piglit-run.py
@@ -22,7 +22,7 @@
 
 """ Run a piglit test profile
 
-Deprecated compatability wrapper
+Deprecated compatibility wrapper
 
 """
 
diff --git a/piglit-summary-html.py b/piglit-summary-html.py
index 163d006..cb4e78c 100755
--- a/piglit-summary-html.py
+++ b/piglit-summary-html.py
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-""" Deprecated compatability wrapper for html summary """
+""" Deprecated compatibility wrapper for html summary """
 
 from __future__ import (
 absolute_import, division, print_function, unicode_literals
diff --git a/piglit-summary.py b/piglit-summary.py
index 62f29ce..307d804 100755
--- a/piglit-summary.py
+++ b/piglit-summary.py
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-""" Deprecated compatability wrapper for console summary """
+""" Deprecated compatibility wrapper for console summary """
 
 from __future__ import (
 absolute_import, division, print_function, unicode_literals
-- 
2.8.0

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

[Piglit] [PATCH 3/8] framework: Fix spelling mistakes

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 framework/backends/__init__.py |  4 ++--
 framework/backends/abstract.py |  2 +-
 framework/backends/json.py | 12 ++--
 framework/core.py  |  2 +-
 framework/dmesg.py |  2 +-
 framework/exceptions.py|  2 +-
 framework/grouptools.py|  2 +-
 framework/profile.py   |  2 +-
 framework/programs/run.py  |  4 ++--
 framework/programs/summary.py  |  6 +++---
 framework/status.py|  4 ++--
 framework/summary/common.py|  2 +-
 framework/test/base.py |  2 +-
 framework/test/glsl_parser_test.py |  2 +-
 framework/test/opengl.py   |  2 +-
 15 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/framework/backends/__init__.py b/framework/backends/__init__.py
index 7821375..488ad55 100644
--- a/framework/backends/__init__.py
+++ b/framework/backends/__init__.py
@@ -28,7 +28,7 @@
 object and receives one.
 
 Most consumers will want to import framework.backends and work directly with
-the helper functions here. For some more detailed uses (test cases expecially)
+the helper functions here. For some more detailed uses (test cases especially)
 the modules themselves may be used.
 
 When this module is loaded it will search through framework/backends for python
@@ -99,7 +99,7 @@ def get_backend(backend):
 is the responsibility of the caller to handle this error.
 
 If the backend module exists, but there is not active implementation then a
-BackendNotImplementedError will be raised, it is also the responsiblity of
+BackendNotImplementedError will be raised, it is also the responsibility of
 the caller to handle this error.
 
 """
diff --git a/framework/backends/abstract.py b/framework/backends/abstract.py
index b5b4858..13a7b67 100644
--- a/framework/backends/abstract.py
+++ b/framework/backends/abstract.py
@@ -141,7 +141,7 @@ def write_test(self, name):
 Should be a context manager, used with the with statement. It should
 first write an incomplete status value, then yield and object that will
 overwrite that value with the final value. That object needs to take a
-'data' paramter whic is a result.TestResult object.
+'data' parameter which is a result.TestResult object.
 
 Arguments:
 name -- the name of the test to be written
diff --git a/framework/backends/json.py b/framework/backends/json.py
index 1219099..2bcedab 100644
--- a/framework/backends/json.py
+++ b/framework/backends/json.py
@@ -234,7 +234,7 @@ def _load(results_file):
 except ValueError as e:
 raise exceptions.PiglitFatalError(
 'While loading json results file: "{}",\n'
-'the following error occured:\n{}'.format(results_file.name,
+'the following error occurred:\n{}'.format(results_file.name,
   str(e)))
 
 if isinstance(result, results.TestrunResult):
@@ -338,7 +338,7 @@ def _update_zero_to_one(result):
 
 - dmesg is sometimes stored as a list, sometimes stored as a string. In
   version 1 it is always stored as a string
-- in version 0 subtests are somtimes stored as duplicates, sometimes stored
+- in version 0 subtests are sometimes stored as duplicates, sometimes 
stored
   only with a single entry, in version 1 tests with subtests are only
   recorded once, always.
 - Version 0 can have an info entry, or returncode, out, and err entries,
@@ -364,7 +364,7 @@ def _update_zero_to_one(result):
 # have a returncode, out, or attribute we'll want to get those out of
 # info first
 #
-# This expects that the order of info is rougly returncode, errors,
+# This expects that the order of info is roughly returncode, errors,
 # output, *extra it can handle having extra information in the middle,
 if (None in [test.get('out'), test.get('err'),
  test.get('returncode')] and test.get('info')):
@@ -381,7 +381,7 @@ def _update_zero_to_one(result):
 if test.get('returncode') is None:
 # In some cases the returncode might not be set (like the test
 # skipped), in that case it will be None, so set it
-# apropriately
+# appropriately
 try:
 test['returncode'] = int(
 returncode[len('returncode: '):].strip())
@@ -406,8 +406,8 @@ def _update_zero_to_one(result):
 if test.get('subtest'):
 for sub in six.iterkeys(test['subtest']):
 # adding the leading / ensures that we get exactly what we
-# expect, since endswith does a character by chacter match, if
-# the subtest name is duplicated it wont match, and if there
+# expect, since endswit

[Piglit] [PATCH 8/8] unittests: Fix spelling mistakes

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 unittests/backends_tests.py|  2 +-
 unittests/base_tests.py| 10 +-
 unittests/core_tests.py|  2 +-
 unittests/dmesg_tests.py   |  2 +-
 unittests/glsl_parser_test_tests.py|  2 +-
 unittests/json_backend_tests.py|  4 ++--
 unittests/json_results_update_tests.py |  2 +-
 unittests/log_tests.py |  2 +-
 unittests/options_tests.py |  2 +-
 unittests/profile_tests.py |  6 +++---
 unittests/results_tests.py |  2 +-
 unittests/run_parser_tests.py  | 16 
 unittests/status_tests.py  |  2 +-
 unittests/utils.py |  2 +-
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/unittests/backends_tests.py b/unittests/backends_tests.py
index c3cda86..81466ec 100644
--- a/unittests/backends_tests.py
+++ b/unittests/backends_tests.py
@@ -88,7 +88,7 @@ def check(n, i):
 
 @nt.raises(backends.BackendError)
 def test_get_backend_unknown():
-"""backends.get_backend: An error is raised with an unkown backend."""
+"""backends.get_backend: An error is raised with an unknown backend."""
 backends.get_backend('obviously fake backend')
 
 
diff --git a/unittests/base_tests.py b/unittests/base_tests.py
index 2e64662..eea830b 100644
--- a/unittests/base_tests.py
+++ b/unittests/base_tests.py
@@ -59,7 +59,7 @@
 class TestTest(Test):
 """ A class for testing that implements a dummy interpret_result
 
-interpret_result() can ve overwritten by setting the
+interpret_result() can be overwritten by setting the
 self.test_interpret_result name
 
 """
@@ -118,8 +118,8 @@ def __init__(self):
 def __call__(self, *args, **kwargs):
 self.popen = subprocess.Popen(*args, **kwargs)
 
-# if commuincate cis called successfully then the proc will be
-# reset to None, whic will make the test fail.
+# if communicate is called successfully then the proc will be
+# reset to None, which will make the test fail.
 self.popen.communicate = mock.Mock(return_value=('out', 'err'))
 
 return self.popen
@@ -159,7 +159,7 @@ def p():
 test.run()
 
 # Check to see if the Popen has children, even after it should have
-# recieved a TimeoutExpired.
+# received a TimeoutExpired.
 proc = psutil.Process(os.getsid(proxy.popen.pid))
 children = proc.children(recursive=True)
 
@@ -423,7 +423,7 @@ def test_traceback(self):
 
 It's fragile to record the actual traceback, and it's unlikely
 that it can easily be implemented differently than the way the original
-code is implimented, so this doesn't do that, it just verifies there is
+code is implemented, so this doesn't do that, it just verifies there is
 a value.
 
 """
diff --git a/unittests/core_tests.py b/unittests/core_tests.py
index df7f48b..a28ebfb 100644
--- a/unittests/core_tests.py
+++ b/unittests/core_tests.py
@@ -109,7 +109,7 @@ def test_PiglitConfig_init():
 def test_parse_listfile_return():
 """core.parse_listfile(): returns a list-like object
 
-Given a file with a newline seperated list of results, parse_listfile
+Given a file with a newline separated list of results, parse_listfile
 should return a list of files with no whitespace
 
 """
diff --git a/unittests/dmesg_tests.py b/unittests/dmesg_tests.py
index 47c1959..b2f537c 100644
--- a/unittests/dmesg_tests.py
+++ b/unittests/dmesg_tests.py
@@ -151,7 +151,7 @@ def test_update_subtest_changed(self):
 
 
 def test_update_result_regex_no_match():
-"""dmesg.BaseDmesg.update_result: if no regex matches dont change status"""
+"""dmesg.BaseDmesg.update_result: if no regex matches don't change 
status"""
 dmesg_ = TestDmesg()
 dmesg_.regex = re.compile(r'nomatchforthisreally')
 result = results.TestResult('pass')
diff --git a/unittests/glsl_parser_test_tests.py 
b/unittests/glsl_parser_test_tests.py
index c732bec..f3c4c98 100644
--- a/unittests/glsl_parser_test_tests.py
+++ b/unittests/glsl_parser_test_tests.py
@@ -303,7 +303,7 @@ def glslparser_exetensions_seperators():
 """ GlslParserTest() can only have [A-Za-z_] as characters
 
 This test generates a number of tests that should catch the majority of
-errors relating to seperating extensions in the config block of a
+errors relating to separating extensions in the config block of a
 glslparser test
 
 """
diff --git a/unittests/json_backend_tests.py b/unittests/json_backend_tests.py
index eb76bfb..7d76b74 100644
--- a/unittests/json_backend_tests.py
+++ b/uni

[Piglit] [PATCH 1/8] README: Fix spelling mistake

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 535a26e..d738cb1 100644
--- a/README
+++ b/README
@@ -407,7 +407,7 @@ Every test is run as a separate process. This minimizes the 
impact that
 severe bugs like memory corruption have on the testing process.
 
 Therefore, tests can be implemented in an arbitrary standalone language.
-C is the prefered language for compiled tests, piglit also supports its own
+C is the preferred language for compiled tests, piglit also supports its own
 simple formats for test shaders and glsl parser input.
 
 All new tests must be added to the appropriate profile, all.py profile for
-- 
2.8.0

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

[Piglit] [PATCH 4/8] generated_tests: Fix spelling mistakes

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 generated_tests/gen_builtin_packing_tests.py  | 2 +-
 generated_tests/gen_builtin_uniform_tests.py  | 2 +-
 generated_tests/gen_builtin_uniform_tests_fp64.py | 2 +-
 generated_tests/random_ubo.py | 2 +-
 generated_tests/random_ubo_trim.py| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generated_tests/gen_builtin_packing_tests.py 
b/generated_tests/gen_builtin_packing_tests.py
index ae8557a..97d31f1 100644
--- a/generated_tests/gen_builtin_packing_tests.py
+++ b/generated_tests/gen_builtin_packing_tests.py
@@ -352,7 +352,7 @@ def pack_half_1x16(f32, func_opts):
 #   - Otherwise, f32 = 2^E * F where 0.5 <= F < 1.0 .
 #
 # Since we decomposed `abs(f32)`, we only need be concerned with the
-# postive cases.
+# positive cases.
 if isnan(F):
 # The resultant float16 is NaN.
 e = 31
diff --git a/generated_tests/gen_builtin_uniform_tests.py 
b/generated_tests/gen_builtin_uniform_tests.py
index 69decfe..29bd2e7 100644
--- a/generated_tests/gen_builtin_uniform_tests.py
+++ b/generated_tests/gen_builtin_uniform_tests.py
@@ -489,7 +489,7 @@ def make_test_shader(self, additional_declarations, 
prefix_statements,
 called.  output_var is the variable that the result of the
 built-in function should be assigned to, after conversion to a
 vec4.  suffix_statements is a string containing any additional
-statements that need to be inside the main() funciton of the
+statements that need to be inside the main() function of the
 shader, after the built-in function is called.
 """
 shader = ''
diff --git a/generated_tests/gen_builtin_uniform_tests_fp64.py 
b/generated_tests/gen_builtin_uniform_tests_fp64.py
index 78c2ace..4538c81 100644
--- a/generated_tests/gen_builtin_uniform_tests_fp64.py
+++ b/generated_tests/gen_builtin_uniform_tests_fp64.py
@@ -415,7 +415,7 @@ def make_test_shader(self, additional_declarations, 
prefix_statements,
 called.  output_var is the variable that the result of the
 built-in function should be assigned to, after conversion to a
 vec4.  suffix_statements is a string containing any additional
-statements that need to be inside the main() funciton of the
+statements that need to be inside the main() function of the
 shader, after the built-in function is called.
 """
 shader = ''
diff --git a/generated_tests/random_ubo.py b/generated_tests/random_ubo.py
index 5b4f813..1fb9b93 100644
--- a/generated_tests/random_ubo.py
+++ b/generated_tests/random_ubo.py
@@ -357,7 +357,7 @@ def generate_layouts(fields, required_layouts, 
allow_row_major_structure):
 layouts.append(lay)
 elif isstructure(type) and not allow_row_major_structure:
 # This would work-around a bug in NVIDIA closed source drivers.
-# They do not propogate row-major down into structures.
+# They do not propagate row-major down into structures.
 
 layouts.append("#column_major")
 elif ismatrix(type) or isstructure(type):
diff --git a/generated_tests/random_ubo_trim.py 
b/generated_tests/random_ubo_trim.py
index 2a1dc5c..438d9c7 100644
--- a/generated_tests/random_ubo_trim.py
+++ b/generated_tests/random_ubo_trim.py
@@ -41,7 +41,7 @@ def remove_empty_structure(s, do_remove = True):
 if s == x:
 continue
 
-# A previous caller may be in the proces of deleting this structure
+# A previous caller may be in the process of deleting this structure
 # type, so just skip it for now.
 if len(struct_types[x]) == 0:
 continue
-- 
2.8.0

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

[Piglit] [PATCH 6/8] templates: Fix spelling mistakes

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 templates/empty_status.mako | 2 +-
 templates/index.mako| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/empty_status.mako b/templates/empty_status.mako
index 8ee6fba..353b089 100644
--- a/templates/empty_status.mako
+++ b/templates/empty_status.mako
@@ -12,7 +12,7 @@
 Currently showing: ${page}
 Show:
   ## Index is a logical choice to put first, it will always be a link
-  ## and we don't want in preceeded by a |
+  ## and we don't want in preceded by a |
   index
   % for i in pages:
 % if i == page:
diff --git a/templates/index.mako b/templates/index.mako
index 39f4976..49a8b1c 100644
--- a/templates/index.mako
+++ b/templates/index.mako
@@ -172,7 +172,7 @@
  
escape_filename(grouptools.groupname(test
   else:
 result = status.NOTRUN
-del raw  # we dont need this, so don't let it leak
+del raw  # we don't need this, so don't let it leak
   %>
   
   % if str(result) not in exclude and result is not status.NOTRUN:
-- 
2.8.0

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

[Piglit] [PATCH 2/8] completion/bash: Fix spelling mistakes

[Eric Engestrom]

Signed-off-by: Eric Engestrom <e...@engestrom.ch>
---
 completions/bash/piglit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/completions/bash/piglit b/completions/bash/piglit
index 1227ab6..b6cfdd1 100644
--- a/completions/bash/piglit
+++ b/completions/bash/piglit
@@ -35,7 +35,7 @@ __piglit_results_extensions="@(json|json.xz|json.gz|json.bz2)"
 #
 # This handles everything piglit run expects, with one small caviat, after the
 # first profile is provided, it mixes profiles and directories together, since
-# either addtional profiles or a directory can be provided. After something
+# either additional profiles or a directory can be provided. After something
 # that isn't a profile is provided it wont auto complete any more positional
 # arguments.
 __piglit_run() {
@@ -209,7 +209,7 @@ __piglit_summary_aggregate() {
 
 # Completions for 'summary console'
 #
-# This function is extremly simple, it takes an infinite number of positional
+# This function is extremely simple, it takes an infinite number of positional
 # arguments which are all the same, a couple of switches, and only two of them
 # take arguments.
 __piglit_summary_console() {
-- 
2.8.0

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