From a45b31ca21377e233775ece7d0a96b58334bce5d Mon Sep 17 00:00:00 2001
From: Kearwood Gilbert <kearwood@kearwood.com>
Date: Sat, 4 Jan 2014 19:00:44 -0800
Subject: [PATCH] OSX Build memory parameter tuning Corrected bug in KTX
 textures that would cause a compilation failure on iOS builds.

--HG--
extra : source : bbb3a2442166488f2581d5cb720b51630324fb73
---
 KREngine/kraken/KREngine-common.h | 1 +
 KREngine/kraken/KREngine.mm       | 6 +++---
 KREngine/kraken/KRTextureKTX.cpp  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/KREngine/kraken/KREngine-common.h b/KREngine/kraken/KREngine-common.h
index 1b60047..5dcf36b 100644
--- a/KREngine/kraken/KREngine-common.h
+++ b/KREngine/kraken/KREngine-common.h
@@ -103,6 +103,7 @@ using std::hash;
 #define glBeginQueryEXT glBeginQuery
 #define glEndQueryEXT glEndQuery
 #define glGetQueryObjectuivEXT glGetQueryObjectuiv
+#define glTexStorage2DEXT glTexStorage2D
 #define GL_ANY_SAMPLES_PASSED_EXT GL_ANY_SAMPLES_PASSED
 #define GL_QUERY_RESULT_EXT GL_QUERY_RESULT
 
diff --git a/KREngine/kraken/KREngine.mm b/KREngine/kraken/KREngine.mm
index e1c8eb6..991fba0 100644
--- a/KREngine/kraken/KREngine.mm
+++ b/KREngine/kraken/KREngine.mm
@@ -134,9 +134,9 @@ void kraken::set_debug_text(const std::string &print_text)
     KRContext::KRENGINE_MAX_VBO_MEM = 256000000;
     KRContext::KRENGINE_MAX_SHADER_HANDLES = 4000;
     KRContext::KRENGINE_MAX_TEXTURE_HANDLES = 10000;
-    KRContext::KRENGINE_MAX_TEXTURE_MEM = 512000000;
-    KRContext::KRENGINE_TARGET_TEXTURE_MEM_MAX = 384000000;
-    KRContext::KRENGINE_MAX_TEXTURE_DIM = 2048;
+    KRContext::KRENGINE_MAX_TEXTURE_MEM = 256000000;
+    KRContext::KRENGINE_TARGET_TEXTURE_MEM_MAX = 192000000;
+    KRContext::KRENGINE_MAX_TEXTURE_DIM = 8192;
     KRContext::KRENGINE_MIN_TEXTURE_DIM = 64;
     KRContext::KRENGINE_MAX_TEXTURE_THROUGHPUT = 128000000;
 #endif
diff --git a/KREngine/kraken/KRTextureKTX.cpp b/KREngine/kraken/KRTextureKTX.cpp
index 029e12a..0550554 100644
--- a/KREngine/kraken/KRTextureKTX.cpp
+++ b/KREngine/kraken/KRTextureKTX.cpp
@@ -195,8 +195,8 @@ bool KRTextureKTX::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
                 height = 1;
             }
         }
-        width = m_iWidth;
-        height = m_iHeight;
+        width = m_header.pixelWidth;
+        height = m_header.pixelHeight;
         
         if(target == GL_TEXTURE_CUBE_MAP_POSITIVE_X) {
             glTexStorage2DEXT(GL_TEXTURE_CUBE_MAP, level_count, (GLenum)m_header.glInternalFormat, max_lod_width, max_lod_height);