OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement ARB_f_p KIL correctly.

Browse Source
This commit is contained in:
Brian Paul
2004-04-02 17:27:46 +00:00
parent 17355e8b38
commit ff1a015ca8
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/shader/nvfragparse.c
View File

@@ -95,7 +95,7 @@ static const struct instruction_pattern Instructions[] = {
{ "EX2", FP_OPCODE_DP4, INPUT_1S, OUTPUT_S, _R | _H | _C | _S }, { "EX2", FP_OPCODE_DP4, INPUT_1S, OUTPUT_S, _R | _H | _C | _S },
{ "FLR", FP_OPCODE_FLR, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S }, { "FLR", FP_OPCODE_FLR, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
{ "FRC", FP_OPCODE_FRC, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S }, { "FRC", FP_OPCODE_FRC, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
{ "KIL", FP_OPCODE_KIL, INPUT_CC, OUTPUT_NONE, 0 }, { "KIL", FP_OPCODE_KIL_NV, INPUT_CC, OUTPUT_NONE, 0 },
{ "LG2", FP_OPCODE_LG2, INPUT_1S, OUTPUT_S, _R | _H | _C | _S }, { "LG2", FP_OPCODE_LG2, INPUT_1S, OUTPUT_S, _R | _H | _C | _S },
{ "LIT", FP_OPCODE_LIT, INPUT_1V, OUTPUT_V, _R | _H | _C | _S }, { "LIT", FP_OPCODE_LIT, INPUT_1V, OUTPUT_V, _R | _H | _C | _S },
{ "LRP", FP_OPCODE_LRP, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S }, { "LRP", FP_OPCODE_LRP, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
@@ -1291,7 +1291,7 @@ Parse_InstructionSequence(struct parse_state *parseState,
RETURN_ERROR1("Expected ,"); RETURN_ERROR1("Expected ,");
} }
else if (instMatch.outputs == OUTPUT_NONE) { else if (instMatch.outputs == OUTPUT_NONE) {
ASSERT(instMatch.opcode == FP_OPCODE_KIL); ASSERT(instMatch.opcode == FP_OPCODE_KIL_NV);
/* This is a little weird, the cond code info is in the dest register */ /* This is a little weird, the cond code info is in the dest register */
if (!Parse_CondCodeMask(parseState, &inst->DstReg)) if (!Parse_CondCodeMask(parseState, &inst->DstReg))
RETURN_ERROR; RETURN_ERROR;

3
src/mesa/shader/nvfragprog.h
View File

@@ -75,7 +75,8 @@ enum fp_opcode {
FP_OPCODE_EX2, FP_OPCODE_EX2,
FP_OPCODE_FLR, FP_OPCODE_FLR,
FP_OPCODE_FRC, FP_OPCODE_FRC,
FP_OPCODE_KIL, FP_OPCODE_KIL_NV, /* NV_f_p only */
FP_OPCODE_KIL, /* ARB_f_p only */
FP_OPCODE_LG2, FP_OPCODE_LG2,
FP_OPCODE_LIT, FP_OPCODE_LIT,
FP_OPCODE_LRP, FP_OPCODE_LRP,

11
src/mesa/swrast/s_nvfragprog.c
View File

@@ -763,7 +763,7 @@ execute_program( GLcontext *ctx,
store_vector4( inst, machine, result ); store_vector4( inst, machine, result );
} }
break; break;
case FP_OPCODE_KIL: case FP_OPCODE_KIL_NV: /* NV_f_p only */
{ {
const GLuint *swizzle = inst->DstReg.CondSwizzle; const GLuint *swizzle = inst->DstReg.CondSwizzle;
const GLuint condMask = inst->DstReg.CondMask; const GLuint condMask = inst->DstReg.CondMask;
@@ -775,6 +775,15 @@ execute_program( GLcontext *ctx,
} }
} }
break; break;
case FP_OPCODE_KIL: /* ARB_f_p only */
{
GLfloat a[4];
fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
if (a[0] < 0.0F || a[1] < 0.0F || a[2] < 0.0F || a[3] < 0.0F) {
return GL_FALSE;
}
}
break;
case FP_OPCODE_LG2: /* log base 2 */ case FP_OPCODE_LG2: /* log base 2 */
{ {
GLfloat a[4], result[4]; GLfloat a[4], result[4];