OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3d: Handle the line width intrinsics

Browse Source 
Adds new QUNIFORMs to store the line widths.

v2: Also handle the aa_line_width intrinsic

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5624>
This commit is contained in:
Neil Roberts
2020-06-22 09:52:25 +02:00
committed by Marge Bot
parent 121b82f638
commit 207da33a86
4 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/broadcom/compiler/nir_to_vir.c
View File

@@ -2169,6 +2169,16 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr)
ntq_store_dest(c, &instr->dest, 0, vir_MOV(c, c->line_x)); ntq_store_dest(c, &instr->dest, 0, vir_MOV(c, c->line_x));
break; break;
case nir_intrinsic_load_line_width:
ntq_store_dest(c, &instr->dest, 0,
vir_uniform(c, QUNIFORM_LINE_WIDTH, 0));
break;
case nir_intrinsic_load_aa_line_width:
ntq_store_dest(c, &instr->dest, 0,
vir_uniform(c, QUNIFORM_AA_LINE_WIDTH, 0));
break;
case nir_intrinsic_load_sample_mask_in: case nir_intrinsic_load_sample_mask_in:
ntq_store_dest(c, &instr->dest, 0, vir_MSF(c)); ntq_store_dest(c, &instr->dest, 0, vir_MSF(c));
break; break;

7
src/broadcom/compiler/v3d_compiler.h
View File

@@ -261,6 +261,13 @@ enum quniform_contents {
QUNIFORM_ALPHA_REF, QUNIFORM_ALPHA_REF,
QUNIFORM_LINE_WIDTH,
/* The line width sent to hardware. This includes the expanded width
* when anti-aliasing is enabled.
*/
QUNIFORM_AA_LINE_WIDTH,
/* Number of workgroups passed to glDispatchCompute in the dimension /* Number of workgroups passed to glDispatchCompute in the dimension
* selected by the data value. * selected by the data value.
*/ */

2
src/broadcom/compiler/vir_dump.c
View File

@@ -31,6 +31,8 @@ vir_dump_uniform(enum quniform_contents contents,
{ {
static const char *quniform_names[] = { static const char *quniform_names[] = {
[QUNIFORM_ALPHA_REF] = "alpha_ref", [QUNIFORM_ALPHA_REF] = "alpha_ref",
[QUNIFORM_LINE_WIDTH] = "line_width",
[QUNIFORM_AA_LINE_WIDTH] = "aa_line_width",
[QUNIFORM_VIEWPORT_X_SCALE] = "vp_x_scale", [QUNIFORM_VIEWPORT_X_SCALE] = "vp_x_scale",
[QUNIFORM_VIEWPORT_Y_SCALE] = "vp_y_scale", [QUNIFORM_VIEWPORT_Y_SCALE] = "vp_y_scale",
[QUNIFORM_VIEWPORT_Z_OFFSET] = "vp_z_offset", [QUNIFORM_VIEWPORT_Z_OFFSET] = "vp_z_offset",

11
src/gallium/drivers/v3d/v3d_uniforms.c
View File

@@ -312,6 +312,12 @@ v3d_write_uniforms(struct v3d_context *v3d, struct v3d_job *job,
v3d->zsa->base.alpha.ref_value); v3d->zsa->base.alpha.ref_value);
break; break;
case QUNIFORM_LINE_WIDTH:
case QUNIFORM_AA_LINE_WIDTH:
cl_aligned_f(&uniforms,
v3d->rasterizer->base.line_width);
break;
case QUNIFORM_UBO_ADDR: { case QUNIFORM_UBO_ADDR: {
uint32_t unit = v3d_unit_data_get_unit(data); uint32_t unit = v3d_unit_data_get_unit(data);
/* Constant buffer 0 may be a system memory pointer, /* Constant buffer 0 may be a system memory pointer,
@@ -464,6 +470,11 @@ v3d_set_shader_uniform_dirty_flags(struct v3d_compiled_shader *shader)
dirty |= VC5_DIRTY_ZSA; dirty |= VC5_DIRTY_ZSA;
break; break;
case QUNIFORM_LINE_WIDTH:
case QUNIFORM_AA_LINE_WIDTH:
dirty |= VC5_DIRTY_RASTERIZER;
break;
case QUNIFORM_NUM_WORK_GROUPS: case QUNIFORM_NUM_WORK_GROUPS:
case QUNIFORM_SHARED_OFFSET: case QUNIFORM_SHARED_OFFSET:
/* Compute always recalculates uniforms. */ /* Compute always recalculates uniforms. */