Skip to content

Commit 5b792ff

Browse files
s1ddoks1ddok
committed
Get rid of CCShader_Private
1 parent 1c76d51 commit 5b792ff

File tree

7 files changed

+19
-46
lines changed

7 files changed

+19
-46
lines changed

‎cocos2d.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
08F4AB3A1C6E98A1004DAAF7 /* CCRendererSharedTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */; };
173173
08F4AB3B1C6E98A1004DAAF7 /* CCAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = B7E775CE18527EF0004221AA /* CCAppDelegate.h */; };
174174
08F4AB3C1C6E98A1004DAAF7 /* CCShader.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D9B1342CE7B001B4DCC /* CCShader.h */; };
175-
08F4AB3D1C6E98A1004DAAF7 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D39FA9C718C1BC6B00441627 /* CCShader_Private.h */; };
176175
08F4AB3E1C6E98A1004DAAF7 /* CCDirectorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E28B14C1DB7D0005BBF2 /* CCDirectorMac.h */; };
177176
08F4AB3F1C6E98A1004DAAF7 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E28F14C1DB7D0005BBF2 /* CCGLView.h */; };
178177
08F4AB401C6E98A1004DAAF7 /* NSValue+CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = D34CAD5F19C3A0B5009BED7A /* NSValue+CCRenderer.h */; };
@@ -326,7 +325,6 @@
326325
7A59471019E372FF00F65F90 /* CCRendererBasicTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D34CAD6519C3A7A5009BED7A /* CCRendererBasicTypes.h */; };
327326
7A59471119E372FF00F65F90 /* CCRendererBasicTypes_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D34CAD6A19C3AA10009BED7A /* CCRendererBasicTypes_Private.h */; };
328327
7A59471319E3730000F65F90 /* CCShader.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D9B1342CE7B001B4DCC /* CCShader.h */; };
329-
7A59471419E3730000F65F90 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D39FA9C718C1BC6B00441627 /* CCShader_Private.h */; };
330328
7A59471619E3730000F65F90 /* NSValue+CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = D34CAD5F19C3A0B5009BED7A /* NSValue+CCRenderer.h */; };
331329
7A59471819E3730100F65F90 /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = D38058181889AD6000822437 /* CCRenderer.h */; };
332330
7A59471919E3730100F65F90 /* CCRenderer_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D309054F18AC23110081BF11 /* CCRenderer_Private.h */; };
@@ -519,7 +517,6 @@
519517
D3903B1A19952ABD003AA81A /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3903B1919952ABD003AA81A /* Metal.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
520518
D395DB2B183D739E0024997E /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E3877010446C6E00150883 /* OpenAL.framework */; };
521519
D395DB2C183D73A70024997E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E3876E10446C6E00150883 /* AudioToolbox.framework */; };
522-
D39FA9C818C1BC6B00441627 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D39FA9C718C1BC6B00441627 /* CCShader_Private.h */; };
523520
D3E3752F19CC842A0076CDBB /* CCRendererSharedTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */; };
524521
E01E6D8C121F130E001A484F /* CCLabelBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E01E6D8A121F130E001A484F /* CCLabelBMFont.h */; };
525522
E01E6D8D121F130E001A484F /* CCLabelBMFont.m in Sources */ = {isa = PBXBuildFile; fileRef = E01E6D8B121F130E001A484F /* CCLabelBMFont.m */; };
@@ -737,7 +734,6 @@
737734
D3903B13199528B6003AA81A /* CCMetalView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCMetalView.m; sourceTree = "<group>"; };
738735
D3903B1919952ABD003AA81A /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
739736
D39A31BB17F227F500E94B3B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
740-
D39FA9C718C1BC6B00441627 /* CCShader_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShader_Private.h; sourceTree = "<group>"; };
741737
D3C12815199D40AC005D2119 /* CCShaders.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = CCShaders.metal; sourceTree = "<group>"; };
742738
D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRendererSharedTypes.h; sourceTree = "<group>"; };
743739
E01E6D8A121F130E001A484F /* CCLabelBMFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCLabelBMFont.h; sourceTree = "<group>"; };
@@ -1245,7 +1241,6 @@
12451241
D34CAD6A19C3AA10009BED7A /* CCRendererBasicTypes_Private.h */,
12461242
D34CAD6819C3A7B3009BED7A /* CCRendererBasicTypes.m */,
12471243
E0BC7D9B1342CE7B001B4DCC /* CCShader.h */,
1248-
D39FA9C718C1BC6B00441627 /* CCShader_Private.h */,
12491244
E0BC7D9C1342CE7B001B4DCC /* CCShader.m */,
12501245
D34CAD5F19C3A0B5009BED7A /* NSValue+CCRenderer.h */,
12511246
D34CAD6219C3A0FD009BED7A /* NSValue+CCRenderer.m */,
@@ -1381,7 +1376,6 @@
13811376
08F4AB3A1C6E98A1004DAAF7 /* CCRendererSharedTypes.h in Headers */,
13821377
08F4AB3B1C6E98A1004DAAF7 /* CCAppDelegate.h in Headers */,
13831378
08F4AB3C1C6E98A1004DAAF7 /* CCShader.h in Headers */,
1384-
08F4AB3D1C6E98A1004DAAF7 /* CCShader_Private.h in Headers */,
13851379
08F4AB3E1C6E98A1004DAAF7 /* CCDirectorMac.h in Headers */,
13861380
08F4AB3F1C6E98A1004DAAF7 /* CCGLView.h in Headers */,
13871381
08F4AB401C6E98A1004DAAF7 /* NSValue+CCRenderer.h in Headers */,
@@ -1474,7 +1468,6 @@
14741468
D3E3752F19CC842A0076CDBB /* CCRendererSharedTypes.h in Headers */,
14751469
B7E775D018527EF0004221AA /* CCAppDelegate.h in Headers */,
14761470
E0BC7D9F1342CE7B001B4DCC /* CCShader.h in Headers */,
1477-
D39FA9C818C1BC6B00441627 /* CCShader_Private.h in Headers */,
14781471
A046E29314C1DB7D0005BBF2 /* CCDirectorMac.h in Headers */,
14791472
A046E29714C1DB7D0005BBF2 /* CCGLView.h in Headers */,
14801473
D34CAD6119C3A0B5009BED7A /* NSValue+CCRenderer.h in Headers */,
@@ -1557,7 +1550,6 @@
15571550
7A59471019E372FF00F65F90 /* CCRendererBasicTypes.h in Headers */,
15581551
7A59471119E372FF00F65F90 /* CCRendererBasicTypes_Private.h in Headers */,
15591552
7A59471319E3730000F65F90 /* CCShader.h in Headers */,
1560-
7A59471419E3730000F65F90 /* CCShader_Private.h in Headers */,
15611553
7A59471619E3730000F65F90 /* NSValue+CCRenderer.h in Headers */,
15621554
7A59471819E3730100F65F90 /* CCRenderer.h in Headers */,
15631555
7A59471919E3730100F65F90 /* CCRenderer_Private.h in Headers */,

‎cocos2d/CCNoARC.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#import "CCTexture_Private.h"
22
#import "CCRenderer_Private.h"
3-
#import "CCShader_Private.h"
43

54
#if __CC_METAL_SUPPORTED_AND_ENABLED
65
#import "CCMetalSupport_Private.h"

‎cocos2d/CCRenderer.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#import "CCRenderer_Private.h"
2929
#import "CCCache.h"
3030
#import "CCTexture_Private.h"
31-
#import "CCShader_private.h"
3231
#import "CCDirector_Private.h"
3332
#import "CCRenderDispatch.h"
3433

‎cocos2d/CCShader.h‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,21 @@
3737

3838
/// Macro to embed Metal shading language source.
3939
#define CC_METAL(x) @#x
40+
41+
#import <Metal/Metal.h>
42+
#import "CCMetalSupport_Private.h"
4043
#endif
4144

45+
@class CCRenderer;
46+
typedef void (^CCUniformSetter)(
47+
__unsafe_unretained CCRenderer *renderer,
48+
__unsafe_unretained NSDictionary *shaderUniforms,
49+
__unsafe_unretained NSDictionary *globalShaderUniforms
50+
);
4251

4352
/// Macro to embed GLSL source.
4453
#define CC_GLSL(x) @#x
4554

46-
4755
/// GL attribute locations for built-in Cocos2D vertex attributes. Used by CCShader.
4856
typedef NS_ENUM(NSUInteger, CCShaderAttribute){
4957
/** Position */
@@ -72,7 +80,16 @@ extern NSString * const CCShaderUniformAlphaTestValue;
7280

7381

7482
/** A wrapper for OpenGL or Metal shader programs. Also gives you access to the built-in shaders used by Cocos2D. */
75-
@interface CCShader : NSObject<NSCopying>
83+
@interface CCShader : NSObject<NSCopying> {
84+
@public
85+
GLuint _program;
86+
NSDictionary *_uniformSetters;
87+
88+
// TODO This should really be split into a separate subclass somehow.
89+
#if __CC_METAL_SUPPORTED_AND_ENABLED
90+
id<MTLFunction> _vertexFunction, _fragmentFunction;
91+
#endif
92+
}
7693

7794
/** @name Creating a OpenGL Shader */
7895

‎cocos2d/CCShader.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
2626
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

28-
29-
#import "CCShader_private.h"
3028
#import "ccMacros.h"
3129
#import "Support/CCFileUtils.h"
3230
#import "Support/uthash.h"

‎cocos2d/CCShader_Private.h‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎cocos2d/Platforms/iOS/CCMetalSupport.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
#import "CCMetalView.h"
3030
#import "CCTexture_Private.h"
31-
#import "CCShader_Private.h"
3231

3332
@implementation CCMetalContext {
3433
id<MTLTexture> _destinationTexture;

0 commit comments

Comments
 (0)