Enabled multithreaded driver in iOS 7.1

Disabled lod_group switch deferral until it can be fixed (objects were failing to up-lod or appear)

--HG--
branch : nfb
This commit is contained in:
2014-03-11 23:43:02 -07:00
parent e463359405
commit 215349d342
3 changed files with 3 additions and 1 deletions

View File

@@ -55,7 +55,7 @@ void KRLODSet::updateLODVisibility(const KRViewport &viewport)
} else if(m_activeLODGroup == NULL) { } else if(m_activeLODGroup == NULL) {
m_activeLODGroup = new_active_lod_group; m_activeLODGroup = new_active_lod_group;
} else if(new_active_lod_group != m_activeLODGroup) { } else if(new_active_lod_group != m_activeLODGroup) {
if(new_active_lod_group->getStreamLevel(true) >= kraken_stream_level::STREAM_LEVEL_IN_LQ) { if(true || new_active_lod_group->getStreamLevel(true) >= kraken_stream_level::STREAM_LEVEL_IN_LQ) {
// fprintf(stderr, "LOD %s -> %s\n", m_activeLODGroup->getName().c_str(), new_active_lod_group->getName().c_str()); // fprintf(stderr, "LOD %s -> %s\n", m_activeLODGroup->getName().c_str(), new_active_lod_group->getName().c_str());
m_activeLODGroup = new_active_lod_group; m_activeLODGroup = new_active_lod_group;
} else { } else {

View File

@@ -39,6 +39,7 @@ void KRMeshStreamer::startStreamer()
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
gMeshStreamerContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup: [EAGLContext currentContext].sharegroup]; gMeshStreamerContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup: [EAGLContext currentContext].sharegroup];
gMeshStreamerContext.multiThreaded = TRUE;
#elif TARGET_OS_MAC #elif TARGET_OS_MAC
NSOpenGLPixelFormatAttribute pixelFormatAttributes[] = NSOpenGLPixelFormatAttribute pixelFormatAttributes[] =
{ {

View File

@@ -41,6 +41,7 @@ void KRTextureStreamer::startStreamer()
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
gTextureStreamerContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup: [EAGLContext currentContext].sharegroup]; gTextureStreamerContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup: [EAGLContext currentContext].sharegroup];
gTextureStreamerContext.multiThreaded = TRUE;
#elif TARGET_OS_MAC #elif TARGET_OS_MAC