fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-24 00:50:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: remove a few fields from si_state_rasterizer

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12812>
This commit is contained in:
Marek Olšák 2021-08-21 14:19:32 -04:00 • committed by Marge Bot
parent 1f8be99621
commit 1d4e47e1db
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/drivers/radeonsi/si_state.c
View file

@ -902,14 +902,6 @@ static void *si_create_rs_state(struct pipe_context *ctx, const struct pipe_rast
return NULL;
}
if (!state->front_ccw) {
rs->cull_front = !!(state->cull_face & PIPE_FACE_FRONT);
rs->cull_back = !!(state->cull_face & PIPE_FACE_BACK);
} else {
rs->cull_back = !!(state->cull_face & PIPE_FACE_FRONT);
rs->cull_front = !!(state->cull_face & PIPE_FACE_BACK);
}
rs->provoking_vertex_first = state->flatshade_first;
rs->scissor_enable = state->scissor;
rs->clip_halfz = state->clip_halfz;
rs->two_side = state->light_twoside;
@ -929,9 +921,6 @@ static void *si_create_rs_state(struct pipe_context *ctx, const struct pipe_rast
rs->flatshade_first = state->flatshade_first;
rs->sprite_coord_enable = state->sprite_coord_enable;
rs->rasterizer_discard = state->rasterizer_discard;
rs->polygon_mode_enabled =
(state->fill_front != PIPE_POLYGON_MODE_FILL && !(state->cull_face & PIPE_FACE_FRONT)) ||
(state->fill_back != PIPE_POLYGON_MODE_FILL && !(state->cull_face & PIPE_FACE_BACK));
rs->polygon_mode_is_lines =
(state->fill_front == PIPE_POLYGON_MODE_LINE && !(state->cull_face & PIPE_FACE_FRONT)) ||
(state->fill_back == PIPE_POLYGON_MODE_LINE && !(state->cull_face & PIPE_FACE_BACK));
@ -957,12 +946,22 @@ static void *si_create_rs_state(struct pipe_context *ctx, const struct pipe_rast
rs->ngg_cull_flags = SI_NGG_CULL_ENABLED;
rs->ngg_cull_flags_y_inverted = rs->ngg_cull_flags;
if (rs->cull_front) {
bool cull_front, cull_back;
if (!state->front_ccw) {
cull_front = !!(state->cull_face & PIPE_FACE_FRONT);
cull_back = !!(state->cull_face & PIPE_FACE_BACK);
} else {
cull_back = !!(state->cull_face & PIPE_FACE_FRONT);
cull_front = !!(state->cull_face & PIPE_FACE_BACK);
}
if (cull_front) {
rs->ngg_cull_flags |= SI_NGG_CULL_FRONT_FACE;
rs->ngg_cull_flags_y_inverted |= SI_NGG_CULL_BACK_FACE;
}
if (rs->cull_back) {
if (cull_back) {
rs->ngg_cull_flags |= SI_NGG_CULL_BACK_FACE;
rs->ngg_cull_flags_y_inverted |= SI_NGG_CULL_FRONT_FACE;
}
@ -1006,6 +1005,11 @@ static void *si_create_rs_state(struct pipe_context *ctx, const struct pipe_rast
S_028A48_ALTERNATE_RBS_PER_TILE(sscreen->info.chip_class >= GFX9));
si_pm4_set_reg(pm4, R_028B7C_PA_SU_POLY_OFFSET_CLAMP, fui(state->offset_clamp));
bool polygon_mode_enabled =
(state->fill_front != PIPE_POLYGON_MODE_FILL && !(state->cull_face & PIPE_FACE_FRONT)) ||
(state->fill_back != PIPE_POLYGON_MODE_FILL && !(state->cull_face & PIPE_FACE_BACK));
si_pm4_set_reg(pm4, R_028814_PA_SU_SC_MODE_CNTL,
S_028814_PROVOKING_VTX_LAST(!state->flatshade_first) |
S_028814_CULL_FRONT((state->cull_face & PIPE_FACE_FRONT) ? 1 : 0) |
@ -1014,11 +1018,11 @@ static void *si_create_rs_state(struct pipe_context *ctx, const struct pipe_rast
S_028814_POLY_OFFSET_FRONT_ENABLE(util_get_offset(state, state->fill_front)) |
S_028814_POLY_OFFSET_BACK_ENABLE(util_get_offset(state, state->fill_back)) |
S_028814_POLY_OFFSET_PARA_ENABLE(state->offset_point || state->offset_line) |
S_028814_POLY_MODE(rs->polygon_mode_enabled) |
S_028814_POLY_MODE(polygon_mode_enabled) |
S_028814_POLYMODE_FRONT_PTYPE(si_translate_fill(state->fill_front)) |
S_028814_POLYMODE_BACK_PTYPE(si_translate_fill(state->fill_back)) |
/* this must be set if POLY_MODE or PERPENDICULAR_ENDCAP_ENA is set */
S_028814_KEEP_TOGETHER_ENABLE(sscreen->info.chip_class >= GFX10 ? rs->polygon_mode_enabled : 0));
S_028814_KEEP_TOGETHER_ENABLE(sscreen->info.chip_class >= GFX10 ? polygon_mode_enabled : 0));
if (!rs->uses_poly_offset)
return rs;

4
src/gallium/drivers/radeonsi/si_state.h
View file

@ -96,10 +96,6 @@ struct si_state_rasterizer {
unsigned rasterizer_discard : 1;
unsigned scissor_enable : 1;
unsigned clip_halfz : 1;
unsigned cull_front : 1;
unsigned cull_back : 1;
unsigned provoking_vertex_first : 1;
unsigned polygon_mode_enabled : 1;
unsigned polygon_mode_is_lines : 1;
unsigned polygon_mode_is_points : 1;
};