Mesa (master): nouveau: nv30: it may have 8 texture samplers (not 4), but shader engine has 16 texture units

[Patrice Mandin]

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

Author: Patrice Mandin <patman...@gmail.com>
Date:   Fri Feb 12 19:22:41 2010 +0100

nouveau: nv30: it may have 8 texture samplers (not 4), but shader engine has 16 
texture units

Signed-off-by: Patrice Mandin <patman...@gmail.com>

---

 src/gallium/drivers/nv30/nv30_screen.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv30/nv30_screen.c 
b/src/gallium/drivers/nv30/nv30_screen.c
index 1caeccc..aef37d3 100644
--- a/src/gallium/drivers/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nv30/nv30_screen.c
@@ -28,7 +28,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, int param)
 {
        switch (param) {
        case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
-               return 16;
+               return 8;
        case PIPE_CAP_NPOT_TEXTURES:
                return 0;
        case PIPE_CAP_TWO_SIDED_STENCIL:
@@ -65,7 +65,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, int param)
        case NOUVEAU_CAP_HW_IDXBUF:
                return 1;
        case PIPE_CAP_MAX_COMBINED_SAMPLERS:
-               return 4;
+               return 16;
        case PIPE_CAP_INDEP_BLEND_ENABLE:
                return 0;
        case PIPE_CAP_INDEP_BLEND_FUNC:

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit