summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2016-04-26 14:19:36 +1000
committerDave Airlie <[email protected]>2016-04-27 08:56:17 +1000
commit6cf36a7231ac38f968ee518bfaf088a14a5d2548 (patch)
treea3072ed56f2d084aba3401ac545dc420f89dbeba
parent912ed84f83381330f0d616678878935cd2366293 (diff)
tgsi: accept a starting PC value for exec machine.
This will be used later to restart barriered execution threads in compute, for now we just want to change the API. Acked-by: Roland Scheidegger <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r--src/gallium/auxiliary/draw/draw_gs.c2
-rw-r--r--src/gallium/auxiliary/draw/draw_vs_exec.c2
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_exec.c2
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_exec.h2
-rw-r--r--src/gallium/drivers/softpipe/sp_fs_exec.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index adba9316517..6cf8846627b 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -207,7 +207,7 @@ static unsigned tgsi_gs_run(struct draw_geometry_shader *shader,
struct tgsi_exec_machine *machine = shader->machine;
/* run interpreter */
- tgsi_exec_machine_run(machine);
+ tgsi_exec_machine_run(machine, 0);
return
machine->Temps[TGSI_EXEC_TEMP_PRIMITIVE_I].xyzw[TGSI_EXEC_TEMP_PRIMITIVE_C].u[0];
diff --git a/src/gallium/auxiliary/draw/draw_vs_exec.c b/src/gallium/auxiliary/draw/draw_vs_exec.c
index fe6ad5b33d9..483ee90f2a4 100644
--- a/src/gallium/auxiliary/draw/draw_vs_exec.c
+++ b/src/gallium/auxiliary/draw/draw_vs_exec.c
@@ -163,7 +163,7 @@ vs_exec_run_linear( struct draw_vertex_shader *shader,
machine->NonHelperMask = (1 << max_vertices) - 1;
/* run interpreter */
- tgsi_exec_machine_run( machine );
+ tgsi_exec_machine_run( machine, 0 );
/* Unswizzle all output results.
*/
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index f6b08bc8ee8..99606ab0290 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -5656,7 +5656,7 @@ exec_instruction(
* \return bitmask of "alive" quad components
*/
uint
-tgsi_exec_machine_run( struct tgsi_exec_machine *mach )
+tgsi_exec_machine_run( struct tgsi_exec_machine *mach, int start_pc )
{
uint i;
int pc = 0;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h
index b12f7bed9b8..0cdc1940c7c 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h
@@ -460,7 +460,7 @@ tgsi_exec_machine_bind_shader(
uint
tgsi_exec_machine_run(
- struct tgsi_exec_machine *mach );
+ struct tgsi_exec_machine *mach, int start_pc );
void
diff --git a/src/gallium/drivers/softpipe/sp_fs_exec.c b/src/gallium/drivers/softpipe/sp_fs_exec.c
index 155382af825..f1662bffdb5 100644
--- a/src/gallium/drivers/softpipe/sp_fs_exec.c
+++ b/src/gallium/drivers/softpipe/sp_fs_exec.c
@@ -130,7 +130,7 @@ exec_run( const struct sp_fragment_shader_variant *var,
machine->Face = (float) (quad->input.facing * -2 + 1);
machine->NonHelperMask = quad->inout.mask;
- quad->inout.mask &= tgsi_exec_machine_run( machine );
+ quad->inout.mask &= tgsi_exec_machine_run( machine, 0 );
if (quad->inout.mask == 0)
return FALSE;