Mesa (master): radeonsi: increase the maximum UBO size to 2 GB

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Aug  8 15:37:21 2018 -0400

radeonsi: increase the maximum UBO size to 2 GB

Same as the closed driver.

This causes a failure in GL45-CTS.compute_shader.max, which has a trivial
bug.

Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

---

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

diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c
index a282b69a87..47368fb7c9 100644
--- a/src/gallium/drivers/radeonsi/si_get.c
+++ b/src/gallium/drivers/radeonsi/si_get.c
@@ -397,7 +397,7 @@ static int si_get_shader_param(struct pipe_screen* pscreen,
 	case PIPE_SHADER_CAP_MAX_TEMPS:
 		return 256; /* Max native temporaries. */
 	case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE:
-		return 4096 * sizeof(float[4]); /* actually only memory limits this */
+		return MIN2(sscreen->info.max_alloc_size, INT_MAX - 3); /* aligned to 4 */
 	case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
 		return SI_NUM_CONST_BUFFERS;
 	case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: