Commit: b583fdfc64b8f634156d1aba5dfc17d33f9873f1 - HotshotOgreIOS (hg)

Commit MetaInfo

• Révision: b583fdfc64b8f634156d1aba5dfc17d33f9873f1 (tree)
• l'heure: 2013-12-11 01:15:04
• Auteur: Osamu Takasugi <otakasugi@cres...>
• Commiter: Osamu Takasugi

Message de Log

Fix wrong texture will be created when RequestedNumMipMap is 0.

Change Summary

• modified: RenderSystems/GLES2/src/OgreGLES2Texture.cpp

Modification

diff -r 20f4b183abdc -r b583fdfc64b8 RenderSystems/GLES2/src/OgreGLES2Texture.cpp
--- a/RenderSystems/GLES2/src/OgreGLES2Texture.cpp	Mon Dec 09 23:33:59 2013 -0600
+++ b/RenderSystems/GLES2/src/OgreGLES2Texture.cpp	Wed Dec 11 01:15:04 2013 +0900
@@ -136,15 +136,15 @@
             mMipmapsHardwareGenerated = false;
 
         // glGenerateMipmap require all mip levels to be prepared. So override how many this texture has.
-        if(mMipmapsHardwareGenerated && (maxMips > mNumMipmaps))
-           mNumMipmaps = maxMips;
+        if((mUsage & TU_AUTOMIPMAP) && mMipmapsHardwareGenerated && mNumRequestedMipmaps)
+			mNumMipmaps = maxMips;
 
-        if(getGLES2SupportRef()->checkExtension("GL_APPLE_texture_max_level") || gleswIsSupported(3, 0))
-            mGLSupport.getStateCacheManager()->setTexParameteri(texTarget, GL_TEXTURE_MAX_LEVEL_APPLE, mNumMipmaps + 1);
+        if((getGLES2SupportRef()->checkExtension("GL_APPLE_texture_max_level") || gleswIsSupported(3, 0)))
+			mGLSupport.getStateCacheManager()->setTexParameteri(texTarget, GL_TEXTURE_MAX_LEVEL_APPLE, mNumRequestedMipmaps ? mNumMipmaps + 1 : 0);
 
 		// Set some misc default parameters, these can of course be changed later
 		mGLSupport.getStateCacheManager()->setTexParameteri(texTarget,
-                                                            GL_TEXTURE_MIN_FILTER, (mUsage & TU_AUTOMIPMAP) ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
+                                                            GL_TEXTURE_MIN_FILTER, ((mUsage & TU_AUTOMIPMAP) && mNumRequestedMipmaps) ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
         mGLSupport.getStateCacheManager()->setTexParameteri(texTarget,
                                                             GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         mGLSupport.getStateCacheManager()->setTexParameteri(texTarget,