glproxy

Merge lp:~marcoil/glproxy/fixes into lp:glproxy

  1. fixes
  2. Merge into trunk
Proposed by Marc Ordinas i Llopis
Status: Merged
Merged at revision: 32
Proposed branch: lp:~marcoil/glproxy/fixes
Merge into: lp:glproxy
Diff against target: 54 lines (+12/-0)
2 files modified
include/GL/glxext_proxy.h (+8/-0)
src/glx_proxy.c (+4/-0)
To merge this branch: bzr merge lp:~marcoil/glproxy/fixes
Reviewer Review Type Date Requested Status
Alexandros Frantzis Approve
Review via email: mp+75217@code.launchpad.net

Description of the change

Added support for GLX_MESA_swap_control.

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Tested, works great.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'include/GL/glxext_proxy.h'
--- include/GL/glxext_proxy.h 2011-02-24 04:52:03 +0000
+++ include/GL/glxext_proxy.h 2011-09-13 16:12:33 +0000
@@ -463,6 +463,10 @@
463// GLX_NV_copy_image463// GLX_NV_copy_image
464typedef void ( * PFNPROXYCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);464typedef void ( * PFNPROXYCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
465465
466// GLX_MESA_swap_control
467typedef int ( * PFNPROXYSWAPINTERVALMESAPROC) (unsigned int interval);
468typedef int ( * PFNPROXYGETSWAPINTERVALMESAPROC) (void);
469
466/* ---------------------------------------------------------------------------------------------470/* ---------------------------------------------------------------------------------------------
467 * function rename471 * function rename
468 * -------------------------------------------------------------------------------------------*/472 * -------------------------------------------------------------------------------------------*/
@@ -546,6 +550,8 @@
546#define glXReleaseVideoCaptureDeviceNV pfnProxyReleaseVideoCaptureDeviceNV550#define glXReleaseVideoCaptureDeviceNV pfnProxyReleaseVideoCaptureDeviceNV
547#define glXSwapIntervalEXT pfnProxySwapIntervalEXT551#define glXSwapIntervalEXT pfnProxySwapIntervalEXT
548#define glXCopyImageSubDataNV pfnProxyCopyImageSubDataNV552#define glXCopyImageSubDataNV pfnProxyCopyImageSubDataNV
553#define glXSwapIntervalMESA pfnProxySwapIntervalMESA
554#define glXGetSwapIntervalMESA pfnProxyGetSwapIntervalMESA
549555
550/* ---------------------------------------------------------------------------------------------556/* ---------------------------------------------------------------------------------------------
551 * export proxy functions557 * export proxy functions
@@ -630,6 +636,8 @@
630extern PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV;636extern PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV;
631extern PFNPROXYSWAPINTERVALEXTPROC pfnProxySwapIntervalEXT;637extern PFNPROXYSWAPINTERVALEXTPROC pfnProxySwapIntervalEXT;
632extern PFNPROXYCOPYIMAGESUBDATANVPROC pfnProxyCopyImageSubDataNV;638extern PFNPROXYCOPYIMAGESUBDATANVPROC pfnProxyCopyImageSubDataNV;
639extern PFNPROXYSWAPINTERVALMESAPROC pfnProxySwapIntervalMESA;
640extern PFNPROXYGETSWAPINTERVALMESAPROC pfnProxyGetSwapIntervalMESA;
633641
634#ifdef __cplusplus642#ifdef __cplusplus
635}643}
636644
=== modified file 'src/glx_proxy.c'
--- src/glx_proxy.c 2011-02-24 04:52:03 +0000
+++ src/glx_proxy.c 2011-09-13 16:12:33 +0000
@@ -147,6 +147,8 @@
147PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV = NULL;147PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV = NULL;
148PFNPROXYSWAPINTERVALEXTPROC pfnProxySwapIntervalEXT = NULL;148PFNPROXYSWAPINTERVALEXTPROC pfnProxySwapIntervalEXT = NULL;
149PFNPROXYCOPYIMAGESUBDATANVPROC pfnProxyCopyImageSubDataNV = NULL;149PFNPROXYCOPYIMAGESUBDATANVPROC pfnProxyCopyImageSubDataNV = NULL;
150PFNPROXYSWAPINTERVALMESAPROC pfnProxySwapIntervalMESA = NULL;
151PFNPROXYGETSWAPINTERVALMESAPROC pfnProxyGetSwapIntervalMESA = NULL;
150152
151extern void *glProxyGetProcAddr(void *handle, const char *name);153extern void *glProxyGetProcAddr(void *handle, const char *name);
152extern void *glProxyGetExtProcAddr(void *handle, const char *name);154extern void *glProxyGetExtProcAddr(void *handle, const char *name);
@@ -285,6 +287,8 @@
285 pfnProxyReleaseVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXReleaseVideoCaptureDeviceNV");287 pfnProxyReleaseVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXReleaseVideoCaptureDeviceNV");
286 pfnProxySwapIntervalEXT = glProxyGetExtProcAddr(handle, "glXSwapIntervalEXT");288 pfnProxySwapIntervalEXT = glProxyGetExtProcAddr(handle, "glXSwapIntervalEXT");
287 pfnProxyCopyImageSubDataNV = glProxyGetExtProcAddr(handle, "glXCopyImageSubDataNV");289 pfnProxyCopyImageSubDataNV = glProxyGetExtProcAddr(handle, "glXCopyImageSubDataNV");
290 pfnProxySwapIntervalMESA = glProxyGetExtProcAddr(handle, "glXSwapIntervalMESA");
291 pfnProxyGetSwapIntervalMESA = glProxyGetExtProcAddr(handle, "glXGetSwapIntervalMESA");
288292
289 return 0;293 return 0;
290} 294}

Subscribers

People subscribed via source and target branches