fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 20:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

zink: assign increasing locations to varyings

Browse source 
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Erik Faye-Lund 2019-06-13 11:03:55 +02:00
parent cedf3598b4
commit e0a93ba351
1 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -38,6 +38,7 @@ struct ntv_context {
SpvId input_types[PIPE_MAX_SHADER_INPUTS][4];
SpvId outputs[PIPE_MAX_SHADER_OUTPUTS][4];
SpvId output_types[PIPE_MAX_SHADER_OUTPUTS][4];
int var_location;
SpvId ubos[128];
size_t num_ubos;
@ -192,19 +193,24 @@ emit_input(struct ntv_context *ctx, struct nir_variable *var)
spirv_builder_emit_name(&ctx->builder, var_id, var->name);
if (ctx->stage == MESA_SHADER_FRAGMENT) {
switch (var->data.location) {
case VARYING_SLOT_POS:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInFragCoord);
break;
case VARYING_SLOT_PNTC:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInPointCoord);
break;
default:
if (var->data.location >= VARYING_SLOT_VAR0 ||
(var->data.location >= VARYING_SLOT_COL0 &&
var->data.location <= VARYING_SLOT_TEX7)) {
spirv_builder_emit_location(&ctx->builder, var_id,
var->data.driver_location);
break;
ctx->var_location++);
} else {
switch (var->data.location) {
case VARYING_SLOT_POS:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInFragCoord);
break;
case VARYING_SLOT_PNTC:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInPointCoord);
break;
default:
unreachable("unknown varying slot");
}
}
} else {
spirv_builder_emit_location(&ctx->builder, var_id,
@ -242,18 +248,24 @@ emit_output(struct ntv_context *ctx, struct nir_variable *var)
if (ctx->stage == MESA_SHADER_VERTEX) {
switch (var->data.location) {
case VARYING_SLOT_POS:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInPosition);
break;
case VARYING_SLOT_PSIZ:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInPointSize);
break;
default:
if (var->data.location >= VARYING_SLOT_VAR0 ||
(var->data.location >= VARYING_SLOT_COL0 &&
var->data.location <= VARYING_SLOT_TEX7)) {
spirv_builder_emit_location(&ctx->builder, var_id,
var->data.driver_location - 1);
ctx->var_location++);
} else {
switch (var->data.location) {
case VARYING_SLOT_POS:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInPosition);
break;
case VARYING_SLOT_PSIZ:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInPointSize);
break;
default:
unreachable("unknown varying slot");
}
}
} else if (ctx->stage == MESA_SHADER_FRAGMENT) {
switch (var->data.location) {