Committed. Thanks.
-Brian
Aaron Plattner wrote:
> Signed-off-by: Aaron Plattner <aplatt...@nvidia.com>
> ---
> progs/xdemos/glxgears.c | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/progs/xdemos/glxgears.c b/progs/xdemos/glxgears.c
> index 2993c82..92c75ca 100644
> --- a/progs/xdemos/glxgears.c
> +++ b/progs/xdemos/glxgears.c
> @@ -35,6 +35,7 @@
> #include <X11/keysym.h>
> #include <GL/gl.h>
> #include <GL/glx.h>
> +#include <GL/glxext.h>
>
> #ifndef GLX_MESA_swap_control
> #define GLX_MESA_swap_control 1
> @@ -586,11 +587,17 @@ is_glx_extension_supported(Display *dpy, const char
> *query)
> * Attempt to determine whether or not the display is synched to vblank.
> */
> static void
> -query_vsync(Display *dpy)
> +query_vsync(Display *dpy, GLXDrawable drawable)
> {
> int interval = 0;
>
> -
> +#if defined(GLX_EXT_swap_control)
> + if (is_glx_extension_supported(dpy, "GLX_EXT_swap_control")) {
> + unsigned int tmp = -1;
> + glXQueryDrawable(dpy, drawable, GLX_SWAP_INTERVAL_EXT, &tmp);
> + interval = tmp;
> + } else
> +#endif
> if (is_glx_extension_supported(dpy, "GLX_MESA_swap_control")) {
> PFNGLXGETSWAPINTERVALMESAPROC pglXGetSwapIntervalMESA =
> (PFNGLXGETSWAPINTERVALMESAPROC)
> @@ -749,7 +756,7 @@ main(int argc, char *argv[])
> make_window(dpy, "glxgears", x, y, winWidth, winHeight, &win, &ctx);
> XMapWindow(dpy, win);
> glXMakeCurrent(dpy, win, ctx);
> - query_vsync(dpy);
> + query_vsync(dpy, win);
>
> if (printInfo) {
> printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
