diff options
author | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-27 20:21:16 +0000 |
---|---|---|
committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-27 20:21:16 +0000 |
commit | 9381363050ec9d3e724076a8e9152bfa9a8de1d1 (patch) | |
tree | dfb55ed16d0ba0db6671c880bb320198501231c5 /src/gpu/GrGpuGL.h | |
parent | 13788bfbedc2528fbfa71162c888908c88f03ac2 (diff) |
Extract GrDrawTarget::DrState into independent GrDrawState struct.
This is intended to be a first step towards making the stack of states
maintained by GrDrawTarget cheaper to maintain.
git-svn-id: http://skia.googlecode.com/svn/trunk@2544 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrGpuGL.h')
-rw-r--r-- | src/gpu/GrGpuGL.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/GrGpuGL.h b/src/gpu/GrGpuGL.h index a2630c8b2c..2d246e8479 100644 --- a/src/gpu/GrGpuGL.h +++ b/src/gpu/GrGpuGL.h @@ -11,6 +11,7 @@ #ifndef GrGpuGL_DEFINED #define GrGpuGL_DEFINED +#include "GrDrawState.h" #include "GrGpu.h" #include "GrGLIndexBuffer.h" #include "GrGLIRect.h" @@ -44,8 +45,8 @@ protected: bool fSmoothLineEnabled; } fHWAAState; - DrState fHWDrawState; - bool fHWStencilClip; + GrDrawState fHWDrawState; + bool fHWStencilClip; // As flush of GL state proceeds it updates fHDrawState // to reflect the new state. Later parts of the state flush @@ -56,7 +57,7 @@ protected: bool fRenderTargetChanged : 1; int fTextureChangedMask; } fDirtyFlags; - GR_STATIC_ASSERT(8 * sizeof(int) >= kNumStages); + GR_STATIC_ASSERT(8 * sizeof(int) >= GrDrawState::kNumStages); // clears the dirty flags void resetDirtyFlags(); |