diff options
| author | Brian <[email protected]> | 2006-12-16 12:52:55 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2006-12-16 12:52:55 -0700 |
| commit | 0031ea7d85ae8990872c2181d038fb97b566dc2b (patch) | |
| tree | f3d7b62d3abe91493402c7055106366d2f8178ad /src/mesa | |
| parent | f7159552ae12f6a47641f3325c9ece6f1c052feb (diff) | |
fix comment, handle NOP
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index d4985fa2d8c..180b86e7bb6 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -708,7 +708,7 @@ execute_program( GLcontext *ctx, break; case OPCODE_BRA: /* conditional branch */ { - /* NOTE: The return is conditional! */ + /* NOTE: The branch is conditional! */ const GLuint swizzle = inst->DstReg.CondSwizzle; const GLuint condMask = inst->DstReg.CondMask; if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) || @@ -1044,6 +1044,8 @@ execute_program( GLcontext *ctx, } } break; + case OPCODE_NOP: + break; case OPCODE_PK2H: /* pack two 16-bit floats in one 32-bit float */ { GLfloat a[4], result[4]; |