diff options
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 18 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_typeinfo.h | 2 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 61b5df5a78..bd7b30cd13 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -2295,25 +2295,15 @@ _slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper) case slang_oper_while: return _slang_gen_while(A, oper); case slang_oper_break: - if (!A->CurLoop && !A->CurLoopBreak) { + if (!A->CurLoop) { RETURN_ERROR("'break' not in loop", 0); } - if (UseHighLevelInstructions) { - return new_break(A->CurLoop); - } - else { - return new_jump(A->CurLoopBreak); - } + return new_break(A->CurLoop); case slang_oper_continue: - if (!A->CurLoop && !A->CurLoopCont) { + if (!A->CurLoop) { RETURN_ERROR("'continue' not in loop", 0); } - if (UseHighLevelInstructions) { - return new_cont(A->CurLoop); - } - else { - return new_jump(A->CurLoopCont); - } + return new_cont(A->CurLoop); case slang_oper_discard: return new_node0(IR_KILL); diff --git a/src/mesa/shader/slang/slang_typeinfo.h b/src/mesa/shader/slang/slang_typeinfo.h index d23bb6be14..0f72fad090 100644 --- a/src/mesa/shader/slang/slang_typeinfo.h +++ b/src/mesa/shader/slang/slang_typeinfo.h @@ -61,8 +61,6 @@ typedef struct slang_assemble_ctx_ struct gl_program *program; slang_var_table *vartable; struct slang_function_ *CurFunction; - slang_atom CurLoopBreak; - slang_atom CurLoopCont; struct slang_ir_node_ *CurLoop; } slang_assemble_ctx; |