Commit 7e13b1af authored by Andrew Nguyen's avatar Andrew Nguyen Committed by Alexandre Julliard

wined3d: Remove references to GLX_SGI_video_sync.

Usage of GLX_SGI_video_sync is problematic, and wined3d cannot use GLX extensions.
parent 6b90fc23
......@@ -229,8 +229,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface,
struct wined3d_context *context;
RECT src_rect, dst_rect;
BOOL render_to_fbo;
unsigned int sync;
int retval;
IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride);
......@@ -453,47 +451,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface,
}
}
if (This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE
&& gl_info->supported[SGI_VIDEO_SYNC])
{
if ((retval = GL_EXTCALL(glXGetVideoSyncSGI(&sync))))
ERR("glXGetVideoSyncSGI failed(retval = %d\n", retval);
switch(This->presentParms.PresentationInterval) {
case WINED3DPRESENT_INTERVAL_DEFAULT:
case WINED3DPRESENT_INTERVAL_ONE:
if(sync <= This->vSyncCounter) {
retval = GL_EXTCALL(glXWaitVideoSyncSGI(1, 0, &This->vSyncCounter));
} else {
This->vSyncCounter = sync;
}
break;
case WINED3DPRESENT_INTERVAL_TWO:
if(sync <= This->vSyncCounter + 1) {
retval = GL_EXTCALL(glXWaitVideoSyncSGI(2, This->vSyncCounter & 0x1, &This->vSyncCounter));
} else {
This->vSyncCounter = sync;
}
break;
case WINED3DPRESENT_INTERVAL_THREE:
if(sync <= This->vSyncCounter + 2) {
retval = GL_EXTCALL(glXWaitVideoSyncSGI(3, This->vSyncCounter % 0x3, &This->vSyncCounter));
} else {
This->vSyncCounter = sync;
}
break;
case WINED3DPRESENT_INTERVAL_FOUR:
if(sync <= This->vSyncCounter + 3) {
retval = GL_EXTCALL(glXWaitVideoSyncSGI(4, This->vSyncCounter & 0x3, &This->vSyncCounter));
} else {
This->vSyncCounter = sync;
}
break;
default:
FIXME("Unknown presentation interval %08x\n", This->presentParms.PresentationInterval);
}
}
context_release(context);
TRACE("returning\n");
......
......@@ -1834,7 +1834,6 @@ typedef enum wined3d_gl_extension
NV_VERTEX_PROGRAM3,
/* SGI */
SGIS_GENERATE_MIPMAP,
SGI_VIDEO_SYNC,
/* WGL extensions */
WGL_ARB_PIXEL_FORMAT,
WGL_WINE_PIXEL_FORMAT_PASSTHROUGH,
......@@ -3717,10 +3716,6 @@ typedef void (WINE_GLAPI *PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage,
#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
#endif
/* GLX_SGI_video_sync */
typedef int (WINE_GLAPI *PGLXFNGETVIDEOSYNCSGIPROC)(unsigned int *);
typedef int (WINE_GLAPI *PGLXFNWAITVIDEOSYNCSGIPROC)(int, int, unsigned int *);
/* WGL_ARB_extensions_string */
typedef const char *(WINAPI *WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC hdc);
......@@ -4530,11 +4525,6 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma
glCombinerParameterivNV, NV_REGISTER_COMBINERS, NULL) \
USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, \
glFinalCombinerInputNV, NV_REGISTER_COMBINERS, NULL) \
/* GLX_SGI_video_sync */ \
USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, \
glXGetVideoSyncSGI, SGI_VIDEO_SYNC, NULL) \
USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, \
glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL)
#define WGL_EXT_FUNCS_GEN \
USE_GL_FUNC(WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB, 0, NULL) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment