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/GrGLRenderTarget.cpp b/src/gpu/GrGLRenderTarget.cpp
index 290ae2e..c98914a 100644
--- a/src/gpu/GrGLRenderTarget.cpp
+++ b/src/gpu/GrGLRenderTarget.cpp
@@ -36,8 +36,6 @@
texture,
viewport.fWidth,
viewport.fHeight,
- texture->allocatedWidth(),
- texture->allocatedHeight(),
desc.fConfig,
desc.fSampleCnt) {
GrAssert(NULL != texID);
@@ -45,6 +43,11 @@
// FBO 0 can't also be a texture, right?
GrAssert(0 != desc.fRTFBOID);
GrAssert(0 != desc.fTexFBOID);
+
+ // we assume this is true, TODO: get rid of viewport as a param.
+ GrAssert(viewport.fWidth == texture->width());
+ GrAssert(viewport.fHeight == texture->height());
+
this->init(desc, viewport, texID);
}
@@ -55,8 +58,6 @@
NULL,
viewport.fWidth,
viewport.fHeight,
- viewport.fWidth, // don't really need separate alloc w/h for
- viewport.fHeight, // non-texture RTs, repeat viewport values
desc.fConfig,
desc.fSampleCnt) {
this->init(desc, viewport, NULL);