Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7e13b1af
Commit
7e13b1af
authored
Dec 27, 2010
by
Andrew Nguyen
Committed by
Alexandre Julliard
Dec 27, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove references to GLX_SGI_video_sync.
Usage of GLX_SGI_video_sync is problematic, and wined3d cannot use GLX extensions.
parent
6b90fc23
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
53 deletions
+0
-53
swapchain.c
dlls/wined3d/swapchain.c
+0
-43
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+0
-10
No files found.
dlls/wined3d/swapchain.c
View file @
7e13b1af
...
...
@@ -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
"
);
...
...
dlls/wined3d/wined3d_gl.h
View file @
7e13b1af
...
...
@@ -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) \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment