=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Get rid of compute_shader_init ().
Alexandre Julliard
julliard at winehq.org
Mon Nov 6 14:37:37 CST 2017
Module: wine
Branch: master
Commit: a1e158971c16da318bfd890e2b9e3979a1cf1d8b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e158971c16da318bfd890e2b9e3979a1cf1d8b
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Nov 6 10:55:26 2017 +0100
wined3d: Get rid of compute_shader_init().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 94ad145..0bad4fa 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -4066,12 +4066,6 @@ void pixelshader_update_resource_types(struct wined3d_shader *shader, WORD tex_t
}
}
-static HRESULT compute_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_COMPUTE, parent, parent_ops);
-}
-
HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc,
void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader)
{
@@ -4084,7 +4078,7 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
- if (FAILED(hr = compute_shader_init(object, device, desc, parent, parent_ops)))
+ if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops)))
{
WARN("Failed to initialize compute shader, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
More information about the wine-cvs
mailing list