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
b7b0b7d2
Commit
b7b0b7d2
authored
Dec 10, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 10, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9/tests: Test user memory with D3DPOOL_SCRATCH.
parent
b0f177b6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
device.c
dlls/d3d9/device.c
+7
-0
d3d9ex.c
dlls/d3d9/tests/d3d9ex.c
+5
-2
No files found.
dlls/d3d9/device.c
View file @
b7b0b7d2
...
@@ -747,8 +747,15 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface,
...
@@ -747,8 +747,15 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface,
set_mem
=
TRUE
;
set_mem
=
TRUE
;
}
}
else
else
{
if
(
pool
!=
D3DPOOL_DEFAULT
)
{
WARN
(
"Trying to create a shared texture in pool %#x.
\n
"
,
pool
);
return
D3DERR_INVALIDCALL
;
}
FIXME
(
"Resource sharing not implemented, *shared_handle %p.
\n
"
,
*
shared_handle
);
FIXME
(
"Resource sharing not implemented, *shared_handle %p.
\n
"
,
*
shared_handle
);
}
}
}
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
if
(
!
object
)
...
...
dlls/d3d9/tests/d3d9ex.c
View file @
b7b0b7d2
...
@@ -535,7 +535,7 @@ out:
...
@@ -535,7 +535,7 @@ out:
IDirect3D9Ex_Release
(
d3d9ex
);
IDirect3D9Ex_Release
(
d3d9ex
);
}
}
static
void
test_
texture_sysmem_create
(
void
)
static
void
test_
user_memory
(
void
)
{
{
IDirect3DDevice9Ex
*
device
;
IDirect3DDevice9Ex
*
device
;
IDirect3DTexture9
*
texture
;
IDirect3DTexture9
*
texture
;
...
@@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void)
...
@@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void)
hr
=
IDirect3DDevice9Ex_CreateTexture
(
device
,
128
,
128
,
2
,
0
,
D3DFMT_A8R8G8B8
,
hr
=
IDirect3DDevice9Ex_CreateTexture
(
device
,
128
,
128
,
2
,
0
,
D3DFMT_A8R8G8B8
,
D3DPOOL_SYSTEMMEM
,
&
texture
,
&
mem
);
D3DPOOL_SYSTEMMEM
,
&
texture
,
&
mem
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
hr
=
IDirect3DDevice9Ex_CreateTexture
(
device
,
128
,
128
,
1
,
0
,
D3DFMT_A8R8G8B8
,
D3DPOOL_SCRATCH
,
&
texture
,
&
mem
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
hr
=
IDirect3DDevice9Ex_CreateTexture
(
device
,
128
,
128
,
1
,
0
,
D3DFMT_A8R8G8B8
,
hr
=
IDirect3DDevice9Ex_CreateTexture
(
device
,
128
,
128
,
1
,
0
,
D3DFMT_A8R8G8B8
,
D3DPOOL_SYSTEMMEM
,
&
texture
,
&
mem
);
D3DPOOL_SYSTEMMEM
,
&
texture
,
&
mem
);
...
@@ -1114,7 +1117,7 @@ START_TEST(d3d9ex)
...
@@ -1114,7 +1117,7 @@ START_TEST(d3d9ex)
test_swapchain_get_displaymode_ex
();
test_swapchain_get_displaymode_ex
();
test_get_adapter_luid
();
test_get_adapter_luid
();
test_get_adapter_displaymode_ex
();
test_get_adapter_displaymode_ex
();
test_
texture_sysmem_create
();
test_
user_memory
();
test_reset
();
test_reset
();
test_reset_resources
();
test_reset_resources
();
test_vidmem_accounting
();
test_vidmem_accounting
();
...
...
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