OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Minor menu tweaks and display the vulkan device name in the menus

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-15 15:23:23 +02:00
commit 9bcef148bf
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/engine/namedef.h
View file

@ -260,6 +260,8 @@ xx(Mididevices)
xx(Aldevices)
xx(Alresamplers)
xx(Vkdevices)
// Decorate compatibility functions
xx(BuiltinRandom)
xx(BuiltinRandom2)

7
src/common/menu/menudef.cpp
View file

@ -66,7 +66,7 @@ PClass *DefaultOptionMenuClass;
void I_BuildALDeviceList(FOptionValues *opt);
void I_BuildALResamplersList(FOptionValues *opt);
void I_BuildVKDeviceList(FOptionValues *opt);
DEFINE_GLOBAL_NAMED(OptionSettings, OptionMenuSettings)
@ -1682,6 +1682,11 @@ void M_CreateMenus()
{
I_BuildALResamplersList(*opt);
}
opt = OptionValues.CheckKey(NAME_Vkdevices);
if (opt != nullptr)
{
I_BuildVKDeviceList(*opt);
}
}

11
src/common/rendering/vulkan/vk_renderdevice.cpp
View file

@ -62,6 +62,7 @@
#include <zvulkan/vulkancompatibledevice.h>
#include "engineerrors.h"
#include "c_dispatch.h"
#include "menu.h"
FString JitCaptureStackTrace(int framesToSkip, bool includeNativeFrames, int maxFrames = -1);
@ -97,6 +98,16 @@ CCMD(vk_listdevices)
}
}
void I_BuildVKDeviceList(FOptionValues* opt)
{
for (size_t i = 0; i < SupportedDevices.size(); i++)
{
unsigned int idx = opt->mValues.Reserve(1);
opt->mValues[idx].Value = (double)i;
opt->mValues[idx].Text = SupportedDevices[i].Device->Properties.Properties.deviceName;
}
}
void VulkanError(const char* text)
{
throw CVulkanError(text);