diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-14 14:08:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-14 14:08:20 +0100 |
| commit | 7c06219c5953076ef3236b6a8959b99329c77ee9 (patch) | |
| tree | c4b00bb9d592afcdffdb3e98c7c7320e29488adb /mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | |
| parent | 2b5652fc7742c5ac57aca701214b046626a729e9 (diff) | |
| parent | 53d28537755790ee4625dc16f560cad5aa93f56b (diff) | |
| download | vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.tar.gz vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.tar.bz2 vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/gl_gentable.py
mesalib/src/mapi/glapi/gen/gl_table.py
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 6cc655d70..9ef65c8fd 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -1807,27 +1807,27 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir) } case ir_binop_lshift: if (native_integers) { - emit(ir, TGSI_OPCODE_SHL, result_dst, op[0]); + emit(ir, TGSI_OPCODE_SHL, result_dst, op[0], op[1]); break; } case ir_binop_rshift: if (native_integers) { - emit(ir, TGSI_OPCODE_ISHR, result_dst, op[0]); + emit(ir, TGSI_OPCODE_ISHR, result_dst, op[0], op[1]); break; } case ir_binop_bit_and: if (native_integers) { - emit(ir, TGSI_OPCODE_AND, result_dst, op[0]); + emit(ir, TGSI_OPCODE_AND, result_dst, op[0], op[1]); break; } case ir_binop_bit_xor: if (native_integers) { - emit(ir, TGSI_OPCODE_XOR, result_dst, op[0]); + emit(ir, TGSI_OPCODE_XOR, result_dst, op[0], op[1]); break; } case ir_binop_bit_or: if (native_integers) { - emit(ir, TGSI_OPCODE_OR, result_dst, op[0]); + emit(ir, TGSI_OPCODE_OR, result_dst, op[0], op[1]); break; } case ir_unop_round_even: @@ -3515,8 +3515,8 @@ glsl_to_tgsi_visitor::eliminate_dead_code_advanced(void) case TGSI_OPCODE_ENDIF: case TGSI_OPCODE_ELSE: - /* Promote the recorded level all channels written inside the preceding - * if or else block to the level above the if/else block. + /* Promote the recorded level of all channels written inside the + * preceding if or else block to the level above the if/else block. */ for (int r = 0; r < this->next_temp; r++) { for (int c = 0; c < 4; c++) { |