October 2023 - Wine-commits

Daniel Lehman : msxml6/tests: Copy namespaces as attributes tests.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 043cc2414d5a67d6d234c83863cb1e107a8b4297 URL: https://gitlab.winehq.org/wine/wine/-/commit/043cc2414d5a67d6d234c83863cb1e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 8 08:09:08 2023 -0700 msxml6/tests: Copy namespaces as attributes tests. --- configure | 1 + configure.ac | 1 + dlls/msxml3/tests/domdoc.c | 3 +- dlls/msxml4/tests/domdoc.c | 2 +- dlls/msxml6/tests/Makefile.in | 5 + dlls/msxml6/tests/domdoc.c | 229 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 238 insertions(+), 3 deletions(-)

1 0

Piotr Caban : gdi32: Fix METADC handling in PlayMetaFile.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 5e507b3e3dc999ae55f314f863ea613a14f0ae84 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e507b3e3dc999ae55f314f863ea61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 11 00:39:01 2023 +0200 gdi32: Fix METADC handling in PlayMetaFile. --- dlls/gdi32/metafile.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 50910956e1d..911dfeecf61 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -360,6 +360,7 @@ HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile, LPCSTR lpFilename ) */ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) { + BOOL metadc = GetObjectType(hdc) == OBJ_METADC; METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; @@ -372,16 +373,19 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) if (!mh) return FALSE; - /* save DC */ - hPen = GetCurrentObject(hdc, OBJ_PEN); - hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hPal = GetCurrentObject(hdc, OBJ_PAL); - - hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - if (!GetClipRgn(hdc, hRgn)) + if (!metadc) { - DeleteObject(hRgn); - hRgn = 0; + /* save DC */ + hPen = GetCurrentObject(hdc, OBJ_PEN); + hBrush = GetCurrentObject(hdc, OBJ_BRUSH); + hPal = GetCurrentObject(hdc, OBJ_PAL); + + hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + if (!GetClipRgn(hdc, hRgn)) + { + DeleteObject(hRgn); + hRgn = 0; + } } /* create the handle table */ @@ -414,12 +418,15 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) PlayMetaFileRecord( hdc, ht, mr, mh->mtNoObjects ); } - /* restore DC */ - SelectObject(hdc, hPen); - SelectObject(hdc, hBrush); - SelectPalette(hdc, hPal, FALSE); - ExtSelectClipRgn(hdc, hRgn, RGN_COPY); - DeleteObject(hRgn); + if (!metadc) + { + /* restore DC */ + SelectObject(hdc, hPen); + SelectObject(hdc, hBrush); + SelectPalette(hdc, hPal, FALSE); + ExtSelectClipRgn(hdc, hRgn, RGN_COPY); + DeleteObject(hRgn); + } /* free objects in handle table */ for(i = 0; i < mh->mtNoObjects; i++)

1 0

Piotr Caban : gdi32: Test PlayMetaFile on METADC.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 25e15e9e2c34b85d6aef5010532e7e343ccb9c80 URL: https://gitlab.winehq.org/wine/wine/-/commit/25e15e9e2c34b85d6aef5010532e7e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 11 11:59:15 2023 +0200 gdi32: Test PlayMetaFile on METADC. --- dlls/gdi32/tests/metafile.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 0e5da463f7f..b013fe1f196 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5066,6 +5066,65 @@ static void test_emf_blit(void) ok(ret, "DeleteMetaFile(%p) error %ld\n", hmf, GetLastError()); } +struct check_mf_arg +{ + int pos; + const WORD *records; +}; + +static int WINAPI check_mf_records(HDC hdc, HANDLETABLE *htable, + METARECORD *rec, int n, LPARAM ctx) +{ + struct check_mf_arg *records = (struct check_mf_arg *)ctx; + + ok(rec->rdFunction == records->records[records->pos], "got record %x, expected %x\n", + rec->rdFunction, records->records[records->pos]); + return rec->rdFunction == records->records[records->pos++]; +} + +static void test_PlayMetaFile(void) +{ + static WORD line_records[] = { META_LINETO, 0 }; + struct check_mf_arg records; + HMETAFILE hmeta; + HDC dc, metadc; + BOOL r; + + dc = CreateCompatibleDC(NULL); + ok(dc != NULL, "CreateCompatibleDC failed\n"); + + metadc = CreateMetaFileW(NULL); + ok(metadc != NULL, "CreateMetaFile failed\n"); + r = LineTo(metadc, 10, 10); + ok(r, "LineTo failed\n"); + hmeta = CloseMetaFile(metadc); + ok(hmeta != NULL, "CloseMetaFile failed\n"); + + records.pos = 0; + records.records = line_records; + r = EnumMetaFile(dc, hmeta, check_mf_records, (LPARAM)&records); + ok(r, "EnumMetaFile failed\n"); + + metadc = CreateMetaFileW(NULL); + ok(metadc != NULL, "CreateMetaFile failed\n"); + r = PlayMetaFile(metadc, hmeta); + ok(r, "PlayMetaFile failed\n"); + r = DeleteMetaFile(hmeta); + ok(r, "DeleteMetaFile failed\n"); + hmeta = CloseMetaFile(metadc); + ok(hmeta != NULL, "CloseMetaFile failed\n"); + + records.pos = 0; + records.records = line_records; + r = EnumMetaFile(dc, hmeta, check_mf_records, (LPARAM)&records); + ok(r, "EnumMetaFile failed\n"); + + r = DeleteMetaFile(hmeta); + ok(r, "DeleteMetaFile failed\n"); + r = DeleteDC(dc); + ok(r, "DeleteDC failed\n"); +} + static void test_emf_mask_blit(void) { BITMAPINFO bmi = {{ sizeof(bmi) }}; @@ -10769,6 +10828,7 @@ START_TEST(metafile) test_mf_select(); test_mf_palette(); test_mf_blit(); + test_PlayMetaFile(); /* For metafile conversions */ test_mf_conversions();

1 0

Piotr Caban : include: Add winppi.h header.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 81fa8615eb23c994724d809182f521b2eba310af URL: https://gitlab.winehq.org/wine/wine/-/commit/81fa8615eb23c994724d809182f521… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 15:36:19 2023 +0200 include: Add winppi.h header. --- include/Makefile.in | 1 + include/winppi.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ef0c48ed9ef..4fdee0c9b91 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -936,6 +936,7 @@ SOURCES = \ winnt.h \ winnt.rh \ winperf.h \ + winppi.h \ winreg.h \ winresrc.h \ winsafer.h \ diff --git a/include/winppi.h b/include/winppi.h new file mode 100644 index 00000000000..0cb04593c08 --- /dev/null +++ b/include/winppi.h @@ -0,0 +1,39 @@ +/* + * Copyright 2023 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINPPI_ +#define _WINPPI_ + +HANDLE WINAPI GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, LPWSTR pwszDocName); +BOOL WINAPI GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle); +DWORD WINAPI GdiGetPageCount(HANDLE SpoolFileHandle); +HDC WINAPI GdiGetDC(HANDLE SpoolFileHandle); +HANDLE WINAPI GdiGetPageHandle(HANDLE SpoolFileHandle, + DWORD Page, LPDWORD pdwPageType); +BOOL WINAPI GdiStartDocEMF(HANDLE SpoolFileHandle, DOCINFOW *pDocInfo); +BOOL WINAPI GdiStartPageEMF(HANDLE SpoolFileHandle); +BOOL WINAPI GdiPlayPageEMF(HANDLE SpoolFileHandle, HANDLE hemf, + RECT *prectDocument, RECT *prectBorder, RECT *prectClip); +BOOL WINAPI GdiEndPageEMF(HANDLE SpoolFileHandle, DWORD dwOptimization); +BOOL WINAPI GdiEndDocEMF(HANDLE SpoolFileHandle); +BOOL WINAPI GdiGetDevmodeForPage(HANDLE SpoolFileHandle, DWORD dwPageNumber, + PDEVMODEW *pCurrDM, PDEVMODEW *pLastDM); +BOOL WINAPI GdiResetDCEMF(HANDLE SpoolFileHandle, PDEVMODEW pCurrDM); + +#endif /* _WINPPI_ */

1 0

Piotr Caban : gdi32: Add GdiGetSpoolFileHandle stub.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 8dfa1d66b1324fd334133d1aac2bc38ee817fda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dfa1d66b1324fd334133d1aac2bc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 16:55:49 2023 +0200 gdi32: Add GdiGetSpoolFileHandle stub. --- dlls/gdi32/dc.c | 10 ++++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 21005fa0719..3023f02eb79 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2663,3 +2663,13 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(void) if (!warn_once++) FIXME( "stub\n" ); return 0; } + +/******************************************************************* + * GdiGetSpoolFileHandle (GDI32.@) + */ +HANDLE WINAPI GdiGetSpoolFileHandle( WCHAR *printer_name, + DEVMODEW *devmode, WCHAR *doc_name ) +{ + FIXME( "%s %p %s\n", wine_dbgstr_w(printer_name), devmode, wine_dbgstr_w(doc_name) ); + return NULL; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 84c294c286f..6045f3c454a 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -198,7 +198,7 @@ @ stub GdiGetLocalFont # @ stub GdiGetPageCount # @ stub GdiGetPageHandle -# @ stub GdiGetSpoolFileHandle +@ stdcall GdiGetSpoolFileHandle(wstr ptr wstr) @ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() NtGdiInitSpool

1 0

Conor McCarthy : vkd3d-shader/dxil: Read immediate constant arrays.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: df4e1b73930f7fa1719634a36776d5c6bd7b6d96 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df4e1b73930f7fa1719634a36776d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Sep 29 10:17:51 2023 +1000 vkd3d-shader/dxil: Read immediate constant arrays. --- libs/vkd3d-shader/d3d_asm.c | 3 +- libs/vkd3d-shader/dxil.c | 96 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 11 ++-- libs/vkd3d-shader/tpf.c | 4 +- libs/vkd3d-shader/vkd3d_shader_main.c | 8 +-- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++- 6 files changed, 115 insertions(+), 14 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Read global constants in sm6_parser_globals_init().
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: 52dc6f252ccafe83af950b80d95a47d357415edc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/52dc6f252ccafe83af950b80d95a4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 1 15:40:32 2023 +1000 vkd3d-shader/dxil: Read global constants in sm6_parser_globals_init(). These are needed for reading metadata. --- libs/vkd3d-shader/dxil.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4963ceac..fd7aeb33 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2156,6 +2156,7 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { const struct dxil_block *block = &sm6->root_block; const struct dxil_record *record; + enum vkd3d_result ret; uint64_t version; size_t i; @@ -2198,6 +2199,13 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) } } + for (i = 0; i < block->child_block_count; ++i) + { + if (block->child_blocks[i]->id == CONSTANTS_BLOCK + && (ret = sm6_parser_constants_init(sm6, block->child_blocks[i])) < 0) + return ret; + } + return VKD3D_OK; } @@ -2770,6 +2778,9 @@ static enum vkd3d_result sm6_parser_module_init(struct sm6_parser *sm6, const st switch (block->id) { case CONSTANTS_BLOCK: + /* Level 1 (global) constants are already done in sm6_parser_globals_init(). */ + if (level < 2) + break; function = &sm6->functions[sm6->function_count]; sm6->cur_max_value = function->value_count; return sm6_parser_constants_init(sm6, block);

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit an error on allocation failure in dxil_record_to_string().
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: 05d516bb00ff8916b38aeccf79a47a1af5ad1a31 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/05d516bb00ff8916b38aeccf79a47… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Sep 25 15:12:47 2023 +1000 vkd3d-shader/dxil: Emit an error on allocation failure in dxil_record_to_string(). --- libs/vkd3d-shader/dxil.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index fd7aeb33..bfb34d24 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -973,14 +973,18 @@ static const struct dxil_block *sm6_parser_get_level_one_block(const struct sm6_ return found; } -static char *dxil_record_to_string(const struct dxil_record *record, unsigned int offset) +static char *dxil_record_to_string(const struct dxil_record *record, unsigned int offset, struct sm6_parser *sm6) { unsigned int i; char *str; assert(offset <= record->operand_count); if (!(str = vkd3d_calloc(record->operand_count - offset + 1, 1))) + { + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory allocating a string of length %u.", record->operand_count - offset); return NULL; + } for (i = offset; i < record->operand_count; ++i) str[i - offset] = record->operands[i]; @@ -1235,7 +1239,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6) break; case TYPE_CODE_STRUCT_NAME: - if (!(struct_name = dxil_record_to_string(record, 0))) + if (!(struct_name = dxil_record_to_string(record, 0, sm6))) { ERR("Failed to allocate struct name.\n"); return VKD3D_ERROR_OUT_OF_MEMORY; @@ -1459,7 +1463,7 @@ static enum vkd3d_result sm6_parser_symtab_init(struct sm6_parser *sm6) symbol = &sm6->global_symbols[sm6->global_symbol_count]; symbol->id = record->operands[0]; - if (!(symbol->name = dxil_record_to_string(record, 1))) + if (!(symbol->name = dxil_record_to_string(record, 1, sm6))) { ERR("Failed to allocate symbol name.\n"); return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Brendan Shanks : winemac.drv: Use ObjC literals.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: bb2e02ab66c5c602d635722cf3a5820d6b366006 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb2e02ab66c5c602d635722cf3a582… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Oct 5 15:37:21 2023 -0700 winemac.drv: Use ObjC literals. --- dlls/winemac.drv/cocoa_app.m | 41 +++++++++++----------- dlls/winemac.drv/cocoa_clipboard.m | 34 ++++++++---------- dlls/winemac.drv/cocoa_cursorclipping.m | 2 +- dlls/winemac.drv/cocoa_display.m | 4 +-- dlls/winemac.drv/cocoa_event.m | 61 +++++++++++++++------------------ dlls/winemac.drv/cocoa_window.m | 29 +++++++--------- 6 files changed, 78 insertions(+), 93 deletions(-)

1 0

Conor McCarthy : tests/shader-runner: Replace immediate shader type strings with an enum.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: d211160b8980652327ca01ddac992a26d48af6ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d211160b8980652327ca01ddac992… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 21 14:32:25 2023 +1000 tests/shader-runner: Replace immediate shader type strings with an enum. --- tests/shader_runner.c | 23 ++++++++++++++++++----- tests/shader_runner.h | 9 +++++++++ tests/shader_runner_d3d12.c | 10 +++++----- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 87502f01..bec08d7e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -790,7 +790,20 @@ static HRESULT map_unidentified_hrs(HRESULT hr) return hr; } -static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, HRESULT expect) +const char *shader_type_string(enum shader_type type) +{ + static const char *const shader_types[] = + { + [SHADER_TYPE_CS] = "cs", + [SHADER_TYPE_PS] = "ps", + [SHADER_TYPE_VS] = "vs", + }; + assert(type < ARRAY_SIZE(shader_types)); + return shader_types[type]; +} + +static void compile_shader(struct shader_runner *runner, const char *source, size_t len, enum shader_type type, + HRESULT expect) { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; @@ -806,7 +819,7 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz [SHADER_MODEL_5_1] = "5_1", }; - sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]); + sprintf(profile, "%s_%s", shader_type_string(type), shader_models[runner->minimum_shader_model]); hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, runner->compile_options, 0, &blob, &errors); hr = map_unidentified_hrs(hr); ok(hr == expect, "Got unexpected hr %#x.\n", hr); @@ -918,7 +931,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o if (!skip_tests) { todo_if (state == STATE_SHADER_COMPUTE_TODO) - compile_shader(runner, shader_source, shader_source_len, "cs", expect_hr); + compile_shader(runner, shader_source, shader_source_len, SHADER_TYPE_CS, expect_hr); } free(runner->cs_source); runner->cs_source = shader_source; @@ -932,7 +945,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o if (!skip_tests) { todo_if (state == STATE_SHADER_PIXEL_TODO) - compile_shader(runner, shader_source, shader_source_len, "ps", expect_hr); + compile_shader(runner, shader_source, shader_source_len, SHADER_TYPE_PS, expect_hr); } free(runner->ps_source); runner->ps_source = shader_source; @@ -946,7 +959,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o if (!skip_tests) { todo_if (state == STATE_SHADER_VERTEX_TODO) - compile_shader(runner, shader_source, shader_source_len, "vs", expect_hr); + compile_shader(runner, shader_source, shader_source_len, SHADER_TYPE_VS, expect_hr); } free(runner->vs_source); runner->vs_source = shader_source; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 0844943d..6591143e 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -38,6 +38,15 @@ enum shader_model SHADER_MODEL_5_1, }; +enum shader_type +{ + SHADER_TYPE_CS, + SHADER_TYPE_PS, + SHADER_TYPE_VS, +}; + +const char *shader_type_string(enum shader_type type); + enum texture_data_type { TEXTURE_DATA_FLOAT, diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d620f1e2..925bdca9 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -56,7 +56,7 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } -static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, const char *source, const char *type) +static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, const char *source, enum shader_type type) { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; @@ -72,7 +72,7 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons [SHADER_MODEL_5_1] = "5_1", }; - sprintf(profile, "%s_%s", type, shader_models[runner->r.minimum_shader_model]); + sprintf(profile, "%s_%s", shader_type_string(type), shader_models[runner->r.minimum_shader_model]); hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, runner->r.compile_options, 0, &blob, &errors); ok(FAILED(hr) == !blob, "Got unexpected hr %#x, blob %p.\n", hr, blob); if (errors) @@ -310,7 +310,7 @@ static bool d3d12_runner_dispatch(struct shader_runner *r, unsigned int x, unsig HRESULT hr; size_t i; - cs_code = compile_shader(runner, runner->r.cs_source, "cs"); + cs_code = compile_shader(runner, runner->r.cs_source, SHADER_TYPE_CS); todo_if (runner->r.is_todo) ok(cs_code, "Failed to compile shader.\n"); if (!cs_code) return false; @@ -385,8 +385,8 @@ static bool d3d12_runner_draw(struct shader_runner *r, HRESULT hr; size_t i; - ps_code = compile_shader(runner, runner->r.ps_source, "ps"); - vs_code = compile_shader(runner, runner->r.vs_source, "vs"); + ps_code = compile_shader(runner, runner->r.ps_source, SHADER_TYPE_PS); + vs_code = compile_shader(runner, runner->r.vs_source, SHADER_TYPE_VS); todo_if (runner->r.is_todo) ok(ps_code && vs_code, "Failed to compile shaders.\n"); if (!ps_code || !vs_code)

1 0