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
c114b040
Commit
c114b040
authored
Jul 21, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 21, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove the useless lastThread field from IWineD3DDeviceImpl.
parent
2d750060
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
context.c
dlls/wined3d/context.c
+5
-4
device.c
dlls/wined3d/device.c
+0
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/context.c
View file @
c114b040
...
@@ -1551,7 +1551,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
...
@@ -1551,7 +1551,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
switch
(
wined3d_settings
.
offscreen_rendering_mode
)
{
switch
(
wined3d_settings
.
offscreen_rendering_mode
)
{
case
ORM_FBO
:
case
ORM_FBO
:
/* FBOs do not need a different context. Stay with whatever context is active at the moment */
/* FBOs do not need a different context. Stay with whatever context is active at the moment */
if
(
This
->
activeContext
&&
tid
==
This
->
lastThread
)
{
if
(
This
->
activeContext
&&
This
->
activeContext
->
tid
==
tid
)
{
context
=
This
->
activeContext
;
context
=
This
->
activeContext
;
}
else
{
}
else
{
/* This may happen if the app jumps straight into offscreen rendering
/* This may happen if the app jumps straight into offscreen rendering
...
@@ -1600,7 +1601,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
...
@@ -1600,7 +1601,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
case
ORM_BACKBUFFER
:
case
ORM_BACKBUFFER
:
/* Stay with the currently active context for back buffer rendering */
/* Stay with the currently active context for back buffer rendering */
if
(
This
->
activeContext
&&
tid
==
This
->
lastThread
)
{
if
(
This
->
activeContext
&&
This
->
activeContext
->
tid
==
tid
)
{
context
=
This
->
activeContext
;
context
=
This
->
activeContext
;
}
else
{
}
else
{
/* This may happen if the app jumps straight into offscreen rendering
/* This may happen if the app jumps straight into offscreen rendering
...
@@ -1763,12 +1765,11 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU
...
@@ -1763,12 +1765,11 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU
if
(
!
target
)
target
=
This
->
activeContext
->
current_rt
;
if
(
!
target
)
target
=
This
->
activeContext
->
current_rt
;
if
(
This
->
activeContext
->
current_rt
!=
target
||
tid
!=
This
->
lastThrea
d
)
if
(
This
->
activeContext
->
current_rt
!=
target
||
This
->
activeContext
->
tid
!=
ti
d
)
{
{
context
=
FindContext
(
This
,
target
,
tid
);
context
=
FindContext
(
This
,
target
,
tid
);
context
->
draw_buffer_dirty
=
TRUE
;
context
->
draw_buffer_dirty
=
TRUE
;
context
->
current_rt
=
target
;
context
->
current_rt
=
target
;
This
->
lastThread
=
tid
;
}
else
{
}
else
{
/* Stick to the old context */
/* Stick to the old context */
context
=
This
->
activeContext
;
context
=
This
->
activeContext
;
...
...
dlls/wined3d/device.c
View file @
c114b040
...
@@ -2165,7 +2165,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
...
@@ -2165,7 +2165,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
}
}
IWineD3DSurface_AddRef
(
This
->
render_targets
[
0
]);
IWineD3DSurface_AddRef
(
This
->
render_targets
[
0
]);
This
->
activeContext
=
swapchain
->
context
[
0
];
This
->
activeContext
=
swapchain
->
context
[
0
];
This
->
lastThread
=
GetCurrentThreadId
();
/* Depth Stencil support */
/* Depth Stencil support */
This
->
stencilBufferTarget
=
This
->
auto_depth_stencil_buffer
;
This
->
stencilBufferTarget
=
This
->
auto_depth_stencil_buffer
;
...
...
dlls/wined3d/wined3d_private.h
View file @
c114b040
...
@@ -1584,7 +1584,6 @@ struct IWineD3DDeviceImpl
...
@@ -1584,7 +1584,6 @@ struct IWineD3DDeviceImpl
/* Context management */
/* Context management */
WineD3DContext
**
contexts
;
/* Dynamic array containing pointers to context structures */
WineD3DContext
**
contexts
;
/* Dynamic array containing pointers to context structures */
WineD3DContext
*
activeContext
;
WineD3DContext
*
activeContext
;
DWORD
lastThread
;
UINT
numContexts
;
UINT
numContexts
;
WineD3DContext
*
pbufferContext
;
/* The context that has a pbuffer as drawable */
WineD3DContext
*
pbufferContext
;
/* The context that has a pbuffer as drawable */
DWORD
pbufferWidth
,
pbufferHeight
;
/* Size of the buffer drawable */
DWORD
pbufferWidth
,
pbufferHeight
;
/* Size of the buffer drawable */
...
...
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