From 05051037101dfa053798cf5ad91d1975fd1aa6a7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 1 Nov 2005 04:36:33 +0000 Subject: Re-org and clean-up of vertx/fragment program limits (instructions, temporaries, parameters, etc). glGetProgramivARB() now returns all the right things. Updated i915 and r300 code to initialize program native limits and current program's native instruction/temporary/etc counts. --- src/mesa/main/texenvprogram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mesa/main/texenvprogram.c') diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 7b74e3ad1b4..18d704ce1b6 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -400,7 +400,7 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p ) static void release_temps( struct texenv_fragment_program *p ) { - GLuint max_temp = p->ctx->Const.MaxFragmentProgramTemps; + GLuint max_temp = p->ctx->Const.FragmentProgram.MaxTemps; /* KW: To support tex_env_crossbar, don't release the registers in * temps_output. @@ -1058,13 +1058,13 @@ static void create_new_program(struct state_key *key, GLcontext *ctx, } else p.program->FogOption = GL_NONE; - if (p.program->NumTexIndirections > ctx->Const.MaxFragmentProgramTexIndirections) + if (p.program->NumTexIndirections > ctx->Const.FragmentProgram.MaxTexIndirections) program_error(&p, "Exceeded max nr indirect texture lookups"); - if (p.program->NumTexInstructions > ctx->Const.MaxFragmentProgramTexInstructions) + if (p.program->NumTexInstructions > ctx->Const.FragmentProgram.MaxTexInstructions) program_error(&p, "Exceeded max TEX instructions"); - if (p.program->NumAluInstructions > ctx->Const.MaxFragmentProgramAluInstructions) + if (p.program->NumAluInstructions > ctx->Const.FragmentProgram.MaxAluInstructions) program_error(&p, "Exceeded max ALU instructions"); -- cgit v1.2.3