summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_shader.c
diff options
context:
space:
mode:
authorEdward O'Callaghan <[email protected]>2015-08-29 18:31:07 +1000
committerMarek Olšák <[email protected]>2015-08-30 11:40:44 +0200
commitb4dee1b6360a91117c7a754ed70f359f6000a0de (patch)
tree1e7c548ff07bf48b498bd50a403cb9c3d3d3f28f /src/gallium/drivers/r600/r600_shader.c
parent7b6369eb69e688e5bf739dbe60452950a794f55d (diff)
r600g: Move geometry properties state from shader to selector
Signed-off-by: Edward O'Callaghan <[email protected]> Signed-off-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_shader.c')
-rw-r--r--src/gallium/drivers/r600/r600_shader.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 44e41fb30a6..f0b794c809e 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -2010,13 +2010,13 @@ static int r600_shader_from_tgsi(struct r600_context *rctx,
/* we don't need this one */
break;
case TGSI_PROPERTY_GS_OUTPUT_PRIM:
- shader->gs_output_prim = property->u[0].Data;
+ pipeshader->selector->gs_output_prim = property->u[0].Data;
break;
case TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES:
- shader->gs_max_out_vertices = property->u[0].Data;
+ pipeshader->selector->gs_max_out_vertices = property->u[0].Data;
break;
case TGSI_PROPERTY_GS_INVOCATIONS:
- shader->gs_num_invocations = property->u[0].Data;
+ pipeshader->selector->gs_num_invocations = property->u[0].Data;
break;
}
break;