Mesa (master): radeonsi: replace magic 16 by SI_NUM_USER_SAMPLERS

Nicolai Hähnle nh at kemper.freedesktop.org
Thu Apr 7 18:16:59 UTC 2016


Module: Mesa
Branch: master
Commit: f270067ef9c755a10d852c3e6ef4e9a01aabcb17
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f270067ef9c755a10d852c3e6ef4e9a01aabcb17

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed Apr  6 11:45:37 2016 -0500

radeonsi: replace magic 16 by SI_NUM_USER_SAMPLERS

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_pipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 97be59d..41bb84d 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -523,7 +523,7 @@ static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enu
 		return 0;
 	case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
 	case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS:
-		return 16;
+		return SI_NUM_USER_SAMPLERS;
 	case PIPE_SHADER_CAP_PREFERRED_IR:
 		return PIPE_SHADER_IR_TGSI;
 	case PIPE_SHADER_CAP_SUPPORTED_IRS:




More information about the mesa-commit mailing list