aboutsummaryrefslogtreecommitdiffstats
path: root/src/gl
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2009-06-29 14:54:46 -0400
committerMike Reed <reed@google.com>2009-06-29 14:54:46 -0400
commita8c52de60de1d2471206b3c81e9243e2c76f2edb (patch)
treeca5960eb8aea3bc8cfee1bf774ddf93afc691506 /src/gl
parent7d7b3cfdc1683207ff600eb39dbf81be53289a94 (diff)
downloadexternal_skia-a8c52de60de1d2471206b3c81e9243e2c76f2edb.zip
external_skia-a8c52de60de1d2471206b3c81e9243e2c76f2edb.tar.gz
external_skia-a8c52de60de1d2471206b3c81e9243e2c76f2edb.tar.bz2
refresh from trunk: shape flattening, bzero
Diffstat (limited to 'src/gl')
-rw-r--r--src/gl/SkGL.cpp2
-rw-r--r--src/gl/SkGL.h4
-rw-r--r--src/gl/SkGLTextCache.cpp4
-rw-r--r--src/gl/SkTextureCache.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gl/SkGL.cpp b/src/gl/SkGL.cpp
index 89bcdf4..1fce98f 100644
--- a/src/gl/SkGL.cpp
+++ b/src/gl/SkGL.cpp
@@ -120,7 +120,7 @@ void SkGL::Ortho(float left, float right, float bottom, float top,
float mat[16];
- bzero(mat, sizeof(mat));
+ sk_bzero(mat, sizeof(mat));
mat[0] = 2 / (right - left);
mat[5] = 2 / (top - bottom);
diff --git a/src/gl/SkGL.h b/src/gl/SkGL.h
index dd2c77f..9f79ad1 100644
--- a/src/gl/SkGL.h
+++ b/src/gl/SkGL.h
@@ -193,12 +193,12 @@ struct SkGLMatrix {
SkGLScalar fMat[16];
void reset() {
- bzero(fMat, sizeof(fMat));
+ sk_bzero(fMat, sizeof(fMat));
fMat[0] = fMat[5] = fMat[10] = fMat[15] = SK_GLScalar1;
}
void set(const SkMatrix& m) {
- bzero(fMat, sizeof(fMat));
+ sk_bzero(fMat, sizeof(fMat));
fMat[0] = SkScalarToGL(m[SkMatrix::kMScaleX]);
fMat[4] = SkScalarToGL(m[SkMatrix::kMSkewX]);
fMat[12] = SkScalarToGL(m[SkMatrix::kMTransX]);
diff --git a/src/gl/SkGLTextCache.cpp b/src/gl/SkGLTextCache.cpp
index 141e100..2619dc8 100644
--- a/src/gl/SkGLTextCache.cpp
+++ b/src/gl/SkGLTextCache.cpp
@@ -127,7 +127,7 @@ SkGLTextCache::Strike::addGlyphAndBind(const SkGlyph& glyph,
///////////////////////////////////////////////////////////////////////////////
SkGLTextCache::SkGLTextCache() {
- bzero(fStrikeList, sizeof(fStrikeList));
+ sk_bzero(fStrikeList, sizeof(fStrikeList));
}
SkGLTextCache::~SkGLTextCache() {
@@ -146,7 +146,7 @@ void SkGLTextCache::deleteAllStrikes(bool texturesAreValid) {
strike = next;
}
}
- bzero(fStrikeList, sizeof(fStrikeList));
+ sk_bzero(fStrikeList, sizeof(fStrikeList));
}
SkGLTextCache::Strike* SkGLTextCache::findGlyph(const SkGlyph& glyph,
diff --git a/src/gl/SkTextureCache.cpp b/src/gl/SkTextureCache.cpp
index 17b37ca..2eb5d84 100644
--- a/src/gl/SkTextureCache.cpp
+++ b/src/gl/SkTextureCache.cpp
@@ -23,7 +23,7 @@ SkTextureCache::SkTextureCache(size_t countMax, size_t sizeMax)
fTexCountMax(countMax), fTexSizeMax(sizeMax),
fTexCount(0), fTexSize(0) {
- bzero(fHash, sizeof(fHash));
+ sk_bzero(fHash, sizeof(fHash));
this->validate();
}
@@ -52,7 +52,7 @@ void SkTextureCache::deleteAllCaches(bool texturesAreValid) {
}
fSorted.reset();
- bzero(fHash, sizeof(fHash));
+ sk_bzero(fHash, sizeof(fHash));
fTexCount = 0;
fTexSize = 0;