Module: wine Branch: master Commit: cf899ac2670b41ae596289ef9336c13d6dee86c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf899ac2670b41ae596289ef93...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Jan 27 00:06:24 2016 +0100
wined3d: Rename WINED3D_RTYPE_VOLUME_TEXTURE to WINED3D_RTYPE_TEXTURE_3D.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d11/texture.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/utils.c | 2 +- include/wine/wined3d.h | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 78aac0a..a73f3fc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -914,7 +914,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_private_store_init(&texture->private_store); texture->desc = *desc;
- wined3d_desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 2db6488..0ca0dd3 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 break;
case D3DRTYPE_VOLUMETEXTURE: - wined3d_rtype = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break;
case D3DRTYPE_CUBETEXTURE: diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f756e01..96a34dc 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1246,7 +1246,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev d3d8_resource_init(&texture->resource); list_init(&texture->rtv_list);
- desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1d759c4..fd6bc8c 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -270,7 +270,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, break;
case D3DRTYPE_VOLUMETEXTURE: - wined3d_rtype = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break;
case D3DRTYPE_CUBETEXTURE: diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ebe5e50..878a4ae 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1386,7 +1386,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list);
- desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dfbec0f..bb910b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3676,7 +3676,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, break; }
- case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: { for (i = 0; i < level_count; ++i) { @@ -4971,7 +4971,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso break;
case WINED3D_RTYPE_TEXTURE_2D: - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc6e5e1..23fdd89 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4662,7 +4662,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } break;
- case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: case WINED3D_RTYPE_VOLUME: format_flags |= WINED3DFMT_FLAG_TEXTURE; allowed_usage = WINED3DUSAGE_DYNAMIC diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4ebcd04..73250ec 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -93,12 +93,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * } resource_types[] = { - {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, - {WINED3D_RTYPE_VOLUME_TEXTURE, 0, WINED3D_GL_RES_TYPE_TEX_3D}, + {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, + {WINED3D_RTYPE_TEXTURE_3D, 0, WINED3D_GL_RES_TYPE_TEX_3D}, };
resource_check_usage(usage); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5eea7d2..12d57b8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -53,7 +53,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) && !(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) - && desc->resource_type != WINED3D_RTYPE_VOLUME_TEXTURE && !once++) + && desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !once++) ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n");
WARN("Failed to initialize resource, returning %#x\n", hr); @@ -610,9 +610,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; }
- if (texture->resource.type == WINED3D_RTYPE_VOLUME_TEXTURE) + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_3D) { - WARN("Not supported on volume textures.\n"); + WARN("Not supported on 3D textures.\n"); return WINED3DERR_INVALIDCALL; }
@@ -1457,7 +1457,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct hr = texture_init(object, desc, level_count, surface_flags, device, parent, parent_ops); break;
- case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: hr = volumetexture_init(object, desc, level_count, device, parent, parent_ops); break;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a4829b6..5eb1696 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3205,9 +3205,9 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_SURFACE); WINED3D_TO_STR(WINED3D_RTYPE_VOLUME); - WINED3D_TO_STR(WINED3D_RTYPE_VOLUME_TEXTURE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR default: FIXME("Unrecognized resource type %#x.\n", resource_type); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0190d12..79db043 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -657,9 +657,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_SURFACE = 1, WINED3D_RTYPE_VOLUME = 2, - WINED3D_RTYPE_VOLUME_TEXTURE = 3, - WINED3D_RTYPE_BUFFER = 4, - WINED3D_RTYPE_TEXTURE_2D = 5, + WINED3D_RTYPE_BUFFER = 3, + WINED3D_RTYPE_TEXTURE_2D = 4, + WINED3D_RTYPE_TEXTURE_3D = 5, };
enum wined3d_pool