OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made sysCallbacks a value variable instead of a pointer to simplify the checks for it.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-03 16:47:47 +02:00
commit ff62d7a8a3
20 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/rendering/gl/gl_samplers.cpp
View file

@ -119,7 +119,7 @@ void FSamplerManager::SetTextureFilterMode()
glBindSampler(i, 0);
}
int filter = sysCallbacks && sysCallbacks->DisableTextureFilter && sysCallbacks->DisableTextureFilter() ? 0 : gl_texture_filter;
int filter = sysCallbacks.DisableTextureFilter && sysCallbacks.DisableTextureFilter() ? 0 : gl_texture_filter;
for (int i = 0; i < 4; i++)
{

2
src/common/rendering/hwrenderer/data/hw_clock.cpp
View file

@ -166,7 +166,7 @@ void CheckBench()
FString compose;
if (sysCallbacks && sysCallbacks->GetLocationDescription) compose = sysCallbacks->GetLocationDescription();
if (sysCallbacks.GetLocationDescription) compose = sysCallbacks.GetLocationDescription();
AppendRenderStats(compose);
AppendRenderTimes(compose);

2
src/common/rendering/hwrenderer/data/hw_vrmodes.cpp
View file

@ -61,7 +61,7 @@ static VRMode vrmi_checker = { 2, isqrt2, isqrt2, 1.f,{ { -.5f, 1.f },{ .5f, 1.f
const VRMode *VRMode::GetVRMode(bool toscreen)
{
#ifdef VR3D_ENABLED
int mode = !toscreen || (sysCallbacks && sysCallbacks->DisableTextureFilter && sysCallbacks->DisableTextureFilter()) ? 0 : vr_mode;
int mode = !toscreen || (sysCallbacks.DisableTextureFilter && sysCallbacks.DisableTextureFilter()) ? 0 : vr_mode;
switch (mode)
{

2
src/common/rendering/r_videoscale.cpp
View file

@ -107,7 +107,7 @@ namespace
static bool lastspecialUI = false;
bool isInActualMenu = false;
bool specialUI = sysCallbacks && (!sysCallbacks->IsSpecialUI || sysCallbacks->IsSpecialUI());
bool specialUI = (!sysCallbacks.IsSpecialUI || sysCallbacks.IsSpecialUI());
if (specialUI == lastspecialUI)
return;

2
src/common/rendering/v_framebuffer.cpp
View file

@ -200,7 +200,7 @@ void DFrameBuffer::SetViewportRects(IntRect *bounds)
mScreenViewport.height = screenHeight;
// Viewport for the 3D scene
if (sysCallbacks && sysCallbacks->GetSceneRect) mSceneViewport = sysCallbacks->GetSceneRect();
if (sysCallbacks.GetSceneRect) mSceneViewport = sysCallbacks.GetSceneRect();
else mSceneViewport = mScreenViewport;
// Scale viewports to fit letterbox

12
src/common/rendering/v_video.cpp
View file

@ -116,8 +116,8 @@ CUSTOM_CVAR(Int, uiscale, 0, CVAR_ARCHIVE | CVAR_NOINITCALL)
self = 0;
return;
}
if (sysCallbacks && sysCallbacks->OnScreenSizeChanged)
sysCallbacks->OnScreenSizeChanged();
if (sysCallbacks.OnScreenSizeChanged)
sysCallbacks.OnScreenSizeChanged();
setsizeneeded = true;
}
@ -294,8 +294,8 @@ void V_OutputResized (int width, int height)
twod->End();
setsizeneeded = true;
C_NewModeAdjust();
if (sysCallbacks && sysCallbacks->OnScreenSizeChanged)
sysCallbacks->OnScreenSizeChanged();
if (sysCallbacks.OnScreenSizeChanged)
sysCallbacks.OnScreenSizeChanged();
}
bool IVideo::SetResolution ()
@ -392,8 +392,8 @@ void V_Init2()
CUSTOM_CVAR (Int, vid_aspect, 0, CVAR_GLOBALCONFIG|CVAR_ARCHIVE)
{
setsizeneeded = true;
if (sysCallbacks && sysCallbacks->OnScreenSizeChanged)
sysCallbacks->OnScreenSizeChanged();
if (sysCallbacks.OnScreenSizeChanged)
sysCallbacks.OnScreenSizeChanged();
}
DEFINE_ACTION_FUNCTION(_Screen, GetAspectRatio)

2
src/common/rendering/vulkan/textures/vk_samplers.cpp
View file

@ -81,7 +81,7 @@ void VkSamplerManager::SetTextureFilterMode()
void VkSamplerManager::Create()
{
int filter = sysCallbacks && sysCallbacks->DisableTextureFilter && sysCallbacks->DisableTextureFilter()? 0 : gl_texture_filter;
int filter = sysCallbacks.DisableTextureFilter && sysCallbacks.DisableTextureFilter()? 0 : gl_texture_filter;
for (int i = CLAMP_NONE; i <= CLAMP_XY; i++)
{