aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-25 18:56:10 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-25 18:56:10 +0000
commit08afc843c074429a9848d8d165e6b898e3e7d371 (patch)
tree9d741b601182c0de30d91503ff4905e13d97dce5 /src
parent16e3ddea6a80972aced04b21b1d66377fa95e7c7 (diff)
Files accidentally omitted from r6123.
git-svn-id: http://skia.googlecode.com/svn/trunk@6124 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/gpu/gl/GrGLRenderTarget.h4
-rw-r--r--src/gpu/gl/GrGLTexture.cpp2
-rw-r--r--src/gpu/gl/GrGLTexture.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h
index 493e90eea9..64b0d21902 100644
--- a/src/gpu/gl/GrGLRenderTarget.h
+++ b/src/gpu/gl/GrGLRenderTarget.h
@@ -59,10 +59,10 @@ public:
GrGLuint textureFBOID() const { return fTexFBOID; }
// override of GrRenderTarget
- virtual intptr_t getRenderTargetHandle() const {
+ virtual GrBackendObject getRenderTargetHandle() const {
return this->renderFBOID();
}
- virtual intptr_t getRenderTargetResolvedHandle() const {
+ virtual GrBackendObject getRenderTargetResolvedHandle() const {
return this->textureFBOID();
}
virtual ResolveType getResolveType() const {
diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index 1e34fe56a2..0aa488418a 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -72,7 +72,7 @@ void GrGLTexture::onAbandon() {
INHERITED::onAbandon();
}
-intptr_t GrGLTexture::getTextureHandle() const {
+GrBackendObject GrGLTexture::getTextureHandle() const {
return fTexIDObj->id();
}
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h
index 2e9ee173c8..a2e4af2554 100644
--- a/src/gpu/gl/GrGLTexture.h
+++ b/src/gpu/gl/GrGLTexture.h
@@ -79,7 +79,7 @@ public:
virtual ~GrGLTexture() { this->release(); }
- virtual intptr_t getTextureHandle() const SK_OVERRIDE;
+ virtual GrBackendObject getTextureHandle() const SK_OVERRIDE;
virtual void invalidateCachedState() SK_OVERRIDE { fTexParams.invalidate(); }