Remove allocated size vs content size in textures
Review URL: http://codereview.appspot.com/5373100/
git-svn-id: http://skia.googlecode.com/svn/trunk@2687 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrGLTexture.cpp b/src/gpu/GrGLTexture.cpp
index 06efb8a..6e93b6c 100644
--- a/src/gpu/GrGLTexture.cpp
+++ b/src/gpu/GrGLTexture.cpp
@@ -38,18 +38,14 @@
fUploadFormat = textureDesc.fUploadFormat;
fUploadType = textureDesc.fUploadType;
fOrientation = textureDesc.fOrientation;
- fScaleX = GrIntToScalar(textureDesc.fContentWidth) /
- textureDesc.fAllocWidth;
- fScaleY = GrIntToScalar(textureDesc.fContentHeight) /
- textureDesc.fAllocHeight;
if (NULL != rtDesc) {
// we render to the top left
GrGLIRect vp;
vp.fLeft = 0;
- vp.fWidth = textureDesc.fContentWidth;
- vp.fHeight = textureDesc.fContentHeight;
- vp.fBottom = textureDesc.fAllocHeight - textureDesc.fContentHeight;
+ vp.fWidth = textureDesc.fWidth;
+ vp.fBottom = 0;
+ vp.fHeight = textureDesc.fHeight;
fRenderTarget = new GrGLRenderTarget(gpu, *rtDesc, vp, fTexIDObj, this);
}
@@ -58,10 +54,8 @@
GrGLTexture::GrGLTexture(GrGpuGL* gpu,
const Desc& textureDesc)
: INHERITED(gpu,
- textureDesc.fContentWidth,
- textureDesc.fContentHeight,
- textureDesc.fAllocWidth,
- textureDesc.fAllocHeight,
+ textureDesc.fWidth,
+ textureDesc.fHeight,
textureDesc.fConfig) {
this->init(gpu, textureDesc, NULL);
}
@@ -70,10 +64,8 @@
const Desc& textureDesc,
const GrGLRenderTarget::Desc& rtDesc)
: INHERITED(gpu,
- textureDesc.fContentWidth,
- textureDesc.fContentHeight,
- textureDesc.fAllocWidth,
- textureDesc.fAllocHeight,
+ textureDesc.fWidth,
+ textureDesc.fHeight,
textureDesc.fConfig) {
this->init(gpu, textureDesc, &rtDesc);
}