From 4b0001c42df10134e792fcd7879e997b0ae4cdbf Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 7 Aug 2019 12:00:14 -0700 Subject: [PATCH] panfrost: Set PIPE_CAP_TGSI_TEXCOORD It doesn't really make sense, since we don't have special texture coordinate varyings, but it'll make some code simpler for XFB and it doesn't hurt us, even if I lose a bit of my soul setting it. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon --- src/gallium/drivers/panfrost/pan_screen.c | 5 +++++ src/gallium/drivers/panfrost/pan_varyings.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index d56897729a3..de34a2e26ca 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -180,6 +180,11 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: return 0; + /* I really don't want to set this CAP but let's not swim against the + * tide.. */ + case PIPE_CAP_TGSI_TEXCOORD: + return 1; + case PIPE_CAP_SEAMLESS_CUBE_MAP: case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: return 1; diff --git a/src/gallium/drivers/panfrost/pan_varyings.c b/src/gallium/drivers/panfrost/pan_varyings.c index b4ed512917a..40d7d98bf65 100644 --- a/src/gallium/drivers/panfrost/pan_varyings.c +++ b/src/gallium/drivers/panfrost/pan_varyings.c @@ -143,7 +143,7 @@ panfrost_emit_varying_descriptor( unsigned loc = fs->varyings_loc[i]; unsigned pnt_loc = - (loc >= VARYING_SLOT_VAR0) ? (loc - VARYING_SLOT_VAR0) : + (loc >= VARYING_SLOT_TEX0) ? (loc - VARYING_SLOT_TEX0) : (loc == VARYING_SLOT_PNTC) ? 8 : ~0; -- 2.30.2