On Fri, May 29, 2015 at 12:26:40PM -0700, Kenneth Graunke wrote:
> See the corresponding code in brw_vs_surface_state.c.
>
> Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
> ---
> src/mesa/drivers/dri/i965/brw_gs_surface_state.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
> b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
> index a323e4d..bfc4516 100644
> --- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
> @@ -47,11 +47,12 @@ brw_upload_gs_pull_constants(struct brw_context *brw)
> return;
>
> /* BRW_NEW_GS_PROG_DATA */
> - const struct brw_stage_prog_data *prog_data =
> &brw->gs.prog_data->base.base;
> + struct brw_vue_prog_data *prog_data = &brw->gs.prog_data->base;
No need to drop the constant qualifier, this is still used only for reading.
Same below in brw_upload_gs_ubo_surfaces().
> + bool dword_pitch = prog_data->dispatch_mode == DISPATCH_MODE_SIMD8;
This could be const as well.
>
> /* _NEW_PROGRAM_CONSTANTS */
> brw_upload_pull_constants(brw, BRW_NEW_GS_CONSTBUF, &gp->program.Base,
> - stage_state, prog_data, false);
> + stage_state, &prog_data->base, dword_pitch);
> }
>
> const struct brw_tracked_state brw_gs_pull_constants = {
> @@ -77,8 +78,11 @@ brw_upload_gs_ubo_surfaces(struct brw_context *brw)
> return;
>
> /* BRW_NEW_GS_PROG_DATA */
> + struct brw_vue_prog_data *prog_data = &brw->gs.prog_data->base;
> + bool dword_pitch = prog_data->dispatch_mode == DISPATCH_MODE_SIMD8;
> +
> brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_GEOMETRY],
> - &brw->gs.base, &brw->gs.prog_data->base.base, false);
> + &brw->gs.base, &prog_data->base, dword_pitch);
> }
>
> const struct brw_tracked_state brw_gs_ubo_surfaces = {
> --
> 2.4.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
