[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mesa3d-dev
Subject:    Re: [Mesa-dev] [PATCH v2 4/7] main/shaderapi: GL_GEOMETRY_SHADER_INVOCATIONS GetProgramiv support
From:       Paul Berry <stereotype441 () gmail ! com>
Date:       2014-01-31 22:53:49
Message-ID: CA+yLL64p9U-Bg8ig-CZ1wkphAE2fedCfFX=59HYCWc8e5p70=g () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


On 28 January 2014 11:22, Jordan Justen <jordan.l.justen@intel.com> wrote:

> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
>  src/mesa/main/shaderapi.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
> index a8336c9..fb107d5 100644
> --- a/src/mesa/main/shaderapi.c
> +++ b/src/mesa/main/shaderapi.c
> @@ -603,6 +603,12 @@ get_programiv(struct gl_context *ctx, GLuint program,
> GLenum pname, GLint *param
>        if (check_gs_query(ctx, shProg))
>           *params = shProg->Geom.VerticesOut;
>        return;
> +   case GL_GEOMETRY_SHADER_INVOCATIONS:
> +      if (!has_core_gs)
>

This needs to be:

   if (!has_core_gs || !ctx->Extensions.ARB_gpu_shader5)

so that the query will generate the proper error message on platforms that
don't support ARB_gpu_shader5.


> +         break;
> +      if (check_gs_query(ctx, shProg))
> +         *params = shProg->Geom.Invocations;
> +      return;
>     case GL_GEOMETRY_INPUT_TYPE:
>        if (!has_core_gs)
>           break;
> --
> 1.8.5.3
>

With that fixed, the patch is:

Reviewed-by: Paul Berry <stereotype441@gmail.com>

[Attachment #5 (text/html)]

<div dir="ltr">On 28 January 2014 11:22, Jordan Justen <span dir="ltr">&lt;<a \
href="mailto:jordan.l.justen@intel.com" \
target="_blank">jordan.l.justen@intel.com</a>&gt;</span> wrote:<br><div \
class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" \
style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex">Signed-off-by: Jordan Justen &lt;<a \
href="mailto:jordan.l.justen@intel.com">jordan.l.justen@intel.com</a>&gt;<br>

---<br>
 src/mesa/main/shaderapi.c | 6 ++++++<br>
 1 file changed, 6 insertions(+)<br>
<br>
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c<br>
index a8336c9..fb107d5 100644<br>
--- a/src/mesa/main/shaderapi.c<br>
+++ b/src/mesa/main/shaderapi.c<br>
@@ -603,6 +603,12 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum \
pname, GLint *param<br>  if (check_gs_query(ctx, shProg))<br>
          *params = shProg-&gt;Geom.VerticesOut;<br>
       return;<br>
+   case GL_GEOMETRY_SHADER_INVOCATIONS:<br>
+      if (!has_core_gs)<br></blockquote><div><br></div><div>This needs to \
be:<br><br></div><div>   if (!has_core_gs || \
!ctx-&gt;Extensions.ARB_gpu_shader5)<br><br></div><div>so that the query will \
generate the proper error message on platforms that don&#39;t support \
ARB_gpu_shader5.<br> </div><div> </div><blockquote class="gmail_quote" \
style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"> +         break;<br>
+      if (check_gs_query(ctx, shProg))<br>
+         *params = shProg-&gt;Geom.Invocations;<br>
+      return;<br>
    case GL_GEOMETRY_INPUT_TYPE:<br>
       if (!has_core_gs)<br>
          break;<br>
<span class=""><font color="#888888">--<br>
1.8.5.3<br></font></span></blockquote><div><br></div><div>With that fixed, the patch \
is:<br><br>Reviewed-by: Paul Berry &lt;<a \
href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>&gt;<br></div></div></div></div>




_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[prev in list] [next in list] [prev in thread] [next in thread]