Mesa (master): r600g: set correct PIPE_CAP_MAX_COMBINED_SAMPLERS

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue May  3 11:54:07 2011 +0200

r600g: set correct PIPE_CAP_MAX_COMBINED_SAMPLERS

---

 src/gallium/drivers/r600/r600_pipe.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index e28d834..9a5f172 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -404,11 +404,10 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 		else
 			return 14;
 	case PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS:
-		/* FIXME allow this once infrastructure is there */
-		return 16;
 	case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
-	case PIPE_CAP_MAX_COMBINED_SAMPLERS:
 		return 16;
+	case PIPE_CAP_MAX_COMBINED_SAMPLERS:
+		return 32;
 
 	/* Render targets. */
 	case PIPE_CAP_MAX_RENDER_TARGETS: