diff options
| author |  bunnei | 2014-12-26 21:43:59 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-26 21:43:59 -0500 |
| commit | 01c675685e46aec81f941af6a8ec83a41969973e (patch) | |
| tree | 8f5eabb6daf74f5b5dc6a7f58cd31ede548b3b62 /src | |
| parent | Merge pull request #339 from bunnei/fixup-gsp-synch (diff) | |
| parent | Fix visual studio ambiguous symbol error (diff) | |
| download | yuzu-01c675685e46aec81f941af6a8ec83a41969973e.tar.gz yuzu-01c675685e46aec81f941af6a8ec83a41969973e.tar.xz yuzu-01c675685e46aec81f941af6a8ec83a41969973e.zip | |
Merge pull request #327 from Apology11/master
Fix visual studio ambiguous symbol error
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/vertex_shader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/vertex_shader.cpp b/src/video_core/vertex_shader.cpp index 935fe66f0..e31bc3bc7 100644 --- a/src/video_core/vertex_shader.cpp +++ b/src/video_core/vertex_shader.cpp | |||
| @@ -160,8 +160,8 @@ static void ProcessShaderCode(VertexShaderState& state) { | |||
| 160 | const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) + address_offset); | 160 | const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) + address_offset); |
| 161 | const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted)); | 161 | const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted)); |
| 162 | 162 | ||
| 163 | const bool negate_src1 = (swizzle.negate_src1 != false); | 163 | const bool negate_src1 = ((bool)swizzle.negate_src1 != false); |
| 164 | const bool negate_src2 = (swizzle.negate_src2 != false); | 164 | const bool negate_src2 = ((bool)swizzle.negate_src2 != false); |
| 165 | 165 | ||
| 166 | float24 src1[4] = { | 166 | float24 src1[4] = { |
| 167 | src1_[(int)swizzle.GetSelectorSrc1(0)], | 167 | src1_[(int)swizzle.GetSelectorSrc1(0)], |
| @@ -385,8 +385,8 @@ static void ProcessShaderCode(VertexShaderState& state) { | |||
| 385 | // TODO: Do we need to consider swizzlers here? | 385 | // TODO: Do we need to consider swizzlers here? |
| 386 | 386 | ||
| 387 | auto flow_control = instr.flow_control; | 387 | auto flow_control = instr.flow_control; |
| 388 | bool results[3] = { flow_control.refx == state.conditional_code[0], | 388 | bool results[3] = { (bool)flow_control.refx == state.conditional_code[0], |
| 389 | flow_control.refy == state.conditional_code[1] }; | 389 | (bool)flow_control.refy == state.conditional_code[1] }; |
| 390 | 390 | ||
| 391 | switch (flow_control.op) { | 391 | switch (flow_control.op) { |
| 392 | case flow_control.Or: | 392 | case flow_control.Or: |