fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 16:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/genxml: rename field

Browse source 
This field is really about the line-shape, not multisampling or not.

Yeah, in OpenGL, these two concepts are kinda intertwined. But this is
what the state actually does, so let's name it based on that.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33382>
This commit is contained in:
Erik Faye-Lund 2025-02-04 11:22:19 +01:00 • committed by Marge Bot
parent dad5ee1039
commit 6bb4971497
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -657,7 +657,7 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
if (u_reduced_prim(ctx->active_prim) == MESA_PRIM_LINES &&
rast->base.line_smooth) {
rsd.opaque[8] |= (1u << 16); // multisample_enable = 1
rsd.opaque[9] &= ~(1u << 30); // single_sampled_lines = 0
rsd.opaque[9] &= ~(1u << 30); // aligned_line_ends = 0
}
/* Word 10, 11 Stencil Front and Back */
@ -3592,7 +3592,7 @@ panfrost_create_rasterizer_state(struct pipe_context *pctx,
pan_pack(&so->stencil_misc, STENCIL_MASK_MISC, cfg) {
cfg.front_facing_depth_bias = cso->offset_tri;
cfg.back_facing_depth_bias = cso->offset_tri;
cfg.single_sampled_lines = !cso->multisample;
cfg.aligned_line_ends = !cso->multisample;
}
#endif

4
src/gallium/drivers/panfrost/pan_csf.c
View file

@ -1183,11 +1183,11 @@ csf_emit_draw_state(struct panfrost_batch *batch,
(rast->multisample &&
((ctx->min_samples > 1) || ctx->valhall_has_blend_shader));
cfg.single_sampled_lines = !rast->multisample;
cfg.aligned_line_ends = !rast->multisample;
if (lines && rast->line_smooth) {
cfg.multisample_enable = true;
cfg.single_sampled_lines = false;
cfg.aligned_line_ends = false;
}
bool has_oq = ctx->occlusion_query && ctx->active_queries;

4
src/gallium/drivers/panfrost/pan_jm.c
View file

@ -563,7 +563,7 @@ jm_emit_tiler_draw(struct mali_draw_packed *out, struct panfrost_batch *batch,
(rast->multisample &&
((ctx->min_samples > 1) || ctx->valhall_has_blend_shader));
cfg.flags_0.single_sampled_lines = !rast->multisample;
cfg.flags_0.aligned_line_ends = !rast->multisample;
cfg.vertex_array.packet = true;
@ -574,7 +574,7 @@ jm_emit_tiler_draw(struct mali_draw_packed *out, struct panfrost_batch *batch,
if (prim == MESA_PRIM_LINES && rast->line_smooth) {
cfg.flags_0.multisample_enable = true;
cfg.flags_0.single_sampled_lines = false;
cfg.flags_0.aligned_line_ends = false;
}
if (fs_required) {

2
src/panfrost/lib/genxml/v10.xml
View file

@ -1880,7 +1880,7 @@
<field name="Clean Fragment Write" size="1" start="9" type="bool"/>
<field name="Primitive Barrier" size="1" start="10" type="bool"/>
<field name="Evaluate per-sample" size="1" start="11" type="bool"/>
<field name="Single-sampled lines" size="1" start="13" type="bool"/>
<field name="Aligned line-ends" size="1" start="13" type="bool"/>
<field name="Occlusion query" size="2" start="14" type="Occlusion Mode" default="Disabled"/>
<field name="Front face CCW" size="1" start="16" type="bool"/>
<field name="Cull front face" size="1" start="17" type="bool"/>

2
src/panfrost/lib/genxml/v4.xml
View file

@ -664,7 +664,7 @@
<field name="Force seamless cubemaps" size="1" start="26" type="bool"/>
<field name="Front-facing depth bias" size="1" start="28" type="bool"/>
<field name="Back-facing depth bias" size="1" start="29" type="bool"/>
<field name="Single-sampled lines" size="1" start="30" type="bool"/>
<field name="Aligned line-ends" size="1" start="30" type="bool"/>
<field name="Point snap" size="1" start="31" type="bool"/>
</struct>

2
src/panfrost/lib/genxml/v5.xml
View file

@ -692,7 +692,7 @@
<field name="Force seamless cubemaps" size="1" start="26" type="bool"/>
<field name="Front-facing depth bias" size="1" start="28" type="bool"/>
<field name="Back-facing depth bias" size="1" start="29" type="bool"/>
<field name="Single-sampled lines" size="1" start="30" type="bool"/>
<field name="Aligned line-ends" size="1" start="30" type="bool"/>
<field name="Point snap" size="1" start="31" type="bool"/>
</struct>

2
src/panfrost/lib/genxml/v6.xml
View file

@ -764,7 +764,7 @@
<field name="Force seamless cubemaps" size="1" start="26" type="bool"/>
<field name="Front-facing depth bias" size="1" start="28" type="bool"/>
<field name="Back-facing depth bias" size="1" start="29" type="bool"/>
<field name="Single-sampled lines" size="1" start="30" type="bool"/>
<field name="Aligned line-ends" size="1" start="30" type="bool"/>
<field name="Point snap" size="1" start="31" type="bool"/>
</struct>

2
src/panfrost/lib/genxml/v7.xml
View file

@ -837,7 +837,7 @@
<field name="Force seamless cubemaps" size="1" start="26" type="bool"/>
<field name="Front-facing depth bias" size="1" start="28" type="bool"/>
<field name="Back-facing depth bias" size="1" start="29" type="bool"/>
<field name="Single-sampled lines" size="1" start="30" type="bool"/>
<field name="Aligned line-ends" size="1" start="30" type="bool"/>
<field name="Point snap" size="1" start="31" type="bool"/>
</struct>

2
src/panfrost/lib/genxml/v9.xml
View file

@ -1408,7 +1408,7 @@
<field name="Clean Fragment Write" size="1" start="9" type="bool"/>
<field name="Primitive Barrier" size="1" start="10" type="bool"/>
<field name="Evaluate per-sample" size="1" start="11" type="bool"/>
<field name="Single-sampled lines" size="1" start="13" type="bool"/>
<field name="Aligned line-ends" size="1" start="13" type="bool"/>
<field name="Occlusion query" size="2" start="14" type="Occlusion Mode" default="Disabled"/>
<field name="Front face CCW" size="1" start="16" type="bool"/>
<field name="Cull front face" size="1" start="17" type="bool"/>