mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #2082 from yuriks/shader-interp-crash

Browse source 
Fix/mask crash in shader debugger in Mii Maker
This commit is contained in:
bunnei 2016-10-06 19:35:37 -04:00 committed by GitHub
commit d989102c9c
3 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/vector_math.h
View file

@ -60,7 +60,6 @@ public:
} }
Vec2() = default; Vec2() = default;
Vec2(const T a[2]) : x(a[0]), y(a[1]) {}
Vec2(const T& _x, const T& _y) : x(_x), y(_y) {} Vec2(const T& _x, const T& _y) : x(_x), y(_y) {}
template <typename T2> template <typename T2>
@ -199,7 +198,6 @@ public:
} }
Vec3() = default; Vec3() = default;
Vec3(const T a[3]) : x(a[0]), y(a[1]), z(a[2]) {}
Vec3(const T& _x, const T& _y, const T& _z) : x(_x), y(_y), z(_z) {} Vec3(const T& _x, const T& _y, const T& _z) : x(_x), y(_y), z(_z) {}
template <typename T2> template <typename T2>
@ -405,7 +403,6 @@ public:
} }
Vec4() = default; Vec4() = default;
Vec4(const T a[4]) : x(a[0]), y(a[1]), z(a[2]), w(a[3]) {}
Vec4(const T& _x, const T& _y, const T& _z, const T& _w) : x(_x), y(_y), z(_z), w(_w) {} Vec4(const T& _x, const T& _y, const T& _z, const T& _w) : x(_x), y(_y), z(_z), w(_w) {}
template <typename T2> template <typename T2>

4
src/video_core/shader/shader.cpp
View file

@ -146,10 +146,8 @@ DebugData<true> ShaderSetup::ProduceDebugInfo(const InputVertex& input, int num_
state.debug.max_opdesc_id = 0; state.debug.max_opdesc_id = 0;
// Setup input register table // Setup input register table
boost::fill(state.registers.input, Math::Vec4<float24>::AssignToAll(float24::Zero()));
const auto& attribute_register_map = config.input_register_map; const auto& attribute_register_map = config.input_register_map;
float24 dummy_register;
boost::fill(state.registers.input, &dummy_register);
for (unsigned i = 0; i < num_attributes; i++) for (unsigned i = 0; i < num_attributes; i++)
state.registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i]; state.registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i];

74
src/video_core/shader/shader_interpreter.cpp
View file

@ -116,32 +116,36 @@ void RunInterpreter(const ShaderSetup& setup, UnitState<Debug>& state, unsigned
: state.address_registers[instr.common.address_register_index - 1]; : state.address_registers[instr.common.address_register_index - 1];
const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) + const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) +
(!is_inverted * address_offset)); (is_inverted ? 0 : address_offset));
const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted) + const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted) +
(is_inverted * address_offset)); (is_inverted ? address_offset : 0));
const bool negate_src1 = ((bool)swizzle.negate_src1 != false); const bool negate_src1 = ((bool)swizzle.negate_src1 != false);
const bool negate_src2 = ((bool)swizzle.negate_src2 != false); const bool negate_src2 = ((bool)swizzle.negate_src2 != false);
float24 src1[4] = { float24 src1[4] = {
src1_[(int)swizzle.GetSelectorSrc1(0)], src1_[(int)swizzle.GetSelectorSrc1(1)], src1_[(int)swizzle.src1_selector_0.Value()],
src1_[(int)swizzle.GetSelectorSrc1(2)], src1_[(int)swizzle.GetSelectorSrc1(3)], src1_[(int)swizzle.src1_selector_1.Value()],
src1_[(int)swizzle.src1_selector_2.Value()],
src1_[(int)swizzle.src1_selector_3.Value()],
}; };
if (negate_src1) { if (negate_src1) {
src1[0] = src1[0] * float24::FromFloat32(-1); src1[0] = -src1[0];
src1[1] = src1[1] * float24::FromFloat32(-1); src1[1] = -src1[1];
src1[2] = src1[2] * float24::FromFloat32(-1); src1[2] = -src1[2];
src1[3] = src1[3] * float24::FromFloat32(-1); src1[3] = -src1[3];
} }
float24 src2[4] = { float24 src2[4] = {
src2_[(int)swizzle.GetSelectorSrc2(0)], src2_[(int)swizzle.GetSelectorSrc2(1)], src2_[(int)swizzle.src2_selector_0.Value()],
src2_[(int)swizzle.GetSelectorSrc2(2)], src2_[(int)swizzle.GetSelectorSrc2(3)], src2_[(int)swizzle.src2_selector_1.Value()],
src2_[(int)swizzle.src2_selector_2.Value()],
src2_[(int)swizzle.src2_selector_3.Value()],
}; };
if (negate_src2) { if (negate_src2) {
src2[0] = src2[0] * float24::FromFloat32(-1); src2[0] = -src2[0];
src2[1] = src2[1] * float24::FromFloat32(-1); src2[1] = -src2[1];
src2[2] = src2[2] * float24::FromFloat32(-1); src2[2] = -src2[2];
src2[3] = src2[3] * float24::FromFloat32(-1); src2[3] = -src2[3];
} }
float24* dest = float24* dest =
@ -451,34 +455,40 @@ void RunInterpreter(const ShaderSetup& setup, UnitState<Debug>& state, unsigned
const bool negate_src3 = ((bool)swizzle.negate_src3 != false); const bool negate_src3 = ((bool)swizzle.negate_src3 != false);
float24 src1[4] = { float24 src1[4] = {
src1_[(int)swizzle.GetSelectorSrc1(0)], src1_[(int)swizzle.GetSelectorSrc1(1)], src1_[(int)swizzle.src1_selector_0.Value()],
src1_[(int)swizzle.GetSelectorSrc1(2)], src1_[(int)swizzle.GetSelectorSrc1(3)], src1_[(int)swizzle.src1_selector_1.Value()],
src1_[(int)swizzle.src1_selector_2.Value()],
src1_[(int)swizzle.src1_selector_3.Value()],
}; };
if (negate_src1) { if (negate_src1) {
src1[0] = src1[0] * float24::FromFloat32(-1); src1[0] = -src1[0];
src1[1] = src1[1] * float24::FromFloat32(-1); src1[1] = -src1[1];
src1[2] = src1[2] * float24::FromFloat32(-1); src1[2] = -src1[2];
src1[3] = src1[3] * float24::FromFloat32(-1); src1[3] = -src1[3];
} }
float24 src2[4] = { float24 src2[4] = {
src2_[(int)swizzle.GetSelectorSrc2(0)], src2_[(int)swizzle.GetSelectorSrc2(1)], src2_[(int)swizzle.src2_selector_0.Value()],
src2_[(int)swizzle.GetSelectorSrc2(2)], src2_[(int)swizzle.GetSelectorSrc2(3)], src2_[(int)swizzle.src2_selector_1.Value()],
src2_[(int)swizzle.src2_selector_2.Value()],
src2_[(int)swizzle.src2_selector_3.Value()],
}; };
if (negate_src2) { if (negate_src2) {
src2[0] = src2[0] * float24::FromFloat32(-1); src2[0] = -src2[0];
src2[1] = src2[1] * float24::FromFloat32(-1); src2[1] = -src2[1];
src2[2] = src2[2] * float24::FromFloat32(-1); src2[2] = -src2[2];
src2[3] = src2[3] * float24::FromFloat32(-1); src2[3] = -src2[3];
} }
float24 src3[4] = { float24 src3[4] = {
src3_[(int)swizzle.GetSelectorSrc3(0)], src3_[(int)swizzle.GetSelectorSrc3(1)], src3_[(int)swizzle.src3_selector_0.Value()],
src3_[(int)swizzle.GetSelectorSrc3(2)], src3_[(int)swizzle.GetSelectorSrc3(3)], src3_[(int)swizzle.src3_selector_1.Value()],
src3_[(int)swizzle.src3_selector_2.Value()],
src3_[(int)swizzle.src3_selector_3.Value()],
}; };
if (negate_src3) { if (negate_src3) {
src3[0] = src3[0] * float24::FromFloat32(-1); src3[0] = -src3[0];
src3[1] = src3[1] * float24::FromFloat32(-1); src3[1] = -src3[1];
src3[2] = src3[2] * float24::FromFloat32(-1); src3[2] = -src3[2];
src3[3] = src3[3] * float24::FromFloat32(-1); src3[3] = -src3[3];
} }
float24* dest = float24* dest =