3 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	6462a1bf79	Adds simple sample for multitexturing	2014-05-13 12:55:34 -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