AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable static asserts to get Chrome compiling

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@6257 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-11-01 22:18:10 +00:00
parent 9cf5b28648
commit e41fee9767
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/gl/GrGLUniformManager.cpp
View File

@ -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),

2
src/gpu/gl/GrGpuGL_program.cpp
View File

@ -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;
}