diff options
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/shader/atifragshader.c | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index dc3dcbba1a2..416f77d25c8 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1756,6 +1756,7 @@ struct ati_fragment_shader struct program Base; struct atifs_instruction *Instructions; GLfloat Constants[8][4]; + GLint NumPasses; GLint cur_pass; }; diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/shader/atifragshader.c index 2a8cf9016a4..d8df8f518b6 100644 --- a/src/mesa/shader/atifragshader.c +++ b/src/mesa/shader/atifragshader.c @@ -231,7 +231,8 @@ _mesa_EndFragmentShaderATI(void) #endif ctx->ATIFragmentShader.Compiling = 0; - + ctx->ATIFragmentShader.Current->NumPasses = ctx->ATIFragmentShader.Current->cur_pass; + ctx->ATIFragmentShader.Current->cur_pass=0; #if MESA_DEBUG_ATI_FS for (i = 0; i < curProg->Base.NumInstructions; i++) { GLuint op0 = curProg->Instructions[i].Opcode[0]; @@ -255,6 +256,9 @@ _mesa_PassTexCoordATI(GLuint dst, GLuint coord, GLenum swizzle) GLint ci; struct atifs_instruction *curI; + if (ctx->ATIFragmentShader.Current->cur_pass==1) + ctx->ATIFragmentShader.Current->cur_pass=2; + new_inst(curProg); ci = curProg->Base.NumInstructions - 1; /* some validation @@ -287,6 +291,10 @@ _mesa_SampleMapATI(GLuint dst, GLuint interp, GLenum swizzle) GLint ci; struct atifs_instruction *curI; + if (ctx->ATIFragmentShader.Current->cur_pass==1) + ctx->ATIFragmentShader.Current->cur_pass=2; + + new_inst(curProg); ci = curProg->Base.NumInstructions - 1; @@ -318,6 +326,9 @@ _mesa_FragmentOpXATI(GLint optype, GLuint arg_count, GLenum op, GLuint dst, GLint ci; struct atifs_instruction *curI; + if (ctx->ATIFragmentShader.Current->cur_pass==0) + ctx->ATIFragmentShader.Current->cur_pass=1; + /* decide whether this is a new instruction or not ... all color instructions are new */ if (optype == 0) new_inst(curProg); |