← Back to branch summary

~ubuntu-branches/ubuntu/trusty/psychtoolbox-3/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/deb_use_system_GLEW/Psychtoolbox/PsychOpenGL/MOGL/source/mogl_rebinder.c

  • Committer: Package Import Robot
  • Author(s): Yaroslav Halchenko
  • Date: 2013-11-19 23:34:50 UTC
  • mfrom: (3.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20131119233450-f7nf92vb8qavjmk8
Tags: 3.0.11.20131017.dfsg1-3
Upload to unsable since fresh glew has arrived to sid!

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/deb_use_system_GLEW/Psychtoolbox/PsychOpenGL/MOGL/source/mogl_rebinder.c
42
42
    if (NULL == glLinkProgram) glLinkProgram = glLinkProgramARB;
43
43
    if (NULL == glUseProgram) glUseProgram = glUseProgramObjectARB;
44
44
    if (NULL == glGetAttribLocation) glGetAttribLocation = glGetAttribLocationARB;
45
 
#ifndef TARGET_OS_WIN32
46
 
#ifndef MATLABR11
 
45
#ifndef WINR2007a
47
46
    // Windows + Octave or any other OS:
48
47
    if (NULL == glGetUniformLocation) glGetUniformLocation = (GLint (*)(GLint, const GLchar*)) glGetUniformLocationARB;
49
48
#else
50
 
    // Windows + Matlab R11 et al:
51
 
    if (NULL == glGetUniformLocation) glGetUniformLocation = glGetUniformLocationARB;
52
 
#endif
53
 
#else
54
49
    // Windows + Matlab R2007a or later:
55
50
    if (NULL == glGetUniformLocation) glGetUniformLocation = glGetUniformLocationARB;
56
51
#endif