From 26b6144e2194db02c0710c52d83b79efdca053ec Mon Sep 17 00:00:00 2001 From: "hans@chromium.org" Date: Sun, 17 Mar 2013 16:12:01 +0000 Subject: GLES2Decoder: Remove redundant || expression Since the expression had the same lhs and rhs, it did not make much sense. It seems this got introduced in a refactoring in r175473. This was found by experimenting with a potential new Clang warning. BUG=none Review URL: https://chromiumcodereview.appspot.com/12670007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188642 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gpu') diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index a90c59b..1d36602 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -2630,8 +2630,8 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() { features().ext_draw_buffers ? 1 : 0; } - ShShaderSpec shader_spec = force_webgl_glsl_validation_ || - force_webgl_glsl_validation_ ? SH_WEBGL_SPEC : SH_GLES2_SPEC; + ShShaderSpec shader_spec = force_webgl_glsl_validation_ ? SH_WEBGL_SPEC + : SH_GLES2_SPEC; if (shader_spec == SH_WEBGL_SPEC && features().enable_shader_name_hashing) #if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108 resources.HashFunction = &CityHashForAngle; -- cgit v1.1