Merge branch 'master' into build

This commit is contained in:
Nigel Stewart 2011-03-11 11:42:51 -06:00
commit c57f2e051e
2 changed files with 19 additions and 1 deletions

View File

@ -42,6 +42,25 @@ if [ ! -d $1 ] ; then
grep -v glGetIntegerIndexedvEXT $1/GL_EXT_transform_feedback > tmp grep -v glGetIntegerIndexedvEXT $1/GL_EXT_transform_feedback > tmp
mv tmp $1/GL_EXT_transform_feedback mv tmp $1/GL_EXT_transform_feedback
# remove duplicates from GL_NV_video_capture and GLX_NV_video_capture
grep -v glX $1/GL_NV_video_capture > tmp
mv tmp $1/GL_NV_video_capture
# add missing functions to GL_NV_video_capture
cat >> $1/GL_NV_video_capture <<EOT
void glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params)
void glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params)
void glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params)
void glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params)
void glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params)
void glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params)
EOT
# fix WGL_NV_video_capture
cat >> $1/WGL_NV_video_capture <<EOT
DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
EOT
# remove duplicates from GL_NV_present_video and GLX_NV_present_video # remove duplicates from GL_NV_present_video and GLX_NV_present_video
grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp
mv tmp $1/GL_NV_present_video mv tmp $1/GL_NV_present_video

View File

@ -12,4 +12,3 @@ SGIX/video_source.txt
SGIX/hyperpipe_group.txt SGIX/hyperpipe_group.txt
OES/OES_fixed_point.txt OES/OES_fixed_point.txt
OES/OES_query_matrix.txt OES/OES_query_matrix.txt
NV/video_capture.txt