March 2020 - Wine-Commits - list.winehq.org

Connor McAdams : d3d10: Implement matrix effect variable set methods.
by Alexandre Julliard March 24, 2020

March 24, 2020

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

Connor McAdams : d3d10: Implement matrix effect variable get methods.
by Alexandre Julliard March 24, 2020

March 24, 2020

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

Zebediah Figura : d3dcompiler: Get rid of the "dxversion" argument to create_writer().
by Alexandre Julliard March 24, 2020

March 24, 2020

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: Store the shader version using separate integer fields.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 5a73777e32b33803fa94595529e79a10311d54c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a73777e32b33803fa945955… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:07:14 2020 -0500 d3dcompiler: Store the shader version using separate integer fields. 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/asmparser.c | 78 +++++++++++++++++-------------- dlls/d3dcompiler_43/asmshader.y | 8 ++-- dlls/d3dcompiler_43/bytecodewriter.c | 19 +++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 +- 4 files changed, 66 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a73777e32b33803fa94…

1 0

Zebediah Figura : d3dcompiler: Fix the location for a warning.
by Alexandre Julliard March 24, 2020

March 24, 2020

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

Zebediah Figura : d3dcompiler: Get rid of the "dxversion" argument to SlWriteBytecode().
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 45aa147945b30c9a90366e63c240200230afb472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45aa147945b30c9a90366e63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:07:13 2020 -0500 d3dcompiler: Get rid of the "dxversion" argument to SlWriteBytecode(). 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 | 2 +- dlls/d3dcompiler_43/compiler.c | 8 ++++---- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 35da93fc6d..5366fa589b 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2410,7 +2410,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, return E_INVALIDARG; } -HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) +HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **result, DWORD *size) { struct bc_writer *writer; struct bytecode_buffer *buffer = NULL; diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 73f8c705a0..9fc7c1d773 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -602,11 +602,11 @@ static HRESULT assemble_shader(const char *preproc_shader, return D3DXERR_INVALIDDATA; } - hr = SlWriteBytecode(shader, 9, &res, &size); + hr = shader_write_bytecode(shader, &res, &size); SlDeleteShader(shader); if (FAILED(hr)) { - ERR("SlWriteBytecode failed with 0x%08x\n", hr); + ERR("Failed to write bytecode, hr %#x.\n", hr); return D3DXERR_INVALIDDATA; } @@ -829,11 +829,11 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co return D3DXERR_INVALIDDATA; } - hr = SlWriteBytecode(shader, 9, &res, &size); + hr = shader_write_bytecode(shader, &res, &size); SlDeleteShader(shader); if (FAILED(hr)) { - ERR("SlWriteBytecode failed with error 0x%08x.\n", hr); + ERR("Failed to write bytecode, hr %#x.\n", hr); return D3DXERR_INVALIDDATA; } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1a9d68e720..51cfc39552 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -591,7 +591,7 @@ enum bwriterdeclusage #define T3_REG 5 struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; -HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; +HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; /* The general IR structure is inspired by Mesa GLSL hir, even though the code

1 0

Nikolay Sivov : include: Added IMFSeekInfo definition.
by Alexandre Julliard March 24, 2020

March 24, 2020

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

Sven Baars : d3dx9: Add two more DT_SINGLELINE tests.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 787d98f47ce7254dda7f644fa6d033fe1776ae38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=787d98f47ce7254dda7f644f… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Mar 16 11:23:19 2020 +0100 d3dx9: Add two more DT_SINGLELINE tests. 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/tests/core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 6fae8bf8d5..fb55a547a0 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -782,12 +782,18 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, DT_SINGLELINE, 0xff00ff); ok(height == 12, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_SINGLELINE, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, 0, 0xff00ff); ok(height == 24, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); ok(height == 36, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_WORDBREAK | DT_SINGLELINE, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, 0, 0xff00ff); ok(height == 48, "Got unexpected height %d.\n", height);

1 0

Alexandre Julliard : unicode: Store downloaded data files in the cache directory.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: ec19bbf43f6ced7c05ce7f4337a3ec8d8f013afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec19bbf43f6ced7c05ce7f43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 13:13:42 2020 +0100 unicode: Store downloaded data files in the cache directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 86a180259f..ec5d8eafb4 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -475,29 +475,32 @@ sub to_utf16(@) sub open_data_file($$) { my ($base, $name) = @_; - (my $dir = "data/$name") =~ s/\/[^\/]+$//; + my $cache = ($ENV{XDG_CACHE_HOME} || "$ENV{HOME}/.cache") . "/wine"; + (my $dir = "$cache/$name") =~ s/\/[^\/]+$//; + my $suffix = ($base =~ /\/\Q$UNIVERSION\E/) ? "-$UNIVERSION" : ""; local *FILE; if ($base =~ /.*\/([^\/]+)\.zip$/) { - my $zip = $1; - unless (-f "data/$zip") + my $zip = "$1$suffix.zip"; + unless (-f "$cache/$zip") { - mkdir "data"; + system "mkdir", "-p", $cache; print "Fetching $base...\n"; - !system "wget", "-q", "-O", "data/$zip", $base or die "cannot fetch $base"; + !system "wget", "-q", "-O", "$cache/$zip", $base or die "cannot fetch $base"; } - open FILE, "-|", "unzip", "-p", "data/$zip", $name or die "cannot extract $name from $zip"; + open FILE, "-|", "unzip", "-p", "$cache/$zip", $name or die "cannot extract $name from $zip"; } else { - unless (-f "data/$name") + (my $dest = "$cache/$name") =~ s/(.*)(\.[^\/.]+)$/$1$suffix$2/; + unless (-f $dest) { system "mkdir", "-p", $dir; print "Fetching $base/$name...\n"; - !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name"; + !system "wget", "-q", "-O", $dest, "$base/$name" or die "cannot fetch $base/$name"; } - open FILE, "<data/$name" or die "cannot open data/$name"; + open FILE, "<$dest" or die "cannot open $dest"; } return *FILE; }

1 0

Nikolay Sivov : mfplat: Add more format-specific attributes guids.
by Alexandre Julliard March 24, 2020

March 24, 2020

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