diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-26 14:27:59 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-26 14:27:59 +0000 |
| commit | 5f226572b3b6e1a6fea11f5f3c862a47158f66fe (patch) | |
| tree | 69e7f761c6e7dc7c58d66bdbfbe499d3385be7e7 /gpu/src | |
| parent | fa510413c18263784dc322f136dec2367dc15f18 (diff) | |
rolling tree back to its state as of r2169 to see if that fixes Windows buildbots
git-svn-id: http://skia.googlecode.com/svn/trunk@2179 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src')
| -rw-r--r-- | gpu/src/GrBinHashKey.h | 2 | ||||
| -rw-r--r-- | gpu/src/GrClip.cpp | 8 | ||||
| -rw-r--r-- | gpu/src/GrGpuFactory.cpp | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gpu/src/GrBinHashKey.h b/gpu/src/GrBinHashKey.h index ceaef7aa6f..936eab0c14 100644 --- a/gpu/src/GrBinHashKey.h +++ b/gpu/src/GrBinHashKey.h @@ -36,7 +36,7 @@ public: return *this; } - ~GrBinHashKey() { + virtual ~GrBinHashKey() { } void setKeyData(const uint32_t *data) { diff --git a/gpu/src/GrClip.cpp b/gpu/src/GrClip.cpp index ade8c2b971..7ccec261a1 100644 --- a/gpu/src/GrClip.cpp +++ b/gpu/src/GrClip.cpp @@ -138,9 +138,13 @@ void GrClip::setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty, } } fConservativeBoundsValid = false; - if (isectRectValid && rectCount) { - fConservativeBounds = fList[0].fRect; + if (isectRectValid) { fConservativeBoundsValid = true; + if (rectCount > 0) { + fConservativeBounds = fList[0].fRect; + } else { + fConservativeBounds.setEmpty(); + } } else if (NULL != conservativeBounds) { fConservativeBounds = *conservativeBounds; fConservativeBoundsValid = true; diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp index 071e67cecb..c3b0242f32 100644 --- a/gpu/src/GrGpuFactory.cpp +++ b/gpu/src/GrGpuFactory.cpp @@ -22,7 +22,7 @@ GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) { - const GrGLInterface* glInterface = NULL; + const GrGLInterface* glInterface; if (kOpenGL_Shaders_GrEngine == engine || kOpenGL_Fixed_GrEngine == engine) { |