diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-08-25 22:52:22 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-08-31 11:50:15 -0700 |
| commit | 4c116cbafb086653e3fcfb78128cc04b8c9264b1 (patch) | |
| tree | 520d38ecc3e3b55b099deb9a2d4ea869d9d38c12 /src/mesa/drivers/dri/i965/gen7_sf_state.c | |
| parent | cd19db4ee61b6182b31ef8dfa1981ea59cfa34c4 (diff) | |
| download | external_mesa3d-4c116cbafb086653e3fcfb78128cc04b8c9264b1.zip external_mesa3d-4c116cbafb086653e3fcfb78128cc04b8c9264b1.tar.gz external_mesa3d-4c116cbafb086653e3fcfb78128cc04b8c9264b1.tar.bz2 | |
i965: Use gs_prog_data in is_drawing_points/lines().
State upload code should use prog_data rather than poking at core
Mesa shader data structures wherever possible.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_sf_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sf_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c index 8727bf8..06d3463 100644 --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -61,7 +61,7 @@ upload_sbe_state(struct brw_context *brw) /* _NEW_POINT | _NEW_LIGHT | _NEW_PROGRAM, * BRW_NEW_FS_PROG_DATA | BRW_NEW_FRAGMENT_PROGRAM | - * BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_PRIMITIVE | BRW_NEW_TES_PROG_DATA | + * BRW_NEW_GS_PROG_DATA | BRW_NEW_PRIMITIVE | BRW_NEW_TES_PROG_DATA | * BRW_NEW_VUE_MAP_GEOM_OUT */ uint32_t urb_entry_read_length; @@ -98,7 +98,7 @@ const struct brw_tracked_state gen7_sbe_state = { BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | - BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_GS_PROG_DATA | BRW_NEW_TES_PROG_DATA | BRW_NEW_PRIMITIVE | BRW_NEW_VUE_MAP_GEOM_OUT, @@ -192,7 +192,7 @@ upload_sf_state(struct brw_context *brw) } /* _NEW_SCISSOR | _NEW_POLYGON, - * BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_PRIMITIVE | BRW_NEW_TES_PROG_DATA + * BRW_NEW_GS_PROG_DATA | BRW_NEW_PRIMITIVE | BRW_NEW_TES_PROG_DATA */ if (ctx->Scissor.EnableFlags || brw_is_drawing_points(brw) || brw_is_drawing_lines(brw)) @@ -262,7 +262,7 @@ const struct brw_tracked_state gen7_sf_state = { _NEW_SCISSOR, .brw = BRW_NEW_BLORP | BRW_NEW_CONTEXT | - BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_GS_PROG_DATA | BRW_NEW_PRIMITIVE | BRW_NEW_TES_PROG_DATA | BRW_NEW_VUE_MAP_GEOM_OUT, |