diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-17 16:12:01 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-17 16:12:01 +0000 |
| commit | 26b6144e2194db02c0710c52d83b79efdca053ec (patch) | |
| tree | 7d4e6f44ddd6c0d30e1b1bbf8906a98729f3b1f4 /gpu | |
| parent | f5f65e3b90733ed9df0a3fefbdc90a5b24491a44 (diff) | |
| download | chromium_src-26b6144e2194db02c0710c52d83b79efdca053ec.zip chromium_src-26b6144e2194db02c0710c52d83b79efdca053ec.tar.gz chromium_src-26b6144e2194db02c0710c52d83b79efdca053ec.tar.bz2 | |
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
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; |