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
1276a3db
Commit
1276a3db
authored
Jun 04, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Properly set resource dimensions in wined3d_texture_init().
parent
16394305
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
15 deletions
+9
-15
texture.c
dlls/wined3d/texture.c
+9
-15
No files found.
dlls/wined3d/texture.c
View file @
1276a3db
...
...
@@ -28,13 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
static
HRESULT
wined3d_texture_init
(
struct
wined3d_texture
*
texture
,
const
struct
wined3d_texture_ops
*
texture_ops
,
UINT
layer_count
,
UINT
level_count
,
enum
wined3d_resource_type
resource_type
,
struct
wined3d_device
*
device
,
DWORD
usage
,
const
struct
wined3d_format
*
format
,
enum
wined3d_pool
pool
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
const
struct
wined3d_resource_ops
*
resource_ops
)
DWORD
usage
,
const
struct
wined3d_format
*
format
,
enum
wined3d_pool
pool
,
UINT
width
,
UINT
height
,
UINT
depth
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
const
struct
wined3d_resource_ops
*
resource_ops
)
{
HRESULT
hr
;
hr
=
resource_init
(
&
texture
->
resource
,
device
,
resource_type
,
format
,
WINED3D_MULTISAMPLE_NONE
,
0
,
usage
,
pool
,
0
,
0
,
0
,
0
,
WINED3D_MULTISAMPLE_NONE
,
0
,
usage
,
pool
,
width
,
height
,
depth
,
0
,
parent
,
parent_ops
,
resource_ops
);
if
(
FAILED
(
hr
))
{
...
...
@@ -822,10 +822,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt
}
}
hr
=
wined3d_texture_init
(
texture
,
&
texture2d_ops
,
6
,
levels
,
WINED3D_RTYPE_CUBE_TEXTURE
,
device
,
usage
,
format
,
pool
,
parent
,
parent_ops
,
&
texture2d_resource_ops
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
=
wined3d_texture_init
(
texture
,
&
texture2d_ops
,
6
,
levels
,
WINED3D_RTYPE_CUBE_TEXTURE
,
device
,
usage
,
format
,
pool
,
edge_length
,
edge_length
,
1
,
parent
,
parent_ops
,
&
texture2d_resource_ops
)))
{
WARN
(
"Failed to initialize texture, returning %#x
\n
"
,
hr
);
return
hr
;
...
...
@@ -948,10 +946,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
TRACE
(
"Calculated levels = %u.
\n
"
,
levels
);
}
hr
=
wined3d_texture_init
(
texture
,
&
texture2d_ops
,
1
,
levels
,
WINED3D_RTYPE_TEXTURE
,
device
,
usage
,
format
,
pool
,
parent
,
parent_ops
,
&
texture2d_resource_ops
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
=
wined3d_texture_init
(
texture
,
&
texture2d_ops
,
1
,
levels
,
WINED3D_RTYPE_TEXTURE
,
device
,
usage
,
format
,
pool
,
width
,
height
,
1
,
parent
,
parent_ops
,
&
texture2d_resource_ops
)))
{
WARN
(
"Failed to initialize texture, returning %#x.
\n
"
,
hr
);
return
hr
;
...
...
@@ -1221,10 +1217,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U
}
}
hr
=
wined3d_texture_init
(
texture
,
&
texture3d_ops
,
1
,
levels
,
WINED3D_RTYPE_VOLUME_TEXTURE
,
device
,
usage
,
format
,
pool
,
parent
,
parent_ops
,
&
texture3d_resource_ops
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
=
wined3d_texture_init
(
texture
,
&
texture3d_ops
,
1
,
levels
,
WINED3D_RTYPE_VOLUME_TEXTURE
,
device
,
usage
,
format
,
pool
,
width
,
height
,
depth
,
parent
,
parent_ops
,
&
texture3d_resource_ops
)))
{
WARN
(
"Failed to initialize texture, returning %#x.
\n
"
,
hr
);
return
hr
;
...
...
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