Add SkSTArray, hide stack storage cons in SkTArray, unify SkTArray init logic
Review URL: http://codereview.appspot.com/5127044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2342 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrAAHairLinePathRenderer.cpp b/gpu/src/GrAAHairLinePathRenderer.cpp
index 32a477b..6c136e2 100644
--- a/gpu/src/GrAAHairLinePathRenderer.cpp
+++ b/gpu/src/GrAAHairLinePathRenderer.cpp
@@ -133,6 +133,7 @@
namespace {
typedef SkTArray<SkPoint, true> PtArray;
+#define PREALLOC_PTARRAY(N) SkSTArray<(N),SkPoint, true>
typedef SkTArray<int, true> IntArray;
/**
@@ -344,8 +345,7 @@
bounds.outset(SK_Scalar1, SK_Scalar1);
bounds.roundOut(&ibounds);
if (SkIRect::Intersects(clip, ibounds)) {
- SkPoint stackStorage[32];
- PtArray q((void*)stackStorage, 32);
+ PREALLOC_PTARRAY(32) q;
// in perspective have to do conversion in src space
if (persp) {
SkScalar tolScale =
@@ -629,10 +629,8 @@
GrMatrix viewM = fTarget->getViewMatrix();
- SkAlignedSTStorage<128, GrPoint> lineStorage;
- SkAlignedSTStorage<128, GrPoint> quadStorage;
- PtArray lines(&lineStorage);
- PtArray quads(&quadStorage);
+ PREALLOC_PTARRAY(128) lines;
+ PREALLOC_PTARRAY(128) quads;
IntArray qSubdivs;
fQuadCnt = generate_lines_and_quads(*fPath, viewM, fTranslate, clip,
&lines, &quads, &qSubdivs);
diff --git a/gpu/src/GrClip.cpp b/gpu/src/GrClip.cpp
index afa143a..a02d9f4 100644
--- a/gpu/src/GrClip.cpp
+++ b/gpu/src/GrClip.cpp
@@ -10,30 +10,25 @@
#include "GrClip.h"
-GrClip::GrClip()
- : fList(&fListStorage) {
+GrClip::GrClip() {
fConservativeBounds.setEmpty();
fConservativeBoundsValid = true;
}
-GrClip::GrClip(const GrClip& src)
- : fList(&fListStorage) {
+GrClip::GrClip(const GrClip& src) {
*this = src;
}
-GrClip::GrClip(const GrIRect& rect)
- : fList(&fListStorage) {
+GrClip::GrClip(const GrIRect& rect) {
this->setFromIRect(rect);
}
-GrClip::GrClip(const GrRect& rect)
- : fList(&fListStorage) {
+GrClip::GrClip(const GrRect& rect) {
this->setFromRect(rect);
}
GrClip::GrClip(GrClipIterator* iter, GrScalar tx, GrScalar ty,
- const GrRect* bounds)
- : fList(&fListStorage) {
+ const GrRect* bounds) {
this->setFromIterator(iter, tx, ty, bounds);
}
diff --git a/gpu/src/GrDrawTarget.cpp b/gpu/src/GrDrawTarget.cpp
index 59661d8..51e6fdd 100644
--- a/gpu/src/GrDrawTarget.cpp
+++ b/gpu/src/GrDrawTarget.cpp
@@ -329,8 +329,7 @@
#define DEBUG_INVAL_BUFFER 0xdeadcafe
#define DEBUG_INVAL_START_IDX -1
-GrDrawTarget::GrDrawTarget()
-: fGeoSrcStateStack(&fGeoSrcStateStackStorage) {
+GrDrawTarget::GrDrawTarget() {
#if GR_DEBUG
VertexLayoutUnitTest();
#endif
diff --git a/gpu/src/GrDrawTarget.h b/gpu/src/GrDrawTarget.h
index f1c98e8..81d0b2b 100644
--- a/gpu/src/GrDrawTarget.h
+++ b/gpu/src/GrDrawTarget.h
@@ -1376,10 +1376,8 @@
enum {
kPreallocGeoSrcStateStackCnt = 4,
};
- SkAlignedSTStorage<kPreallocGeoSrcStateStackCnt,
- GeometrySrcState>
- fGeoSrcStateStackStorage;
- SkTArray<GeometrySrcState, true> fGeoSrcStateStack;
+ SkSTArray<kPreallocGeoSrcStateStackCnt,
+ GeometrySrcState, true> fGeoSrcStateStack;
};
diff --git a/gpu/src/GrGpu.cpp b/gpu/src/GrGpu.cpp
index 91e659d..7b98ffa 100644
--- a/gpu/src/GrGpu.cpp
+++ b/gpu/src/GrGpu.cpp
@@ -36,7 +36,6 @@
, fIndexPool(NULL)
, fVertexPoolUseCnt(0)
, fIndexPoolUseCnt(0)
- , fGeomPoolStateStack(&fGeoSrcStateStackStorage)
, fQuadIndexBuffer(NULL)
, fUnitSquareVertexBuffer(NULL)
, fPathRendererChain(NULL)
diff --git a/gpu/src/GrGpu.h b/gpu/src/GrGpu.h
index 9ecb4b0..3193a56 100644
--- a/gpu/src/GrGpu.h
+++ b/gpu/src/GrGpu.h
@@ -374,9 +374,8 @@
enum {
kPreallocGeomPoolStateStackCnt = 4,
};
- SkAlignedSTStorage<kPreallocGeomPoolStateStackCnt,
- GeometryPoolState> fGeoSrcStateStackStorage;
- SkTArray<GeometryPoolState, true> fGeomPoolStateStack;
+ SkSTArray<kPreallocGeomPoolStateStackCnt,
+ GeometryPoolState, true> fGeomPoolStateStack;
mutable GrIndexBuffer* fQuadIndexBuffer; // mutable so it can be
// created on-demand
diff --git a/gpu/src/GrInOrderDrawBuffer.cpp b/gpu/src/GrInOrderDrawBuffer.cpp
index 9519655..3d78da3 100644
--- a/gpu/src/GrInOrderDrawBuffer.cpp
+++ b/gpu/src/GrInOrderDrawBuffer.cpp
@@ -30,8 +30,7 @@
, fCurrQuad(0)
, fVertexPool(*vertexPool)
- , fIndexPool(*indexPool)
- , fGeoPoolStateStack(&fGeoStackStorage) {
+ , fIndexPool(*indexPool) {
fCaps = gpu->getCaps();
diff --git a/gpu/src/GrInOrderDrawBuffer.h b/gpu/src/GrInOrderDrawBuffer.h
index f0b5c9e..122be53 100644
--- a/gpu/src/GrInOrderDrawBuffer.h
+++ b/gpu/src/GrInOrderDrawBuffer.h
@@ -161,6 +161,15 @@
GrVertexBufferAllocPool& fVertexPool;
GrIndexBufferAllocPool& fIndexPool;
+
+ enum {
+ kDrawPreallocCnt = 8,
+ kStatePreallocCnt = 8,
+ kClipPreallocCnt = 8,
+ kClearPreallocCnt = 4,
+ kGeoPoolStatePreAllocCnt = 4,
+ };
+
struct GeometryPoolState {
const GrVertexBuffer* fPoolVertexBuffer;
int fPoolStartVertex;
@@ -172,23 +181,12 @@
size_t fUsedPoolVertexBytes;
size_t fUsedPoolIndexBytes;
};
- SkTArray<GeometryPoolState> fGeoPoolStateStack;
-
-
- enum {
- kDrawPreallocCnt = 8,
- kStatePreallocCnt = 8,
- kClipPreallocCnt = 8,
- kClearPreallocCnt = 4,
- kGeoPoolStatePreAllocCnt = 4,
- };
+ SkSTArray<kGeoPoolStatePreAllocCnt, GeometryPoolState> fGeoPoolStateStack;
SkAlignedSTStorage<kDrawPreallocCnt, Draw> fDrawStorage;
SkAlignedSTStorage<kStatePreallocCnt, SavedDrawState> fStateStorage;
SkAlignedSTStorage<kClipPreallocCnt, GrClip> fClipStorage;
SkAlignedSTStorage<kClearPreallocCnt, Clear> fClearStorage;
- SkAlignedSTStorage<kGeoPoolStatePreAllocCnt,
- GeometryPoolState> fGeoStackStorage;
typedef GrDrawTarget INHERITED;
};
diff --git a/gpu/src/GrPathRendererChain.cpp b/gpu/src/GrPathRendererChain.cpp
index 87ebe10..7a064e8 100644
--- a/gpu/src/GrPathRendererChain.cpp
+++ b/gpu/src/GrPathRendererChain.cpp
@@ -16,8 +16,7 @@
GrPathRendererChain::GrPathRendererChain(GrContext* context, UsageFlags flags)
: fInit(false)
, fOwner(context)
- , fFlags(flags)
- , fChain(fStorage.get(), kPreAllocCount) {
+ , fFlags(flags) {
fInit = false;
}
diff --git a/gpu/src/GrPathRendererChain.h b/gpu/src/GrPathRendererChain.h
index 24abda4..5719484 100644
--- a/gpu/src/GrPathRendererChain.h
+++ b/gpu/src/GrPathRendererChain.h
@@ -55,8 +55,7 @@
bool fInit;
GrContext* fOwner;
UsageFlags fFlags;
- SkAlignedSTStorage<kPreAllocCount, GrPathRenderer*> fStorage;
- SkTArray<GrPathRenderer*, true> fChain;
+ SkSTArray<kPreAllocCount, GrPathRenderer*, true> fChain;
};
GR_MAKE_BITFIELD_OPS(GrPathRendererChain::UsageFlags)