RSS

(root)/iphone/common : 71 : source/ES2Shader.m

To get this branch, use:
bzr branch /browse/iphone/common

« back to all changes in this revision

Viewing changes to source/ES2Shader.m

Dömötör Gulyás
2010-08-09 13:29:37
Revision ID: dognotdog@gmail.com-20100809112937-ltb573qbvp9e39ak
fixes bug when VAOs are used in VertexArray: VAO now correctly setup again after applying transform to vertices; adds threaded animation mode to GLESView; fixes warning in ES2Shader uniform setters

Show diffs side-by-side

added added

removed removed

source/ES2Shader.m
237
237
 
238
238
- (void) setUniformInteger: (GLint) i named: (NSString*) name
239
239
{
240
 
        GLuint loc = [[uniformDict objectForKey: name] unsignedIntValue];
 
240
        GLint loc = [[uniformDict objectForKey: name] intValue];
241
241
        if (!loc)
242
242
        {
243
243
                loc = glGetUniformLocation(programObj, [name UTF8String]);
252
252
 
253
253
- (void) setUniformFloat: (float) f named: (NSString*) name
254
254
{
255
 
        GLuint loc = [[uniformDict objectForKey: name] unsignedIntValue];
 
255
        GLint loc = [[uniformDict objectForKey: name] intValue];
256
256
        if (!loc)
257
257
        {
258
258
                loc = glGetUniformLocation(programObj, [name UTF8String]);
267
267
 
268
268
- (void) setUniformFloat: (float*) f count: (int) count named: (NSString*) name
269
269
{
270
 
        GLuint loc = [[uniformDict objectForKey: name] unsignedIntValue];
 
270
        GLint loc = [[uniformDict objectForKey: name] intValue];
271
271
        if (!loc)
272
272
        {
273
273
                loc = glGetUniformLocation(programObj, [name UTF8String]);

Loggerhead 1.17 is a web-based interface for Bazaar branches