=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Factor out shader_find_signature_element() function.
Alexandre Julliard
julliard at winehq.org
Thu Mar 23 15:34:54 CDT 2017
Module: wine
Branch: master
Commit: 7583bcfc22976c6633190c4fd9698171b406ada3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7583bcfc22976c6633190c4fd9698171b406ada3
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Mar 23 12:15:49 2017 +0100
d3d11: Factor out shader_find_signature_element() function.
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/d3d11/d3d11_private.h | 2 ++
dlls/d3d11/inputlayout.c | 16 ++++------------
dlls/d3d11/shader.c | 15 +++++++++++++++
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 53be0f8..62f46ea 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -353,6 +353,8 @@ HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_
struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) DECLSPEC_HIDDEN;
HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN;
+struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s,
+ const char *semantic_name, unsigned int semantic_idx) DECLSPEC_HIDDEN;
void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN;
/* ID3D11ClassLinkage */
diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c
index 3d7135a..1fdb2c3 100644
--- a/dlls/d3d11/inputlayout.c
+++ b/dlls/d3d11/inputlayout.c
@@ -65,7 +65,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME
{
struct wined3d_vertex_element *e = &(*wined3d_elements)[i];
const D3D11_INPUT_ELEMENT_DESC *f = &element_descs[i];
- unsigned int j;
+ struct wined3d_shader_signature_element *element;
e->format = wined3dformat_from_dxgi_format(f->Format);
e->input_slot = f->InputSlot;
@@ -77,17 +77,9 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME
e->usage = 0;
e->usage_idx = 0;
- for (j = 0; j < is.element_count; ++j)
- {
- if (!strcasecmp(element_descs[i].SemanticName, is.elements[j].semantic_name)
- && element_descs[i].SemanticIndex == is.elements[j].semantic_idx)
- {
- e->output_slot = is.elements[j].register_idx;
- break;
- }
- }
-
- if (e->output_slot == WINED3D_OUTPUT_SLOT_UNUSED)
+ if ((element = shader_find_signature_element(&is, f->SemanticName, f->SemanticIndex)))
+ e->output_slot = element->register_idx;
+ else
WARN("Unused input element %u.\n", i);
}
diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c
index a22a0c3..87312c3 100644
--- a/dlls/d3d11/shader.c
+++ b/dlls/d3d11/shader.c
@@ -226,6 +226,21 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d
return S_OK;
}
+struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s,
+ const char *semantic_name, unsigned int semantic_idx)
+{
+ struct wined3d_shader_signature_element *e = s->elements;
+ unsigned int i;
+
+ for (i = 0; i < s->element_count; ++i)
+ {
+ if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx)
+ return &e[i];
+ }
+
+ return NULL;
+}
+
void shader_free_signature(struct wined3d_shader_signature *s)
{
HeapFree(GetProcessHeap(), 0, s->elements);
More information about the wine-cvs
mailing list