Module: wine Branch: master Commit: 86933f9d31b1a1e187dfb1c554124d6d49066660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86933f9d31b1a1e187dfb1c554...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Nov 6 10:55:27 2017 +0100
wined3d: Get rid of domain_shader_init().
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/wined3d/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0bad4fa..6ba0fc4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3674,12 +3674,6 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; }
-static HRESULT domain_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops); -} - static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -4103,7 +4097,7 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;
- if (FAILED(hr = domain_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops))) { WARN("Failed to initialize domain shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);