ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Henri Verbeet 2016-01-27 00:06:24 +01:00 committed by Alexandre Julliard
parent dafaae7730
commit cf899ac267
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d11/texture.c
View File

@ -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;

2
dlls/d3d8/directx.c
View File

@ -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:

2
dlls/d3d8/texture.c
View File

@ -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;

2
dlls/d3d9/directx.c
View File

@ -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:

2
dlls/d3d9/texture.c
View File

@ -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;

4
dlls/wined3d/device.c
View File

@ -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);

2
dlls/wined3d/directx.c
View File

@ -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

12
dlls/wined3d/resource.c
View File

@ -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);

8
dlls/wined3d/texture.c
View File

@ -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;

2
dlls/wined3d/utils.c
View File

@ -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);

6
include/wine/wined3d.h
View File

@ -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