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

2010-09-03 15:44:27 +02:00
parent 50c1b6f2e8
commit 6ddfdaead8
2 changed files with 3 additions and 4 deletions
@@ -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;
@@ -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: