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/gen6_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/gen6_sf_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_sf_state.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c index 7cef17a..059dd90 100644 --- a/src/mesa/drivers/dri/i965/gen6_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c @@ -193,7 +193,7 @@ calculate_attr_overrides(const struct brw_context *brw, * correctly set the attr overrides. * * _NEW_POLYGON - * BRW_NEW_PRIMITIVE | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_TES_PROG_DATA + * BRW_NEW_PRIMITIVE | BRW_NEW_GS_PROG_DATA | BRW_NEW_TES_PROG_DATA */ bool drawing_points = brw_is_drawing_points(brw); @@ -335,7 +335,9 @@ upload_sf_state(struct brw_context *brw) unreachable("not reached"); } - /* _NEW_SCISSOR _NEW_POLYGON BRW_NEW_GEOMETRY_PROGRAM BRW_NEW_PRIMITIVE */ + /* _NEW_SCISSOR | _NEW_POLYGON, + * BRW_NEW_GS_PROG_DATA | BRW_NEW_TES_PROG_DATA | BRW_NEW_PRIMITIVE + */ if (ctx->Scissor.EnableFlags || brw_is_drawing_points(brw) || brw_is_drawing_lines(brw)) dw3 |= GEN6_SF_SCISSOR_ENABLE; @@ -448,7 +450,7 @@ const struct brw_tracked_state gen6_sf_state = { BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | - BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_GS_PROG_DATA | BRW_NEW_PRIMITIVE | BRW_NEW_TES_PROG_DATA | BRW_NEW_VUE_MAP_GEOM_OUT, |