October 2021 - Wine-Commits

Nikolay Sivov : d3dx9: Implement ID3DXTextureShader::GetFunction().
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: e3d42ca3033551b99816f812bdc491fc60988ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d42ca3033551b99816f812… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 15 12:17:52 2021 +0200 d3dx9: Implement ID3DXTextureShader::GetFunction(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 28 ++++++++++++++++++++++++---- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fe0f99180ac..d5b58222ca2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2349,6 +2349,8 @@ struct d3dx9_texture_shader { ID3DXTextureShader ID3DXTextureShader_iface; LONG ref; + + ID3DXBuffer *byte_code; }; static inline struct d3dx9_texture_shader *impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) @@ -2392,6 +2394,8 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) if (!refcount) { + if (texture_shader->byte_code) + ID3DXBuffer_Release(texture_shader->byte_code); HeapFree(GetProcessHeap(), 0, texture_shader); } @@ -2400,9 +2404,14 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) static HRESULT WINAPI d3dx9_texture_shader_GetFunction(ID3DXTextureShader *iface, struct ID3DXBuffer **function) { - FIXME("iface %p, function %p stub.\n", iface, function); + struct d3dx9_texture_shader *texture_shader = impl_from_ID3DXTextureShader(iface); - return E_NOTIMPL; + TRACE("iface %p, function %p.\n", iface, function); + + *function = texture_shader->byte_code; + ID3DXBuffer_AddRef(*function); + + return S_OK; } static HRESULT WINAPI d3dx9_texture_shader_GetConstantBuffer(ID3DXTextureShader *iface, struct ID3DXBuffer **constant_buffer) @@ -2594,19 +2603,30 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; + unsigned int size; + HRESULT hr; TRACE("function %p, texture_shader %p.\n", function, texture_shader); if (!function || !texture_shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!object) + if (!(size = D3DXGetShaderSize(function))) + return D3DXERR_INVALIDDATA; + + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; object->ref = 1; + if (FAILED(hr = D3DXCreateBuffer(size, &object->byte_code))) + { + IUnknown_Release(&object->ID3DXTextureShader_iface); + return hr; + } + memcpy(ID3DXBuffer_GetBufferPointer(object->byte_code), function, size); + *texture_shader = &object->ID3DXTextureShader_iface; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bec7ba48279..26e5aa3dbb6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2353,17 +2353,20 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; + D3DXCONSTANTTABLE_DESC ctab_desc; + ID3DXBuffer *buffer, *buffer2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; unsigned int x, y, z; - ID3DXBuffer *buffer; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; D3DCAPS9 caps; + D3DXHANDLE h; + DWORD size; HRESULT hr; HWND wnd; @@ -2386,15 +2389,42 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetFunction(tx, &buffer); - todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer object.\n"); + ID3DXBuffer_Release(buffer2); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 224, "Unexpected buffer size %u.\n", size); + + ID3DXBuffer_Release(buffer); + + /* Constant buffer */ + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { skip("Texture shaders not supported, skipping further tests.\n"); IUnknown_Release(tx); return; } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "Unexpected buffer size %u.\n", size); + ID3DXBuffer_Release(buffer); + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(!ctab_desc.Constants, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + /* Constant table access calls, without constant table. */ + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!h, "Unexpected handle %p.\n", h); + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) {

1 0

Rémi Bernon : winebus.sys: Fix inverted SDL joystick hat switch y axis.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 38059e7ecf3100d7904192ec72733687463b75b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38059e7ecf3100d7904192ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 15 13:17:40 2021 +0200 winebus.sys: Fix inverted SDL joystick hat switch y axis. SDL_HAT_UP should work as SDL_CONTROLLER_BUTTON_DPAD_UP. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4fb91e4dc6d..16e7a2f6f30 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -161,14 +161,14 @@ static void set_hat_value(struct unix_device *iface, int index, int value) switch (value) { case SDL_HAT_CENTERED: break; - case SDL_HAT_UP: y = 1; break; - case SDL_HAT_RIGHTUP: y = x = 1; break; + case SDL_HAT_DOWN: y = 1; break; + case SDL_HAT_RIGHTDOWN: y = x = 1; break; case SDL_HAT_RIGHT: x = 1; break; - case SDL_HAT_RIGHTDOWN: x = 1; y = -1; break; - case SDL_HAT_DOWN: y = -1; break; - case SDL_HAT_LEFTDOWN: x = y = -1; break; + case SDL_HAT_RIGHTUP: x = 1; y = -1; break; + case SDL_HAT_UP: y = -1; break; + case SDL_HAT_LEFTUP: x = y = -1; break; case SDL_HAT_LEFT: x = -1; break; - case SDL_HAT_LEFTUP: x = -1; y = 1; break; + case SDL_HAT_LEFTDOWN: x = -1; y = 1; break; } hid_device_set_hatswitch_x(iface, index, x); hid_device_set_hatswitch_y(iface, index, y);

1 0

Zebediah Figura : wined3d: Omit GL_MAP_FLUSH_EXPLICIT_BIT for incoherent maps when ARB_MAP_BUFFER_RANGE is used.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 86e4d3aa8c971182661ad07afe0499dd598cb3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e4d3aa8c971182661ad07a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:16 2021 -0500 wined3d: Omit GL_MAP_FLUSH_EXPLICIT_BIT for incoherent maps when ARB_MAP_BUFFER_RANGE is used. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 27 +++++++++++++++------------ dlls/wined3d/resource.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b08003c697a..4510fe5b155 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2712,7 +2712,7 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(flags))); + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(bo, flags))); } else { @@ -2754,21 +2754,24 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (!bo->coherent) { - for (i = 0; i < range_count; ++i) + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, - (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + } } - } - else if (!bo->coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - { - for (i = 0; i < range_count; ++i) + else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, - (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f31996595c..abf07682c76 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -388,12 +388,16 @@ GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *reso return flags; } -GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) +GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d3d_flags) { GLbitfield ret = 0; if (d3d_flags & WINED3D_MAP_WRITE) - ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + { + ret |= GL_MAP_WRITE_BIT; + if (!bo->coherent) + ret |= GL_MAP_FLUSH_EXPLICIT_BIT; + } if (d3d_flags & WINED3D_MAP_READ) ret |= GL_MAP_READ_BIT; else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 161d36ad76c..41956f1f061 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4217,7 +4217,7 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; -GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : include: Define fpclassify().
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 29717168359b152fe7a8d7dd53d990955692d693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29717168359b152fe7a8d7dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 11:05:38 2021 +0200 include: Define fpclassify(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index d4db618f542..da07303bcd9 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -251,11 +251,22 @@ static const union { #define FP_ILOGB0 (-0x7fffffff - _C2) #define FP_ILOGBNAN 0x7fffffff +#if _MSVCR_VER >= 120 + _ACRTIMP short __cdecl _dclass(double); _ACRTIMP short __cdecl _fdclass(float); _ACRTIMP int __cdecl _dsign(double); _ACRTIMP int __cdecl _fdsign(float); +#define fpclassify(x) (sizeof(x) == sizeof(float) ? _fdclass(x) : _dclass(x)) +#define signbit(x) (sizeof(x) == sizeof(float) ? _fdsign(x) : _dsign(x)) +#define isinf(x) (fpclassify(x) == FP_INFINITE) +#define isnan(x) (fpclassify(x) == FP_NAN) +#define isnormal(x) (fpclassify(x) == FP_NORMAL) +#define isfinite(x) (fpclassify(x) <= 0) + +#else + static inline int __isnanf(float x) { union { float x; unsigned int i; } u = { x }; @@ -303,6 +314,8 @@ static inline int __signbit(double x) #define signbit(x) (sizeof(x) == sizeof(float) ? __signbitf(x) : __signbit(x)) #define isfinite(x) (!isinf(x) && !isnan(x)) +#endif + #ifdef __cplusplus } #endif

1 0

Rémi Bernon : dinput: Add support for more HID axes usages.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: b905ea81aa28cb6946b8a14e5d5181b28d01605c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b905ea81aa28cb6946b8a14e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 15 13:17:41 2021 +0200 dinput: Add support for more HID axes usages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 33 +++++++++- dlls/dinput8/tests/hid.c | 157 ++++++++++++++++++++++++++++----------------- 2 files changed, 128 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b905ea81aa28cb6946b8…

1 0

Conor McCarthy : vkd3d: Pass descriptor offset info to vkd3d-shader for graphics pipelines.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: vkd3d Branch: master Commit: 3948056256eb891c7991fc6a0309bf8e5369f6bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3948056256eb891c7991fc6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:46 2021 +0200 vkd3d: Pass descriptor offset info to vkd3d-shader for graphics pipelines. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e27c98e..ef74d7f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2403,6 +2403,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_spirv_target_info *target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; @@ -2643,6 +2644,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&shader_interface, &offset_info); + } + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { struct vkd3d_shader_scan_descriptor_info shader_info =

1 0

Conor McCarthy : vkd3d: Ignore d3d12_command_list_IASetVertexBuffers() calls with NULL views.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: vkd3d Branch: master Commit: f172647d5eb0d300a2127b76aa3189b7d285cbf1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f172647d5eb0d300a2127b7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:37 2021 +0200 vkd3d: Ignore d3d12_command_list_IASetVertexBuffers() calls with NULL views. Part of a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 118fc4b..1db624e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4498,6 +4498,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } + if (!views) + { + WARN("NULL \"views\" pointer specified.\n"); + return; + } + for (i = 0; i < view_count; ++i) { if (views[i].BufferLocation)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allocate textures for SM4.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: vkd3d Branch: master Commit: 899c2f25e219604e2e10c80640e9e757f2f68f1f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=899c2f25e219604e2e10c80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 11 21:58:46 2021 -0500 vkd3d-shader/hlsl: Allocate textures for SM4. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 63 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 00fe76b..bf93a03 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1197,6 +1197,64 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } +static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) +{ + const struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) + { + if (var->has_resource_access && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + return var; + } + return NULL; +} + +static void allocate_textures(struct hlsl_ctx *ctx) +{ + struct hlsl_ir_var *var; + uint32_t index = 0; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (!var->has_resource_access || var->data_type->type != HLSL_CLASS_OBJECT + || var->data_type->base_type != HLSL_TYPE_TEXTURE) + continue; + + if (var->reg_reservation.type == 't') + { + const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); + + if (reserved_texture && reserved_texture != var) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, + "Multiple textures bound to t%u.", var->reg_reservation.index); + hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, + "Texture '%s' is already bound to t%u.", reserved_texture->name, + var->reg_reservation.index); + } + + var->reg.id = var->reg_reservation.index; + var->reg.allocated = true; + TRACE("Allocated reserved %s to t%u.\n", var->name, index); + } + else if (!var->reg_reservation.type) + { + while (get_reserved_texture(ctx, index)) + ++index; + + var->reg.id = index; + var->reg.allocated = true; + TRACE("Allocated %s to t%u.\n", var->name, index); + ++index; + } + else + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Textures must be bound to register type 't'."); + } + } +} + static bool type_is_single_reg(const struct hlsl_type *type) { return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; @@ -1315,9 +1373,14 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun allocate_temp_registers(ctx, entry_func); if (ctx->profile->major_version < 4) + { allocate_const_registers(ctx, entry_func); + } else + { allocate_buffers(ctx); + allocate_textures(ctx); + } allocate_semantic_registers(ctx); if (ctx->result)

1 0

Philip Rebohle : vkd3d-shader/spirv: Implement texel offset support for sample_c instructions.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: vkd3d Branch: master Commit: ea1b01b1f80e5a5b4e2920be71a802d36347759e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea1b01b1f80e5a5b4e2920b… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Fri Oct 15 01:37:42 2021 +0200 vkd3d-shader/spirv: Implement texel offset support for sample_c instructions. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- tests/d3d12.c | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 58bf3d9..f9124fc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8235,12 +8235,9 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - if (instruction->handler_idx == VKD3DSIH_SAMPLE_C_LZ) { op = SpvOpImageSampleDrefExplicitLod; @@ -8255,6 +8252,14 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_SAMPLED | VKD3D_IMAGE_FLAG_DEPTH); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); diff --git a/tests/d3d12.c b/tests/d3d12.c index 93cd56d..c73e15b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14784,8 +14784,7 @@ static void test_sample_c_lz(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(j && tests[i].d_ref > 0.0f) - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target,

1 0

Conor McCarthy : tests: Add tests for sample_c texel offsets.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: vkd3d Branch: master Commit: ebc82a622cbd6514eabae78285dbe531befc49ab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebc82a622cbd6514eabae78… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:41 2021 +0200 tests: Add tests for sample_c texel offsets. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 110 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ebc82a622cbd6514eab…

1 0