Re: [Mesa-dev] [PATCH 17/42] st/mesa: switch gs over to shared shader_info

[Marek Olšák]

Reviewed-by: Marek Olšák 

Marek

On Thu, Oct 20, 2016 at 1:09 AM, Timothy Arceri
 wrote:
> ---
>  src/mesa/state_tracker/st_program.c | 11 +++
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_program.c 
> b/src/mesa/state_tracker/st_program.c
> index 7804452..0a80568 100644
> --- a/src/mesa/state_tracker/st_program.c
> +++ b/src/mesa/state_tracker/st_program.c
> @@ -1520,11 +1520,14 @@ st_translate_geometry_program(struct st_context *st,
> if (ureg == NULL)
>return false;
>
> -   ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM, stgp->Base.InputType);
> -   ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM, stgp->Base.OutputType);
> +   ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM,
> + stgp->Base.Base.info.gs.input_primitive);
> +   ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM,
> + stgp->Base.Base.info.gs.output_primitive);
> ureg_property(ureg, TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES,
> - stgp->Base.VerticesOut);
> -   ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS, stgp->Base.Invocations);
> + stgp->Base.Base.info.gs.vertices_out);
> +   ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS,
> + stgp->Base.Base.info.gs.invocations);
>
> st_translate_program_common(st, >Base.Base, stgp->glsl_to_tgsi, 
> ureg,
> PIPE_SHADER_GEOMETRY, >tgsi);
> --
> 2.7.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 17/42] st/mesa: switch gs over to shared shader_info

[Timothy Arceri]

---
 src/mesa/state_tracker/st_program.c | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_program.c 
b/src/mesa/state_tracker/st_program.c
index 7804452..0a80568 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1520,11 +1520,14 @@ st_translate_geometry_program(struct st_context *st,
if (ureg == NULL)
   return false;
 
-   ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM, stgp->Base.InputType);
-   ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM, stgp->Base.OutputType);
+   ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM,
+ stgp->Base.Base.info.gs.input_primitive);
+   ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM,
+ stgp->Base.Base.info.gs.output_primitive);
ureg_property(ureg, TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES,
- stgp->Base.VerticesOut);
-   ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS, stgp->Base.Invocations);
+ stgp->Base.Base.info.gs.vertices_out);
+   ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS,
+ stgp->Base.Base.info.gs.invocations);
 
st_translate_program_common(st, >Base.Base, stgp->glsl_to_tgsi, ureg,
PIPE_SHADER_GEOMETRY, >tgsi);
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev