Mesa (master): r600g: enable texture arrays
Marek Olšák
mareko at kemper.freedesktop.org
Sat Sep 10 06:56:32 UTC 2011
Module: Mesa
Branch: master
Commit: b37931f69b7885ec9cdcaea8aec10db777d7e60a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b37931f69b7885ec9cdcaea8aec10db777d7e60a
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun Sep 4 04:41:52 2011 +0200
r600g: enable texture arrays
---
src/gallium/drivers/r600/r600_pipe.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index cfbeae5..a3fc618 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;
More information about the mesa-commit
mailing list