From 64b06290628145e1f9082f1d5a61a23186a5ec19 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Sat, 29 Apr 2023 09:54:15 +0200 Subject: [PATCH] frontend/nine: Fix programmable vs check Checking if context->vs is set is not equivalent to checking programmable vs Cc: mesa-stable Signed-off-by: Axel Davy Part-of: (cherry picked from commit d3cec6cdf1de14ae3b16d0a5084b0af0088e8ff1) --- .pick_status.json | 2 +- src/gallium/frontends/nine/nine_ff.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 565c84e0813..51e2f4c7643 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -244,7 +244,7 @@ "description": "frontend/nine: Fix programmable vs check", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/frontends/nine/nine_ff.h b/src/gallium/frontends/nine/nine_ff.h index 0fbbda7e2a0..cd4fe94f676 100644 --- a/src/gallium/frontends/nine/nine_ff.h +++ b/src/gallium/frontends/nine/nine_ff.h @@ -86,7 +86,7 @@ nine_ff_get_projected_key(struct nine_context *context, unsigned num_stages) unsigned idx = context->ff.tex_stage[s][D3DTSS_TEXCOORDINDEX] & 7; unsigned proj = !!(context->ff.tex_stage[s][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED); - if (!context->vs) { + if (!context->programmable_vs) { if (dim > 4) dim = input_texture_coord[idx];