Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable b_ndebug for release builds #1133

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Enable b_ndebug for release builds #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cfa814
dxil-spirv: Update submodule.
HansKristian-Work Jun 20, 2022
630576d
meson: Add b_ndebug=if-release default option.
HansKristian-Work Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/vkd3d-shader/spirv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,8 +2586,8 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor
struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg,
enum vkd3d_shader_resource_type resource_type, bool is_uav_counter, bool raw_ssbo)
{
VKD3D_UNUSED enum vkd3d_shader_descriptor_type descriptor_type;
const struct vkd3d_shader_resource_binding *resource = NULL;
enum vkd3d_shader_descriptor_type descriptor_type;
struct vkd3d_shader_descriptor_binding binding;
uint32_t binding_flags;

Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d/command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7593,7 +7593,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l
{
struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
const struct d3d12_root_signature *root_signature = bindings->root_signature;
const struct vkd3d_shader_descriptor_table *table;
VKD3D_UNUSED const struct vkd3d_shader_descriptor_table *table;

table = root_signature_get_descriptor_table(root_signature, index);

Expand Down
20 changes: 10 additions & 10 deletions libs/vkd3d/vkd3d_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ struct d3d12_fence

static inline struct d3d12_fence *impl_from_ID3D12Fence1(ID3D12Fence1 *iface)
{
extern CONST_VTBL struct ID3D12Fence1Vtbl d3d12_fence_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12Fence1Vtbl d3d12_fence_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_fence_vtbl);
Expand Down Expand Up @@ -753,7 +753,7 @@ HRESULT d3d12_device_validate_custom_heap_type(struct d3d12_device *device,

static inline struct d3d12_heap *impl_from_ID3D12Heap1(ID3D12Heap1 *iface)
{
extern CONST_VTBL struct ID3D12Heap1Vtbl d3d12_heap_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12Heap1Vtbl d3d12_heap_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_heap_vtbl);
Expand Down Expand Up @@ -908,7 +908,7 @@ HRESULT d3d12_resource_create_reserved(struct d3d12_device *device,

static inline struct d3d12_resource *impl_from_ID3D12Resource2(ID3D12Resource2 *iface)
{
extern CONST_VTBL struct ID3D12Resource2Vtbl d3d12_resource_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12Resource2Vtbl d3d12_resource_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_resource_vtbl);
Expand Down Expand Up @@ -1198,7 +1198,7 @@ void d3d12_descriptor_heap_cleanup(struct d3d12_descriptor_heap *descriptor_heap

static inline struct d3d12_descriptor_heap *impl_from_ID3D12DescriptorHeap(ID3D12DescriptorHeap *iface)
{
extern CONST_VTBL struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_descriptor_heap_vtbl);
Expand Down Expand Up @@ -1272,7 +1272,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H

static inline struct d3d12_query_heap *impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface)
{
extern CONST_VTBL struct ID3D12QueryHeapVtbl d3d12_query_heap_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12QueryHeapVtbl d3d12_query_heap_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_query_heap_vtbl);
Expand Down Expand Up @@ -1403,7 +1403,7 @@ void d3d12_root_signature_dec_ref(struct d3d12_root_signature *state);

static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface)
{
extern CONST_VTBL struct ID3D12RootSignatureVtbl d3d12_root_signature_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12RootSignatureVtbl d3d12_root_signature_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_root_signature_vtbl);
Expand Down Expand Up @@ -1661,7 +1661,7 @@ VkPipeline d3d12_pipeline_state_create_pipeline_variant(struct d3d12_pipeline_st

static inline struct d3d12_pipeline_state *impl_from_ID3D12PipelineState(ID3D12PipelineState *iface)
{
extern CONST_VTBL struct ID3D12PipelineStateVtbl d3d12_pipeline_state_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12PipelineStateVtbl d3d12_pipeline_state_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_pipeline_state_vtbl);
Expand Down Expand Up @@ -2413,7 +2413,7 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_

static inline struct d3d12_command_signature *impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface)
{
extern CONST_VTBL struct ID3D12CommandSignatureVtbl d3d12_command_signature_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12CommandSignatureVtbl d3d12_command_signature_vtbl;
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d12_command_signature_vtbl);
Expand Down Expand Up @@ -3260,9 +3260,9 @@ static inline struct d3d12_device *unsafe_impl_from_ID3D12Device(d3d12_device_if

static inline struct d3d12_device *impl_from_ID3D12Device(d3d12_device_iface *iface)
{
extern CONST_VTBL struct ID3D12Device9Vtbl d3d12_device_vtbl;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12Device9Vtbl d3d12_device_vtbl;
#ifdef VKD3D_ENABLE_PROFILING
extern CONST_VTBL struct ID3D12Device9Vtbl d3d12_device_vtbl_profiled;
VKD3D_UNUSED extern CONST_VTBL struct ID3D12Device9Vtbl d3d12_device_vtbl_profiled;
#endif
if (!iface)
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('vkd3d-proton', ['c'], version : '2.6', meson_version : '>= 0.49', default_options : [
'warning_level=2',
'warning_level=2', 'b_ndebug=if-release',
])

cpu_family = target_machine.cpu_family()
Expand Down
2 changes: 1 addition & 1 deletion subprojects/dxil-spirv
Open in desktop
Submodule dxil-spirv updated 3 files
+1 −1 meson.build
+4 −1 third_party/bc-decoder/llvm_bitreader.h
+2 −1 third_party/bc-decoder/llvm_decoder.cpp