diff options
| author | Eric Anholt <[email protected]> | 2018-01-27 18:34:35 +1100 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-01-27 19:04:21 +1100 |
| commit | 91f899cbc1efc8618c213ca6766d5c27a99238db (patch) | |
| tree | 945c9ec6862e4884df337d810f28ce86db49c1ca | |
| parent | f2e41daac577f0b34b345e8e4c801f44454faa02 (diff) | |
broadcom/vc5: Update the compiler for V3D 4.2.
| -rw-r--r-- | src/broadcom/compiler/nir_to_vir.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c index 68e86f3a1c2..46f3c9bc419 100644 --- a/src/broadcom/compiler/nir_to_vir.c +++ b/src/broadcom/compiler/nir_to_vir.c @@ -969,7 +969,11 @@ emit_frag_end(struct v3d_compile *c) switch (glsl_get_base_type(var->type)) { case GLSL_TYPE_UINT: case GLSL_TYPE_INT: - conf |= TLB_TYPE_I32_COLOR; + /* The F32 vs I32 distinction was dropped in 4.2. */ + if (c->devinfo->ver < 42) + conf |= TLB_TYPE_I32_COLOR; + else + conf |= TLB_TYPE_F32_COLOR; conf |= ((num_components - 1) << TLB_VEC_SIZE_MINUS_1_SHIFT); @@ -1159,7 +1163,7 @@ emit_vert_end(struct v3d_compile *c) /* GFXH-1684: VPM writes need to be complete by the end of the shader. */ - if (c->devinfo->ver >= 40 && c->devinfo->ver <= 41) + if (c->devinfo->ver >= 40 && c->devinfo->ver <= 42) vir_VPMWT(c); } |