fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 15:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300: handle polygon-mode points in point sprite path

Browse source 
arb_point_sprite-mipmap renders polygons with polygon mode set to POINT.
However, r300 point-sprite setup only treated MESA_PRIM_POINTS as point
draws, so sprite coord replacement was disabled for polygon primitives
that were rasterized as points. This produced wrong texcoord orientation
and failed the piglit test.

Detect point rasterization from the primitive plus rasterizer fill/cull
state and use that in both HWTCL and SWTCL draw paths when updating
is_point flag.

The test now pass on RV370 and fails with the rest of the CI HW, but the
remaining issues seem to be some LOD boundary mismatch at point size 22,
the hardware samples level 0 where test expects level 1. In total only 4
cases now fail instead of 82 before.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39850>
This commit is contained in:
Pavel Ondračka 2026-02-12 11:25:20 +01:00 • committed by Marge Bot
parent 922e3c75cf
commit 5ee7d99f64
1 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/gallium/drivers/r300/r300_render.c
View file

@ -799,6 +799,39 @@ r300_update_clip_discard_distance(struct r300_context *r300, unsigned prim)
}
}
static bool
r300_rasterizer_emits_points(struct r300_context *r300, unsigned prim)
{
struct r300_rs_state *rs = (struct r300_rs_state*)r300->rs_state.state;
if (prim == MESA_PRIM_POINTS)
return true;
switch (prim) {
case MESA_PRIM_TRIANGLES:
case MESA_PRIM_TRIANGLE_STRIP:
case MESA_PRIM_TRIANGLE_FAN:
case MESA_PRIM_QUADS:
case MESA_PRIM_QUAD_STRIP:
case MESA_PRIM_POLYGON:
break;
default:
return false;
}
if (!rs)
return false;
bool front_rasterized = !(rs->rs.cull_face & PIPE_FACE_FRONT);
bool back_rasterized = !(rs->rs.cull_face & PIPE_FACE_BACK);
if (front_rasterized && rs->rs.fill_front != PIPE_POLYGON_MODE_POINT)
return false;
if (back_rasterized && rs->rs.fill_back != PIPE_POLYGON_MODE_POINT)
return false;
return front_rasterized || back_rasterized;
}
static void r300_draw_vbo(struct pipe_context* pipe,
const struct pipe_draw_info *dinfo,
@ -823,11 +856,13 @@ static void r300_draw_vbo(struct pipe_context* pipe,
r300_update_clip_discard_distance(r300, info.mode);
if (r300->sprite_coord_enable != 0)
if ((info.mode == MESA_PRIM_POINTS) != r300->is_point) {
r300->is_point = !r300->is_point;
if (r300->sprite_coord_enable != 0) {
bool is_point = r300_rasterizer_emits_points(r300, info.mode);
if (is_point != r300->is_point) {
r300->is_point = is_point;
r300_mark_atom_dirty(r300, &r300->rs_block_state);
}
}
r300_update_derived_state(r300);
@ -910,11 +945,13 @@ static void r300_swtcl_draw_vbo(struct pipe_context* pipe,
info->index_size, ~0);
}
if (r300->sprite_coord_enable != 0)
if ((info->mode == MESA_PRIM_POINTS) != r300->is_point) {
r300->is_point = !r300->is_point;
if (r300->sprite_coord_enable != 0) {
bool is_point = r300_rasterizer_emits_points(r300, info->mode);
if (is_point != r300->is_point) {
r300->is_point = is_point;
r300_mark_atom_dirty(r300, &r300->rs_block_state);
}
}
r300_update_derived_state(r300);