On Thu, 2018-11-08 at 09:54 +0100, Erik Faye-Lund wrote:
> On Thu, 2018-11-08 at 10:47 +0200, Tapani Pälli wrote:
> > On 11/8/18 10:44 AM, Erik Faye-Lund wrote:
> > > On Thu, 2018-11-08 at 08:47 +0200, Tapani Pälli wrote:
> > > > FYI there's a whole lot of tests that start to fail when this
> > > > series
> > > > running on Intel CI. It includes dEQP but also Piglit tests,
> > > > can
> > > > you
> > > > do
> > > > Intel CI run or do you want me to send you results?
> > >
> > > If you mean mesa-ci.01.org, then I have no clue how to do this...
> > > If
> > > you could pass me the results, that'd be great! Or perhaps these
> > > are
> > > the results?
> > > https://mesa-ci.01.org/tpalli/builds/623/group/63a9f0ea7bb98050796b649e85481845
> >
> > Yep, this is it!
> >
> > > I also wouldn't mind being able to trigger test-runs manually if
> > > some
> > > credentials or whatnot could be set up ;)
> > >
> >
> > I'm not sure how this process goes but if you want me to do re-run
> > that's fine.
> >
> > // Tapani
>
> Cool. I already have a tentative patch, seems I missed
> OES_geometry_shader:
>
> ---8<---
> diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
> index 5c455a6db81..80ef3025285 100644
> --- a/src/mesa/main/queryobj.c
> +++ b/src/mesa/main/queryobj.c
> @@ -187,7 +187,8 @@ get_query_binding_point(struct gl_context *ctx,
> GLenum target, GLuint index)
> else
> return NULL;
> case GL_PRIMITIVES_GENERATED:
> - if (_mesa_has_EXT_transform_feedback(ctx))
> + if (_mesa_has_EXT_transform_feedback(ctx) ||
> + _mesa_has_OES_geometry_shader(ctx))
> return &ctx->Query.PrimitivesGenerated[index];
> else
> return NULL;
> ---8<---
>
> I'll dig a bit more through logs to look for more mistakes, though.
>
Here's another one, I forgot to account for the fact that
ARB_occlusion_query isn't enabled in core-contexts:
---8<---
Author: Erik Faye-Lund <erik.faye-l...@collabora.com>
Date: Thu Nov 8 10:26:09 2018 +0100
squash! mesa/main: fix validation of GL_SAMPLES_PASSED
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 80ef3025285..842067bff02 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -165,7 +165,8 @@ get_query_binding_point(struct gl_context *ctx,
GLenum target, GLuint index)
{
switch (target) {
case GL_SAMPLES_PASSED:
- if (_mesa_has_ARB_occlusion_query(ctx))
+ if (_mesa_has_ARB_occlusion_query(ctx) ||
+ _mesa_has_ARB_occlusion_query2(ctx))
return &ctx->Query.CurrentOcclusionObject;
else
return NULL;
---8<---
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
