aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrGpu.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-15 14:36:41 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-15 14:36:41 +0000
commit5d8d18651a64f62dbb8881794e23f53bf22c9a23 (patch)
treef1de838dc1288635ea2cfb08ba01d808fd95a5f0 /src/gpu/GrGpu.cpp
parent5bdef29ae0f5a495381cd2c9787ce7c112e58354 (diff)
Addressed Windows compiler complaints
http://codereview.appspot.com/6462062/ This CL will require re-baselining of the imagemagnifier GM git-svn-id: http://skia.googlecode.com/svn/trunk@5108 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrGpu.cpp')
-rw-r--r--src/gpu/GrGpu.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index a9306f49e4..c159f5e735 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -29,8 +29,7 @@ extern void gr_run_unittests();
#define DEBUG_INVAL_START_IDX -1
GrGpu::GrGpu()
- : fClipMaskManager(this)
- , fContext(NULL)
+ : fContext(NULL)
, fResetTimestamp(kExpiredTimestamp+1)
, fVertexPool(NULL)
, fIndexPool(NULL)
@@ -41,10 +40,12 @@ GrGpu::GrGpu()
, fContextIsDirty(true)
, fResourceHead(NULL) {
+ fClipMaskManager.setGpu(this);
+
#if GR_DEBUG
//gr_run_unittests();
#endif
-
+
fGeomPoolStateStack.push_back();
#if GR_DEBUG
GeometryPoolState& poolState = fGeomPoolStateStack.back();