aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nvfx
diff options
context:
space:
mode:
authorLuca Barbieri <[email protected]>2010-09-03 15:44:27 +0200
committerLuca Barbieri <[email protected]>2010-09-03 16:13:21 +0200
commit6ddfdaead85df873de96939239013c772dca745f (patch)
tree623b5ac77506ed999ddd4120c3fef9f16fbd5fd2 /src/gallium/drivers/nvfx
parent50c1b6f2e845c067ac91493c0f93caca794521dd (diff)
nvfx: fix support for more than 8 texture units (fixes etqw crash)
Diffstat (limited to 'src/gallium/drivers/nvfx')
-rw-r--r--src/gallium/drivers/nvfx/nvfx_context.h4
-rw-r--r--src/gallium/drivers/nvfx/nvfx_screen.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index 4c654bfa8ba..9e46f5d623f 100644
--- 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 65ca265d45c..affed961d46 100644
--- 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: