OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-26 18:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #327 from Apology11/master

Browse Source 
Fix visual studio ambiguous symbol error
This commit is contained in:
bunnei 2014-12-26 21:43:59 -05:00
commit 01c675685e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_core/vertex_shader.cpp
View File

@ -160,8 +160,8 @@ static void ProcessShaderCode(VertexShaderState& state) {
const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) + address_offset); const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) + address_offset);
const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted)); const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted));
const bool negate_src1 = (swizzle.negate_src1 != false); const bool negate_src1 = ((bool)swizzle.negate_src1 != false);
const bool negate_src2 = (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(0)],
@ -385,8 +385,8 @@ static void ProcessShaderCode(VertexShaderState& state) {
// TODO: Do we need to consider swizzlers here? // TODO: Do we need to consider swizzlers here?
auto flow_control = instr.flow_control; auto flow_control = instr.flow_control;
bool results[3] = { flow_control.refx == state.conditional_code[0], bool results[3] = { (bool)flow_control.refx == state.conditional_code[0],
flow_control.refy == state.conditional_code[1] }; (bool)flow_control.refy == state.conditional_code[1] };
switch (flow_control.op) { switch (flow_control.op) {
case flow_control.Or: case flow_control.Or: