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
bcc46031
Commit
bcc46031
authored
May 24, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
May 24, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set the swapchain.c GLINFO_LOCATION to *gl_info.
parent
5178e475
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
swapchain.c
dlls/wined3d/swapchain.c
+6
-3
No files found.
dlls/wined3d/swapchain.c
View file @
bcc46031
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
WINE_DECLARE_DEBUG_CHANNEL
(
fps
);
WINE_DECLARE_DEBUG_CHANNEL
(
fps
);
#define GLINFO_LOCATION
This->device->adapter->gl_info
#define GLINFO_LOCATION
(*gl_info)
/*IWineD3DSwapChain parts follow: */
/*IWineD3DSwapChain parts follow: */
static
void
WINAPI
IWineD3DSwapChainImpl_Destroy
(
IWineD3DSwapChain
*
iface
)
static
void
WINAPI
IWineD3DSwapChainImpl_Destroy
(
IWineD3DSwapChain
*
iface
)
...
@@ -217,6 +217,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *
...
@@ -217,6 +217,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *
static
HRESULT
WINAPI
IWineD3DSwapChainImpl_Present
(
IWineD3DSwapChain
*
iface
,
CONST
RECT
*
pSourceRect
,
CONST
RECT
*
pDestRect
,
HWND
hDestWindowOverride
,
CONST
RGNDATA
*
pDirtyRegion
,
DWORD
dwFlags
)
{
static
HRESULT
WINAPI
IWineD3DSwapChainImpl_Present
(
IWineD3DSwapChain
*
iface
,
CONST
RECT
*
pSourceRect
,
CONST
RECT
*
pDestRect
,
HWND
hDestWindowOverride
,
CONST
RGNDATA
*
pDirtyRegion
,
DWORD
dwFlags
)
{
IWineD3DSwapChainImpl
*
This
=
(
IWineD3DSwapChainImpl
*
)
iface
;
IWineD3DSwapChainImpl
*
This
=
(
IWineD3DSwapChainImpl
*
)
iface
;
const
struct
wined3d_gl_info
*
gl_info
;
struct
wined3d_context
*
context
;
struct
wined3d_context
*
context
;
RECT
src_rect
,
dst_rect
;
RECT
src_rect
,
dst_rect
;
BOOL
render_to_fbo
;
BOOL
render_to_fbo
;
...
@@ -233,6 +234,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
...
@@ -233,6 +234,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
return
WINED3D_OK
;
return
WINED3D_OK
;
}
}
gl_info
=
context
->
gl_info
;
/* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */
/* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */
if
(
This
->
device
->
bCursorVisible
&&
This
->
device
->
cursorTexture
)
if
(
This
->
device
->
bCursorVisible
&&
This
->
device
->
cursorTexture
)
{
{
...
@@ -254,7 +257,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
...
@@ -254,7 +257,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
cursor
.
resource
.
ref
=
1
;
cursor
.
resource
.
ref
=
1
;
cursor
.
resource
.
device
=
This
->
device
;
cursor
.
resource
.
device
=
This
->
device
;
cursor
.
resource
.
pool
=
WINED3DPOOL_SCRATCH
;
cursor
.
resource
.
pool
=
WINED3DPOOL_SCRATCH
;
cursor
.
resource
.
format_desc
=
getFormatDescEntry
(
WINED3DFMT_B8G8R8A8_UNORM
,
context
->
gl_info
);
cursor
.
resource
.
format_desc
=
getFormatDescEntry
(
WINED3DFMT_B8G8R8A8_UNORM
,
gl_info
);
cursor
.
resource
.
resourceType
=
WINED3DRTYPE_SURFACE
;
cursor
.
resource
.
resourceType
=
WINED3DRTYPE_SURFACE
;
cursor
.
texture_name
=
This
->
device
->
cursorTexture
;
cursor
.
texture_name
=
This
->
device
->
cursorTexture
;
cursor
.
texture_target
=
GL_TEXTURE_2D
;
cursor
.
texture_target
=
GL_TEXTURE_2D
;
...
@@ -485,7 +488,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
...
@@ -485,7 +488,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
}
}
if
(
This
->
presentParms
.
PresentationInterval
!=
WINED3DPRESENT_INTERVAL_IMMEDIATE
if
(
This
->
presentParms
.
PresentationInterval
!=
WINED3DPRESENT_INTERVAL_IMMEDIATE
&&
context
->
gl_info
->
supported
[
SGI_VIDEO_SYNC
])
&&
gl_info
->
supported
[
SGI_VIDEO_SYNC
])
{
{
retval
=
GL_EXTCALL
(
glXGetVideoSyncSGI
(
&
sync
));
retval
=
GL_EXTCALL
(
glXGetVideoSyncSGI
(
&
sync
));
if
(
retval
!=
0
)
{
if
(
retval
!=
0
)
{
...
...
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