diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 22:18:10 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 22:18:10 +0000 |
| commit | e41fee97678d7870f05ec8b56a057f9d8cb02431 (patch) | |
| tree | 2e1db0c923760d03828a1954de8e38e1a34aaa97 | |
| parent | 9cf5b28648fa9d14bc407dda52477f3292d31d0d (diff) | |
Disable static asserts to get Chrome compiling
git-svn-id: http://skia.googlecode.com/svn/trunk@6257 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/gpu/gl/GrGLUniformManager.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL_program.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLUniformManager.cpp b/src/gpu/gl/GrGLUniformManager.cpp index 7a92d25b28..da6726bb24 100644 --- a/src/gpu/gl/GrGLUniformManager.cpp +++ b/src/gpu/gl/GrGLUniformManager.cpp @@ -233,7 +233,7 @@ void GrGLUniformManager::setMatrix4fv(UniformHandle u, } void GrGLUniformManager::setSkMatrix(UniformHandle u, const SkMatrix& matrix) const { - GR_STATIC_ASSERT(SK_SCALAR_IS_FLOAT); +// GR_STATIC_ASSERT(SK_SCALAR_IS_FLOAT); GrGLfloat mt[] = { matrix.get(SkMatrix::kMScaleX), matrix.get(SkMatrix::kMSkewY), diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index d14b1e8261..17a3036e49 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -464,7 +464,7 @@ void GrGpuGL::setupGeometry(int* startVertex, scalarType = TEXT_COORDS_GL_TYPE; texCoordNorm = SkToBool(TEXT_COORDS_ARE_NORMALIZED); } else { - GR_STATIC_ASSERT(SK_SCALAR_IS_FLOAT); +// GR_STATIC_ASSERT(SK_SCALAR_IS_FLOAT); scalarType = GR_GL_FLOAT; texCoordNorm = false; } |