Moves GenerateMipmap function to the Renderer

src/libGLESv2/Texture.cpp

@@ -822,7 +822,7 @@ void Texture2D::generateMipmaps()
     {
         for (unsigned int i = 1; i <= q; i++)
         {
-            rx::Image::GenerateMipmap(mImageArray[i], mImageArray[i - 1]);
+            rx::Image::generateMipmap(mImageArray[i], mImageArray[i - 1]);
         }
     }
 }
@@ -1448,7 +1448,7 @@ void TextureCubeMap::generateMipmaps()
         {
             for (unsigned int i = 1; i <= q; i++)
             {
-                rx::Image::GenerateMipmap(mImageArray[f][i], mImageArray[f][i - 1]);
+                rx::Image::generateMipmap(mImageArray[f][i], mImageArray[f][i - 1]);
             }
         }
     }

src/libGLESv2/renderer/Image.cpp

@@ -226,7 +226,7 @@ Image::~Image()
     }
 }
 
-void Image::GenerateMipmap(Image *dest, Image *source)
+void Image::generateMipmap(Image *dest, Image *source)
 {
     IDirect3DSurface9 *sourceSurface = source->getSurface();
     if (sourceSurface == NULL)
@@ -238,7 +238,7 @@ void Image::GenerateMipmap(Image *dest, Image *source)
     source->markDirty();
 }
 
-void Image::CopyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *source)
+void Image::copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *source)
 {
     D3DLOCKED_RECT sourceLock = {0};
     D3DLOCKED_RECT destLock = {0};
@@ -407,7 +407,7 @@ void Image::setManagedSurface(IDirect3DSurface9 *surface)
     {
         if (mSurface)
         {
-            CopyLockableSurfaces(surface, mSurface);
+            copyLockableSurfaces(surface, mSurface);
             mSurface->Release();
         }
 
@@ -455,7 +455,7 @@ bool Image::updateSurface(IDirect3DSurface9 *destSurface, GLint xoffset, GLint y
 
             if (SUCCEEDED(result))
             {
-                CopyLockableSurfaces(surf, sourceSurface);
+                copyLockableSurfaces(surf, sourceSurface);
                 result = device->UpdateSurface(surf, &rect, destSurface, &point);
                 ASSERT(SUCCEEDED(result));
                 surf->Release();

src/libGLESv2/renderer/Image.h

@@ -34,8 +34,8 @@ class Image
     Image();
     ~Image();
 
-    static void GenerateMipmap(Image *dest, Image *source);
-    static void Image::CopyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *source);
+    static void generateMipmap(Image *dest, Image *source);
+    static void copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *source);
 
     bool redefine(Renderer *renderer, GLint internalformat, GLsizei width, GLsizei height, bool forceRelease);
     void markDirty() {mDirty = true;}

src/libGLESv2/renderer/Renderer.h

@@ -166,8 +166,9 @@ class Renderer
     virtual ShaderExecutable *loadExecutable(const void *function, size_t length, GLenum type, void *data) = 0;
     virtual ShaderExecutable *compileToExecutable(gl::InfoLog &infoLog, const char *shaderHLSL, GLenum type) = 0;
 
-    // Image creation
+    // Image operations
     virtual Image *createImage() = 0;
+    virtual void generateMipmap(Image *dest, Image *source) = 0;
 
   protected:
     bool initializeCompiler();

src/libGLESv2/renderer/Renderer11.cpp

@@ -1257,4 +1257,11 @@ Image *Renderer11::createImage()
     return NULL;
 }
 
+void Renderer11::generateMipmap(Image *dest, Image *src)
+{
+    // TODO
+    UNIMPLEMENTED();
+    return;
+}
+
 }
\ No newline at end of file

src/libGLESv2/renderer/Renderer11.h

@@ -134,6 +134,7 @@ class Renderer11 : public Renderer
 
     // Image operations
     virtual Image *createImage();
+    virtual void generateMipmap(Image *dest, Image *source);
 
     // D3D11-renderer specific methods
     ID3D11Device *getDevice() { return mDevice; }

src/libGLESv2/renderer/Renderer9.cpp

@@ -2789,7 +2789,7 @@ bool Renderer9::copyToRenderTarget(IDirect3DSurface9 *dest, IDirect3DSurface9 *s
 
             if (SUCCEEDED(result))
             {
-                Image::CopyLockableSurfaces(surf, source);
+                Image::copyLockableSurfaces(surf, source);
                 result = device->UpdateSurface(surf, NULL, dest, NULL);
                 surf->Release();
             }
@@ -2815,4 +2815,9 @@ Image *Renderer9::createImage()
     return new Image();
 }
 
+void Renderer9::generateMipmap(Image *dest, Image *src)
+{
+    Image::generateMipmap(dest, src);
+}
+
 }
\ No newline at end of file

src/libGLESv2/renderer/Renderer9.h

@@ -168,6 +168,7 @@ class Renderer9 : public Renderer
 
     // Image operations
     virtual Image *createImage();
+    virtual void generateMipmap(Image *dest, Image *source);
 
     // D3D9-renderer specific methods
     bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);