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
5eedb704
Commit
5eedb704
authored
Apr 14, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 15, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Check texture usage/pool in volumetexture_init().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ecee205f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
texture.c
dlls/wined3d/texture.c
+7
-0
volume.c
dlls/wined3d/volume.c
+0
-9
No files found.
dlls/wined3d/texture.c
View file @
5eedb704
...
...
@@ -1850,6 +1850,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct
}
}
if
(
desc
->
usage
&
WINED3DUSAGE_DYNAMIC
&&
(
desc
->
pool
==
WINED3D_POOL_MANAGED
||
desc
->
pool
==
WINED3D_POOL_SCRATCH
))
{
WARN
(
"Attempted to create a DYNAMIC texture in pool %s.
\n
"
,
debug_d3dpool
(
desc
->
pool
));
return
WINED3DERR_INVALIDCALL
;
}
if
(
!
gl_info
->
supported
[
ARB_TEXTURE_NON_POWER_OF_TWO
])
{
UINT
pow2_w
,
pow2_h
,
pow2_d
;
...
...
dlls/wined3d/volume.c
View file @
5eedb704
...
...
@@ -441,15 +441,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur
HRESULT
hr
;
UINT
size
;
/* TODO: Write tests for other resources and move this check
* to resource_init, if applicable. */
if
(
desc
->
usage
&
WINED3DUSAGE_DYNAMIC
&&
(
desc
->
pool
==
WINED3D_POOL_MANAGED
||
desc
->
pool
==
WINED3D_POOL_SCRATCH
))
{
WARN
(
"Attempted to create a DYNAMIC texture in pool %s.
\n
"
,
debug_d3dpool
(
desc
->
pool
));
return
WINED3DERR_INVALIDCALL
;
}
size
=
wined3d_format_calculate_size
(
format
,
device
->
surface_alignment
,
desc
->
width
,
desc
->
height
,
desc
->
depth
);
if
(
FAILED
(
hr
=
resource_init
(
&
volume
->
resource
,
device
,
WINED3D_RTYPE_VOLUME
,
format
,
...
...
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