kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OSX Build memory parameter tuning

Browse Source 
Corrected bug in KTX textures that would cause a compilation failure on iOS builds.

--HG--
branch : nfb
This commit is contained in:
Kearwood Gilbert
2014-01-04 19:00:44 -08:00
parent f6da62221f
commit 656a9cadb6
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
KREngine/kraken/KREngine-common.h
View File

@@ -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

6
KREngine/kraken/KREngine.mm
View File

@@ -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

4
KREngine/kraken/KRTextureKTX.cpp
View File

@@ -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);