Changeset 399
- Timestamp:
- 05/28/07 05:13:11 (1 year ago)
- Files:
-
- branches/thune/thread_safe/gl/shader.c (modified) (5 diffs)
- trunk/thune/gl/shader.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/thune/thread_safe/gl/shader.c
r390 r399 35 35 36 36 37 static void printInfoLog( UThread* ut, GLuint obj )37 static void printInfoLog( UThread* ut, GLuint obj, int prog ) 38 38 { 39 39 GLint infologLength; … … 41 41 char* infoLog; 42 42 43 glGetShaderiv( obj, GL_INFO_LOG_LENGTH, &infologLength ); 43 if( prog ) 44 glGetProgramiv( obj, GL_INFO_LOG_LENGTH, &infologLength ); 45 else 46 glGetShaderiv( obj, GL_INFO_LOG_LENGTH, &infologLength ); 47 44 48 if( infologLength > 0 ) 45 49 { 46 50 infoLog = (char*) malloc( infologLength ); 47 glGetShaderInfoLog( obj, infologLength, &charsWritten, infoLog ); 51 52 if( prog ) 53 glGetProgramInfoLog( obj, infologLength, &charsWritten, infoLog ); 54 else 55 glGetShaderInfoLog( obj, infologLength, &charsWritten, infoLog ); 48 56 49 57 //fprintf( stderr, "%s\n", infoLog ); … … 73 81 if( ! ok ) 74 82 { 75 printInfoLog( ut, sh->vertexObj );83 printInfoLog( ut, sh->vertexObj, 0 ); 76 84 return 0; 77 85 } … … 83 91 if( ! ok ) 84 92 { 85 printInfoLog( ut, sh->fragmentObj );93 printInfoLog( ut, sh->fragmentObj, 0 ); 86 94 return 0; 87 95 } … … 99 107 if( ! ok ) 100 108 { 101 printInfoLog( ut, sh-> fragmentObj);109 printInfoLog( ut, sh->program, 1 ); 102 110 return 0; 103 111 } trunk/thune/gl/shader.c
r382 r399 35 35 36 36 37 static void printInfoLog( UThread* ur_thread, GLuint obj )37 static void printInfoLog( UThread* ur_thread, GLuint obj, int prog ) 38 38 { 39 39 GLint infologLength; … … 41 41 char* infoLog; 42 42 43 glGetShaderiv( obj, GL_INFO_LOG_LENGTH, &infologLength ); 43 if( prog ) 44 glGetProgramiv( obj, GL_INFO_LOG_LENGTH, &infologLength ); 45 else 46 glGetShaderiv( obj, GL_INFO_LOG_LENGTH, &infologLength ); 47 44 48 if( infologLength > 0 ) 45 49 { 46 50 infoLog = (char*) malloc( infologLength ); 47 glGetShaderInfoLog( obj, infologLength, &charsWritten, infoLog ); 51 52 if( prog ) 53 glGetProgramInfoLog( obj, infologLength, &charsWritten, infoLog ); 54 else 55 glGetShaderInfoLog( obj, infologLength, &charsWritten, infoLog ); 48 56 49 57 //fprintf( stderr, "%s\n", infoLog ); … … 73 81 if( ! ok ) 74 82 { 75 printInfoLog( thr, sh->vertexObj );83 printInfoLog( thr, sh->vertexObj, 0 ); 76 84 return 0; 77 85 } … … 83 91 if( ! ok ) 84 92 { 85 printInfoLog( thr, sh->fragmentObj );93 printInfoLog( thr, sh->fragmentObj, 0 ); 86 94 return 0; 87 95 } … … 99 107 if( ! ok ) 100 108 { 101 printInfoLog( thr, sh-> fragmentObj);109 printInfoLog( thr, sh->program, 1 ); 102 110 return 0; 103 111 }
