AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600: remove unscaled poly offset support

Browse Source 
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35147>
This commit is contained in:
Georg Lehmann
2025-05-24 16:21:39 +02:00
committed by Marge Bot
parent 2f6d1f1f31
commit 6071367ffa
5 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gallium/drivers/r600/evergreen_state.c
View File

@@ -515,7 +515,6 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
rs->offset_units = state->offset_units;
rs->offset_scale = state->offset_scale * 16.0f;
rs->offset_enable = state->offset_point || state->offset_line || state->offset_tri;
rs->offset_units_unscaled = state->offset_units_unscaled;
if (state->point_size_per_vertex) {
psize_min = util_get_min_point_size(state);
@@ -1982,26 +1981,24 @@ static void evergreen_emit_polygon_offset(struct r600_context *rctx, struct r600
float offset_scale = state->offset_scale;
uint32_t pa_su_poly_offset_db_fmt_cntl = 0;
if (!state->offset_units_unscaled) {
switch (state->zs_format) {
case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
case PIPE_FORMAT_X8Z24_UNORM:
case PIPE_FORMAT_S8_UINT_Z24_UNORM:
offset_units *= 2.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-24);
break;
case PIPE_FORMAT_Z16_UNORM:
offset_units *= 4.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-16);
break;
default:
pa_su_poly_offset_db_fmt_cntl =
S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-23) |
S_028B78_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
}
switch (state->zs_format) {
case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
case PIPE_FORMAT_X8Z24_UNORM:
case PIPE_FORMAT_S8_UINT_Z24_UNORM:
offset_units *= 2.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-24);
break;
case PIPE_FORMAT_Z16_UNORM:
offset_units *= 4.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-16);
break;
default:
pa_su_poly_offset_db_fmt_cntl =
S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-23) |
S_028B78_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
}
radeon_set_context_reg_seq(cs, R_028B80_PA_SU_POLY_OFFSET_FRONT_SCALE, 4);

1
src/gallium/drivers/r600/r600_pipe.c
View File

@@ -412,7 +412,6 @@ static void r600_init_screen_caps(struct r600_screen *rscreen)
caps->surface_reinterpret_blocks = true;
caps->query_memory_info = true;
caps->framebuffer_no_attachment = true;
caps->polygon_offset_units_unscaled = true;
caps->legacy_math_rules = true;
caps->can_bind_const_buffer_as_vertex = true;
caps->allow_mapped_buffers_during_execution = true;

2
src/gallium/drivers/r600/r600_pipe.h
View File

@@ -279,7 +279,6 @@ struct r600_rasterizer_state {
float line_width;
float max_point_size;
bool offset_enable;
bool offset_units_unscaled;
bool scissor_enable;
bool multisample_enable;
bool clip_halfz;
@@ -291,7 +290,6 @@ struct r600_poly_offset_state {
enum pipe_format zs_format;
float offset_units;
float offset_scale;
bool offset_units_unscaled;
};
struct r600_blend_state {

35
src/gallium/drivers/r600/r600_state.c
View File

@@ -247,24 +247,22 @@ static void r600_emit_polygon_offset(struct r600_context *rctx, struct r600_atom
float offset_scale = state->offset_scale;
uint32_t pa_su_poly_offset_db_fmt_cntl = 0;
if (!state->offset_units_unscaled) {
switch (state->zs_format) {
case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
offset_units *= 2.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS((char)-24);
break;
case PIPE_FORMAT_Z16_UNORM:
offset_units *= 4.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS((char)-16);
break;
default:
pa_su_poly_offset_db_fmt_cntl =
S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS((char)-23) |
S_028DF8_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
}
switch (state->zs_format) {
case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
offset_units *= 2.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS((char)-24);
break;
case PIPE_FORMAT_Z16_UNORM:
offset_units *= 4.0f;
pa_su_poly_offset_db_fmt_cntl =
S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS((char)-16);
break;
default:
pa_su_poly_offset_db_fmt_cntl =
S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS((char)-23) |
S_028DF8_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
}
radeon_set_context_reg_seq(cs, R_028E00_PA_SU_POLY_OFFSET_FRONT_SCALE, 4);
@@ -488,7 +486,6 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
rs->offset_units = state->offset_units;
rs->offset_scale = state->offset_scale * 16.0f;
rs->offset_enable = state->offset_point || state->offset_line || state->offset_tri;
rs->offset_units_unscaled = state->offset_units_unscaled;
if (state->point_size_per_vertex) {
psize_min = util_get_min_point_size(state);

4
src/gallium/drivers/r600/r600_state_common.c
View File

@@ -372,11 +372,9 @@ static void r600_bind_rs_state(struct pipe_context *ctx, void *state)
if (rs->offset_enable &&
(rs->offset_units != rctx->poly_offset_state.offset_units ||
rs->offset_scale != rctx->poly_offset_state.offset_scale ||
rs->offset_units_unscaled != rctx->poly_offset_state.offset_units_unscaled)) {
rs->offset_scale != rctx->poly_offset_state.offset_scale)) {
rctx->poly_offset_state.offset_units = rs->offset_units;
rctx->poly_offset_state.offset_scale = rs->offset_scale;
rctx->poly_offset_state.offset_units_unscaled = rs->offset_units_unscaled;
r600_mark_atom_dirty(rctx, &rctx->poly_offset_state.atom);
}