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

compiler: add PERSP to the existing barycentric system values

Browse Source 
We need the LINEAR versions for AMD_shader_explicit_vertex_parameter.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3578>
This commit is contained in:
Samuel Pitoiset
2020-01-27 18:45:26 +01:00
committed by Marge Bot
parent 5c053cc6ec
commit 15d53d8294
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/shader_enums.c
View File

@@ -250,10 +250,10 @@ gl_system_value_name(gl_system_value sysval)
ENUM(SYSTEM_VALUE_DEVICE_INDEX), ENUM(SYSTEM_VALUE_DEVICE_INDEX),
ENUM(SYSTEM_VALUE_VIEW_INDEX), ENUM(SYSTEM_VALUE_VIEW_INDEX),
ENUM(SYSTEM_VALUE_VERTEX_CNT), ENUM(SYSTEM_VALUE_VERTEX_CNT),
ENUM(SYSTEM_VALUE_BARYCENTRIC_PIXEL), ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL),
ENUM(SYSTEM_VALUE_BARYCENTRIC_SAMPLE), ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE),
ENUM(SYSTEM_VALUE_BARYCENTRIC_CENTROID), ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID),
ENUM(SYSTEM_VALUE_BARYCENTRIC_SIZE), ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE),
ENUM(SYSTEM_VALUE_GS_HEADER_IR3), ENUM(SYSTEM_VALUE_GS_HEADER_IR3),
ENUM(SYSTEM_VALUE_TCS_HEADER_IR3), ENUM(SYSTEM_VALUE_TCS_HEADER_IR3),
}; };

8
src/compiler/shader_enums.h
View File

@@ -636,10 +636,10 @@ typedef enum
* The _SIZE value is "primitive size", used to scale i/j in primitive * The _SIZE value is "primitive size", used to scale i/j in primitive
* space to pixel space. * space to pixel space.
*/ */
SYSTEM_VALUE_BARYCENTRIC_PIXEL, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL,
SYSTEM_VALUE_BARYCENTRIC_SAMPLE, SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE,
SYSTEM_VALUE_BARYCENTRIC_CENTROID, SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID,
SYSTEM_VALUE_BARYCENTRIC_SIZE, SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE,
/** /**
* IR3 specific geometry shader and tesselation control shader system * IR3 specific geometry shader and tesselation control shader system

10
src/freedreno/ir3/ir3_compiler_nir.c
View File

@@ -1268,7 +1268,7 @@ get_barycentric_centroid(struct ir3_context *ctx)
struct ir3_instruction *xy[2]; struct ir3_instruction *xy[2];
struct ir3_instruction *ij; struct ir3_instruction *ij;
ij = create_sysval_input(ctx, SYSTEM_VALUE_BARYCENTRIC_CENTROID, 0x3); ij = create_sysval_input(ctx, SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID, 0x3);
ir3_split_dest(ctx->block, xy, ij, 0, 2); ir3_split_dest(ctx->block, xy, ij, 0, 2);
ctx->ij_centroid = ir3_create_collect(ctx, xy, 2); ctx->ij_centroid = ir3_create_collect(ctx, xy, 2);
@@ -1284,7 +1284,7 @@ get_barycentric_sample(struct ir3_context *ctx)
struct ir3_instruction *xy[2]; struct ir3_instruction *xy[2];
struct ir3_instruction *ij; struct ir3_instruction *ij;
ij = create_sysval_input(ctx, SYSTEM_VALUE_BARYCENTRIC_SAMPLE, 0x3); ij = create_sysval_input(ctx, SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE, 0x3);
ir3_split_dest(ctx->block, xy, ij, 0, 2); ir3_split_dest(ctx->block, xy, ij, 0, 2);
ctx->ij_sample = ir3_create_collect(ctx, xy, 2); ctx->ij_sample = ir3_create_collect(ctx, xy, 2);
@@ -1509,7 +1509,7 @@ emit_intrinsic(struct ir3_context *ctx, nir_intrinsic_instr *intr)
case nir_intrinsic_load_size_ir3: case nir_intrinsic_load_size_ir3:
if (!ctx->ij_size) { if (!ctx->ij_size) {
ctx->ij_size = ctx->ij_size =
create_sysval_input(ctx, SYSTEM_VALUE_BARYCENTRIC_SIZE, 0x1); create_sysval_input(ctx, SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE, 0x1);
} }
dst[0] = ctx->ij_size; dst[0] = ctx->ij_size;
break; break;
@@ -3059,7 +3059,7 @@ emit_instructions(struct ir3_context *ctx)
* because sysvals need to be appended after varyings: * because sysvals need to be appended after varyings:
*/ */
if (vcoord) { if (vcoord) {
add_sysval_input_compmask(ctx, SYSTEM_VALUE_BARYCENTRIC_PIXEL, add_sysval_input_compmask(ctx, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL,
0x3, vcoord); 0x3, vcoord);
} }
@@ -3462,7 +3462,7 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler,
int idx = 0; int idx = 0;
foreach_input(instr, ir) { foreach_input(instr, ir) {
if (instr->input.sysval != SYSTEM_VALUE_BARYCENTRIC_PIXEL) if (instr->input.sysval != SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL)
continue; continue;
assert(idx < ARRAY_SIZE(precolor)); assert(idx < ARRAY_SIZE(precolor));

2
src/freedreno/ir3/ir3_depth.c
View File

@@ -224,7 +224,7 @@ compute_depth_and_remove_unused(struct ir3 *ir, struct ir3_shader_variant *so)
*/ */
if (so->num_sampler_prefetch && if (so->num_sampler_prefetch &&
(instr->opc == OPC_META_INPUT) && (instr->opc == OPC_META_INPUT) &&
(instr->input.sysval == SYSTEM_VALUE_BARYCENTRIC_PIXEL)) (instr->input.sysval == SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL))
continue; continue;
instr->flags |= IR3_INSTR_UNUSED; instr->flags |= IR3_INSTR_UNUSED;
} }

6
src/freedreno/ir3/ir3_shader.c
View File

@@ -470,11 +470,11 @@ ir3_shader_disasm(struct ir3_shader_variant *so, uint32_t *bin, FILE *out)
break; break;
case MESA_SHADER_FRAGMENT: case MESA_SHADER_FRAGMENT:
dump_reg(out, "pos (ij_pixel)", dump_reg(out, "pos (ij_pixel)",
ir3_find_sysval_regid(so, SYSTEM_VALUE_BARYCENTRIC_PIXEL)); ir3_find_sysval_regid(so, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL));
dump_reg(out, "pos (ij_centroid)", dump_reg(out, "pos (ij_centroid)",
ir3_find_sysval_regid(so, SYSTEM_VALUE_BARYCENTRIC_CENTROID)); ir3_find_sysval_regid(so, SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID));
dump_reg(out, "pos (ij_size)", dump_reg(out, "pos (ij_size)",
ir3_find_sysval_regid(so, SYSTEM_VALUE_BARYCENTRIC_SIZE)); ir3_find_sysval_regid(so, SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE));
dump_output(out, so, FRAG_RESULT_DEPTH, "posz"); dump_output(out, so, FRAG_RESULT_DEPTH, "posz");
if (so->color0_mrt) { if (so->color0_mrt) {
dump_output(out, so, FRAG_RESULT_COLOR, "color"); dump_output(out, so, FRAG_RESULT_COLOR, "color");

8
src/freedreno/vulkan/tu_pipeline.c
View File

@@ -760,10 +760,10 @@ tu6_emit_fs_inputs(struct tu_cs *cs, const struct ir3_shader_variant *fs)
face_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRONT_FACE); face_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRONT_FACE);
coord_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRAG_COORD); coord_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRAG_COORD);
zwcoord_regid = VALIDREG(coord_regid) ? coord_regid + 2 : regid(63, 0); zwcoord_regid = VALIDREG(coord_regid) ? coord_regid + 2 : regid(63, 0);
ij_pix_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PIXEL); ij_pix_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL);
ij_samp_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_SAMPLE); ij_samp_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE);
ij_cent_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_CENTROID); ij_cent_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID);
ij_size_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_SIZE); ij_size_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE);
if (fs->num_sampler_prefetch > 0) { if (fs->num_sampler_prefetch > 0) {
assert(VALIDREG(ij_pix_regid)); assert(VALIDREG(ij_pix_regid));

2
src/gallium/drivers/freedreno/a3xx/fd3_program.c
View File

@@ -174,7 +174,7 @@ fd3_program_emit(struct fd_ringbuffer *ring, struct fd3_emit *emit,
face_regid = ir3_find_sysval_regid(fp, SYSTEM_VALUE_FRONT_FACE); face_regid = ir3_find_sysval_regid(fp, SYSTEM_VALUE_FRONT_FACE);
coord_regid = ir3_find_sysval_regid(fp, SYSTEM_VALUE_FRAG_COORD); coord_regid = ir3_find_sysval_regid(fp, SYSTEM_VALUE_FRAG_COORD);
zwcoord_regid = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2); zwcoord_regid = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2);
vcoord_regid = ir3_find_sysval_regid(fp, SYSTEM_VALUE_BARYCENTRIC_PIXEL); vcoord_regid = ir3_find_sysval_regid(fp, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL);
/* adjust regids for alpha output formats. there is no alpha render /* adjust regids for alpha output formats. there is no alpha render
* format, so it's just treated like red * format, so it's just treated like red

2
src/gallium/drivers/freedreno/a4xx/fd4_program.c
View File

@@ -208,7 +208,7 @@ fd4_program_emit(struct fd_ringbuffer *ring, struct fd4_emit *emit,
face_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRONT_FACE); face_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRONT_FACE);
coord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRAG_COORD); coord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRAG_COORD);
zwcoord_regid = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2); zwcoord_regid = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2);
vcoord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_BARYCENTRIC_PIXEL); vcoord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL);
/* we could probably divide this up into things that need to be /* we could probably divide this up into things that need to be
* emitted if frag-prog is dirty vs if vert-prog is dirty.. * emitted if frag-prog is dirty vs if vert-prog is dirty..

2
src/gallium/drivers/freedreno/a5xx/fd5_program.c
View File

@@ -320,7 +320,7 @@ fd5_program_emit(struct fd_context *ctx, struct fd_ringbuffer *ring,
face_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRONT_FACE); face_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRONT_FACE);
coord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRAG_COORD); coord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRAG_COORD);
zwcoord_regid = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2); zwcoord_regid = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2);
vcoord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_BARYCENTRIC_PIXEL); vcoord_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL);
/* we could probably divide this up into things that need to be /* we could probably divide this up into things that need to be
* emitted if frag-prog is dirty vs if vert-prog is dirty.. * emitted if frag-prog is dirty vs if vert-prog is dirty..

8
src/gallium/drivers/freedreno/a6xx/fd6_program.c
View File

@@ -352,10 +352,10 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
face_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRONT_FACE); face_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRONT_FACE);
coord_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRAG_COORD); coord_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_FRAG_COORD);
zwcoord_regid = next_regid(coord_regid, 2); zwcoord_regid = next_regid(coord_regid, 2);
ij_pix_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PIXEL); ij_pix_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL);
ij_samp_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_SAMPLE); ij_samp_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE);
ij_cent_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_CENTROID); ij_cent_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID);
ij_size_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_SIZE); ij_size_regid = ir3_find_sysval_regid(fs, SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE);
posz_regid = ir3_find_output_regid(fs, FRAG_RESULT_DEPTH); posz_regid = ir3_find_output_regid(fs, FRAG_RESULT_DEPTH);
smask_regid = ir3_find_output_regid(fs, FRAG_RESULT_SAMPLE_MASK); smask_regid = ir3_find_output_regid(fs, FRAG_RESULT_SAMPLE_MASK);

8
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -5879,10 +5879,10 @@ _mesa_sysval_to_semantic(unsigned sysval)
case SYSTEM_VALUE_LOCAL_INVOCATION_INDEX: case SYSTEM_VALUE_LOCAL_INVOCATION_INDEX:
case SYSTEM_VALUE_GLOBAL_INVOCATION_ID: case SYSTEM_VALUE_GLOBAL_INVOCATION_ID:
case SYSTEM_VALUE_VERTEX_CNT: case SYSTEM_VALUE_VERTEX_CNT:
case SYSTEM_VALUE_BARYCENTRIC_PIXEL: case SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL:
case SYSTEM_VALUE_BARYCENTRIC_SAMPLE: case SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE:
case SYSTEM_VALUE_BARYCENTRIC_CENTROID: case SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID:
case SYSTEM_VALUE_BARYCENTRIC_SIZE: case SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE:
default: default:
assert(!"Unexpected SYSTEM_VALUE_ enum"); assert(!"Unexpected SYSTEM_VALUE_ enum");
return TGSI_SEMANTIC_COUNT; return TGSI_SEMANTIC_COUNT;