From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 4 Sep 2011 02:41:52 +0000 (+0200)
Subject: r600g: enable texture arrays
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b37931f69b7885ec9cdcaea8aec10db777d7e60a;p=mesa.git

r600g: enable texture arrays
---

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index cfbeae5a4fa..a3fc61822e7 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -380,9 +380,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
 		return 0;
 
-	case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
-		return 0; /* will be re-enabled in the following commits. */
-
 	/* Texturing. */
 	case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
 	case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
@@ -391,6 +388,9 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 			return 15;
 		else
 			return 14;
+	case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
+		return r600_get_minor_version(rscreen->radeon) >= 9 ?
+			(family >= CHIP_CEDAR ? 16384 : 8192) : 0;
 	case PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS:
 	case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
 		return 16;