Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 20:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.13][D3DCOMPILER_43] Addendum to last commit CORE-14955 & CORE-15652

Browse source 
GCC Linux build had no issues with the last commit in D3DCOMPILER_43 but
MSVC x86 & x64 v18.0.31101.0 choked on it with
error C4133: 'function' : incompatible types - from 'D3D_PRIMITIVE *' to 'DWORD *'
and similar.

MSVC v18.0.31101.0, target x86 and x64, flagged C4133 as error
MSVC v16.0.40219.1, target x86, flagged C4133 as warning

cherry picked from commit 0.4.14-dev-8-g
36d9e80add
This commit is contained in:
Joachim Henze 2019-10-03 21:45:38 +02:00
parent 9f1e2cd172
commit d27a20233d
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
dll/directx/wine/d3dcompiler_43/reflection.c
View file

@ -1107,10 +1107,18 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c
skip_dword_unknown(&ptr, 1);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&r->input_primitive);
#else
read_dword(&ptr, &r->input_primitive);
#endif
TRACE("InputPrimitive: %x\n", r->input_primitive);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&r->gs_output_topology);
#else
read_dword(&ptr, &r->gs_output_topology);
#endif
TRACE("GSOutputTopology: %x\n", r->gs_output_topology);
read_dword(&ptr, &r->gs_max_output_vertex_count);
@ -1126,13 +1134,25 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c
read_dword(&ptr, &r->c_control_points);
TRACE("cControlPoints: %u\n", r->c_control_points);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&r->hs_output_primitive);
#else
read_dword(&ptr, &r->hs_output_primitive);
#endif
TRACE("HSOutputPrimitive: %x\n", r->hs_output_primitive);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&r->hs_prtitioning);
#else
read_dword(&ptr, &r->hs_prtitioning);
#endif
TRACE("HSPartitioning: %x\n", r->hs_prtitioning);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&r->tessellator_domain);
#else
read_dword(&ptr, &r->tessellator_domain);
#endif
TRACE("TessellatorDomain: %x\n", r->tessellator_domain);
skip_dword_unknown(&ptr, 3);
@ -1438,13 +1458,25 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c
desc->Name = string_data + (offset - string_data_offset);
TRACE("Input bind Name: %s\n", debugstr_a(desc->Name));
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&desc->Type);
#else
read_dword(&ptr, &desc->Type);
#endif
TRACE("Input bind Type: %#x\n", desc->Type);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&desc->ReturnType);
#else
read_dword(&ptr, &desc->ReturnType);
#endif
TRACE("Input bind ReturnType: %#x\n", desc->ReturnType);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&desc->Dimension);
#else
read_dword(&ptr, &desc->Dimension);
#endif
TRACE("Input bind Dimension: %#x\n", desc->Dimension);
read_dword(&ptr, &desc->NumSamples);
@ -1507,7 +1539,11 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c
read_dword(&ptr, &cb->flags);
TRACE("Cbuffer flags: %u\n", cb->flags);
#ifdef __REACTOS__ /* DWORD* cast added */
read_dword(&ptr, (DWORD*)&cb->type);
#else
read_dword(&ptr, &cb->type);
#endif
TRACE("Cbuffer type: %#x\n", cb->type);
}
}
@ -1603,8 +1639,13 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *
read_dword(&ptr, &name_offset);
d[i].SemanticName = string_data + (name_offset - string_data_offset);
read_dword(&ptr, &d[i].SemanticIndex);
#ifdef __REACTOS__ /* DWORD* casts added */
read_dword(&ptr, (DWORD*)&d[i].SystemValueType);
read_dword(&ptr, (DWORD*)&d[i].ComponentType);
#else
read_dword(&ptr, &d[i].SystemValueType);
read_dword(&ptr, &d[i].ComponentType);
#endif
read_dword(&ptr, &d[i].Register);
read_dword(&ptr, &mask);
d[i].ReadWriteMask = (mask >> 8) & 0xff;