wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : d3dcompiler: Get rid of the "dxversion" argument to create_writer().
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: b52497c53f076795910c0d978ed02c10e9e3ae28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52497c53f076795910c0d97… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:07:12 2020 -0500 d3dcompiler: Get rid of the "dxversion" argument to create_writer(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/bytecodewriter.c | 62 ++---------------------------------- 1 file changed, 3 insertions(+), 59 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 42013dfba3..35da93fc6d 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2327,7 +2327,8 @@ static void init_ps30_dx9_writer(struct bc_writer *writer) { writer->funcs = &ps_3_backend; } -static struct bc_writer *create_writer(DWORD version, DWORD dxversion) { +static struct bc_writer *create_writer(DWORD version) +{ struct bc_writer *ret = d3dcompiler_alloc(sizeof(*ret)); if(!ret) { @@ -2337,101 +2338,44 @@ static struct bc_writer *create_writer(DWORD version, DWORD dxversion) { switch(version) { case BWRITERVS_VERSION(1, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 1.0 requested: %u\n", dxversion); - goto fail; - } init_vs10_dx9_writer(ret); break; case BWRITERVS_VERSION(1, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 1.1 requested: %u\n", dxversion); - goto fail; - } init_vs11_dx9_writer(ret); break; case BWRITERVS_VERSION(2, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 2.0 requested: %u\n", dxversion); - goto fail; - } init_vs20_dx9_writer(ret); break; case BWRITERVS_VERSION(2, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 2.x requested: %u\n", dxversion); - goto fail; - } init_vs2x_dx9_writer(ret); break; case BWRITERVS_VERSION(3, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 3.0 requested: %u\n", dxversion); - goto fail; - } init_vs30_dx9_writer(ret); break; - case BWRITERPS_VERSION(1, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.0 requested: %u\n", dxversion); - goto fail; - } init_ps10_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.1 requested: %u\n", dxversion); - goto fail; - } init_ps11_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 2): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.2 requested: %u\n", dxversion); - goto fail; - } init_ps12_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 3): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.3 requested: %u\n", dxversion); - goto fail; - } init_ps13_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 4): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.4 requested: %u\n", dxversion); - goto fail; - } init_ps14_dx9_writer(ret); break; - case BWRITERPS_VERSION(2, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 2.0 requested: %u\n", dxversion); - goto fail; - } init_ps20_dx9_writer(ret); break; - case BWRITERPS_VERSION(2, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 2.x requested: %u\n", dxversion); - goto fail; - } init_ps2x_dx9_writer(ret); break; - case BWRITERPS_VERSION(3, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 3.0 requested: %u\n", dxversion); - goto fail; - } init_ps30_dx9_writer(ret); break; - default: WARN("Unexpected shader version requested: %08x\n", version); goto fail; @@ -2477,7 +2421,7 @@ HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWOR ERR("NULL shader structure, aborting\n"); return E_FAIL; } - writer = create_writer(shader->version, dxversion); + writer = create_writer(shader->version); *result = NULL; if(!writer) {

1 0

Zebediah Figura : d3dcompiler: Fix the location for a warning.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: e0948524f2a1cf1f9bac4dbe0b0d051df14ef222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0948524f2a1cf1f9bac4dbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:07:11 2020 -0500 d3dcompiler: Fix the location for a warning. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 4f5a7b1782..4c3e96caa0 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1257,7 +1257,7 @@ struct_declaration: var_modifiers struct_spec variables_def_optional ';' { if (!$2->name) { - hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "anonymous struct declaration with no variables"); } if (modifiers)

1 0

Nikolay Sivov : include: Added IMFSeekInfo definition.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 529608f10eb6e2c7ff8233b7ca0ceaa446d19fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=529608f10eb6e2c7ff8233b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 24 14:33:58 2020 +0300 include: Added IMFSeekInfo definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfuuid/mfuuid.c | 2 ++ include/mfidl.idl | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index c4976d7dc9..8801eac8b8 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -32,3 +32,5 @@ #include "mfidl.h" #include "mfreadwrite.h" #include "mfmediaengine.h" + +DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14); diff --git a/include/mfidl.idl b/include/mfidl.idl index 60337f8106..a5fb8bc0bd 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -581,6 +581,20 @@ interface IMFSampleGrabberSinkCallback2 : IMFSampleGrabberSinkCallback [in] IMFAttributes *attributes); } +[ + object, + uuid(26afea53-d9ed-42b5-ab80-e64f9ee34779), + local +] +interface IMFSeekInfo : IUnknown +{ + HRESULT GetNearestKeyFrames( + [in] const GUID *format, + [in] const PROPVARIANT *position, + [out] PROPVARIANT *prev_frame, + [out] PROPVARIANT *next_frame); +} + cpp_quote("HRESULT WINAPI CreatePropertyStore(IPropertyStore **store);") cpp_quote("HRESULT WINAPI MFCreateAudioRenderer(IMFAttributes *config, IMFMediaSink **sink);") cpp_quote("HRESULT WINAPI MFCreateAudioRendererActivate(IMFActivate **activate);") @@ -1037,6 +1051,7 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);") cpp_quote("EXTERN_GUID(MF_LOCAL_MFT_REGISTRATION_SERVICE, 0xddf5cf9c, 0x4506, 0x45aa, 0xab, 0xf0, 0x6d, 0x5d, 0x94, 0xdd, 0x1b, 0x4a);") +cpp_quote("EXTERN_C const GUID MF_SCRUBBING_SERVICE;") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Nikolay Sivov : mfplat: Add more format-specific attributes guids.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 346cf20ba4909ba7a465f2048cae810df8e6eab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=346cf20ba4909ba7a465f204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 24 14:33:57 2020 +0300 mfplat: Add more format-specific attributes guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 41 +++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=346cf20ba4909ba7a465…

1 0

Matteo Bruni : d3dx9: Use an assert() to validate access to const_tbl[].
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: cfc533b40d2d1426a8f05501152b28aa1ec78f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfc533b40d2d1426a8f05501… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 24 15:17:16 2020 +0100 d3dx9: Use an assert() to validate access to const_tbl[]. This check is essentially validating that the hardcoded state_table[] has reasonable values for the shader constant states. Use ARRAY_SIZE() to avoid warnings if the compiler chooses an unsigned integer to back enum SHADER_CONSTANT_TYPE. Based on an idea by Henri Verbeet. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 88168df1e1..525b87340b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1469,11 +1469,7 @@ static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHAD D3DXVECTOR4 value; HRESULT ret; - if (op < 0 || op > SCT_PSINT) - { - FIXME("Unknown op %u.\n", op); - return D3DERR_INVALIDCALL; - } + assert(op < ARRAY_SIZE(const_tbl)); element_count = param->bytes / const_tbl[op].elem_size; TRACE("%s, index %u, element_count %u.\n", const_tbl[op].name, index, element_count); if (param->type != const_tbl[op].type)

1 0

Connor McAdams : d3d10: Get resources used by effect shaders.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: f8086a3e7ec5e68afaa94519e2a9fda2f00d4b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8086a3e7ec5e68afaa94519… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Mar 24 14:07:41 2020 +0100 d3d10: Get resources used by effect shaders. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 12 +++++++ dlls/d3d10/effect.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e02ea376bb..21d7f964e8 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -81,6 +81,15 @@ struct d3d10_effect_object } object; }; +struct d3d10_effect_shader_resource +{ + D3D10_SHADER_INPUT_TYPE in_type; + unsigned int bind_point; + unsigned int bind_count; + + struct d3d10_effect_variable *variable; +}; + struct d3d10_effect_shader_signature { char *signature; @@ -99,6 +108,9 @@ struct d3d10_effect_shader_variable ID3D10PixelShader *ps; ID3D10GeometryShader *gs; } shader; + + unsigned int resource_count; + struct d3d10_effect_shader_resource *resources; }; struct d3d10_effect_state_object_variable diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8cc2d11feb..2360e5a025 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -656,6 +656,84 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag return S_OK; } +static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) +{ + struct d3d10_effect_shader_variable *sv = &v->u.shader; + struct d3d10_effect_shader_resource *sr; + D3D10_SHADER_INPUT_BIND_DESC bind_desc; + ID3D10ShaderReflection *reflection; + struct d3d10_effect_variable *var; + D3D10_SHADER_DESC desc; + unsigned int i, y; + HRESULT hr; + + if (FAILED(hr = D3D10ReflectShader(data, data_size, &reflection))) + return hr; + + reflection->lpVtbl->GetDesc(reflection, &desc); + sv->resource_count = desc.BoundResources; + + if (!(sv->resources = heap_calloc(sv->resource_count, sizeof(*sv->resources)))) + { + ERR("Failed to allocate shader resource binding information memory.\n"); + reflection->lpVtbl->Release(reflection); + return E_OUTOFMEMORY; + } + + for (i = 0; i < desc.BoundResources; ++i) + { + reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &bind_desc); + sr = &sv->resources[i]; + + sr->in_type = bind_desc.Type; + sr->bind_point = bind_desc.BindPoint; + sr->bind_count = bind_desc.BindCount; + + switch (bind_desc.Type) + { + case D3D10_SIT_CBUFFER: + case D3D10_SIT_TBUFFER: + for (y = 0; y < v->effect->local_buffer_count; ++y) + { + var = &v->effect->local_buffers[y]; + + if (!strcmp(bind_desc.Name, var->name)) + { + sr->variable = var; + break; + } + } + break; + + case D3D10_SIT_SAMPLER: + case D3D10_SIT_TEXTURE: + for (y = 0; y < v->effect->local_variable_count; ++y) + { + var = &v->effect->local_variables[y]; + + if (!strcmp(bind_desc.Name, var->name)) + { + sr->variable = var; + break; + } + } + break; + + default: + break; + } + + if (!sr->variable) + { + WARN("Failed to find shader resource.\n"); + reflection->lpVtbl->Release(reflection); + return E_FAIL; + } + } + + return S_OK; +} + static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_variable *v) { ID3D10Device *device = v->effect->device; @@ -691,6 +769,9 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; + if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) + return hr; + switch (v->type->basetype) { case D3D10_SVT_VERTEXSHADER: @@ -2623,6 +2704,9 @@ static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_vari FIXME("Unhandled shader type %s.\n", debug_d3d10_shader_variable_type(type)); break; } + + if (s->resource_count) + heap_free(s->resources); } static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v)

1 0

Connor McAdams : d3d10: Add tests for matrix effect variable.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 05d16673607957056e236c586ccbc64e227d3856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d16673607957056e236c58… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Mar 24 14:05:58 2020 +0100 d3d10: Add tests for matrix effect variable. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 333 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05d16673607957056e23…

1 0

Connor McAdams : d3d10: Implement matrix effect variable get methods.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 71804bfab0f5fe92141d3851bade637640c1b336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71804bfab0f5fe92141d3851… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Mar 24 14:05:57 2020 +0100 d3d10: Implement matrix effect variable get methods. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index f843b65bb8..8cc2d11feb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5151,6 +5151,80 @@ static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable * variable->buffer->u.buffer.changed = TRUE; } +static void read_matrix_from_buffer(struct d3d10_effect_variable *variable, void *src_void, + struct d3d10_matrix *dst, BOOL transpose) +{ + unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; + unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + float *src = src_void; + unsigned int row, col; + + if (transpose) + major = !major; + + if (major) + { + for (col = 0; col < col_count; ++col) + { + for (row = 0; row < row_count; ++row) + dst->m[row][col] = src[(col * 4) + row]; + } + } + else + { + for (row = 0; row < row_count; ++row) + { + for (col = 0; col < col_count; ++col) + dst->m[row][col] = src[(row * 4) + col]; + } + } +} + +static void read_matrix_variable_from_buffer(struct d3d10_effect_variable *variable, void *dst, BOOL transpose) +{ + BYTE *src = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + + read_matrix_from_buffer(variable, src, dst, transpose); +} + +static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable *variable, void *dst_data, UINT offset, + UINT count, BOOL transpose) +{ + BYTE *src = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + struct d3d10_matrix *dst = dst_data; + unsigned int i; + + if (!variable->type->element_count) + { + read_matrix_variable_from_buffer(variable, dst_data, transpose); + return; + } + + if (offset >= variable->type->element_count) + { + WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + return; + } + + if (count > variable->type->element_count - offset) + { + WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + offset, count, variable->type->element_count); + count = variable->type->element_count - offset; + } + + if (offset) + src += variable->type->stride * offset; + + for (i = 0; i < count; ++i) + { + read_matrix_from_buffer(variable, src, &dst[i], transpose); + + src += variable->type->stride; + } +} + /* ID3D10EffectVariable methods */ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface) @@ -5325,9 +5399,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrix(ID3D10Ef static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + read_matrix_variable_from_buffer(var, data, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixArray(ID3D10EffectMatrixVariable *iface, @@ -5344,9 +5421,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixArray(ID3 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + read_matrix_variable_array_from_buffer(var, data, offset, count, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTranspose(ID3D10EffectMatrixVariable *iface, @@ -5363,9 +5443,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTranspose static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + read_matrix_variable_from_buffer(var, data, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, @@ -5382,9 +5465,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTranspose static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + read_matrix_variable_array_from_buffer(var, data, offset, count, TRUE); + + return S_OK; }

1 0

Connor McAdams : d3d10: Implement matrix effect variable set methods.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 00861d10ec36c0d9349a112781d7d850c72a59e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00861d10ec36c0d9349a1127… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Mar 24 14:05:56 2020 +0100 d3d10: Implement matrix effect variable set methods. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 5 ++ dlls/d3d10/effect.c | 111 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f83ff0d4c9..e02ea376bb 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -61,6 +61,11 @@ enum d3d10_effect_object_operation D3D10_EOO_ANONYMOUS_SHADER = 7, }; +struct d3d10_matrix +{ + float m[4][4]; +}; + struct d3d10_effect_object { struct d3d10_effect_pass *pass; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9f92b590bc..f843b65bb8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5073,8 +5073,91 @@ static const struct ID3D10EffectVectorVariableVtbl d3d10_effect_vector_variable_ d3d10_effect_vector_variable_GetFloatVectorArray, }; +static void write_matrix_to_buffer(struct d3d10_effect_variable *variable, void *dst_void, + struct d3d10_matrix *src, BOOL transpose) +{ + unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; + unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + float *dst = dst_void; + unsigned int row, col; + + if (transpose) + major = !major; + + if (major) + { + for (col = 0; col < col_count; ++col) + { + for (row = 0; row < row_count; ++row) + dst[(col * 4) + row] = src->m[row][col]; + } + } + else + { + for (row = 0; row < row_count; ++row) + { + for (col = 0; col < col_count; ++col) + dst[(row * 4) + col] = src->m[row][col]; + } + } +} + +static void write_matrix_variable_to_buffer(struct d3d10_effect_variable *variable, void *src_data, BOOL transpose) +{ + BYTE *dst = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + + write_matrix_to_buffer(variable, dst, src_data, transpose); + + variable->buffer->u.buffer.changed = TRUE; +} + +static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable *variable, void *src_data, + unsigned int offset, unsigned int count, BOOL transpose) +{ + BYTE *dst = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + struct d3d10_matrix *src = src_data; + unsigned int i; + + if (!variable->type->element_count) + { + write_matrix_variable_to_buffer(variable, src_data, transpose); + return; + } + + if (offset >= variable->type->element_count) + { + WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + return; + } + + if (count > variable->type->element_count - offset) + { + WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + offset, count, variable->type->element_count); + count = variable->type->element_count - offset; + } + + if (offset) + dst += variable->type->stride * offset; + + for (i = 0; i < count; ++i) + { + write_matrix_to_buffer(variable, dst, &src[i], transpose); + + dst += variable->type->stride; + } + + variable->buffer->u.buffer.changed = TRUE; +} + /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface) { TRACE("iface %p\n", iface); @@ -5231,9 +5314,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrix(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + write_matrix_variable_to_buffer(var, data, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10EffectMatrixVariable *iface, @@ -5247,9 +5333,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10Ef static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + write_matrix_variable_array_to_buffer(var, data, offset, count, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3D10EffectMatrixVariable *iface, @@ -5263,9 +5352,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTranspose(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + write_matrix_variable_to_buffer(var, data, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose(ID3D10EffectMatrixVariable *iface, @@ -5279,9 +5371,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + write_matrix_variable_array_to_buffer(var, data, offset, count, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface,

1 0

Sven Baars : d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 9796bdc966a89cd31829f3a094bb37ec71e21871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9796bdc966a89cd31829f3a0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 24 14:05:14 2020 +0100 d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 3645903367..54b1574bb1 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -629,17 +629,8 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (format & DT_SINGLELINE) format &= ~DT_WORDBREAK; - if (!rect) - { - y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0); - - if (format & DT_CALCRECT) - return y; - } - else - { + if (rect) textrect = *rect; - } x = textrect.left; y = textrect.top; @@ -716,7 +707,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, break; } - if (format & DT_CALCRECT) + if (format & DT_CALCRECT && rect) { *rect = textrect;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020