commit e41fee97678d7870f05ec8b56a057f9d8cb02431
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 22:18:10 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 22:18:10 2012 +0000
tree 2e1db0c923760d03828a1954de8e38e1a34aaa97
parent 9cf5b28648fa9d14bc407dda52477f3292d31d0d

Disable static asserts to get Chrome compiling



git-svn-id: http://skia.googlecode.com/svn/trunk@6257 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLUniformManager.cpp

diff --git a/src/gpu/gl/GrGLUniformManager.cpp b/src/gpu/gl/GrGLUniformManager.cpp
index 7a92d25..da6726b 100644
--- a/src/gpu/gl/GrGLUniformManager.cpp
+++ b/src/gpu/gl/GrGLUniformManager.cpp
@@ -233,7 +233,7 @@
 }
 
 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),