summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-23 23:39:40 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-23 23:39:40 +0000
commitfba23cb54c684acecac598a94e8ed1b01174f594 (patch)
treea71d72afbc07d5e0665fe444451785692b4ea241 /third_party
parent3cf6eec1ad683c34c1be8eb65a1055900185c4aa (diff)
downloadchromium_src-fba23cb54c684acecac598a94e8ed1b01174f594.zip
chromium_src-fba23cb54c684acecac598a94e8ed1b01174f594.tar.gz
chromium_src-fba23cb54c684acecac598a94e8ed1b01174f594.tar.bz2
mesa: Clean up redundant comparison in nvvertparse.c.
This was found by experimenting with a new Clang warning. BUG=none Review URL: https://chromiumcodereview.appspot.com/12662026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/mesa/MesaLib/src/mesa/program/nvvertparse.c3
-rw-r--r--third_party/mesa/README.chromium2
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/program/nvvertparse.c b/third_party/mesa/MesaLib/src/mesa/program/nvvertparse.c
index 1ac83d0..674259f 100644
--- a/third_party/mesa/MesaLib/src/mesa/program/nvvertparse.c
+++ b/third_party/mesa/MesaLib/src/mesa/program/nvvertparse.c
@@ -573,8 +573,7 @@ Parse_MaskedDstReg(struct parse_state *parseState, struct prog_dst_register *dst
RETURN_ERROR;
dstReg->Index = idx;
}
- else if (parseState->isStateProgram && token[0] == 'c' &&
- parseState->isStateProgram) {
+ else if (parseState->isStateProgram && token[0] == 'c') {
/* absolute program parameter register */
/* Only valid for vertex state programs */
dstReg->File = PROGRAM_ENV_PARAM;
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index e8aec51..a5e36dc 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -124,3 +124,5 @@ Later modifications (see chromium.patch):
CLAMPED_FLOAT_TO_UBYTE (src/mesa/main/macros.h) in chromium version
of mesa. They produce slightly different results than the
un-optimized versions that are used when DEBUG is defined.
+
+- Cleaned up redundant comparison in nvvertparse.c.