Skip to content

Commit df4a3d4

Browse files
committed
update rpp
1 parent 2849d2c commit df4a3d4

File tree

15 files changed

+70
-70
lines changed

15 files changed

+70
-70
lines changed

rvk/acceleration.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Opt<TLAS::Buffers> TLAS::make(Arc<Device_Memory, Alloc>& memory, u32 instances)
8282
}
8383

8484
TLAS TLAS::build(Arc<Device, Alloc> device, Commands& cmds, Buffers buffers, Buffer gpu_instances,
85-
Slice<Instance> cpu_instances) {
85+
Slice<const Instance> cpu_instances) {
8686

8787
VkAccelerationStructureKHR acceleration_structure = null;
8888

@@ -168,7 +168,7 @@ u64 BLAS::gpu_address() {
168168
return vkGetAccelerationStructureDeviceAddressKHR(*device, &info);
169169
}
170170

171-
Opt<BLAS::Buffers> BLAS::make(Arc<Device_Memory, Alloc>& memory, Slice<BLAS::Size> sizes) {
171+
Opt<BLAS::Buffers> BLAS::make(Arc<Device_Memory, Alloc>& memory, Slice<const BLAS::Size> sizes) {
172172

173173
assert(sizes.length());
174174

@@ -239,7 +239,7 @@ Opt<BLAS::Buffers> BLAS::make(Arc<Device_Memory, Alloc>& memory, Slice<BLAS::Siz
239239
}
240240

241241
BLAS BLAS::build(Arc<Device, Alloc> device, Commands& cmds, Buffers buffers, Buffer geometry,
242-
Slice<Offset> offsets) {
242+
Slice<const Offset> offsets) {
243243

244244
assert(offsets.length());
245245

rvk/acceleration.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct TLAS {
4141

4242
static Opt<Buffers> make(Arc<Device_Memory, Alloc>& memory, u32 instances);
4343
static TLAS build(Arc<Device, Alloc> device, Commands& cmds, Buffers buffers,
44-
Buffer gpu_instances, Slice<Instance> cpu_instances);
44+
Buffer gpu_instances, Slice<const Instance> cpu_instances);
4545

4646
Arc<Device, Alloc> device;
4747

@@ -86,13 +86,12 @@ struct BLAS {
8686
}
8787

8888
private:
89-
explicit BLAS(Arc<Device, Alloc> device, VkAccelerationStructureKHR structure,
90-
Buffer buffer);
89+
explicit BLAS(Arc<Device, Alloc> device, VkAccelerationStructureKHR structure, Buffer buffer);
9190
friend struct Vk;
9291

93-
static Opt<Buffers> make(Arc<Device_Memory, Alloc>& memory, Slice<Size> sizes);
92+
static Opt<Buffers> make(Arc<Device_Memory, Alloc>& memory, Slice<const Size> sizes);
9493
static BLAS build(Arc<Device, Alloc> device, Commands& cmds, Buffers buffers, Buffer geometry,
95-
Slice<Offset> offsets);
94+
Slice<const Offset> offsets);
9695

9796
Arc<Device, Alloc> device;
9897

rvk/descriptors.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Descriptor_Set::~Descriptor_Set() {
106106
}
107107
}
108108

109-
void Descriptor_Set::write(u64 frame_index, Slice<VkWriteDescriptorSet> writes) {
109+
void Descriptor_Set::write(u64 frame_index, Slice<const VkWriteDescriptorSet> writes) {
110110
assert(frame_index < sets.length());
111111

112112
Region(R) {
@@ -121,8 +121,8 @@ void Descriptor_Set::write(u64 frame_index, Slice<VkWriteDescriptorSet> writes)
121121
}
122122

123123
Descriptor_Set_Layout::Descriptor_Set_Layout(Arc<Device, Alloc> D,
124-
Slice<VkDescriptorSetLayoutBinding> bindings,
125-
Slice<VkDescriptorBindingFlags> flags)
124+
Slice<const VkDescriptorSetLayoutBinding> bindings,
125+
Slice<const VkDescriptorBindingFlags> flags)
126126
: device(move(D)) {
127127

128128
assert(bindings.length() == flags.length() || flags.length() == 0);

rvk/descriptors.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ struct Descriptor_Set_Layout {
2626

2727
private:
2828
explicit Descriptor_Set_Layout(Arc<Device, Alloc> device,
29-
Slice<VkDescriptorSetLayoutBinding> bindings,
30-
Slice<VkDescriptorBindingFlags> flags);
29+
Slice<const VkDescriptorSetLayoutBinding> bindings,
30+
Slice<const VkDescriptorBindingFlags> flags);
3131
friend struct Vk;
3232

3333
Arc<Device, Alloc> device;
@@ -48,7 +48,7 @@ struct Descriptor_Set {
4848
Descriptor_Set(Descriptor_Set&& src) = default;
4949
Descriptor_Set& operator=(Descriptor_Set&& src) = default;
5050

51-
void write(u64 frame_index, Slice<VkWriteDescriptorSet> writes);
51+
void write(u64 frame_index, Slice<const VkWriteDescriptorSet> writes);
5252

5353
VkDescriptorSet get(u64 frame_index) {
5454
return sets[frame_index];

rvk/device.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,14 +283,12 @@ u32 Physical_Device::n_present_modes(VkSurfaceKHR surface) {
283283

284284
void Physical_Device::get_surface_formats(VkSurfaceKHR surface, Slice<VkSurfaceFormatKHR> formats) {
285285
u32 n = static_cast<u32>(formats.length());
286-
RVK_CHECK(vkGetPhysicalDeviceSurfaceFormatsKHR(
287-
device, surface, &n, const_cast<VkSurfaceFormatKHR*>(formats.data())));
286+
RVK_CHECK(vkGetPhysicalDeviceSurfaceFormatsKHR(device, surface, &n, formats.data()));
288287
}
289288

290289
void Physical_Device::get_present_modes(VkSurfaceKHR surface, Slice<VkPresentModeKHR> modes) {
291290
u32 n = static_cast<u32>(modes.length());
292-
RVK_CHECK(vkGetPhysicalDeviceSurfacePresentModesKHR(
293-
device, surface, &n, const_cast<VkPresentModeKHR*>(modes.data())));
291+
RVK_CHECK(vkGetPhysicalDeviceSurfacePresentModesKHR(device, surface, &n, modes.data()));
294292
}
295293

296294
u64 Physical_Device::max_allocation() {
@@ -686,7 +684,8 @@ void Device::submit(Commands& cmds, u32 index, Fence& fence) {
686684
}
687685
}
688686

689-
void Device::submit(Commands& cmds, u32 index, Slice<Sem_Ref> signal, Slice<Sem_Ref> wait) {
687+
void Device::submit(Commands& cmds, u32 index, Slice<const Sem_Ref> signal,
688+
Slice<const Sem_Ref> wait) {
690689

691690
Region(R) {
692691

@@ -732,8 +731,8 @@ void Device::submit(Commands& cmds, u32 index, Slice<Sem_Ref> signal, Slice<Sem_
732731
}
733732
}
734733

735-
void Device::submit(Commands& cmds, u32 index, Slice<Sem_Ref> signal, Slice<Sem_Ref> wait,
736-
Fence& fence) {
734+
void Device::submit(Commands& cmds, u32 index, Slice<const Sem_Ref> signal,
735+
Slice<const Sem_Ref> wait, Fence& fence) {
737736

738737
Region(R) {
739738

@@ -814,7 +813,7 @@ Slice<const char*> Device::baseline_extensions() {
814813
reinterpret_cast<const char*>(VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME),
815814
#endif
816815
};
817-
return Slice<const char*>{device};
816+
return device.slice();
818817
}
819818

820819
Slice<const char*> Device::ray_tracing_extensions() {
@@ -826,7 +825,7 @@ Slice<const char*> Device::ray_tracing_extensions() {
826825
reinterpret_cast<const char*>(VK_KHR_RAY_TRACING_POSITION_FETCH_EXTENSION_NAME),
827826
reinterpret_cast<const char*>(VK_KHR_RAY_QUERY_EXTENSION_NAME),
828827
};
829-
return Slice<const char*>{device};
828+
return device.slice();
830829
}
831830

832831
} // namespace rvk::impl

rvk/device.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ struct Device {
109109

110110
void submit(Commands& cmds, u32 index);
111111
void submit(Commands& cmds, u32 index, Fence& fence);
112-
void submit(Commands& cmds, u32 index, Slice<Sem_Ref> wait, Slice<Sem_Ref> signal);
113-
void submit(Commands& cmds, u32 index, Slice<Sem_Ref> wait, Slice<Sem_Ref> signal,
112+
void submit(Commands& cmds, u32 index, Slice<const Sem_Ref> wait, Slice<const Sem_Ref> signal);
113+
void submit(Commands& cmds, u32 index, Slice<const Sem_Ref> wait, Slice<const Sem_Ref> signal,
114114
Fence& fence);
115115

116116
operator VkDevice() const {

rvk/instance.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ void crash_dump_callback(const void* dump, u32 dump_size, void*) {
3636
Region(R) {
3737
static u64 count = 0;
3838
auto filename = format<Mregion<R>>("gpu-dump-%.nv-gpudmp"_v, count++);
39-
static_cast<void>(Files::write(
40-
filename.view(), Slice<u8>{reinterpret_cast<u8*>(const_cast<void*>(dump)), dump_size}));
39+
static_cast<void>(
40+
Files::write(filename.view(), Slice{reinterpret_cast<const u8*>(dump), dump_size}));
4141
}
4242
}
4343

@@ -46,9 +46,8 @@ void shader_debug_info_callback(const void* dump, u32 debug_info_size, void*) {
4646
Region(R) {
4747
static u64 count = 0;
4848
auto filename = format<Mregion<R>>("gpu-dump-%.nvdbg"_v, count++);
49-
static_cast<void>(
50-
Files::write(filename.view(), Slice<u8>{reinterpret_cast<u8*>(const_cast<void*>(dump)),
51-
debug_info_size}));
49+
static_cast<void>(Files::write(filename.view(),
50+
Slice{reinterpret_cast<const u8*>(dump), debug_info_size}));
5251
}
5352
}
5453

@@ -120,10 +119,10 @@ Slice<const char*> Instance::baseline_extensions() {
120119
static Array<const char*, 1> instance{
121120
reinterpret_cast<const char*>(VK_EXT_DEBUG_UTILS_EXTENSION_NAME),
122121
};
123-
return Slice<const char*>{instance};
122+
return instance.slice();
124123
}
125124

126-
Instance::Instance(Slice<String_View> extensions, Slice<String_View> layers,
125+
Instance::Instance(Slice<const String_View> extensions, Slice<const String_View> layers,
127126
Function<VkSurfaceKHR(VkInstance)> create_surface, bool validation) {
128127

129128
Profile::Time_Point start = Profile::timestamp();

rvk/instance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct Instance {
5050
static Slice<const char*> baseline_extensions();
5151

5252
private:
53-
explicit Instance(Slice<String_View> extensions, Slice<String_View> layers,
53+
explicit Instance(Slice<const String_View> extensions, Slice<const String_View> layers,
5454
Function<VkSurfaceKHR(VkInstance)> create_surface, bool validation);
5555
friend struct Arc<Instance, Alloc>;
5656

rvk/pipeline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ static VkPipelineBindPoint bind_point(Pipeline::Kind kind) {
1919
}
2020
}
2121

22-
Shader::Shader(Arc<Device, Alloc> D, Slice<u8> source) : device(move(D)) {
22+
Shader::Shader(Arc<Device, Alloc> D, Slice<const u8> source) : device(move(D)) {
2323

2424
VkShaderModuleCreateInfo mod_info = {
2525
.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,

0 commit comments

Comments
 (0)