nvfx: fix support for more than 8 texture units (fixes etqw crash)

diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index 4c654bfa8bab1ca4af6b104f21e0c6c24a7b38ec..9e46f5d623f1bf6530d063333fb138ac42e2bcf7 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -199,8 +199,8 @@ struct nvfx_context {
        int use_vertex_buffers;
 
        unsigned hw_vtxelt_nr;
-       uint8_t hw_samplers;
-       uint32_t hw_txf[8];
+       unsigned hw_samplers;
+       uint32_t hw_txf[16];
        struct nvfx_render_target hw_rt[4];
        struct nvfx_render_target hw_zeta;
        int hw_pointsprite_control;

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c b/src/gallium/drivers/nvfx/nvfx_screen.c
index 65ca265d45cdee71997b54b7c8d8177e9b92a171..affed961d46bc1d6de6b380991640bd812d7cef4 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -25,8 +25,7 @@ nvfx_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
 
        switch (param) {
        case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
-               /* TODO: check this */
-               return screen->is_nv4x ? 16 : 8;
+               return 16;
        case PIPE_CAP_NPOT_TEXTURES:
                return !!screen->is_nv4x;
        case PIPE_CAP_TWO_SIDED_STENCIL: