Module: wine Branch: master Commit: aa11efc4af2cdd34bf0c11da0121b15ba4cebc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa11efc4af2cdd34bf0c11da01...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Nov 3 12:21:11 2016 +0100
wined3d: Get rid of WINED3DFMT_VERTEXDATA.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d8/device.c | 4 +--- dlls/d3d9/device.c | 4 +--- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 2 -- include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ff7a5..fae5610 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -83,7 +83,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_X8D24_UNORM: return D3DFMT_D24X8; case WINED3DFMT_S4X4_UINT_D24_UNORM: return D3DFMT_D24X4S4; case WINED3DFMT_D16_UNORM: return D3DFMT_D16; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; default: @@ -134,11 +133,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_D24X8: return WINED3DFMT_X8D24_UNORM; case D3DFMT_D24X4S4: return WINED3DFMT_S4X4_UINT_D24_UNORM; case D3DFMT_D16: return WINED3DFMT_D16_UNORM; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b8c4638..dab19ab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -80,7 +80,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_L16_UNORM: return D3DFMT_L16; case WINED3DFMT_D32_FLOAT: return D3DFMT_D32F_LOCKABLE; case WINED3DFMT_S8_UINT_D24_FLOAT: return D3DFMT_D24FS8; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; case WINED3DFMT_R16G16B16A16_SNORM: return D3DFMT_Q16W16V16U16; @@ -145,7 +144,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_L16: return WINED3DFMT_L16_UNORM; case D3DFMT_D32F_LOCKABLE: return WINED3DFMT_D32_FLOAT; case D3DFMT_D24FS8: return WINED3DFMT_S8_UINT_D24_FLOAT; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; case D3DFMT_Q16W16V16U16: return WINED3DFMT_R16G16B16A16_SNORM; @@ -157,7 +155,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_A32B32G32R32F: return WINED3DFMT_R32G32B32A32_FLOAT; case D3DFMT_CxV8U8: return WINED3DFMT_R8G8_SNORM_Cx; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 25c1853..202ce32 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1578,7 +1578,7 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return WINED3DERR_OUTOFVIDEOMEMORY; }
- hr = buffer_init(object, device, size, usage, WINED3DFMT_VERTEXDATA, + hr = buffer_init(object, device, size, usage, WINED3DFMT_UNKNOWN, pool, WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2171611..6ab851d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -136,7 +136,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, - {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -3664,7 +3663,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_S4X4_UINT_D24_UNORM); FMT_TO_STR(WINED3DFMT_L16_UNORM); FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT); - FMT_TO_STR(WINED3DFMT_VERTEXDATA); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI1N); FMT_TO_STR(WINED3DFMT_ATI2N); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d234d6..c7ecef1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -123,7 +123,6 @@ enum wined3d_format_id WINED3DFMT_S4X4_UINT_D24_UNORM, WINED3DFMT_L16_UNORM, WINED3DFMT_S8_UINT_D24_FLOAT, - WINED3DFMT_VERTEXDATA, WINED3DFMT_R8G8_SNORM_Cx, WINED3DFMT_R32G32B32A32_TYPELESS, WINED3DFMT_R32G32B32A32_FLOAT,