Merge branch 'master' of github.com:xenia-project/xenia into d3d12

This commit is contained in:
Triang3l 2018-11-18 20:44:47 +03:00
commit c9fdb72b72
1 changed files with 2 additions and 2 deletions

View File

@ -1380,7 +1380,7 @@ void Value::VectorAverage(Value* other, TypeName type, bool is_unsigned,
bool saturate) { bool saturate) {
assert_true(this->type == VEC128_TYPE && other->type == VEC128_TYPE); assert_true(this->type == VEC128_TYPE && other->type == VEC128_TYPE);
switch (type) { switch (type) {
case INT16_TYPE: case INT16_TYPE: {
// TODO(gibbed): is this correct? // TODO(gibbed): is this correct?
alignas(16) int8_t result[16]; alignas(16) int8_t result[16];
__m128i src1 = __m128i src1 =
@ -1390,7 +1390,7 @@ void Value::VectorAverage(Value* other, TypeName type, bool is_unsigned,
__m128i dest = _mm_avg_epu16(src1, src2); __m128i dest = _mm_avg_epu16(src1, src2);
_mm_store_si128(reinterpret_cast<__m128i*>(result), dest); _mm_store_si128(reinterpret_cast<__m128i*>(result), dest);
std::memcpy(constant.v128.i8, result, sizeof(result)); std::memcpy(constant.v128.i8, result, sizeof(result));
break; } break;
default: default:
assert_unhandled_case(type); assert_unhandled_case(type);
break; break;