aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-01 23:24:15 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-01 23:24:15 +0000
commit2c5ddb69288ed7031109d6612e1c00a3b11d1b1c (patch)
treebc574d6166557ad3f536950d8d924026d1388a39 /src
parent97055966846f1d3312714d4b811124443aecf681 (diff)
Fix clang compiler warning/error
git-svn-id: http://skia.googlecode.com/svn/trunk@8475 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrDrawState.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 6d7969f024..aa9e692f6c 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -146,7 +146,8 @@ bool GrDrawState::validateVertexAttribs() const {
int slVecCount = GrSLTypeVectorCount(effectSLType);
int attribVecCount = GrVertexAttribTypeVectorCount(attribType);
if (slVecCount != attribVecCount ||
- (-1 != slTypes[attribIndex] && slTypes[attribIndex] != effectSLType)) {
+ (static_cast<GrSLType>(-1) != slTypes[attribIndex] &&
+ slTypes[attribIndex] != effectSLType)) {
return false;
}
slTypes[attribIndex] = effectSLType;