diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-16 19:08:53 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-16 19:08:53 -0700 |
| commit | 6c03c576cc49bbb008de66d374f4302ff0fe0390 (patch) | |
| tree | 7ddeb3ee88532d9aef8728b9aa256edf7c125247 /src/mesa/program/prog_instruction.h | |
| parent | 15a3b42e135a3a2cb463ec3cff80a55dd8528051 (diff) | |
| parent | a433cd286c60eb9d4c2114f042709eda0f3de676 (diff) | |
Merge branch 'glsl2'
Conflicts:
src/mesa/program/prog_optimize.c
Diffstat (limited to 'src/mesa/program/prog_instruction.h')
| -rw-r--r-- | src/mesa/program/prog_instruction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h index 098b366ab5..ca90de7ce1 100644 --- a/src/mesa/program/prog_instruction.h +++ b/src/mesa/program/prog_instruction.h @@ -401,7 +401,7 @@ struct prog_instruction /** * For BRA and CAL instructions, the location to jump to. * For BGNLOOP, points to ENDLOOP (and vice-versa). - * For BRK, points to BGNLOOP (which points to ENDLOOP). + * For BRK, points to ENDLOOP * For IF, points to ELSE or ENDIF. * For ELSE, points to ENDIF. */ |