OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

fix a few minor issues.

Browse source 
* make Corona a fully scripted class so that AActor can be made final again.
* add global vkversion variable for use by the survey code.
* move progress bar on generic start screen to the bottom and made it longer.
* revert BulletPuff to its GZDoom version because the changes are not compatible with Dehacked.
This commit is contained in:
Christoph Oelckers 2023-10-19 22:35:54 +02:00 • committed by Magnus Norddahl
commit 92bbaa7531
11 changed files with 21 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,7 @@ EXTERN_CVAR(Bool, cl_capfps)
// Physical device info
static std::vector<VulkanCompatibleDevice> SupportedDevices;
int vkversion;
CUSTOM_CVAR(Bool, vk_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{
@ -524,6 +525,7 @@ void VulkanRenderDevice::PrintStartupLog()
FString apiVersion, driverVersion;
apiVersion.Format("%d.%d.%d", VK_VERSION_MAJOR(props.apiVersion), VK_VERSION_MINOR(props.apiVersion), VK_VERSION_PATCH(props.apiVersion));
driverVersion.Format("%d.%d.%d", VK_VERSION_MAJOR(props.driverVersion), VK_VERSION_MINOR(props.driverVersion), VK_VERSION_PATCH(props.driverVersion));
vkversion = VK_API_VERSION_MAJOR(props.apiVersion) * 100 + VK_API_VERSION_MINOR(props.apiVersion);
Printf("Vulkan device: " TEXTCOLOR_ORANGE "%s\n", props.deviceName);
Printf("Vulkan device type: %s\n", deviceType.GetChars());

4
src/common/startscreen/startscreen_generic.cpp
View file

@ -107,11 +107,11 @@ bool FGenericStartScreen::DoProgress(int advance)
if (CurPos < MaxPos)
{
RgbQuad bcolor = { 2, 25, 87, 255 }; // todo: make configurable
int numnotches = 100 * 2;
int numnotches = 200 * 2;
notch_pos = ((CurPos + 1) * numnotches) / MaxPos;
if (notch_pos != NotchPos)
{ // Time to draw another notch.
ClearBlock(StartupBitmap, bcolor, (320 - 50) * 2, 250 * 2, notch_pos, 4 * 2);
ClearBlock(StartupBitmap, bcolor, (320 - 100) * 2, 480 * 2 - 30, notch_pos, 4 * 2);
NotchPos = notch_pos;
StartupTexture->CleanHardwareData(true);
}