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
1=== modified file 'include/GL/glxext_proxy.h'
2--- include/GL/glxext_proxy.h 2011-02-24 04:52:03 +0000
3+++ include/GL/glxext_proxy.h 2011-09-13 16:12:33 +0000
4@@ -463,6 +463,10 @@
5 // GLX_NV_copy_image
6 typedef 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);
7
8+// GLX_MESA_swap_control
9+typedef int ( * PFNPROXYSWAPINTERVALMESAPROC) (unsigned int interval);
10+typedef int ( * PFNPROXYGETSWAPINTERVALMESAPROC) (void);
11+
12 /* ---------------------------------------------------------------------------------------------
13 * function rename
14 * -------------------------------------------------------------------------------------------*/
15@@ -546,6 +550,8 @@
16 #define glXReleaseVideoCaptureDeviceNV pfnProxyReleaseVideoCaptureDeviceNV
17 #define glXSwapIntervalEXT pfnProxySwapIntervalEXT
18 #define glXCopyImageSubDataNV pfnProxyCopyImageSubDataNV
19+#define glXSwapIntervalMESA pfnProxySwapIntervalMESA
20+#define glXGetSwapIntervalMESA pfnProxyGetSwapIntervalMESA
21
22 /* ---------------------------------------------------------------------------------------------
23 * export proxy functions
24@@ -630,6 +636,8 @@
25 extern PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV;
26 extern PFNPROXYSWAPINTERVALEXTPROC pfnProxySwapIntervalEXT;
27 extern PFNPROXYCOPYIMAGESUBDATANVPROC pfnProxyCopyImageSubDataNV;
28+extern PFNPROXYSWAPINTERVALMESAPROC pfnProxySwapIntervalMESA;
29+extern PFNPROXYGETSWAPINTERVALMESAPROC pfnProxyGetSwapIntervalMESA;
30
31 #ifdef __cplusplus
32 }
33
34=== modified file 'src/glx_proxy.c'
35--- src/glx_proxy.c 2011-02-24 04:52:03 +0000
36+++ src/glx_proxy.c 2011-09-13 16:12:33 +0000
37@@ -147,6 +147,8 @@
38 PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV = NULL;
39 PFNPROXYSWAPINTERVALEXTPROC pfnProxySwapIntervalEXT = NULL;
40 PFNPROXYCOPYIMAGESUBDATANVPROC pfnProxyCopyImageSubDataNV = NULL;
41+PFNPROXYSWAPINTERVALMESAPROC pfnProxySwapIntervalMESA = NULL;
42+PFNPROXYGETSWAPINTERVALMESAPROC pfnProxyGetSwapIntervalMESA = NULL;
43
44 extern void *glProxyGetProcAddr(void *handle, const char *name);
45 extern void *glProxyGetExtProcAddr(void *handle, const char *name);
46@@ -285,6 +287,8 @@
47 pfnProxyReleaseVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXReleaseVideoCaptureDeviceNV");
48 pfnProxySwapIntervalEXT = glProxyGetExtProcAddr(handle, "glXSwapIntervalEXT");
49 pfnProxyCopyImageSubDataNV = glProxyGetExtProcAddr(handle, "glXCopyImageSubDataNV");
50+ pfnProxySwapIntervalMESA = glProxyGetExtProcAddr(handle, "glXSwapIntervalMESA");
51+ pfnProxyGetSwapIntervalMESA = glProxyGetExtProcAddr(handle, "glXGetSwapIntervalMESA");
52
53 return 0;
54 }

Subscribers

People subscribed via source and target branches