fix comment, handle NOP

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index d4985fa2d8cb3acec854c906b86ce2edc3353be1..180b86e7bb610bde48bb9a75ff9d1b94a8bfd408 100644 (file)
--- 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];