Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
be57ebe0
Commit
be57ebe0
authored
Jan 16, 2023
by
Paul Gofman
Committed by
Alexandre Julliard
Jan 24, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Do not report D3DDEVCAPS_HWRASTERIZATION for RGB emulation device.
parent
90416a48
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
3 deletions
+17
-3
ddraw.c
dlls/ddraw/ddraw.c
+3
-3
ddraw1.c
dlls/ddraw/tests/ddraw1.c
+4
-0
ddraw2.c
dlls/ddraw/tests/ddraw2.c
+4
-0
ddraw4.c
dlls/ddraw/tests/ddraw4.c
+4
-0
ddraw7.c
dlls/ddraw/tests/ddraw7.c
+2
-0
No files found.
dlls/ddraw/ddraw.c
View file @
be57ebe0
...
...
@@ -73,7 +73,7 @@ static struct enum_device_entry
"WINE Direct3D7 RGB Software Emulation using WineD3D"
,
"Wine D3D7 RGB"
,
&
IID_IDirect3DRGBDevice
,
D3DDEVCAPS_HWTRANSFORMANDLIGHT
|
D3DDEVCAPS_DRAWPRIMITIVES2EX
,
D3DDEVCAPS_HWTRANSFORMANDLIGHT
|
D3DDEVCAPS_DRAWPRIMITIVES2EX
|
D3DDEVCAPS_HWRASTERIZATION
,
},
};
...
...
@@ -3883,8 +3883,8 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
/* RGB, RAMP and MMX devices cannot report HAL hardware flags */
hal_desc
.
dwFlags
=
0
;
/* RGB, REF, RAMP and MMX devices don't report hardware transform and lighting capability */
hal_desc
.
dwDevCaps
&=
~
(
D3DDEVCAPS_HWTRANSFORMANDLIGHT
|
D3DDEVCAPS_DRAWPRIMITIVES2EX
);
hel_desc
.
dwDevCaps
&=
~
(
D3DDEVCAPS_HWTRANSFORMANDLIGHT
|
D3DDEVCAPS_DRAWPRIMITIVES2EX
);
hal_desc
.
dwDevCaps
&=
~
(
D3DDEVCAPS_HWTRANSFORMANDLIGHT
|
D3DDEVCAPS_DRAWPRIMITIVES2EX
|
D3DDEVCAPS_HWRASTERIZATION
);
hel_desc
.
dwDevCaps
&=
~
(
D3DDEVCAPS_HWTRANSFORMANDLIGHT
|
D3DDEVCAPS_DRAWPRIMITIVES2EX
|
D3DDEVCAPS_HWRASTERIZATION
);
hr
=
callback
((
GUID
*
)
&
IID_IDirect3DRGBDevice
,
reference_description
,
device_name
,
&
hal_desc
,
&
hel_desc
,
context
);
...
...
dlls/ddraw/tests/ddraw1.c
View file @
be57ebe0
...
...
@@ -15215,6 +15215,10 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d
"RGB Device hal device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
hel
->
dwDevCaps
&
D3DDEVCAPS_DRAWPRIMITIVES2EX
)
==
0
,
"RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
hal
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device hal device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
ok
((
hel
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device hel device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DHALDevice
,
guid
))
{
...
...
dlls/ddraw/tests/ddraw2.c
View file @
be57ebe0
...
...
@@ -16161,6 +16161,10 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d
"RGB Device hal device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
hel
->
dwDevCaps
&
D3DDEVCAPS_DRAWPRIMITIVES2EX
)
==
0
,
"RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
hal
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device hal device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
ok
((
hel
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device hel device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DHALDevice
,
guid
))
{
...
...
dlls/ddraw/tests/ddraw4.c
View file @
be57ebe0
...
...
@@ -19230,6 +19230,10 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d
"RGB Device hal device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
hel
->
dwDevCaps
&
D3DDEVCAPS_DRAWPRIMITIVES2EX
)
==
0
,
"RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
hal
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device hal device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
ok
((
hel
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device hel device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DHALDevice
,
guid
))
{
...
...
dlls/ddraw/tests/ddraw7.c
View file @
be57ebe0
...
...
@@ -19446,6 +19446,8 @@ static HRESULT WINAPI test_enum_devices_caps_callback(char *device_desc, char *d
"RGB Device device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set
\n
"
);
ok
((
device_desc7
->
dwDevCaps
&
D3DDEVCAPS_DRAWPRIMITIVES2EX
)
==
0
,
"RGB Device device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set
\n
"
);
ok
((
device_desc7
->
dwDevCaps
&
D3DDEVCAPS_HWRASTERIZATION
)
==
0
,
"RGB Device device caps has D3DDEVCAPS_HWRASTERIZATION set
\n
"
);
}
else
{
...
...
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