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
54d63891
Commit
54d63891
authored
Nov 18, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Allow binding scratch textures.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
87871e75
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
14 deletions
+4
-14
device.c
dlls/d3d8/tests/device.c
+2
-4
device.c
dlls/d3d9/tests/device.c
+2
-4
device.c
dlls/wined3d/device.c
+0
-6
No files found.
dlls/d3d8/tests/device.c
View file @
54d63891
...
@@ -9055,8 +9055,7 @@ static void test_resource_access(void)
...
@@ -9055,8 +9055,7 @@ static void test_resource_access(void)
if
(
SUCCEEDED
(
IDirect3DSurface8_GetContainer
(
surface
,
&
IID_IDirect3DBaseTexture8
,
(
void
**
)
&
texture
)))
if
(
SUCCEEDED
(
IDirect3DSurface8_GetContainer
(
surface
,
&
IID_IDirect3DBaseTexture8
,
(
void
**
)
&
texture
)))
{
{
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
texture
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
texture
);
todo_wine_if
(
surface_desc
.
Pool
==
D3DPOOL_SCRATCH
)
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
NULL
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
NULL
);
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
IDirect3DBaseTexture8_Release
(
texture
);
IDirect3DBaseTexture8_Release
(
texture
);
...
@@ -9121,8 +9120,7 @@ static void test_resource_access(void)
...
@@ -9121,8 +9120,7 @@ static void test_resource_access(void)
ok
(
hr
==
expected_hr
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
expected_hr
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
(
IDirect3DBaseTexture8
*
)
texture
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
(
IDirect3DBaseTexture8
*
)
texture
);
todo_wine_if
(
volume_desc
.
Pool
==
D3DPOOL_SCRATCH
)
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
NULL
);
hr
=
IDirect3DDevice8_SetTexture
(
device
,
0
,
NULL
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
...
...
dlls/d3d9/tests/device.c
View file @
54d63891
...
@@ -12888,8 +12888,7 @@ static void test_resource_access(void)
...
@@ -12888,8 +12888,7 @@ static void test_resource_access(void)
if
(
SUCCEEDED
(
IDirect3DSurface9_GetContainer
(
surface
,
&
IID_IDirect3DBaseTexture9
,
(
void
**
)
&
texture
)))
if
(
SUCCEEDED
(
IDirect3DSurface9_GetContainer
(
surface
,
&
IID_IDirect3DBaseTexture9
,
(
void
**
)
&
texture
)))
{
{
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
texture
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
texture
);
todo_wine_if
(
surface_desc
.
Pool
==
D3DPOOL_SCRATCH
)
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
NULL
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
NULL
);
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %s %u: Got unexpected hr %#x.
\n
"
,
surface_types
[
i
].
name
,
j
,
hr
);
IDirect3DBaseTexture9_Release
(
texture
);
IDirect3DBaseTexture9_Release
(
texture
);
...
@@ -12954,8 +12953,7 @@ static void test_resource_access(void)
...
@@ -12954,8 +12953,7 @@ static void test_resource_access(void)
ok
(
hr
==
expected_hr
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
expected_hr
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
(
IDirect3DBaseTexture9
*
)
texture
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
(
IDirect3DBaseTexture9
*
)
texture
);
todo_wine_if
(
volume_desc
.
Pool
==
D3DPOOL_SCRATCH
)
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
NULL
);
hr
=
IDirect3DDevice9_SetTexture
(
device
,
0
,
NULL
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
ok
(
hr
==
D3D_OK
,
"Test %u: Got unexpected hr %#x.
\n
"
,
i
,
hr
);
...
...
dlls/wined3d/device.c
View file @
54d63891
...
@@ -3467,12 +3467,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
...
@@ -3467,12 +3467,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
return
WINED3D_OK
;
return
WINED3D_OK
;
}
}
if
(
texture
&&
texture
->
resource
.
usage
&
WINED3DUSAGE_SCRATCH
)
{
WARN
(
"Rejecting attempt to set scratch texture.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
if
(
device
->
recording
)
if
(
device
->
recording
)
device
->
recording
->
changed
.
textures
|=
1u
<<
stage
;
device
->
recording
->
changed
.
textures
|=
1u
<<
stage
;
...
...
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