From 215349d3422be25b9767462369933686f6a5729b Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Tue, 11 Mar 2014 23:43:02 -0700 Subject: [PATCH] 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 --- KREngine/kraken/KRLODSet.cpp | 2 +- KREngine/kraken/KRMeshStreamer.mm | 1 + KREngine/kraken/KRTextureStreamer.mm | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/KREngine/kraken/KRLODSet.cpp b/KREngine/kraken/KRLODSet.cpp index b3577c7..01a7cd0 100644 --- a/KREngine/kraken/KRLODSet.cpp +++ b/KREngine/kraken/KRLODSet.cpp @@ -55,7 +55,7 @@ void KRLODSet::updateLODVisibility(const KRViewport &viewport) } else if(m_activeLODGroup == NULL) { m_activeLODGroup = new_active_lod_group; } 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()); m_activeLODGroup = new_active_lod_group; } else { diff --git a/KREngine/kraken/KRMeshStreamer.mm b/KREngine/kraken/KRMeshStreamer.mm index 82f101c..e1fb85f 100644 --- a/KREngine/kraken/KRMeshStreamer.mm +++ b/KREngine/kraken/KRMeshStreamer.mm @@ -39,6 +39,7 @@ void KRMeshStreamer::startStreamer() #if TARGET_OS_IPHONE gMeshStreamerContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup: [EAGLContext currentContext].sharegroup]; + gMeshStreamerContext.multiThreaded = TRUE; #elif TARGET_OS_MAC NSOpenGLPixelFormatAttribute pixelFormatAttributes[] = { diff --git a/KREngine/kraken/KRTextureStreamer.mm b/KREngine/kraken/KRTextureStreamer.mm index 4aa1230..320a34f 100644 --- a/KREngine/kraken/KRTextureStreamer.mm +++ b/KREngine/kraken/KRTextureStreamer.mm @@ -41,6 +41,7 @@ void KRTextureStreamer::startStreamer() #if TARGET_OS_IPHONE gTextureStreamerContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup: [EAGLContext currentContext].sharegroup]; + gTextureStreamerContext.multiThreaded = TRUE; #elif TARGET_OS_MAC