commit 4ba2406781174627e817ca547a6e9f6b1a196ff0
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:54:24 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:54:24 2012 +0000
tree 3441d8a899618d1876bab999e4ba609652669704
parent f721fdbdaa5c675e60115e8f0203956f848c1fc1

Migrate Image to Image9 and add an abstract base

TRAC #22254

Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1572 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index d182f74..10736be 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -487,8 +487,6 @@
 
 void Texture2D::commitRect(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
 {
-    ASSERT(mImageArray[level]->getSurface() != NULL);
-
     if (level < levelCount())
     {
         rx::Image *image = mImageArray[level];
@@ -822,7 +820,7 @@
     {
         for (unsigned int i = 1; i <= q; i++)
         {
-            rx::Image::generateMipmap(mImageArray[i], mImageArray[i - 1]);
+            mRenderer->generateMipmap(mImageArray[i], mImageArray[i - 1]);
         }
     }
 }
@@ -1041,8 +1039,6 @@
 
 void TextureCubeMap::commitRect(int face, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
 {
-    ASSERT(mImageArray[face][level]->getSurface() != NULL);
-
     if (level < levelCount())
     {
         rx::Image *image = mImageArray[face][level];
@@ -1448,7 +1444,7 @@
         {
             for (unsigned int i = 1; i <= q; i++)
             {
-                rx::Image::generateMipmap(mImageArray[f][i], mImageArray[f][i - 1]);
+                mRenderer->generateMipmap(mImageArray[f][i], mImageArray[f][i - 1]);
             }
         }
     }