diff options
| author |  jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-01 19:29:32 +0000 |
|---|---|---|
| committer | jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-01 19:29:32 +0000 |
| commit | c7bf2963f00a29bd28e5e2a446da79f93c1d9383 (patch) | |
| tree | 065de5e21129c28201547891d806bff2f60bb646 /src/gpu/gl/GrGpuGL.cpp | |
| parent | fb495b537f5ddd6966f02cfe38f6b106a4869934 (diff) | |
Rolling back r8466.
Not reviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@8467 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index d2996564f3..d03ef781e1 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -180,7 +180,9 @@ GrGpuGL::GrGpuGL(const GrGLContext& ctx, GrContext* context) fProgramCache = SkNEW_ARGS(ProgramCache, (this->glContext())); - GrAssert(this->glCaps().maxVertexAttributes() >= GrDrawState::kMaxVertexAttribCnt); + GrAssert(this->glCaps().maxVertexAttributes() >= GrDrawState::kVertexAttribCnt); + GrAssert(this->glCaps().maxVertexAttributes() > GrDrawState::kColorOverrideAttribIndexValue); + GrAssert(this->glCaps().maxVertexAttributes() > GrDrawState::kCoverageOverrideAttribIndexValue); fLastSuccessfulStencilFmtIdx = 0; if (false) { // avoid bit rot, suppress warning |