merge of glsl-compiler-1 branch

1 files changed, 105 insertions, 40 deletions

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 4c8f967fdff..425a8669948 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  6.5.3
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,12 +37,15 @@
 #include "arbprogparse.h"
 #include "light.h"
 #include "program.h"
+#include "prog_instruction.h"
+#include "prog_parameter.h"
+#include "prog_statevars.h"
+#include "programopt.h"
 #include "math/m_matrix.h"
 #include "t_context.h"
 #include "t_pipeline.h"
 #include "t_vb_arbprogram.h"
 #include "tnl.h"
-#include "program_instruction.h"
 
 
 #define DISASSEM 0
@@ -292,7 +295,7 @@ static void do_EX2( struct arb_vp_machine *m, union instruction op )
    GLfloat *result = m->File[0][op.alu.dst];
    const GLfloat *arg0 = m->File[op.alu.file0][op.alu.idx0];
 
-   result[0] = (GLfloat)ApproxExp2(arg0[0]);
+   result[0] = ApproxExp2(arg0[0]);
    PUFF(result);
 }
 
@@ -335,6 +338,17 @@ static void do_FRC( struct arb_vp_machine *m, union instruction op )
    result[3] = arg0[3] - FLOORF(arg0[3]);
 }
 
+static void do_INT( struct arb_vp_machine *m, union instruction op ) 
+{
+   GLfloat *result = m->File[0][op.alu.dst];
+   const GLfloat *arg0 = m->File[op.alu.file0][op.alu.idx0];
+
+   result[0] = (GLfloat) (GLint) arg0[0];
+   result[1] = (GLfloat) (GLint) arg0[1];
+   result[2] = (GLfloat) (GLint) arg0[2];
+   result[3] = (GLfloat) (GLint) arg0[3];
+}
+
 /* High precision log base 2:
  */
 static void do_LG2( struct arb_vp_machine *m, union instruction op ) 
@@ -566,7 +580,7 @@ static void print_reg( GLuint file, GLuint reg )
 	 _mesa_printf("TMP%d", reg - REG_TMP0);
       else if (reg >= REG_IN0 && reg <= REG_IN31)
 	 _mesa_printf("IN%d", reg - REG_IN0);
-      else if (reg >= REG_OUT0 && reg <= REG_OUT14)
+      else if (reg >= REG_OUT0 && reg <= REG_OUT23)
 	 _mesa_printf("OUT%d", reg - REG_OUT0);
       else if (reg == REG_ADDR)
 	 _mesa_printf("ADDR");
@@ -662,6 +676,7 @@ _tnl_disassem_vba_insn( union instruction op )
    case OPCODE_EXP:
    case OPCODE_FLR:
    case OPCODE_FRC:
+   case OPCODE_INT:
    case OPCODE_LG2:
    case OPCODE_LIT:
    case OPCODE_LOG:
@@ -711,18 +726,28 @@ _tnl_disassem_vba_insn( union instruction op )
    }
 }
 
+typedef void (*gpu_function)(struct arb_vp_machine *m, union instruction op);
 
-static void (* const opcode_func[MAX_OPCODE+3])(struct arb_vp_machine *, union instruction) = 
+static gpu_function opcode_func[MAX_OPCODE+3] =
 {
+   do_NOP,
    do_ABS,
    do_ADD,
    do_NOP,/*ARA*/
    do_NOP,/*ARL*/
    do_NOP,/*ARL_NV*/
    do_NOP,/*ARR*/
+   do_NOP,/*BGNLOOP*/
+   do_NOP,/*BGNSUB*/
    do_NOP,/*BRA*/
+   do_NOP,/*BRK*/
+   do_NOP,/*BRK0*/
+   do_NOP,/*BRK1*/
    do_NOP,/*CAL*/
    do_NOP,/*CMP*/
+   do_NOP,/*CONT*/
+   do_NOP,/*CONT0*/
+   do_NOP,/*CONT1*/
    do_NOP,/*COS*/
    do_NOP,/*DDX*/
    do_NOP,/*DDY*/
@@ -730,11 +755,17 @@ static void (* const opcode_func[MAX_OPCODE+3])(struct arb_vp_machine *, union i
    do_DP4,
    do_DPH,
    do_DST,
-   do_NOP,
+   do_NOP,/*ELSE*/
+   do_NOP,/*END*/
+   do_NOP,/*ENDIF*/
+   do_NOP,/*ENDLOOP*/
+   do_NOP,/*ENDSUB*/
    do_EX2,
    do_EXP,
    do_FLR,
    do_FRC,
+   do_NOP,/*IF*/
+   do_INT,
    do_NOP,/*KIL*/
    do_NOP,/*KIL_NV*/
    do_LG2,
@@ -746,6 +777,10 @@ static void (* const opcode_func[MAX_OPCODE+3])(struct arb_vp_machine *, union i
    do_MIN,
    do_MOV,
    do_MUL,
+   do_NOP,/*NOISE1*/
+   do_NOP,/*NOISE2*/
+   do_NOP,/*NOISE3*/
+   do_NOP,/*NOISE4*/
    do_NOP,/*PK2H*/
    do_NOP,/*PK2US*/
    do_NOP,/*PK4B*/
@@ -828,6 +863,7 @@ static struct reg cvp_load_reg( struct compilation *cp,
 
    switch (file) {
    case PROGRAM_TEMPORARY:
+      assert(REG_TMP0 + index <= REG_TMP11);
       return cvp_make_reg(FILE_REG, REG_TMP0 + index);
 
    case PROGRAM_INPUT:
@@ -853,6 +889,8 @@ static struct reg cvp_load_reg( struct compilation *cp,
 	 return reg;
 
    case PROGRAM_STATE_VAR:
+   case PROGRAM_CONSTANT:
+   case PROGRAM_UNIFORM:
       reg = cvp_make_reg(FILE_STATE_PARAM, index);
       if (rel) 
 	 return cvp_emit_rel(cp, reg, tmpreg);
@@ -864,7 +902,7 @@ static struct reg cvp_load_reg( struct compilation *cp,
    case PROGRAM_WRITE_ONLY:
    case PROGRAM_ADDRESS:
    default:
-      _mesa_problem(NULL, "Invalid register file %d in cvp_load_reg()");
+      _mesa_problem(NULL, "Invalid register file %d in cvp_load_reg()", file);
       assert(0);
       return tmpreg;		/* can't happen */
    }
@@ -925,7 +963,10 @@ static GLuint cvp_choose_result( struct compilation *cp,
       idx = REG_OUT0 + dst->Index;
       break;
    default:
+#if 0
+      /* IF/ELSE/ENDIF instructions will hit this */
       assert(0);
+#endif
       return REG_RES;		/* can't happen */
    }
 
@@ -1020,6 +1061,13 @@ static void cvp_emit_inst( struct compilation *cp,
       }
       break;
 
+   case OPCODE_NOP:
+      break;
+
+   case OPCODE_BRA:
+      /* XXX implement */
+      break;
+
    default:
       result = cvp_choose_result( cp, &inst->DstReg, &fixup );
       nr_args = _mesa_num_inst_src_regs(inst->Opcode);
@@ -1058,6 +1106,16 @@ static void compile_vertex_program( struct gl_vertex_program *program,
    struct tnl_compiled_program *p = CALLOC_STRUCT(tnl_compiled_program);
    GLint i;
 
+#if 1
+   if (!program->IsNVProgram && program->IsPositionInvariant) {
+      printf("Adding MVP code\n");
+      if (!program->Base.Parameters)
+         program->Base.Parameters = _mesa_new_parameter_list();
+      _mesa_insert_mvp_code(NULL, program);
+      program->IsPositionInvariant = 0;
+   }
+#endif
+
    if (program->TnlData) 
       free_tnl_data( program );
    
@@ -1097,7 +1155,6 @@ static void compile_vertex_program( struct gl_vertex_program *program,
 
 
 
-
 /* ----------------------------------------------------------------------
  * Execution
  */
@@ -1182,6 +1239,7 @@ do_ndc_cliptest(GLcontext *ctx, struct arb_vp_machine *m)
 
    /* Test userclip planes.  This contributes to VB->ClipMask.
     */
+   /** XXX NEW_SLANG _Enabled ??? */
    if (ctx->Transform.ClipPlanesEnabled && (!ctx->VertexProgram._Enabled ||
       ctx->VertexProgram.Current->IsPositionInvariant)) {
       userclip( ctx,
@@ -1209,6 +1267,7 @@ static INLINE void call_func( struct tnl_compiled_program *p,
    p->compiled_func(m);
 }
 
+
 /**
  * Execute the given vertex program.  
  * 
@@ -1221,22 +1280,20 @@ static INLINE void call_func( struct tnl_compiled_program *p,
 static GLboolean
 run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 {
-   const struct gl_vertex_program *program;
+   const struct gl_vertex_program *program = ctx->VertexProgram._Current;
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    struct arb_vp_machine *m = ARB_VP_MACHINE(stage);
    struct tnl_compiled_program *p;
    GLuint i, j;
    GLbitfield outputs;
 
-   if (ctx->ShaderObjects._VertexShaderPresent)
-      return GL_TRUE;
-
-   program = ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : NULL;
-   if (!program && ctx->_MaintainTnlProgram) {
-      program = ctx->_TnlProgram;
-   }
-   if (!program || program->IsNVProgram)
+#define FORCE_PROG_EXECUTE_C 1
+#if FORCE_PROG_EXECUTE_C
+   return GL_TRUE;   
+#else
+   if (!program)
       return GL_TRUE;   
+#endif
 
    if (program->Base.Parameters) {
       _mesa_load_state_parameters(ctx, program->Base.Parameters);
@@ -1279,7 +1336,13 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 	 case 2: m->File[0][idx][1] = m->input[j].data[1];
 	 case 1: m->File[0][idx][0] = m->input[j].data[0];
 	 }
-
+#if 0
+         printf("  attr %d/%d: %g %g %g %g\n", j, idx-REG_IN0,
+                m->input[j].data[0],
+                m->input[j].data[1],
+                m->input[j].data[2],
+                m->input[j].data[3]);
+#endif
 	 STRIDE_F(m->input[j].data, m->input[j].stride);
       }
 
@@ -1288,9 +1351,9 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 	 call_func( p, m );
       }
       else {
-         GLint j;
-	 for (j = 0; j < p->nr_instructions; j++) {
-	    union instruction inst = p->instructions[j];	 
+         GLint pc;
+	 for (pc = 0; pc < p->nr_instructions; pc++) {
+	    union instruction inst = p->instructions[pc];	 
 	    opcode_func[inst.alu.opcode]( m, inst );
 	 }
       }
@@ -1384,6 +1447,14 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
       }
    }
 
+   for (i = 0; i < ctx->Const.MaxVarying; i++) {
+      if (outputs & (1 << (VERT_RESULT_VAR0 + i))) {
+         /* Note: varying results get put into the generic attributes */
+	 VB->AttribPtr[VERT_ATTRIB_GENERIC0+i]
+            = &m->attribs[VERT_RESULT_VAR0 + i];
+      }
+   }
+
 #if 0
    for (i = 0; i < VB->Count; i++) {
       printf("Out %d: %f %f %f %f %f %f %f %f\n", i,
@@ -1408,17 +1479,13 @@ static void
 validate_vertex_program( GLcontext *ctx, struct tnl_pipeline_stage *stage )
 {
    struct arb_vp_machine *m = ARB_VP_MACHINE(stage);
-   struct gl_vertex_program *program;
-
-   if (ctx->ShaderObjects._VertexShaderPresent)
-      return;
-
-   program = (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : 0);
-   if (!program && ctx->_MaintainTnlProgram) {
-      program = ctx->_TnlProgram;
-   }
+   struct gl_vertex_program *program = ctx->VertexProgram._Current;
 
+#if FORCE_OLD
+   if (0 &&program) {
+#else
    if (program) {
+#endif
       if (!program->TnlData)
 	 compile_vertex_program( program, m->try_codegen );
       
@@ -1435,11 +1502,6 @@ validate_vertex_program( GLcontext *ctx, struct tnl_pipeline_stage *stage )
 }
 
 
-
-
-
-
-
 /**
  * Called the first time stage->run is called.  In effect, don't
  * allocate data until the first time the stage is run.
@@ -1453,6 +1515,10 @@ static GLboolean init_vertex_program( GLcontext *ctx,
    const GLuint size = VB->Size;
    GLuint i;
 
+   /* spot checks to be sure the opcode table is correct */
+   assert(opcode_func[OPCODE_SGE] == do_SGE);
+   assert(opcode_func[OPCODE_XPD] == do_XPD);
+
    stage->privatePtr = _mesa_calloc(sizeof(*m));
    m = ARB_VP_MACHINE(stage);
    if (!m)
@@ -1486,7 +1552,7 @@ static GLboolean init_vertex_program( GLcontext *ctx,
    _mesa_vector4f_alloc( &m->ndcCoords, 0, size, 32 );
    m->clipmask = (GLubyte *) ALIGN_MALLOC(sizeof(GLubyte)*size, 32 );
 
-   if (ctx->_MaintainTnlProgram)
+   if (ctx->VertexProgram._MaintainTnlProgram)
       _mesa_allow_light_in_model( ctx, GL_FALSE );
 
    m->fpucntl_rnd_neg = RND_NEG_FPU; /* const value */
@@ -1496,8 +1562,6 @@ static GLboolean init_vertex_program( GLcontext *ctx,
 }
 
 
-
-
 /**
  * Destructor for this pipeline stage.
  */
@@ -1522,6 +1586,7 @@ static void dtr( struct tnl_pipeline_stage *stage )
    }
 }
 
+
 /**
  * Public description of this pipeline stage.
  */
@@ -1543,7 +1608,7 @@ const struct tnl_pipeline_stage _tnl_arb_vertex_program_stage =
 void
 _tnl_program_string(GLcontext *ctx, GLenum target, struct gl_program *program)
 {
-   if (target == GL_VERTEX_PROGRAM_ARB) {
+   if (program->Target == GL_VERTEX_PROGRAM_ARB) {
       /* free any existing tnl data hanging off the program */
       struct gl_vertex_program *vprog = (struct gl_vertex_program *) program;
       if (vprog->TnlData) {