From 9c9b5949120c5105056d507fb05843d8172b36d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3zef=20Kucia?= Date: Fri, 2 Oct 2015 01:31:49 +0200 Subject: [PATCH] d3d11: Rename d3d10_shader_info to d3d_shader_info. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/shader.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index ab9edfa7481..8ff484761f3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -47,7 +47,7 @@ struct d3d_device; -struct d3d10_shader_info +struct d3d_shader_info { const DWORD *shader_code; struct wined3d_shader_signature *input_signature; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 709ecba6568..aa3ac5eafe7 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - struct d3d10_shader_info *shader_info = ctx; + struct d3d_shader_info *shader_info = ctx; HRESULT hr; switch (tag) @@ -53,7 +53,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * return S_OK; } -static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d10_shader_info *shader_info) +static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d_shader_info *shader_info) { HRESULT hr; @@ -364,7 +364,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d { struct wined3d_shader_signature output_signature; struct wined3d_shader_signature input_signature; - struct d3d10_shader_info shader_info; + struct d3d_shader_info shader_info; struct wined3d_shader_desc desc; HRESULT hr; @@ -659,7 +659,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru { struct wined3d_shader_signature output_signature; struct wined3d_shader_signature input_signature; - struct d3d10_shader_info shader_info; + struct d3d_shader_info shader_info; struct wined3d_shader_desc desc; HRESULT hr; @@ -973,7 +973,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d { struct wined3d_shader_signature output_signature; struct wined3d_shader_signature input_signature; - struct d3d10_shader_info shader_info; + struct d3d_shader_info shader_info; struct wined3d_shader_desc desc; HRESULT hr; -- 2.11.4.GIT