Skip to content

W
wine-cw
Commit 3b3b7451 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d9: Calculate texture levels in d3d9 instead of wined3d.

parent 1a28c7c5
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 0 deletions
dlls/d3d9/texture.c
View file @ 3b3b7451
...@@ -1296,6 +1296,14 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, ...@@ -1296,6 +1296,14 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device,
if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC))
surface_flags |= WINED3D_SURFACE_MAPPABLE; surface_flags |= WINED3D_SURFACE_MAPPABLE;
if (!levels)
{
if (usage & D3DUSAGE_AUTOGENMIPMAP)
levels = 1;
else
levels = wined3d_log2i(max(width, height)) + 1;
}
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags,
texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);
...@@ -1338,6 +1346,14 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic ...@@ -1338,6 +1346,14 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic
if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC))
surface_flags |= WINED3D_SURFACE_MAPPABLE; surface_flags |= WINED3D_SURFACE_MAPPABLE;
if (!levels)
{
if (usage & D3DUSAGE_AUTOGENMIPMAP)
levels = 1;
else
levels = wined3d_log2i(edge_length) + 1;
}
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags,
texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);
...@@ -1376,6 +1392,14 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev ...@@ -1376,6 +1392,14 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev
desc.depth = depth; desc.depth = depth;
desc.size = 0; desc.size = 0;
if (!levels)
{
if (usage & D3DUSAGE_AUTOGENMIPMAP)
levels = 1;
else
levels = wined3d_log2i(max(max(width, height), depth)) + 1;
}
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0,
texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment