From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 29 May 2018 14:32:43 +0000 (-0700)
Subject: iris: fix constant packet length to match i965
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=badefe50a06d9e7196367dcaa1f233ff68d5c67c;p=mesa.git

iris: fix constant packet length to match i965
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 87a34d73721..bcbab9e2b07 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -2177,8 +2177,11 @@ iris_upload_render_state(struct iris_context *ice,
          continue;
 
       struct iris_shader_state *shs = &ice->shaders.state[stage];
+      struct iris_compiled_shader *shader = ice->shaders.prog[stage];
+      struct brw_stage_prog_data *prog_data = (void *) shader->prog_data;
       // XXX: DIV_ROUND_UP(prog_data->nr_params, 8)?
-      shs->const_size = DIV_ROUND_UP(cbuf0->buffer_size, 32);
+      //shs->const_size = DIV_ROUND_UP(cbuf0->buffer_size, 32);
+      shs->const_size = DIV_ROUND_UP(prog_data->nr_params, 8);
       u_upload_data(ice->ctx.const_uploader, 0, 32 * shs->const_size, 32,
                     cbuf0->user_buffer, &shs->const_offset,
                     &shs->push_resource);