From 99a47874de3930b29098e721e2d0b19ae9c03c77 Mon Sep 17 00:00:00 2001 From: Charmaine Lee Date: Mon, 29 Mar 2021 23:01:41 -0700 Subject: [PATCH] gallivm: increase size of texture target enum bitfield Need to bump up the size of texture target bitfield for MSVC. Fixes: 0ce7c4a7c981 ("gallivm: Use the proper enum for the texture target bitfield.") Reviewed-by: Neha Bhende Reviewed-by: Roland Scheidegger Part-of: (cherry picked from commit a442e3ff551dd737607be6d5bb3ca08bea8dc1f5) --- .pick_status.json | 2 +- src/gallium/auxiliary/gallivm/lp_bld_sample.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 05108d0fed8..64be840207c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -292,7 +292,7 @@ "description": "gallivm: increase size of texture target enum bitfield", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "0ce7c4a7c98122996af849b0f1199da13cd7efa2" }, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h index ed85f86258e..b09a9b9f40c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h @@ -169,7 +169,7 @@ struct lp_static_texture_state unsigned swizzle_a:3; /* pipe_texture's state */ - enum pipe_texture_target target:4; /**< PIPE_TEXTURE_* */ + enum pipe_texture_target target:5; /**< PIPE_TEXTURE_* */ unsigned pot_width:1; /**< is the width a power of two? */ unsigned pot_height:1; unsigned pot_depth:1;