diff options
Diffstat (limited to 'src/mesa/shader')
-rw-r--r-- | src/mesa/shader/arbprogparse.c | 3 | ||||
-rw-r--r-- | src/mesa/shader/arbprogparse.h | 2 | ||||
-rw-r--r-- | src/mesa/shader/nvfragprog.h | 9 | ||||
-rw-r--r-- | src/mesa/shader/nvvertparse.c | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index e8fe869d0b..19c38b6272 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -3013,6 +3013,7 @@ parse_fp_instruction (GLcontext * ctx, GLubyte ** inst, break; case OP_TEX_KIL: + Program->UsesKill = 1; if (parse_fp_vector_src_reg(ctx, inst, vc_head, Program, &fp->SrcReg[0])) return 1; fp->Opcode = FP_OPCODE_KIL; @@ -4014,6 +4015,8 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len, program->NumTexInstructions = program->NumTexIndirections = 0; + program->UsesKill = 0; + program->FPInstructions = NULL; program->VPInstructions = NULL; diff --git a/src/mesa/shader/arbprogparse.h b/src/mesa/shader/arbprogparse.h index ececfafa8f..947c22e767 100644 --- a/src/mesa/shader/arbprogparse.h +++ b/src/mesa/shader/arbprogparse.h @@ -65,6 +65,8 @@ struct arb_program GLuint NumAluInstructions; GLuint NumTexInstructions; GLuint NumTexIndirections; + + GLboolean UsesKill; }; diff --git a/src/mesa/shader/nvfragprog.h b/src/mesa/shader/nvfragprog.h index 99ec20bb82..bd9c8bb06c 100644 --- a/src/mesa/shader/nvfragprog.h +++ b/src/mesa/shader/nvfragprog.h @@ -37,15 +37,6 @@ #include "mtypes.h" -/** - * Fragment program output registers. - * Note: when we fully suppport GL_ARB_draw_buffers we'll have more than - * one output color. - */ -#define FRAG_OUTPUT_COLR 0 /* fragment color */ -#define FRAG_OUTPUT_COLH 1 /* fragment color, half precision (NV) */ -#define FRAG_OUTPUT_DEPR 2 /* depth/Z */ - /* condition codes */ #define COND_GT 1 /* greater than zero */ diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c index c48a4cb358..24882a2897 100644 --- a/src/mesa/shader/nvvertparse.c +++ b/src/mesa/shader/nvvertparse.c @@ -288,8 +288,9 @@ static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = { }; static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = { - "HPOS", "COL0", "COL1", "BFC0", "BFC1", "FOGC", "PSIZ", - "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL + "HPOS", "COL0", "COL1", "FOGC", + "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", + "PSIZ", "BFC0", "BFC1", NULL }; /* NOTE: the order here must match opcodes in nvvertprog.h */ |