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
30e187e0
Commit
30e187e0
authored
May 16, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the haveHardwareCursor flag.
parent
d52ae4b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
device.c
dlls/wined3d/device.c
+3
-8
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-2
No files found.
dlls/wined3d/device.c
View file @
30e187e0
...
...
@@ -870,7 +870,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device)
ERR
(
"Context array not freed!
\n
"
);
if
(
device
->
hardwareCursor
)
DestroyCursor
(
device
->
hardwareCursor
);
device
->
ha
veHardwareCursor
=
FALSE
;
device
->
ha
rdwareCursor
=
0
;
wined3d_decref
(
device
->
wined3d
);
device
->
wined3d
=
NULL
;
...
...
@@ -5203,11 +5203,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
device
->
cursorTexture
=
0
;
}
if
(
cursor_image
->
resource
.
width
==
32
&&
cursor_image
->
resource
.
height
==
32
)
device
->
haveHardwareCursor
=
TRUE
;
else
device
->
haveHardwareCursor
=
FALSE
;
if
(
cursor_image
)
{
WINED3DLOCKED_RECT
rect
;
...
...
@@ -5229,7 +5224,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
return
WINED3DERR_INVALIDCALL
;
}
if
(
!
device
->
haveHardwareCursor
)
if
(
cursor_image
->
resource
.
width
!=
32
||
cursor_image
->
resource
.
height
!=
32
)
{
/* TODO: MSDN: Cursor sizes must be a power of 2 */
...
...
@@ -5369,7 +5364,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show)
device
->
xScreenSpace
=
pt
.
x
;
device
->
yScreenSpace
=
pt
.
y
;
if
(
device
->
ha
veHa
rdwareCursor
)
if
(
device
->
hardwareCursor
)
{
device
->
bCursorVisible
=
show
;
if
(
show
)
...
...
dlls/wined3d/wined3d_private.h
View file @
30e187e0
...
...
@@ -1680,14 +1680,13 @@ struct wined3d_device
WORD
isRecordingState
:
1
;
WORD
isInDraw
:
1
;
WORD
bCursorVisible
:
1
;
WORD
haveHardwareCursor
:
1
;
WORD
d3d_initialized
:
1
;
WORD
inScene
:
1
;
/* A flag to check for proper BeginScene / EndScene call pairs */
WORD
softwareVertexProcessing
:
1
;
/* process vertex shaders using software or hardware */
WORD
useDrawStridedSlow
:
1
;
WORD
instancedDraw
:
1
;
WORD
filter_messages
:
1
;
WORD
padding
:
3
;
WORD
padding
:
4
;
BYTE
fixed_function_usage_map
;
/* MAX_TEXTURES, 8 */
...
...
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