Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
1276a3db
Commit
1276a3db
authored
11 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Properly set resource dimensions in wined3d_texture_init().
parent
16394305
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/wined3d/texture.c
+9
-15
9 additions, 15 deletions
dlls/wined3d/texture.c
with
9 additions
and
15 deletions
dlls/wined3d/texture.c
+
9
−
15
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment