Commit 945e8d49 authored by Gaëtan Renaudeau's avatar Gaëtan Renaudeau

polish

parent 44bd5a73
...@@ -85,13 +85,6 @@ ...@@ -85,13 +85,6 @@
ReferencedContainer = "container:AdvancedEffects.xcodeproj"> ReferencedContainer = "container:AdvancedEffects.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "NSZombieEnabled"
value = "YES"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
......
...@@ -301,7 +301,6 @@ RCT_NOT_IMPLEMENTED(-init) ...@@ -301,7 +301,6 @@ RCT_NOT_IMPLEMENTED(-init)
contentData[i] = imgData; contentData[i] = imgData;
} }
_contentData = contentData; _contentData = contentData;
_deferredRendering = true;
[self setNeedsDisplay]; [self setNeedsDisplay];
RCT_PROFILE_END_EVENT(0, @"gl", nil); RCT_PROFILE_END_EVENT(0, @"gl", nil);
} }
...@@ -350,16 +349,17 @@ RCT_NOT_IMPLEMENTED(-init) ...@@ -350,16 +349,17 @@ RCT_NOT_IMPLEMENTED(-init)
BOOL needsDeferredRendering = _nbContentTextures > 0 && !_autoRedraw; BOOL needsDeferredRendering = _nbContentTextures > 0 && !_autoRedraw;
if (needsDeferredRendering && !_deferredRendering) { if (needsDeferredRendering && !_deferredRendering) {
_deferredRendering = true;
[self performSelectorOnMainThread:@selector(syncContentData) withObject:nil waitUntilDone:NO]; [self performSelectorOnMainThread:@selector(syncContentData) withObject:nil waitUntilDone:NO];
} }
else { else {
RCT_PROFILE_BEGIN_EVENT(0, @"GLCanvas render", nil);
[self render]; [self render];
RCT_PROFILE_END_EVENT(0, @"gl", nil);
_deferredRendering = false; _deferredRendering = false;
if (_captureFrameRequested) { if (_captureFrameRequested) {
_captureFrameRequested = false; _captureFrameRequested = false;
// FIXME: might use performSelectorOnMainThread as well
dispatch_async(dispatch_get_main_queue(), ^{ // snapshot not allowed in render tick. defer it. dispatch_async(dispatch_get_main_queue(), ^{ // snapshot not allowed in render tick. defer it.
if (!weakSelf) return; if (!weakSelf) return;
UIImage *frameImage = [weakSelf snapshot]; UIImage *frameImage = [weakSelf snapshot];
...@@ -377,10 +377,11 @@ RCT_NOT_IMPLEMENTED(-init) ...@@ -377,10 +377,11 @@ RCT_NOT_IMPLEMENTED(-init)
{ {
GLRenderData *rd = _renderData; GLRenderData *rd = _renderData;
if (!rd) return; if (!rd) return;
RCT_PROFILE_BEGIN_EVENT(0, @"GLCanvas render", nil);
@autoreleasepool {
CGFloat scale = RCTScreenScale(); CGFloat scale = RCTScreenScale();
@autoreleasepool {
void (^recDraw) (GLRenderData *renderData); void (^recDraw) (GLRenderData *renderData);
__block __weak void (^weak_recDraw) (GLRenderData *renderData); __block __weak void (^weak_recDraw) (GLRenderData *renderData);
weak_recDraw = recDraw = ^void(GLRenderData *renderData) { weak_recDraw = recDraw = ^void(GLRenderData *renderData) {
...@@ -437,6 +438,8 @@ RCT_NOT_IMPLEMENTED(-init) ...@@ -437,6 +438,8 @@ RCT_NOT_IMPLEMENTED(-init)
[self dispatchOnLoad]; [self dispatchOnLoad];
} }
} }
RCT_PROFILE_END_EVENT(0, @"gl", nil);
} }
//// utility methods //// utility methods
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment