hodasemi/rFactor2_vk_hud
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases 1 Wiki Activity Actions

Compare commits

base: hodasemi:c4d199ac4bdd6333d2c6be1047ba67ddf1ac2649
Branches Tags
hodasemi:master
hodasemi:renovate/ringbuf-0.x
hodasemi:v0.1
..
compare: hodasemi:aa19e7a28d2b5b5ef2ca18687fd9604266140df8
Branches Tags
hodasemi:renovate/ringbuf-0.x
hodasemi:master
hodasemi:v0.1

No commits in common. "c4d199ac4bdd6333d2c6be1047ba67ddf1ac2649" and "aa19e7a28d2b5b5ef2ca18687fd9604266140df8" have entirely different histories.
c4d199ac4b ... aa19e7a28d

6 changed files with 30 additions and 76 deletions
Show stats Expand all files Collapse all files

2
resources/pkgbuild/PKGBUILD
View file

@ -7,7 +7,7 @@ pkgdesc="Vulkan overlay layer for rFactor 2"
arch=('x86_64')
url="https://gavania.de/hodasemi/${_pkgbase}"
license=('GPL-3.0')
makedepends=('rust' 'ctags' 'glslang' 'vulkan-headers')
makedepends=('rust' 'ctags' 'glslang')
depends=()
conflicts=("${_pkgbase}")
source=("git+${url}")

4
src/overlay/elements/leaderboard/leaderboard_entry.rs
View file

@ -218,7 +218,7 @@ impl LeaderBoardEntry {
if best_lap > 60.0 {
let (full_minutes, remainder) = Self::split_minute(best_lap);
format!("{:.0}:{:06.3}", full_minutes, remainder)
format!("{:.0}:{:.3}", full_minutes, remainder)
} else {
format!("{:.3}", best_lap)
}
@ -307,7 +307,5 @@ mod test {
let behind_leader = LeaderBoardEntry::calculate_behind_leader(BehindLeader::Time(85.42));
let behind_next = LeaderBoardEntry::calculate_behind_next(150.213423);
let best_lap = LeaderBoardEntry::calculuate_best_lap(97.23436);
let t = LeaderBoardEntry::calculuate_best_lap(65.23436);
}
}

40
src/overlay/elements/pedals/mod.rs
View file

@ -116,16 +116,7 @@ impl Pedals {
write_log!("allocate throttle descriptor");
let throttle_descriptor = match descriptor_pool.prepare_set().allocate() {
Ok(d) => d,
Err(err) => {
write_log!(format!("desc alloc {:?}, {}", err, err.backtrace()));
return Err(err);
}
};
write_log!("update throttle descriptor");
let throttle_descriptor = descriptor_pool.prepare_set().allocate()?;
throttle_descriptor.update(&[DescriptorWrite::uniform_buffers(
0,
&[&throttle_color_buffer],
@ -139,8 +130,6 @@ impl Pedals {
brake_samples.push_overwrite(0.0);
}
write_log!(format!("create vertex buffers ({icon_width})"));
let brake_vertex_buffer = Self::create_vertex_buffer(&device, icon_width as VkDeviceSize)?;
let throttle_vertex_buffer =
Self::create_vertex_buffer(&device, icon_width as VkDeviceSize)?;
@ -171,8 +160,6 @@ impl Pedals {
throttle_vertex_buffer,
};
write_log!("update vertex buffers");
me.update_vertex_buffers()?;
Ok(me)
@ -220,27 +207,26 @@ impl Pedals {
let command_buffer =
CommandBuffer::new_primary().build(self.device.clone(), self.queue.clone())?;
{
if self.enable {
let mut recorder = command_buffer.begin(VkCommandBufferBeginInfo::new(
VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
| VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT,
))?;
if self.enable {
self.render_target
.begin(&mut recorder, VK_SUBPASS_CONTENTS_INLINE, 0);
recorder.bind_pipeline(self.pipeline.pipeline())?;
self.render_target
.begin(&mut recorder, VK_SUBPASS_CONTENTS_INLINE, 0);
recorder.bind_descriptor_sets_minimal(&[&self.throttle_descriptor]);
recorder.bind_vertex_buffer(&self.throttle_vertex_buffer);
recorder.draw_complete_single_instance(self.throttle_vertex_buffer.size() as u32);
recorder.bind_pipeline(self.pipeline.pipeline())?;
recorder.bind_descriptor_sets_minimal(&[&self.brake_descriptor]);
recorder.bind_vertex_buffer(&self.brake_vertex_buffer);
recorder.draw_complete_single_instance(self.brake_vertex_buffer.size() as u32);
recorder.bind_descriptor_sets_minimal(&[&self.throttle_descriptor]);
recorder.bind_vertex_buffer(&self.throttle_vertex_buffer);
recorder.draw_complete_single_instance(self.throttle_vertex_buffer.size() as u32);
self.render_target.end(&mut recorder);
}
recorder.bind_descriptor_sets_minimal(&[&self.brake_descriptor]);
recorder.bind_vertex_buffer(&self.brake_vertex_buffer);
recorder.draw_complete_single_instance(self.brake_vertex_buffer.size() as u32);
self.render_target.end(&mut recorder);
}
Ok(command_buffer)

30
src/overlay/elements/radar/mod.rs
View file

@ -222,31 +222,29 @@ impl Radar {
let command_buffer =
CommandBuffer::new_primary().build(self.device.clone(), self.queue.clone())?;
{
if self.enable {
let mut recorder = command_buffer.begin(VkCommandBufferBeginInfo::new(
VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
| VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT,
))?;
if self.enable {
self.render_target.begin(
&mut recorder,
VK_SUBPASS_CONTENTS_INLINE,
image_index as usize,
);
self.render_target.begin(
&mut recorder,
VK_SUBPASS_CONTENTS_INLINE,
image_index as usize,
);
recorder.bind_pipeline(self.pipeline.pipeline())?;
recorder.bind_pipeline(self.pipeline.pipeline())?;
for object in self.objects() {
let buffer = &object.position_buffer;
for object in self.objects() {
let buffer = &object.position_buffer;
recorder.bind_descriptor_sets_minimal(&[&object.descriptor_set]);
recorder.bind_vertex_buffer(buffer);
recorder.draw_complete_single_instance(buffer.size() as u32);
}
self.render_target.end(&mut recorder);
recorder.bind_descriptor_sets_minimal(&[&object.descriptor_set]);
recorder.bind_vertex_buffer(buffer);
recorder.draw_complete_single_instance(buffer.size() as u32);
}
self.render_target.end(&mut recorder);
}
Ok(command_buffer)

22
src/vk_layer/mod.rs
View file

@ -55,8 +55,6 @@ extern "system" fn get_device_proc_addr(
_device: VkDevice,
function_name: *const c_char,
) -> PFN_vkVoidFunction {
write_log!("get_device_proc_addr");
let func_string = match VkString::try_from(function_name) {
Ok(func) => func,
Err(_) => {
@ -67,8 +65,6 @@ extern "system" fn get_device_proc_addr(
let s = func_string.as_str();
write_log!(format!("\t{}", s));
if let Some(func) = Functions::get_vk_func(s) {
return func.convert();
}
@ -77,8 +73,6 @@ extern "system" fn get_device_proc_addr(
return func;
}
write_log!("\t-> returning null");
Functions::Null.convert()
}
@ -87,8 +81,6 @@ extern "system" fn get_instance_proc_addr(
_instance: VkInstance,
function_name: *const c_char,
) -> PFN_vkVoidFunction {
write_log!("get_instance_proc_addr");
let func_string = match VkString::try_from(function_name) {
Ok(func) => func,
Err(_) => {
@ -99,8 +91,6 @@ extern "system" fn get_instance_proc_addr(
let s = func_string.as_str();
write_log!(format!("\t{}", s));
if let Some(func) = Functions::get_vk_func(s) {
return func.convert();
}
@ -109,8 +99,6 @@ extern "system" fn get_instance_proc_addr(
return func;
}
write_log!("\t-> returning null");
Functions::Null.convert()
}
@ -156,8 +144,6 @@ pub(crate) extern "system" fn create_instance(
// DXVK workaround, it creates the instance twice with different properties
if ext_names.contains(&VkString::new("VK_KHR_surface")) {
write_log!("found VK_KHR_surface");
unsafe {
let panic_result =
match std::panic::catch_unwind(|| -> anyhow::Result<std::sync::Arc<Instance>> {
@ -165,11 +151,7 @@ pub(crate) extern "system" fn create_instance(
*instance,
proc_addr,
&ext_names,
if (*create_info).pApplicationInfo == ptr::null() {
None
} else {
Some((*(*create_info).pApplicationInfo).apiVersion)
},
(*(*create_info).pApplicationInfo).apiVersion,
)
}) {
Ok(panic_ok) => panic_ok,
@ -196,8 +178,6 @@ pub(crate) extern "system" fn create_instance(
write_log!("-> created local instance handle");
}
write_log!("returning from create_instance");
VK_SUCCESS
}

8
src/vk_layer/vk_handles.rs
View file

@ -2,8 +2,6 @@ use anyhow::Result;
use std::{collections::HashMap, ffi::c_void, mem, ptr};
use vulkan_rs::prelude::*;
use crate::write_log;
static mut FN_HANDLES: Option<VkTypedefHandles> = None;
pub fn vk_handles() -> &'static VkTypedefHandles {
@ -45,10 +43,7 @@ impl VkTypedefHandles {
let function = proc_addr(instance, name.as_ptr());
if mem::transmute::<PFN_vkVoidFunction, *const c_void>(function) != ptr::null() {
write_log!(format!("layer (instance): successfully read: {}", symbol));
self.functions.insert(symbol.clone(), function);
} else {
write_log!(format!("layer (instance): failed reading {}", symbol));
}
}
}
@ -61,10 +56,7 @@ impl VkTypedefHandles {
let function = proc_addr(device, name.as_ptr());
if mem::transmute::<PFN_vkVoidFunction, *const c_void>(function) != ptr::null() {
write_log!(format!("layer (device): successfully read: {}", symbol));
self.functions.insert(symbol.clone(), function);
} else {
write_log!(format!("layer (device): failed reading {}", symbol));
}
}
}