diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-05 14:05:06 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-05 14:05:06 +0000 |
| commit | cf9faf6ce9e3351b4d4030753eb43c8cd2010e0c (patch) | |
| tree | b54f84cbd628e82f70bd74895ebbbe4f115509ac /include/gpu/GrSurface.h | |
| parent | 0c38ed3b1d704a0ed6147299046f51fd52e841a2 (diff) | |
Reverting r7545 (render target origin change) due to layout test issues (see https://codereview.chromium.org/12210002/)
git-svn-id: http://skia.googlecode.com/svn/trunk@7571 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrSurface.h')
| -rw-r--r-- | include/gpu/GrSurface.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h index 02fc0d5dea..3429cc6d80 100644 --- a/include/gpu/GrSurface.h +++ b/include/gpu/GrSurface.h @@ -34,8 +34,8 @@ public: int height() const { return fDesc.fHeight; } GrSurfaceOrigin origin() const { - GrAssert(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin); - return fDesc.fOrigin; + GrAssert(kTopLeft_GrSurfaceOrigin == fOrigin || kBottomLeft_GrSurfaceOrigin == fOrigin); + return fOrigin; } /** @@ -104,14 +104,17 @@ public: uint32_t pixelOpsFlags = 0) = 0; protected: - GrSurface(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc) + GrSurface(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc, GrSurfaceOrigin origin) : INHERITED(gpu, isWrapped) - , fDesc(desc) { + , fDesc(desc) + , fOrigin(origin) { } GrTextureDesc fDesc; private: + GrSurfaceOrigin fOrigin; + typedef GrResource INHERITED; }; |