framework/wflinfo: use x11_egl for gles with mixed_glx_egl

Submitted by Dylan Baker on Oct. 4, 2018, 6:28 p.m.

Details

Message ID 20181004182822.27191-1-dylan@pnwbakers.com
State New
Headers show
Series "framework/wflinfo: use x11_egl for gles with mixed_glx_egl" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Dylan Baker Oct. 4, 2018, 6:28 p.m.
Because wflinfo returns GL legacy (non-profile) for gles on glx.
---
 framework/wflinfo.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

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:
+                        platform = "x11_egl"
+                    else:
+                        platform = "glx"
+                if platform == 'glx' and 'gles2' in opts or 'gles3' in opts:
+                    # There is a wflinfo bug, which makes
+                    raise StopWflinfo('Called')
 
                 if sys.platform in ['windows', 'cygwin']:
                     bin = 'wflinfo.exe'

Comments

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
Quoting Eric Engestrom (2018-10-05 08:22:38)
> 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?

Apparently :)

Now that I think about it this patch isn't complete either. Actually, if we hit
this bug we need to alter the behavior of the fast-skipper so that it doesn't
fast skip when it doesn't have valid data.

Or not, apparently waffle just does the wrong thing with GLES on GLX.

> > +                    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