commit 8531c1cea2a9cf7702ef314ccd0a6cd1dd33c76c
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 13 19:52:45 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 13 19:52:45 2011 +0000
tree c760b89996fbc0c43eee1e100dcfee1a66ec4418
parent a76de3d1a92134c3e95ad7fce99234f92fa48268

Towards issue #106

Adds notion of texture multiple stages but currently just uses 1.


git-svn-id: http://skia.googlecode.com/svn/trunk@694 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrGLTexture.cpp

diff --git a/gpu/src/GrGLTexture.cpp b/gpu/src/GrGLTexture.cpp
index 4e9d922..9460086 100644
--- a/gpu/src/GrGLTexture.cpp
+++ b/gpu/src/GrGLTexture.cpp
@@ -144,6 +144,9 @@
                                     uint32_t width,
                                     uint32_t height,
                                     const void* srcData) {
+    
+    fGpuGL->setSpareTextureUnit();
+
     // glCompressedTexSubImage2D doesn't support any formats
     // (at least without extensions)
     GrAssert(fUploadFormat != GR_PALETTE8_RGBA8);
@@ -152,7 +155,6 @@
     // then we have to modify this code to flip the srcData
     GrAssert(kTopDown_Orientation == fOrientation);
     GR_GL(BindTexture(GL_TEXTURE_2D, fTextureID));
-    fGpuGL->notifyTextureBind(this);
     GR_GL(PixelStorei(GL_UNPACK_ALIGNMENT, fUploadByteCount));
     GR_GL(TexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, 
                         fUploadFormat, fUploadType, srcData));