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
b9d50242
Commit
b9d50242
authored
Nov 21, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Disallow rendertarget and depth/stencil usage on index buffers.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5e000be1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
buffer.c
dlls/d3d8/buffer.c
+4
-0
device.c
dlls/d3d8/tests/device.c
+3
-5
No files found.
dlls/d3d8/buffer.c
View file @
b9d50242
...
...
@@ -580,6 +580,10 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de
if
(
pool
==
D3DPOOL_SCRATCH
)
return
D3DERR_INVALIDCALL
;
/* In d3d8, buffers can't be used as rendertarget or depth/stencil buffer. */
if
(
usage
&
(
D3DUSAGE_RENDERTARGET
|
D3DUSAGE_DEPTHSTENCIL
))
return
D3DERR_INVALIDCALL
;
desc
.
byte_width
=
size
;
desc
.
usage
=
(
usage
&
WINED3DUSAGE_MASK
)
|
WINED3DUSAGE_STATICDECL
;
if
(
pool
==
D3DPOOL_SCRATCH
)
...
...
dlls/d3d8/tests/device.c
View file @
b9d50242
...
...
@@ -9130,16 +9130,14 @@ static void test_resource_access(void)
hr
=
IDirect3DDevice8_CreateIndexBuffer
(
device
,
16
,
tests
[
i
].
usage
,
tests
[
i
].
format
==
FORMAT_COLOUR
?
D3DFMT_INDEX32
:
D3DFMT_INDEX16
,
tests
[
i
].
pool
,
&
ib
);
todo_wine_if
(
tests
[
i
].
pool
!=
D3DPOOL_SCRATCH
&&
tests
[
i
].
usage
&
~
D3DUSAGE_DYNAMIC
)
ok
(
hr
==
(
tests
[
i
].
pool
==
D3DPOOL_SCRATCH
||
(
tests
[
i
].
usage
&
~
D3DUSAGE_DYNAMIC
)
?
D3DERR_INVALIDCALL
:
D3D_OK
),
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
(
tests
[
i
].
pool
==
D3DPOOL_SCRATCH
||
(
tests
[
i
].
usage
&
~
D3DUSAGE_DYNAMIC
)
?
D3DERR_INVALIDCALL
:
D3D_OK
),
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
if
(
FAILED
(
hr
))
continue
;
hr
=
IDirect3DIndexBuffer8_GetDesc
(
ib
,
&
ib_desc
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
todo_wine_if
(
tests
[
i
].
usage
&
~
D3DUSAGE_DYNAMIC
)
ok
(
ib_desc
.
Usage
==
tests
[
i
].
usage
,
"Test %u: Got unexpected usage %#x.
\n
"
,
i
,
ib_desc
.
Usage
);
ok
(
ib_desc
.
Usage
==
tests
[
i
].
usage
,
"Test %u: Got unexpected usage %#x.
\n
"
,
i
,
ib_desc
.
Usage
);
ok
(
ib_desc
.
Pool
==
tests
[
i
].
pool
,
"Test %u: Got unexpected pool %#x.
\n
"
,
i
,
ib_desc
.
Pool
);
hr
=
IDirect3DIndexBuffer8_Lock
(
ib
,
0
,
0
,
&
data
,
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