December 2023 - Wine-Commits

Jacek Caban : ntdll: Remove unused valgrind_make_readable function.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 04b3f6ee511696c2e3b1700475f775738d7fe24d URL: https://gitlab.winehq.org/wine/wine/-/commit/04b3f6ee511696c2e3b1700475f775… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 00:28:10 2023 +0100 ntdll: Remove unused valgrind_make_readable function. --- dlls/ntdll/heap.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e3388e1bc8a..4dc3e7296b6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -460,16 +460,6 @@ static inline void valgrind_make_noaccess( void const *ptr, SIZE_T size ) #endif } -/* mark a block of memory as initialized for debugging purposes */ -static inline void valgrind_make_readable( void const *ptr, SIZE_T size ) -{ -#if defined(VALGRIND_MAKE_MEM_DEFINED) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size ) ); -#elif defined(VALGRIND_MAKE_READABLE) - VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ) ); -#endif -} - /* mark a block of memory as uninitialized for debugging purposes */ static inline void valgrind_make_writable( void const *ptr, SIZE_T size ) {

1 0

Stefan Dösinger : tests: Show that creating identical root signatures returns the same pointer.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 705cf106264f03cb22a906fbca00d56bb3d0ea96 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/705cf106264f03cb22a906fbca00d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 2 21:22:43 2023 +0300 tests: Show that creating identical root signatures returns the same pointer. --- tests/d3d12.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 49e3a840..5d894d4b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2633,15 +2633,19 @@ static void test_create_unordered_access_view(void) static void test_create_root_signature(void) { + ID3D12RootSignature *root_signature, *root_signature2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; D3D12_RESOURCE_BINDING_TIER binding_tier; D3D12_ROOT_PARAMETER root_parameters[3]; - ID3D12RootSignature *root_signature; ID3D12Device *device, *tmp_device; + unsigned int size; ULONG refcount; HRESULT hr; + static const GUID test_guid + = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -2653,6 +2657,43 @@ static void test_create_root_signature(void) * ranges of different types. */ binding_tier = get_resource_binding_tier(device); + /* empty root signature */ + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = NULL; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + /* Creating the same root signature twice returns the same interface pointer. + * + * However, the root signature object actually gets destroyed after releasing + * the last reference. Re-creating the same root descriptor later does not + * reliably return the same interface pointer, although it might do so if the + * heap manager reuses the allocation. */ + hr = create_root_signature(device, &root_signature_desc, &root_signature2); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + todo ok(root_signature == root_signature2, "Got different root signature pointers.\n"); + refcount = ID3D12RootSignature_Release(root_signature2); + todo ok(refcount == 1, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + + hr = 0xdeadbeef; + hr = ID3D12RootSignature_SetPrivateData(root_signature, &test_guid, sizeof(hr), &hr); + ok(hr == S_OK, "Failed to set private data, hr %#x.\n", hr); + hr = ID3D12RootSignature_GetPrivateData(root_signature, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + hr = ID3D12RootSignature_GetPrivateData(root_signature, &test_guid, &size, NULL); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + /* descriptor table */ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[0].NumDescriptors = 1; @@ -2685,6 +2726,12 @@ static void test_create_root_signature(void) check_interface(root_signature, &IID_ID3D12Pageable, false); check_interface(root_signature, &IID_ID3D12RootSignature, true); + hr = create_root_signature(device, &root_signature_desc, &root_signature2); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + todo ok(root_signature == root_signature2, "Got different root signature pointers.\n"); + refcount = ID3D12RootSignature_Release(root_signature2); + todo ok(refcount == 1, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); @@ -2747,17 +2794,6 @@ static void test_create_root_signature(void) hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* empty root signature */ - root_signature_desc.NumParameters = 0; - root_signature_desc.pParameters = NULL; - root_signature_desc.NumStaticSamplers = 0; - root_signature_desc.pStaticSamplers = NULL; - root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; - hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - refcount = ID3D12RootSignature_Release(root_signature); - ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); - /* root constants */ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; root_parameters[0].Constants.ShaderRegister = 0;

1 0

Stefan Dösinger : tests: Show that graphics pipeline state objects are not reused.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 82a3209ee200b7dc7443512fdc47b754cc363ae3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/82a3209ee200b7dc7443512fdc47b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 2 21:35:52 2023 +0300 tests: Show that graphics pipeline state objects are not reused. --- tests/d3d12.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5d894d4b..5f145194 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3067,10 +3067,10 @@ static void test_create_compute_pipeline_state(void) static void test_create_graphics_pipeline_state(void) { + ID3D12PipelineState *pipeline_state, *pipeline_state2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12RootSignature *root_signature; - ID3D12PipelineState *pipeline_state; ID3D12Device *device, *tmp_device; D3D12_BLEND_DESC *blend; ULONG refcount; @@ -3105,6 +3105,13 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state2); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ok(pipeline_state != pipeline_state2, "Got the same pipeline state object.\n"); + refcount = ID3D12PipelineState_Release(pipeline_state2); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);

1 0

Stefan Dösinger : tests: Show that compute pipeline state objects are not reused.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 1eaf7fa37bbef1a3ab51cca962c1b1e2d93a2fc9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1eaf7fa37bbef1a3ab51cca962c1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 2 22:30:07 2023 +0300 tests: Show that compute pipeline state objects are not reused. --- tests/d3d12.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f145194..1fa24121 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2991,9 +2991,9 @@ static void test_root_signature_limits(void) static void test_create_compute_pipeline_state(void) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; + ID3D12PipelineState *pipeline_state, *pipeline_state2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12RootSignature *root_signature; - ID3D12PipelineState *pipeline_state; ID3D12Device *device, *tmp_device; ID3D10Blob *bytecode; ULONG refcount; @@ -3036,6 +3036,13 @@ static void test_create_compute_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); + hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state2); + ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); + ok(pipeline_state != pipeline_state2, "Got the same pipeline state object.\n"); + refcount = ID3D12PipelineState_Release(pipeline_state2); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);

1 0

Stefan Dösinger : tests: Show that CreatePipelineState also doesn't reuse duplicate objects.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: b0d1fb0bd78f848a008ebc10113d4b7363a6aa02 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b0d1fb0bd78f848a008ebc10113d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 4 11:04:46 2023 +0300 tests: Show that CreatePipelineState also doesn't reuse duplicate objects. --- tests/d3d12.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1fa24121..1126d974 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3227,9 +3227,9 @@ static void test_create_graphics_pipeline_state(void) static void test_create_pipeline_state(void) { + ID3D12PipelineState *pipeline_state, *pipeline_state2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12RootSignature *root_signature; - ID3D12PipelineState *pipeline_state; ID3D12Device2 *device2; ID3D12Device *device; unsigned int i; @@ -3685,6 +3685,13 @@ static void test_create_pipeline_state(void) if (hr == S_OK) { + hr = ID3D12Device2_CreatePipelineState(device2, &tests[i].stream_desc, &IID_ID3D12PipelineState, + (void **)&pipeline_state2); + ok(hr == S_OK, "Got unexpected return value %#x.\n", hr); + ok(pipeline_state != pipeline_state2, "Got the same pipeline state object.\n"); + refcount = ID3D12PipelineState_Release(pipeline_state2); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12PipelineState_Release(pipeline_state); ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); }

1 0

Conor McCarthy : vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input().
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 45679a966c73669bdb7fa371569dcc34a448d8d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/45679a966c73669bdb7fa371569dc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 8 00:34:10 2023 +1000 vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input(). --- libs/vkd3d-shader/ir.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 710811c6..a35ef862 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -463,6 +463,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i struct vkd3d_shader_instruction_array *instructions; struct control_point_normaliser normaliser; unsigned int input_control_point_count; + struct vkd3d_shader_location location; struct vkd3d_shader_instruction *ins; enum vkd3d_result ret; unsigned int i, j; @@ -513,8 +514,10 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i return VKD3D_OK; case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_HS_JOIN_PHASE: + /* ins may be relocated if the instruction array expands. */ + location = ins->location; ret = control_point_normaliser_emit_hs_input(&normaliser, input_signature, - input_control_point_count, i, &ins->location); + input_control_point_count, i, &location); *src_instructions = normaliser.instructions; return ret; default:

1 0

Zebediah Figura : configure: Enable -Wshadow.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 26a30b85399ba4618e72d949bee231511b2277b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/26a30b85399ba4618e72d949bee23… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:43:43 2023 -0500 configure: Enable -Wshadow. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 1b6003b0..84209d31 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) + VKD3D_CHECK_CFLAGS([-Wshadow]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wpointer-arith])

1 0

Zebediah Figura : vkd3d-shader: Add a helper to search the scan descriptor info.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 28f32349f4fa11b3b40b961a351b07fb7677d425 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/28f32349f4fa11b3b40b961a351b0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 24 17:25:55 2023 -0600 vkd3d-shader: Add a helper to search the scan descriptor info. Avoid shadowing "info" in vkd3d_shader_scan_combined_sampler_declaration(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 43 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 77164c9c..88155502 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -890,6 +890,21 @@ static void vkd3d_shader_scan_combined_sampler_declaration( &semantic->resource.range, semantic->resource_type, VKD3D_SHADER_RESOURCE_DATA_FLOAT); } +static const struct vkd3d_shader_descriptor_info1 *find_descriptor( + const struct vkd3d_shader_scan_descriptor_info1 *info, + enum vkd3d_shader_descriptor_type type, unsigned int register_id) +{ + for (unsigned int i = 0; i < info->descriptor_count; ++i) + { + const struct vkd3d_shader_descriptor_info1 *d = &info->descriptors[i]; + + if (d->type == type && d->register_id == register_id) + return d; + } + + return NULL; +} + static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) { @@ -915,7 +930,6 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co if (vkd3d_shader_ver_ge(context->version, 5, 1)) { - const struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; const struct vkd3d_shader_descriptor_info1 *d; bool dynamic_resource, dynamic_sampler; @@ -930,30 +944,13 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co if (dynamic_resource || dynamic_sampler) return; - for (i = 0; i < info->descriptor_count; ++i) - { - d = &info->descriptors[i]; - if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_SRV) - continue; - if (d->register_id != resource->idx[0].offset) - continue; + if ((d = find_descriptor(context->scan_descriptor_info, + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, resource->idx[0].offset))) resource_space = d->register_space; - break; - } - if (sampler) - { - for (i = 0; i < info->descriptor_count; ++i) - { - d = &info->descriptors[i]; - if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER) - continue; - if (d->register_id != sampler->idx[0].offset) - continue; - sampler_space = d->register_space; - break; - } - } + if (sampler && (d = find_descriptor(context->scan_descriptor_info, + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->idx[0].offset))) + sampler_space = d->register_space; } for (i = 0; i < info->combined_sampler_count; ++i)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid shadowing "jump" in normalize_switch_cases().
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: dfea1abbd8eb4635fc722a9f605ec8e9ea69fa01 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfea1abbd8eb4635fc722a9f605ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 24 17:25:21 2023 -0600 vkd3d-shader/hlsl: Avoid shadowing "jump" in normalize_switch_cases(). --- libs/vkd3d-shader/hlsl_codegen.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6a7545da..88cbef61 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2301,7 +2301,6 @@ static bool normalize_switch_cases(struct hlsl_ctx *ctx, struct hlsl_ir_node *in struct hlsl_ir_switch_case *c, *def = NULL; bool missing_terminal_break = false; struct hlsl_ir_node *node; - struct hlsl_ir_jump *jump; struct hlsl_ir_switch *s; if (instr->type != HLSL_IR_SWITCH) @@ -2320,10 +2319,7 @@ static bool normalize_switch_cases(struct hlsl_ctx *ctx, struct hlsl_ir_node *in { node = LIST_ENTRY(list_tail(&c->body.instrs), struct hlsl_ir_node, entry); if (node->type == HLSL_IR_JUMP) - { - jump = hlsl_ir_jump(node); - terminal_break = jump->type == HLSL_IR_JUMP_BREAK; - } + terminal_break = (hlsl_ir_jump(node)->type == HLSL_IR_JUMP_BREAK); } missing_terminal_break |= !terminal_break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid shadowing "load" in intrinsic_tex().
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: vkd3d Branch: master Commit: 98a02ceffb433b342d075c6aef54cf9bb946cf11 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98a02ceffb433b342d075c6aef54c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 12:32:29 2023 -0500 vkd3d-shader/hlsl: Avoid shadowing "load" in intrinsic_tex(). --- libs/vkd3d-shader/hlsl.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d0210b82..ed053f16 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3553,7 +3553,7 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * { struct hlsl_resource_load_params load_params = { 0 }; const struct hlsl_type *sampler_type; - struct hlsl_ir_node *coords, *load; + struct hlsl_ir_node *coords, *sample; if (params->args_count != 2 && params->args_count != 4) { @@ -3688,9 +3688,9 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * load_params.format = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4); load_params.sampling_dim = dim; - if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) + if (!(sample = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - hlsl_block_add_instr(params->instrs, load); + hlsl_block_add_instr(params->instrs, sample); return true; }

1 0