- Wine-Commits - list.winehq.org

Anton Baskanov : dsound: Remove the unused nAvgBytesPerSec field.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: 7bd2e99b66965473cce0b6e1b4779eae72d378ee URL: https://gitlab.winehq.org/wine/wine/-/commit/7bd2e99b66965473cce0b6e1b4779e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 26 12:08:37 2023 +0700 dsound: Remove the unused nAvgBytesPerSec field. --- dlls/dsound/buffer.c | 3 --- dlls/dsound/dsound_private.h | 1 - 2 files changed, 4 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index b3238b8918e..9f68752232f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -293,7 +293,6 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i if (freq != oldFreq) { This->freqAdjustNum = This->freq; This->freqAdjustDen = This->device->pwfx->nSamplesPerSec; - This->nAvgBytesPerSec = freq * This->pwfx->nBlockAlign; DSOUND_RecalcFormat(This); newcommitted = realloc(This->committedbuff, This->writelead); @@ -1114,8 +1113,6 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds dsb->freqAdjustNum = dsb->freq; dsb->freqAdjustDen = device->pwfx->nSamplesPerSec; - dsb->nAvgBytesPerSec = dsb->freq * - dsbd->lpwfxFormat->nBlockAlign; /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index e12baadf650..4d8cf84385d 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -141,7 +141,6 @@ struct IDirectSoundBufferImpl BufferMemory* buffer; DWORD playflags,state,leadin; DWORD writelead,buflen; - DWORD nAvgBytesPerSec; DWORD freq; DSVOLUMEPAN volpan; DSBUFFERDESC dsbd;

1 0

Anton Baskanov : dsound: Remove redundant assignments to freqAdjustNum and freqAdjustDen.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: c2563de512d8ce1aa2b42c33b56b2d26fd1d5bf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2563de512d8ce1aa2b42c33b56b2d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 26 12:15:19 2023 +0700 dsound: Remove redundant assignments to freqAdjustNum and freqAdjustDen. --- dlls/dsound/buffer.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 9f68752232f..403c88c2c95 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -291,8 +291,6 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i oldFreq = This->freq; This->freq = freq; if (freq != oldFreq) { - This->freqAdjustNum = This->freq; - This->freqAdjustDen = This->device->pwfx->nSamplesPerSec; DSOUND_RecalcFormat(This); newcommitted = realloc(This->committedbuff, This->writelead); @@ -1111,9 +1109,6 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds dsb->sec_mixpos = 0; dsb->state = STATE_STOPPED; - dsb->freqAdjustNum = dsb->freq; - dsb->freqAdjustDen = device->pwfx->nSamplesPerSec; - /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb);

1 0

Paul Gofman : mfplat: Fix returned buffer length in dxgi_surface_buffer_lock().
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: 5a162f2c316a28ad45f7c0707ed16b194204227e URL: https://gitlab.winehq.org/wine/wine/-/commit/5a162f2c316a28ad45f7c0707ed16b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 4 16:07:19 2023 -0600 mfplat: Fix returned buffer length in dxgi_surface_buffer_lock(). --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 52 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index d8de06fb23a..1b9ba24a408 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1063,7 +1063,7 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl if (buffer_start) *buffer_start = *scanline0; if (buffer_length) - *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; + *buffer_length = buffer->dxgi_surface.map_desc.DepthPitch; } return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 77b7b26ba9c..14a7beedacf 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7255,6 +7255,7 @@ static ID3D12Device *create_d3d12_device(void) static void test_d3d11_surface_buffer(void) { DWORD max_length, cur_length, length, color; + BYTE *data, *data2, *buffer_start; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; IMF2DBuffer2 *_2dbuffer2; @@ -7263,7 +7264,6 @@ static void test_d3d11_surface_buffer(void) IMFMediaBuffer *buffer; ID3D11Device *device; BYTE buff[64 * 64 * 4]; - BYTE *data, *data2; LONG pitch, pitch2; UINT index, size; IUnknown *obj; @@ -7575,7 +7575,54 @@ static void test_d3d11_surface_buffer(void) ID3D11Texture2D_Release(texture); - /* Subresource index 1. */ + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_NV12; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + if (SUCCEEDED(hr)) + { + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &buffer_start, &length); + ok(hr == S_OK, "got %#lx.\n", hr); + + ok(pitch >= desc.Width, "got %ld.\n", pitch); + ok(length == pitch * desc.Height * 3 / 2, "got %lu.\n", length); + + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "got %#lx.\n", hr); + + IMF2DBuffer2_Release(_2dbuffer2); + IMFMediaBuffer_Release(buffer); + ID3D11Texture2D_Release(texture); + } + else + { + win_skip("Failed to create NV12 texture, hr %#lx, skipping test.\n", hr); + ID3D11Device_Release(device); + return; + } + + /* Subresource index 1. + * When WARP d3d11 device is used, this test leaves the device in a broken state, so it should + * be kept last. */ + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Failed to create a texture, hr %#lx.\n", hr); @@ -7600,7 +7647,6 @@ static void test_d3d11_surface_buffer(void) IMF2DBuffer_Release(_2d_buffer); IMFMediaBuffer_Release(buffer); - ID3D11Texture2D_Release(texture); ID3D11Device_Release(device);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: 0c4e69ec5bb3a90a43fb0d050a164f354c365270 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c4e69ec5bb3a90a43fb0d050a164f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Apr 27 09:31:39 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2560b727e14..d6f9eb04340 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-04-01 17:37+0300\n" +"PO-Revision-Date: 2023-04-27 09:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -325,7 +325,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:47 msgid "Please wait until the current uninstall/modify process is complete." -msgstr "" +msgstr "Palaukite, kol dabartinis šalinimo/modifikavimo procesas bus baigtas." #: dlls/avifil32/avifil32.rc:42 msgid "Compress options"

1 0

Francois Gouget : msi/tests: Ok_() takes printf-style arguments.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: a80b183af74194a06af3281ee272590a7134b7f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a80b183af74194a06af3281ee27259… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 13:13:59 2023 +0200 msi/tests: Ok_() takes printf-style arguments. This lets the compiler check that the format and argument sizes match. --- dlls/msi/tests/custom.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6c73687b3c5..5b81deb2c94 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -32,9 +32,15 @@ #include <msiquery.h> #include <msidefs.h> +#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__))) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static int todo_level, todo_do_loop; -static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV __WINE_PRINTF_ATTR(6,7) ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; MSIHANDLE record;

1 0

Francois Gouget : msi/tests: Fix the ok() formats so they match the size of their arguments.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: b6fb1b8983af7644b78bb0ba5fb9d18a1f0822f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6fb1b8983af7644b78bb0ba5fb9d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 13:16:08 2023 +0200 msi/tests: Fix the ok() formats so they match the size of their arguments. --- dlls/msi/tests/custom.c | 298 ++++++++++++++++++++++++------------------------ 1 file changed, 149 insertions(+), 149 deletions(-)

1 0

Jactry Zeng : appwiz.cpl: Handle WM_CLOSE and WM_COMMAND(IDCANCEL) in the support info dialog.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 619e34500fc43f1103fddd91e86d581660d2ae4b URL: https://gitlab.winehq.org/wine/wine/-/commit/619e34500fc43f1103fddd91e86d58… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 4 02:42:31 2023 -0500 appwiz.cpl: Handle WM_CLOSE and WM_COMMAND(IDCANCEL) in the support info dialog. --- dlls/appwiz.cpl/appwiz.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 14917c14795..3359d5c4a2b 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -608,9 +608,14 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L case WM_DESTROY: return 0; + case WM_CLOSE: + EndDialog(hWnd, TRUE); + return TRUE; + case WM_COMMAND: switch (LOWORD(wParam)) { + case IDCANCEL: case IDOK: EndDialog(hWnd, TRUE); break;

1 0

Jactry Zeng : appwiz.cpl: Process messages while waiting for the uninstaller to terminate.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 3e6779867a62e3e7a3562ed802191e3e309ff0b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e6779867a62e3e7a3562ed802191e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 3 09:09:06 2023 -0500 appwiz.cpl: Process messages while waiting for the uninstaller to terminate. In the current implementation, the main UI will be blocked after the uninstaller is launched. So using MsgWaitForMultipleObjects() to wait the process and process new messages from GUI. Also popup a message dialog while trying to launch multiple uninstallers. --- dlls/appwiz.cpl/appwiz.c | 45 ++++++++++++++++++++++++------------ dlls/appwiz.cpl/appwiz.rc | 1 + dlls/appwiz.cpl/res.h | 1 + po/ar.po | 58 +++++++++++++++++++++++++---------------------- po/ast.po | 58 +++++++++++++++++++++++++---------------------- po/bg.po | 58 +++++++++++++++++++++++++---------------------- po/ca.po | 58 +++++++++++++++++++++++++---------------------- po/cs.po | 58 +++++++++++++++++++++++++---------------------- po/da.po | 58 +++++++++++++++++++++++++---------------------- po/de.po | 58 +++++++++++++++++++++++++---------------------- po/el.po | 58 +++++++++++++++++++++++++---------------------- po/en.po | 58 +++++++++++++++++++++++++---------------------- po/en_US.po | 58 +++++++++++++++++++++++++---------------------- po/eo.po | 58 +++++++++++++++++++++++++---------------------- po/es.po | 58 +++++++++++++++++++++++++---------------------- po/fa.po | 58 +++++++++++++++++++++++++---------------------- po/fi.po | 58 +++++++++++++++++++++++++---------------------- po/fr.po | 58 +++++++++++++++++++++++++---------------------- po/he.po | 58 +++++++++++++++++++++++++---------------------- po/hi.po | 58 +++++++++++++++++++++++++---------------------- po/hr.po | 58 +++++++++++++++++++++++++---------------------- po/hu.po | 58 +++++++++++++++++++++++++---------------------- po/it.po | 58 +++++++++++++++++++++++++---------------------- po/ja.po | 58 +++++++++++++++++++++++++---------------------- po/ko.po | 58 +++++++++++++++++++++++++---------------------- po/lt.po | 58 +++++++++++++++++++++++++---------------------- po/ml.po | 58 +++++++++++++++++++++++++---------------------- po/nb_NO.po | 58 +++++++++++++++++++++++++---------------------- po/nl.po | 58 +++++++++++++++++++++++++---------------------- po/or.po | 58 +++++++++++++++++++++++++---------------------- po/pa.po | 58 +++++++++++++++++++++++++---------------------- po/pl.po | 58 +++++++++++++++++++++++++---------------------- po/pt_BR.po | 58 +++++++++++++++++++++++++---------------------- po/pt_PT.po | 58 +++++++++++++++++++++++++---------------------- po/rm.po | 58 +++++++++++++++++++++++++---------------------- po/ro.po | 58 +++++++++++++++++++++++++---------------------- po/ru.po | 58 +++++++++++++++++++++++++---------------------- po/si.po | 58 +++++++++++++++++++++++++---------------------- po/sk.po | 58 +++++++++++++++++++++++++---------------------- po/sl.po | 58 +++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 58 +++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 58 +++++++++++++++++++++++++---------------------- po/sv.po | 58 +++++++++++++++++++++++++---------------------- po/ta.po | 58 +++++++++++++++++++++++++---------------------- po/te.po | 58 +++++++++++++++++++++++++---------------------- po/th.po | 58 +++++++++++++++++++++++++---------------------- po/tr.po | 58 +++++++++++++++++++++++++---------------------- po/uk.po | 58 +++++++++++++++++++++++++---------------------- po/wa.po | 58 +++++++++++++++++++++++++---------------------- po/wine.pot | 58 +++++++++++++++++++++++++---------------------- po/zh_CN.po | 58 +++++++++++++++++++++++++---------------------- po/zh_TW.po | 58 +++++++++++++++++++++++++---------------------- 52 files changed, 1552 insertions(+), 1337 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement SampleBias() method.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: af4bb037959a7aa7981444f4be0e8ff9854e8c0d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af4bb037959a7aa7981444f4be0e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 19:24:14 2023 +0200 vkd3d-shader/hlsl: Implement SampleBias() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++------ libs/vkd3d-shader/tpf.c | 34 ++++++++++++++++++++++++++++------ tests/sampler.shader_test | 13 +++++++++++++ 5 files changed, 60 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 32511590..f0b6a5ef 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2383,6 +2383,7 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", [HLSL_RESOURCE_SAMPLE_LOD] = "sample_lod", + [HLSL_RESOURCE_SAMPLE_LOD_BIAS] = "sample_biased", [HLSL_RESOURCE_GATHER_RED] = "gather_red", [HLSL_RESOURCE_GATHER_GREEN] = "gather_green", [HLSL_RESOURCE_GATHER_BLUE] = "gather_blue", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 974252d4..2ff18536 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -588,6 +588,7 @@ enum hlsl_resource_load_type HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, HLSL_RESOURCE_SAMPLE_LOD, + HLSL_RESOURCE_SAMPLE_LOD_BIAS, HLSL_RESOURCE_GATHER_RED, HLSL_RESOURCE_GATHER_GREEN, HLSL_RESOURCE_GATHER_BLUE, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a7237f1d..10deda75 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3819,21 +3819,26 @@ static bool add_gather_method_call(struct hlsl_ctx *ctx, struct list *instrs, st return true; } -static bool add_sample_level_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object, +static bool add_sample_lod_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object, const char *name, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { const struct hlsl_type *object_type = object->data_type; - struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE_LOD}; + struct hlsl_resource_load_params load_params = { 0 }; const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; + if (!strcmp(name, "SampleLevel")) + load_params.type = HLSL_RESOURCE_SAMPLE_LOD; + else + load_params.type = HLSL_RESOURCE_SAMPLE_LOD_BIAS; + if (params->args_count < 3 || params->args_count > 4 + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of arguments to method 'SampleLevel': expected from 3 to %u, but got %u.", - 4 + !!offset_dim, params->args_count); + "Wrong number of arguments to method '%s': expected from 3 to %u, but got %u.", + name, 4 + !!offset_dim, params->args_count); return false; } @@ -3845,7 +3850,7 @@ static bool add_sample_level_method_call(struct hlsl_ctx *ctx, struct list *inst if ((string = hlsl_type_to_string(ctx, sampler_type))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Wrong type for argument 0 of SampleLevel(): expected 'sampler', but got '%s'.", string->buffer); + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); hlsl_release_string_buffer(ctx, string); return false; } @@ -3920,7 +3925,13 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) { - return add_sample_level_method_call(ctx, instrs, object, name, params, loc); + return add_sample_lod_method_call(ctx, instrs, object, name, params, loc); + } + else if (!strcmp(name, "SampleBias") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) + { + return add_sample_lod_method_call(ctx, instrs, object, name, params, loc); } else { diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index f3a15305..d104c078 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3700,14 +3700,30 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf } static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, - const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, - const struct hlsl_deref *resource, const struct hlsl_deref *sampler, - const struct hlsl_ir_node *coords, const struct hlsl_ir_node *texel_offset) + const struct hlsl_ir_resource_load *load) { + const struct hlsl_type *resource_type = load->resource.var->data_type; + const struct hlsl_ir_node *texel_offset = load->texel_offset.node; + const struct hlsl_ir_node *coords = load->coords.node; + const struct hlsl_deref *resource = &load->resource; + const struct hlsl_deref *sampler = &load->sampler; + const struct hlsl_ir_node *dst = &load->node; struct sm4_instruction instr; memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_SAMPLE; + switch (load->load_type) + { + case HLSL_RESOURCE_SAMPLE: + instr.opcode = VKD3D_SM4_OP_SAMPLE; + break; + + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: + instr.opcode = VKD3D_SM4_OP_SAMPLE_B; + break; + + default: + vkd3d_unreachable(); + } if (texel_offset) { @@ -3727,6 +3743,12 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_deref(ctx, &instr.srcs[2], sampler, sampler->var->data_type, VKD3DSP_WRITEMASK_ALL); instr.src_count = 3; + if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS) + { + sm4_src_from_node(&instr.srcs[3], load->lod.node, VKD3DSP_WRITEMASK_ALL); + ++instr.src_count; + } + write_sm4_instruction(buffer, &instr); } @@ -4478,13 +4500,13 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: if (!load->sampler.var) { hlsl_fixme(ctx, &load->node.loc, "SM4 combined sample expression."); return; } - write_sm4_sample(ctx, buffer, resource_type, &load->node, - &load->resource, &load->sampler, coords, texel_offset); + write_sm4_sample(ctx, buffer, load); break; case HLSL_RESOURCE_GATHER_RED: diff --git a/tests/sampler.shader_test b/tests/sampler.shader_test index 3970fb51..2cb70a0b 100644 --- a/tests/sampler.shader_test +++ b/tests/sampler.shader_test @@ -32,3 +32,16 @@ float4 main() : sv_target [test] draw quad probe all rgba (0.25, 0, 0.25, 0) + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.SampleBias(s, float2(0.5, 0.5), 0.0); +} + +[test] +draw quad +probe all rgba (0.25, 0, 0.25, 0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add separate helpers to generate object methods.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: c166ab97278ea42a0726275bc494a5824b7a9092 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c166ab97278ea42a0726275bc494a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 19:13:46 2023 +0200 vkd3d-shader/hlsl: Add separate helpers to generate object methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 484 +++++++++++++++++++++++++---------------------- 1 file changed, 256 insertions(+), 228 deletions(-)

1 0