diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 5b2e49c..a90316a 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -142,6 +142,7 @@ void st_init_limits(struct st_context *st) /* Quads always follow GL provoking rules. */ c->QuadsFollowProvokingVertexConvention = GL_FALSE; +#if 0 if (screen->get_param(screen, PIPE_CAP_GLSL)) { /* * In the lack of more fine grained capabilities, if the pipe driver supports @@ -197,6 +198,8 @@ void st_init_limits(struct st_context *st) pc->MaxNativeAddressRegs = 2; /* a0 and aL */ pc->MaxNativeParameters = 256; } else { +#endif + { /* * Assume the hardware meets the minimum requirements * for Shader Model 2. @@ -210,11 +213,11 @@ void st_init_limits(struct st_context *st) pc->MaxNativeInstructions = 96; /* D3DPS20_MIN_NUMINSTRUCTIONSLOTS */ pc->MaxNativeAluInstructions = 64; pc->MaxNativeTexInstructions = 32; - pc->MaxNativeTexIndirections = pc->MaxNativeTexInstructions; + pc->MaxNativeTexIndirections = 4; pc->MaxNativeAttribs = 10; /* 2 color + 8 texture coord */ - pc->MaxNativeTemps = 12; /* D3DPS20_MIN_NUMTEMPS */ + pc->MaxNativeTemps = 32; /* D3DPS20_MIN_NUMTEMPS */ pc->MaxNativeAddressRegs = 0; - pc->MaxNativeParameters = 16; + pc->MaxNativeParameters = 32; pc = &c->VertexProgram; pc->MaxNativeInstructions = 256; @@ -222,7 +225,7 @@ void st_init_limits(struct st_context *st) pc->MaxNativeTexInstructions = 0; pc->MaxNativeTexIndirections = 0; pc->MaxNativeAttribs = 16; - pc->MaxNativeTemps = 12; /* D3DVS20_MIN_NUMTEMPS */ + pc->MaxNativeTemps = 32; /* D3DVS20_MIN_NUMTEMPS */ pc->MaxNativeAddressRegs = 2; /* a0 and aL */ pc->MaxNativeParameters = 256; }