[PATCH 2/5] wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d().
Henri Verbeet
hverbeet at codeweavers.com
Wed Jun 5 04:06:11 CDT 2013
---
dlls/d3d10core/texture.c | 18 ++++++++---
dlls/d3d8/texture.c | 15 +++++++--
dlls/d3d9/texture.c | 15 +++++++--
dlls/ddraw/surface.c | 20 ++++++++++--
dlls/wined3d/texture.c | 81 ++++++++++++++++++++---------------------------
dlls/wined3d/wined3d.spec | 2 +-
include/wine/wined3d.h | 5 ++-
7 files changed, 95 insertions(+), 61 deletions(-)
diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c
index a065991..f2aa13a 100644
--- a/dlls/d3d10core/texture.c
+++ b/dlls/d3d10core/texture.c
@@ -229,6 +229,7 @@ static const struct wined3d_parent_ops d3d10_texture2d_wined3d_parent_ops =
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device,
const D3D10_TEXTURE2D_DESC *desc)
{
+ struct wined3d_resource_desc wined3d_desc;
HRESULT hr;
texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl;
@@ -263,10 +264,19 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
if (desc->SampleDesc.Count > 1)
FIXME("Multisampled textures not implemented.\n");
- hr = wined3d_texture_create_2d(device->wined3d_device, desc->Width, desc->Height,
- desc->MipLevels, desc->Usage, wined3dformat_from_dxgi_format(desc->Format), WINED3D_POOL_DEFAULT,
- texture, &d3d10_texture2d_wined3d_parent_ops, &texture->wined3d_texture);
- if (FAILED(hr))
+ wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE;
+ wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format);
+ wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE;
+ wined3d_desc.multisample_quality = desc->SampleDesc.Quality;
+ wined3d_desc.usage = desc->Usage;
+ wined3d_desc.pool = WINED3D_POOL_DEFAULT;
+ wined3d_desc.width = desc->Width;
+ wined3d_desc.height = desc->Height;
+ wined3d_desc.depth = 1;
+ wined3d_desc.size = 0;
+
+ if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &wined3d_desc, desc->MipLevels,
+ texture, &d3d10_texture2d_wined3d_parent_ops, &texture->wined3d_texture)))
{
WARN("Failed to create wined3d texture, hr %#x.\n", hr);
if (texture->dxgi_surface)
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index 07695f9..1bb91c0 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -1185,14 +1185,25 @@ static const struct wined3d_parent_ops d3d8_texture_wined3d_parent_ops =
HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device,
UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool)
{
+ struct wined3d_resource_desc desc;
HRESULT hr;
texture->IDirect3DBaseTexture8_iface.lpVtbl = (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl;
texture->refcount = 1;
+ desc.resource_type = WINED3D_RTYPE_TEXTURE;
+ desc.format = wined3dformat_from_d3dformat(format);
+ desc.multisample_type = WINED3D_MULTISAMPLE_NONE;
+ desc.multisample_quality = 0;
+ desc.usage = usage & WINED3DUSAGE_MASK;
+ desc.pool = pool;
+ desc.width = width;
+ desc.height = height;
+ desc.depth = 1;
+ desc.size = 0;
+
wined3d_mutex_lock();
- hr = wined3d_texture_create_2d(device->wined3d_device, width, height, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool,
+ hr = wined3d_texture_create_2d(device->wined3d_device, &desc, levels,
texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 87395c0..5f21192 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -1309,14 +1309,25 @@ static const struct wined3d_parent_ops d3d9_texture_wined3d_parent_ops =
HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device,
UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool)
{
+ struct wined3d_resource_desc desc;
HRESULT hr;
texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl;
texture->refcount = 1;
+ desc.resource_type = WINED3D_RTYPE_TEXTURE;
+ desc.format = wined3dformat_from_d3dformat(format);
+ desc.multisample_type = WINED3D_MULTISAMPLE_NONE;
+ desc.multisample_quality = 0;
+ desc.usage = usage & WINED3DUSAGE_MASK;
+ desc.pool = pool;
+ desc.width = width;
+ desc.height = height;
+ desc.depth = 1;
+ desc.size = 0;
+
wined3d_mutex_lock();
- hr = wined3d_texture_create_2d(device->wined3d_device, width, height, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool,
+ hr = wined3d_texture_create_2d(device->wined3d_device, &desc, levels,
texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 32e6d95..59ac9d2 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5588,6 +5588,7 @@ static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops =
HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface)
{
const DDSURFACEDESC2 *desc = &surface->surface_desc;
+ struct wined3d_resource_desc wined3d_desc;
struct ddraw_surface *mip, **attach;
struct wined3d_resource *resource;
enum wined3d_format_id format;
@@ -5615,11 +5616,26 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface)
format = PixelFormat_DD2WineD3D(&surface->surface_desc.u4.ddpfPixelFormat);
if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
+ {
hr = wined3d_texture_create_cube(surface->ddraw->wined3d_device, desc->dwWidth,
levels, 0, format, pool, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture);
+ }
else
- hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, desc->dwWidth, desc->dwHeight,
- levels, 0, format, pool, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture);
+ {
+ wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE;
+ wined3d_desc.format = format;
+ wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE;
+ wined3d_desc.multisample_quality = 0;
+ wined3d_desc.usage = 0;
+ wined3d_desc.pool = pool;
+ wined3d_desc.width = desc->dwWidth;
+ wined3d_desc.height = desc->dwHeight;
+ wined3d_desc.depth = 1;
+ wined3d_desc.size = 0;
+
+ hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, &wined3d_desc, levels,
+ surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture);
+ }
if (FAILED(hr))
{
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 8cf9fc2..5c16d19 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -891,19 +891,18 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt
return WINED3D_OK;
}
-static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, UINT levels,
- struct wined3d_device *device, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool,
- void *parent, const struct wined3d_parent_ops *parent_ops)
+static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc,
+ UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops)
{
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
- struct wined3d_resource_desc desc;
+ struct wined3d_resource_desc surface_desc;
UINT pow2_width, pow2_height;
unsigned int i;
HRESULT hr;
/* TODO: It should only be possible to create textures for formats
* that are reported as supported. */
- if (WINED3DFMT_UNKNOWN >= format_id)
+ if (WINED3DFMT_UNKNOWN >= desc->format)
{
WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture);
return WINED3DERR_INVALIDCALL;
@@ -912,22 +911,24 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
/* Non-power2 support. */
if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
{
- pow2_width = width;
- pow2_height = height;
+ pow2_width = desc->width;
+ pow2_height = desc->height;
}
else
{
/* Find the nearest pow2 match. */
pow2_width = pow2_height = 1;
- while (pow2_width < width) pow2_width <<= 1;
- while (pow2_height < height) pow2_height <<= 1;
+ while (pow2_width < desc->width)
+ pow2_width <<= 1;
+ while (pow2_height < desc->height)
+ pow2_height <<= 1;
- if (pow2_width != width || pow2_height != height)
+ if (pow2_width != desc->width || pow2_height != desc->height)
{
/* levels == 0 returns an error as well */
if (levels != 1)
{
- if (pool == WINED3D_POOL_SCRATCH)
+ if (desc->pool == WINED3D_POOL_SCRATCH)
{
WARN("Creating a scratch mipmapped NPOT texture despite lack of HW support.\n");
}
@@ -941,7 +942,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
}
/* Calculate levels for mip mapping. */
- if (usage & WINED3DUSAGE_AUTOGENMIPMAP)
+ if (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP)
{
if (!gl_info->supported[SGIS_GENERATE_MIPMAP])
{
@@ -959,23 +960,12 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
}
else if (!levels)
{
- levels = wined3d_log2i(max(width, height)) + 1;
+ levels = wined3d_log2i(max(desc->width, desc->height)) + 1;
TRACE("Calculated levels = %u.\n", levels);
}
- desc.resource_type = WINED3D_RTYPE_TEXTURE;
- desc.format = format_id;
- desc.multisample_type = WINED3D_MULTISAMPLE_NONE;
- desc.multisample_quality = 0;
- desc.usage = usage;
- desc.pool = pool;
- desc.width = width;
- desc.height = height;
- desc.depth = 1;
- desc.size = 0;
-
if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels,
- &desc, device, parent, parent_ops, &texture2d_resource_ops)))
+ desc, device, parent, parent_ops, &texture2d_resource_ops)))
{
WARN("Failed to initialize texture, returning %#x.\n", hr);
return hr;
@@ -985,7 +975,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
* Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE
* is used in combination with texture uploads (RTL_READTEX). The reason is that EXT_PALETTED_TEXTURE
* doesn't work in combination with ARB_TEXTURE_RECTANGLE. */
- if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] && (width != pow2_width || height != pow2_height))
+ if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]
+ && (desc->width != pow2_width || desc->height != pow2_height))
{
texture->pow2_matrix[0] = 1.0f;
texture->pow2_matrix[5] = 1.0f;
@@ -995,12 +986,12 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
texture->flags |= WINED3D_TEXTURE_COND_NP2;
texture->min_mip_lookup = minMipLookup_noFilter;
}
- else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height)
- && !(format_id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE]
+ else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (desc->width != pow2_width || desc->height != pow2_height)
+ && !(desc->format == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE]
&& wined3d_settings.rendertargetlock_mode == RTL_READTEX))
{
- texture->pow2_matrix[0] = (float)width;
- texture->pow2_matrix[5] = (float)height;
+ texture->pow2_matrix[0] = (float)desc->width;
+ texture->pow2_matrix[5] = (float)desc->height;
texture->pow2_matrix[10] = 1.0f;
texture->pow2_matrix[15] = 1.0f;
texture->target = GL_TEXTURE_RECTANGLE_ARB;
@@ -1014,10 +1005,10 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
}
else
{
- if ((width != pow2_width) || (height != pow2_height))
+ if ((desc->width != pow2_width) || (desc->height != pow2_height))
{
- texture->pow2_matrix[0] = (((float)width) / ((float)pow2_width));
- texture->pow2_matrix[5] = (((float)height) / ((float)pow2_height));
+ texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width));
+ texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height));
texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT;
}
else
@@ -1033,14 +1024,15 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]);
/* Generate all the surfaces. */
- desc.resource_type = WINED3D_RTYPE_SURFACE;
+ surface_desc = *desc;
+ surface_desc.resource_type = WINED3D_RTYPE_SURFACE;
for (i = 0; i < texture->level_count; ++i)
{
struct wined3d_surface *surface;
/* Use the callback to create the texture surface. */
if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent,
- parent, &desc, i, &surface)))
+ parent, &surface_desc, i, &surface)))
{
FIXME("Failed to create surface %p, hr %#x\n", texture, hr);
wined3d_texture_cleanup(texture);
@@ -1052,8 +1044,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
texture->sub_resources[i] = &surface->resource;
TRACE("Created surface level %u @ %p.\n", i, surface);
/* Calculate the next mipmap level. */
- desc.width = max(1, desc.width >> 1);
- desc.height = max(1, desc.height >> 1);
+ surface_desc.width = max(1, surface_desc.width >> 1);
+ surface_desc.height = max(1, surface_desc.height >> 1);
}
return WINED3D_OK;
@@ -1300,17 +1292,14 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U
return WINED3D_OK;
}
-HRESULT CDECL wined3d_texture_create_2d(struct wined3d_device *device, UINT width, UINT height,
- UINT level_count, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, void *parent,
- const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture)
+HRESULT CDECL wined3d_texture_create_2d(struct wined3d_device *device, const struct wined3d_resource_desc *desc,
+ UINT level_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture)
{
struct wined3d_texture *object;
HRESULT hr;
- TRACE("device %p, width %u, height %u, level_count %u, usage %#x\n",
- device, width, height, level_count, usage);
- TRACE("format %s, pool %#x, parent %p, parent_ops %p, texture %p.\n",
- debug_d3dformat(format_id), pool, parent, parent_ops, texture);
+ TRACE("device %p, desc %p, level_count %u, parent %p, parent_ops %p, texture %p.\n",
+ device, desc, level_count, parent, parent_ops, texture);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
@@ -1319,9 +1308,7 @@ HRESULT CDECL wined3d_texture_create_2d(struct wined3d_device *device, UINT widt
return WINED3DERR_OUTOFVIDEOMEMORY;
}
- hr = texture_init(object, width, height, level_count,
- device, usage, format_id, pool, parent, parent_ops);
- if (FAILED(hr))
+ if (FAILED(hr = texture_init(object, desc, level_count, device, parent, parent_ops)))
{
WARN("Failed to initialize texture, returning %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 0f7e703..eb97b12 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -251,7 +251,7 @@
@ cdecl wined3d_swapchain_set_window(ptr ptr)
@ cdecl wined3d_texture_add_dirty_region(ptr long ptr)
-@ cdecl wined3d_texture_create_2d(ptr long long long long long long ptr ptr ptr)
+@ cdecl wined3d_texture_create_2d(ptr ptr long ptr ptr ptr)
@ cdecl wined3d_texture_create_3d(ptr long long long long long long long ptr ptr ptr)
@ cdecl wined3d_texture_create_cube(ptr long long long long long ptr ptr ptr)
@ cdecl wined3d_texture_decref(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 588d8b9..eb28685 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2371,9 +2371,8 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H
HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
UINT layer, const struct wined3d_box *dirty_region);
-HRESULT __cdecl wined3d_texture_create_2d(struct wined3d_device *device, UINT width, UINT height,
- UINT level_count, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, void *parent,
- const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture);
+HRESULT __cdecl wined3d_texture_create_2d(struct wined3d_device *device, const struct wined3d_resource_desc *desc,
+ UINT level_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture);
HRESULT __cdecl wined3d_texture_create_3d(struct wined3d_device *device, UINT width, UINT height, UINT depth,
UINT level_count, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, void *parent,
const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture);
--
1.8.1.5
More information about the wine-patches
mailing list