diff options
author | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
commit | 2433c3693663c0ace48aee718c10a6b78207b7cf (patch) | |
tree | 8c569c4af28c0e365d64d432957b20c9aa0b4953 /mesalib/src/mesa/program/program.h | |
parent | fadba36545cbab5859bf346921bf416d0160a5b2 (diff) | |
parent | 2ecad38adbeaa652daaab8f2a6d112921b7e74eb (diff) | |
download | vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.gz vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.bz2 vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa libxcb git update 4 jul 2013
Diffstat (limited to 'mesalib/src/mesa/program/program.h')
-rw-r--r-- | mesalib/src/mesa/program/program.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/program.h b/mesalib/src/mesa/program/program.h index ecda59b58..f28983894 100644 --- a/mesalib/src/mesa/program/program.h +++ b/mesalib/src/mesa/program/program.h @@ -205,8 +205,8 @@ _mesa_program_index_to_target(GLuint i) { static const GLenum enums[MESA_SHADER_TYPES] = { GL_VERTEX_PROGRAM_ARB, - GL_FRAGMENT_PROGRAM_ARB, GL_GEOMETRY_PROGRAM_NV, + GL_FRAGMENT_PROGRAM_ARB }; if(i >= MESA_SHADER_TYPES) return 0; |