12 Commits

Author	SHA1	Message	Date
Ricardo Quesada	9d1ab1ba07	uniform sampler CC_Texture0 MUST NOT be defined on shaders ... since it is a built-in. Built-in uniforms MUST NOT be defined on shaders. Basically all CC_ uniforms must be defined by cocos2d-x	2014-05-15 16:47:54 -07:00
Ricardo Quesada	1c13f901ae	Even better shader test	2014-05-14 16:55:57 -07:00
Ricardo Quesada	6462a1bf79	Adds simple sample for multitexturing	2014-05-13 12:55:34 -07:00
Ricardo Quesada	012f1020ca	GLProgramState fixes ... It is possible to submit to the Renderer a Sprite with custom uniforms (although it won't be batched). It is possible to use a custom shader + uniforms on Sprite with subclassing Sprite	2014-05-12 19:12:56 -07:00
Huabing.Xu	e84d96234b	add two shaderTest case for Trace ... comment out one(it is not working on IOS device)	2014-05-09 20:35:15 -07:00
yangxiao	5190fb27c8	use proposed vertex attribute api	2014-05-07 09:27:44 -07:00
Trace	69fd841b30	fix the include error	2014-05-06 11:19:51 -07:00
James Chen	e16d6fa63f	Re-adds resources in cpp-tests and lua-tests, but removes some large ... files. We need to reuse some resources when doing some tests.	2014-05-05 13:27:47 +08:00
James Chen	3b3c1c4dbb	issue #4674: Removed large files and updated .gitignore	2014-05-04 14:36:16 +08:00
andyque	10cca8674a	closed #4783. remove unused comments in shader file	2014-04-14 12:06:42 +08:00
andyque	2c1f5da69c	issue #4783, add outline shader files	2014-04-14 11:52:17 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00