diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-26 21:43:59 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-26 21:43:59 -0500 |
| commit | 01c675685e46aec81f941af6a8ec83a41969973e (patch) | |
| tree | 8f5eabb6daf74f5b5dc6a7f58cd31ede548b3b62 /src | |
| parent | e5ddbfee0211642858f0114691966db7c17e5f7e (diff) | |
| parent | 8d81e23d6ea998fcd4f6045160b0f9fa89d64c9d (diff) | |
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) { const float24* src1_ = LookupSourceRegister(instr.common.GetSrc1(is_inverted) + address_offset); const float24* src2_ = LookupSourceRegister(instr.common.GetSrc2(is_inverted)); - const bool negate_src1 = (swizzle.negate_src1 != false); - const bool negate_src2 = (swizzle.negate_src2 != false); + const bool negate_src1 = ((bool)swizzle.negate_src1 != false); + const bool negate_src2 = ((bool)swizzle.negate_src2 != false); float24 src1[4] = { src1_[(int)swizzle.GetSelectorSrc1(0)], @@ -385,8 +385,8 @@ static void ProcessShaderCode(VertexShaderState& state) { // TODO: Do we need to consider swizzlers here? auto flow_control = instr.flow_control; - bool results[3] = { flow_control.refx == state.conditional_code[0], - flow_control.refy == state.conditional_code[1] }; + bool results[3] = { (bool)flow_control.refx == state.conditional_code[0], + (bool)flow_control.refy == state.conditional_code[1] }; switch (flow_control.op) { case flow_control.Or: |