gallium/ttn: mark location specially in nir for color0-writes-all
We need to distinguish a shader that has separate writes to each MRT from one which is supposed to write the data from MRT 0 to all the MRTs. In TGSI this is done with a property. NIR doesn't have that, so encode it as a funny location and decode on the other end. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
959b47262b
commit
0a155538eb
|
@ -253,7 +253,12 @@ ttn_emit_declaration(struct ttn_compile *c)
|
||||||
var->name = ralloc_asprintf(var, "out_%d", idx);
|
var->name = ralloc_asprintf(var, "out_%d", idx);
|
||||||
|
|
||||||
var->data.location = decl->Semantic.Name;
|
var->data.location = decl->Semantic.Name;
|
||||||
var->data.index = decl->Semantic.Index;
|
if (decl->Semantic.Name == TGSI_SEMANTIC_COLOR &&
|
||||||
|
decl->Semantic.Index == 0 &&
|
||||||
|
c->scan->properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS])
|
||||||
|
var->data.index = -1;
|
||||||
|
else
|
||||||
|
var->data.index = decl->Semantic.Index;
|
||||||
|
|
||||||
if (is_array) {
|
if (is_array) {
|
||||||
unsigned j;
|
unsigned j;
|
||||||
|
|
|
@ -2110,6 +2110,10 @@ setup_output(struct ir3_compile *ctx, nir_variable *out)
|
||||||
so->writes_pos = true;
|
so->writes_pos = true;
|
||||||
break;
|
break;
|
||||||
case TGSI_SEMANTIC_COLOR:
|
case TGSI_SEMANTIC_COLOR:
|
||||||
|
if (semantic_index == -1) {
|
||||||
|
semantic_index = 0;
|
||||||
|
so->color0_mrt = 1;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
compile_error(ctx, "unknown FS semantic name: %s\n",
|
compile_error(ctx, "unknown FS semantic name: %s\n",
|
||||||
|
|
|
@ -1783,6 +1783,12 @@ ntq_setup_outputs(struct vc4_compile *c)
|
||||||
|
|
||||||
assert(array_len == 1);
|
assert(array_len == 1);
|
||||||
|
|
||||||
|
/* NIR hack to pass through
|
||||||
|
* TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS */
|
||||||
|
if (semantic_name == TGSI_SEMANTIC_COLOR &&
|
||||||
|
semantic_index == -1)
|
||||||
|
semantic_index = 0;
|
||||||
|
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
add_output(c,
|
add_output(c,
|
||||||
loc + i,
|
loc + i,
|
||||||
|
|
Loading…
Reference in New Issue