Skip to content

Commit 8f9cd17

Browse files
author
汪洋
committed
update init function
1 parent 96ed9f9 commit 8f9cd17

File tree

26 files changed

+104
-92
lines changed

26 files changed

+104
-92
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,5 @@ fastlane/test_output
6363
# After new code Injection tools there's a generated folder /iOSInjectionProject
6464
# https://github.com/johnno1962/injectionforxcode
6565

66-
iOSInjectionProject/
66+
iOSInjectionProject/
67+
Podfile.lock

AiyaEffectSDK/AiyaEffectSDK.xcodeproj/xcuserdata/wangyang.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>AyBeauty.xcscheme_^#shared#^_</key>
1818
<dict>
1919
<key>orderHint</key>
20-
<integer>8</integer>
20+
<integer>7</integer>
2121
</dict>
2222
<key>AyCore.xcscheme</key>
2323
<dict>
@@ -32,7 +32,7 @@
3232
<key>AyEffect.xcscheme_^#shared#^_</key>
3333
<dict>
3434
<key>orderHint</key>
35-
<integer>7</integer>
35+
<integer>6</integer>
3636
</dict>
3737
<key>AyFaceTrack.xcscheme</key>
3838
<dict>
@@ -47,7 +47,7 @@
4747
<key>AyShortVideoEffect.xcscheme_^#shared#^_</key>
4848
<dict>
4949
<key>orderHint</key>
50-
<integer>9</integer>
50+
<integer>8</integer>
5151
</dict>
5252
</dict>
5353
<key>SuppressBuildableAutocreation</key>

AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGLProgram.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
- (id)initWithVertexShaderString:(NSString *)vShaderString
2929
fragmentShaderString:(NSString *)fShaderString;
30-
- (id)initWithVertexShaderString:(NSString *)vShaderString
31-
fragmentShaderFilename:(NSString *)fShaderFilename;
32-
- (id)initWithVertexShaderFilename:(NSString *)vShaderFilename
33-
fragmentShaderFilename:(NSString *)fShaderFilename;
30+
3431
- (GLuint)attributeIndex:(NSString *)attributeName;
32+
3533
- (GLuint)uniformIndex:(NSString *)uniformName;
34+
3635
- (BOOL)link;
36+
3737
- (void)use;
3838

3939
@end

AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGLProgram.m

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
#import "AYGLProgram.h"
1010

11-
// START:typedefs
12-
#pragma mark Function Pointer Definitions
13-
typedef void (*GLInfoFunction)(GLuint program, GLenum pname, GLint* params);
14-
typedef void (*GLLogFunction) (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
1511
// END:typedefs
1612
#pragma mark -
1713
#pragma mark Private Extension Method Declaration
@@ -62,34 +58,6 @@ - (id)initWithVertexShaderString:(NSString *)vShaderString
6258
return self;
6359
}
6460

65-
- (id)initWithVertexShaderString:(NSString *)vShaderString
66-
fragmentShaderFilename:(NSString *)fShaderFilename;
67-
{
68-
NSString *fragShaderPathname = [[NSBundle mainBundle] pathForResource:fShaderFilename ofType:@"fsh"];
69-
NSString *fragmentShaderString = [NSString stringWithContentsOfFile:fragShaderPathname encoding:NSUTF8StringEncoding error:nil];
70-
71-
if ((self = [self initWithVertexShaderString:vShaderString fragmentShaderString:fragmentShaderString]))
72-
{
73-
}
74-
75-
return self;
76-
}
77-
78-
- (id)initWithVertexShaderFilename:(NSString *)vShaderFilename
79-
fragmentShaderFilename:(NSString *)fShaderFilename;
80-
{
81-
NSString *vertShaderPathname = [[NSBundle mainBundle] pathForResource:vShaderFilename ofType:@"vsh"];
82-
NSString *vertexShaderString = [NSString stringWithContentsOfFile:vertShaderPathname encoding:NSUTF8StringEncoding error:nil];
83-
84-
NSString *fragShaderPathname = [[NSBundle mainBundle] pathForResource:fShaderFilename ofType:@"fsh"];
85-
NSString *fragmentShaderString = [NSString stringWithContentsOfFile:fragShaderPathname encoding:NSUTF8StringEncoding error:nil];
86-
87-
if ((self = [self initWithVertexShaderString:vertexShaderString fragmentShaderString:fragmentShaderString]))
88-
{
89-
}
90-
91-
return self;
92-
}
9361
// END:init
9462
// START:compile
9563
- (BOOL)compileShader:(GLuint *)shader

AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageContext.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ void runAYSynchronouslyOnContextQueue(AYGPUImageContext *context, void (^block)(
2121

2222
@property(readonly, nonatomic) dispatch_queue_t contextQueue;
2323
@property(readonly, nonatomic) void *contextKey;
24+
2425
@property(readonly, retain, nonatomic) EAGLContext *context;
26+
2527
@property(readonly) CVOpenGLESTextureCacheRef coreVideoTextureCache;
2628
@property(readonly, retain, nonatomic) AYGPUImageFramebufferCache *framebufferCache;
2729

@@ -35,8 +37,6 @@ void runAYSynchronouslyOnContextQueue(AYGPUImageContext *context, void (^block)(
3537

3638
- (AYGLProgram *)programForVertexShaderString:(NSString *)vertexShaderString fragmentShaderString:(NSString *)fragmentShaderString;
3739

38-
- (void)useSharegroup:(EAGLSharegroup *)sharegroup;
39-
4040
@end
4141

4242
@protocol AYGPUImageInput <NSObject>

AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageContext.m

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ @interface AYGPUImageContext()
4242
{
4343
NSMutableDictionary *shaderProgramCache;
4444
EAGLSharegroup *_sharegroup;
45+
46+
BOOL _newGLContext;
4547
}
4648

4749
@end
@@ -56,7 +58,7 @@ @implementation AYGPUImageContext
5658

5759
static int specificKey;
5860

59-
- (instancetype)initWithNewGLContext
61+
- (instancetype)initWithNewGLContext;
6062
{
6163
self = [super init];
6264
if (self) {
@@ -70,7 +72,9 @@ - (instancetype)initWithNewGLContext
7072

7173
shaderProgramCache = [[NSMutableDictionary alloc] init];
7274

73-
_context = [self createContext];
75+
dispatch_sync(_contextQueue, ^{
76+
_context = [self createContext];
77+
});
7478
}
7579
return self;
7680
}
@@ -135,11 +139,6 @@ - (EAGLContext *)createContext;
135139
#pragma mark -
136140
#pragma mark Accessors
137141

138-
- (EAGLContext *)context;
139-
{
140-
return _context;
141-
}
142-
143142
- (CVOpenGLESTextureCacheRef)coreVideoTextureCache;
144143
{
145144
if (_coreVideoTextureCache == NULL)
@@ -165,5 +164,4 @@ - (AYGPUImageFramebufferCache *)framebufferCache;
165164

166165
return _framebufferCache;
167166
}
168-
169167
@end

AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageFilter.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
#define STRINGIZE2(x) STRINGIZE(x)
1818
#define SHADER_STRING(text) @ STRINGIZE2(text)
1919

20-
#define AYGPUImageHashIdentifier #
21-
#define AYGPUImageWrappedLabel(x) x
22-
#define AYGPUImageEscapedHashIdentifier(a) AYGPUImageWrappedLabel(AYGPUImageHashIdentifier)a
23-
2420
extern NSString *const kAYGPUImageVertexShaderString;
2521
extern NSString *const kAYGPUImagePassthroughFragmentShaderString;
2622

@@ -47,7 +43,9 @@ extern NSString *const kAYGPUImagePassthroughFragmentShaderString;
4743

4844
/// @name Rendering
4945
+ (const GLfloat *)textureCoordinatesForRotation:(AYGPUImageRotationMode)rotationMode;
46+
5047
+ (BOOL)needExchangeWidthAndHeightWithRotation:(AYGPUImageRotationMode)rotationMode;
48+
5149
- (void)renderToTextureWithVertices:(const GLfloat *)vertices textureCoordinates:(const GLfloat *)textureCoordinates;
5250

5351
- (void)informTargetsAboutNewFrame;

AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageFramebufferCache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
- (id)initWithContext:(AYGPUImageContext *)context;
2121

2222
- (AYGPUImageFramebuffer *)fetchFramebufferForSize:(CGSize)framebufferSize textureOptions:(AYGPUTextureOptions)textureOptions missCVPixelBuffer:(BOOL)missCVPixelBuffer;
23+
2324
- (AYGPUImageFramebuffer *)fetchFramebufferForSize:(CGSize)framebufferSize missCVPixelBuffer:(BOOL)missCVPixelBuffer;
2425

2526
- (void)returnFramebufferToCache:(AYGPUImageFramebuffer *)framebuffer;

AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTrackOutput.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context{
4747

4848
runAYSynchronouslyOnContextQueue(context, ^{
4949
[context useAsCurrentContext];
50+
5051
dataProgram = [context programForVertexShaderString:kAYGPUImageVertexShaderString fragmentShaderString:kAYGPUImagePassthroughFragmentShaderString];
5152

5253
if (!dataProgram.initialized)
@@ -71,6 +72,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context{
7172
_track = [[AyFaceTrack alloc] init];
7273
#endif
7374
});
75+
7476
return self;
7577
}
7678

0 commit comments

Comments
 (0)