diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2011-01-06 08:20:42 +0000 |
|---|---|---|
| committer | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2011-01-06 08:20:42 +0000 |
| commit | 7eff40f947ad6ec2c9fd745b449a56ad28bba183 (patch) | |
| tree | 4be790ecdfcdcb134b153fad240802a243d6492d | |
| parent | a13c2d24e8db642c849e4f73edb336337254617b (diff) | |
Really fix build with upstream (newer) libGL headers.
| -rw-r--r-- | src/utils_glx.c | 4 | ||||
| -rw-r--r-- | src/utils_glx.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/utils_glx.c b/src/utils_glx.c index 1c3a5a3..5b661ae 100644 --- a/src/utils_glx.c +++ b/src/utils_glx.c @@ -780,7 +780,7 @@ gl_init_vtable(void) get_proc_address("glVDPAURegisterOutputSurfaceNV"); if (!gl_vtable->gl_vdpau_register_output_surface) return NULL; - gl_vtable->gl_vdpau_is_surface = (PFNGLVDPAUISSURFACEPROC) + gl_vtable->gl_vdpau_is_surface = (PFNGLVDPAUISSURFACENVPROC) get_proc_address("glVDPAUIsSurfaceNV"); if (!gl_vtable->gl_vdpau_is_surface) return NULL; @@ -788,7 +788,7 @@ gl_init_vtable(void) get_proc_address("glVDPAUUnregisterSurfaceNV"); if (!gl_vtable->gl_vdpau_unregister_surface) return NULL; - gl_vtable->gl_vdpau_get_surface_iv = (PFNGLVDPAUGETSURFACEIVPROC) + gl_vtable->gl_vdpau_get_surface_iv = (PFNGLVDPAUGETSURFACEIVNVPROC) get_proc_address("glVDPAUGetSurfaceivNV"); if (!gl_vtable->gl_vdpau_get_surface_iv) return NULL; diff --git a/src/utils_glx.h b/src/utils_glx.h index c25f002..4242051 100644 --- a/src/utils_glx.h +++ b/src/utils_glx.h @@ -34,9 +34,9 @@ typedef void (*PFNGLVDPAUINITNVPROC)(const GLvoid *vdpDevice, const GLvoid *getP typedef void (*PFNGLVDPAUFININVPROC)(void); typedef GLvdpauSurfaceNV (*PFNGLVDPAUREGISTERVIDEOSURFACENVPROC)(const GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); typedef GLvdpauSurfaceNV (*PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC)(const GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef GLboolean (*PFNGLVDPAUISSURFACEPROC)(GLvdpauSurfaceNV surface); +typedef GLboolean (*PFNGLVDPAUISSURFACENVPROC)(GLvdpauSurfaceNV surface); typedef void (*PFNGLVDPAUUNREGISTERSURFACENVPROC)(GLvdpauSurfaceNV surface); -typedef void (*PFNGLVDPAUGETSURFACEIVPROC)(GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +typedef void (*PFNGLVDPAUGETSURFACEIVNVPROC)(GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); typedef void (*PFNGLVDPAUSURFACEACCESSNVPROC)(GLvdpauSurfaceNV surface, GLenum access); typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); @@ -165,9 +165,9 @@ struct _GLVTable { PFNGLVDPAUFININVPROC gl_vdpau_fini; PFNGLVDPAUREGISTERVIDEOSURFACENVPROC gl_vdpau_register_video_surface; PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC gl_vdpau_register_output_surface; - PFNGLVDPAUISSURFACEPROC gl_vdpau_is_surface; + PFNGLVDPAUISSURFACENVPROC gl_vdpau_is_surface; PFNGLVDPAUUNREGISTERSURFACENVPROC gl_vdpau_unregister_surface; - PFNGLVDPAUGETSURFACEIVPROC gl_vdpau_get_surface_iv; + PFNGLVDPAUGETSURFACEIVNVPROC gl_vdpau_get_surface_iv; PFNGLVDPAUSURFACEACCESSNVPROC gl_vdpau_surface_access; PFNGLVDPAUMAPSURFACESNVPROC gl_vdpau_map_surfaces; PFNGLVDPAUUNMAPSURFACESNVPROC gl_vdpau_unmap_surfaces; |