From 8d81e23d6ea998fcd4f6045160b0f9fa89d64c9d Mon Sep 17 00:00:00 2001 From: Apology11 Date: Sun, 21 Dec 2014 18:34:20 +0100 Subject: Fix visual studio ambiguous symbol error --- src/video_core/vertex_shader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/video_core/vertex_shader.cpp') diff --git a/src/video_core/vertex_shader.cpp b/src/video_core/vertex_shader.cpp index 4ba69fa5..859b4836 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: -- cgit v1.2.3