edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Always clear window with black color instead of background color"

Browse source 
This reverts commit caa062c88c.

As this decreased FPS and caused the background quad to be rendered twice when using a map background in entities mode.
This commit is contained in:
Robert Müller 2024-05-19 20:01:56 +02:00
parent 8a20f0d8a2
commit c0a6f5a927
11 changed files with 67 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/backend/opengl/backend_opengl.cpp
View file

@ -937,7 +937,7 @@ void CCommandProcessorFragment_OpenGL::Cmd_Clear(const CCommandBuffer::SCommand_
{
glDisable(GL_SCISSOR_TEST);
}
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glClearColor(pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, 0.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
if(ClipWasEnabled)
{

8
src/engine/client/backend/opengl/backend_opengl3.cpp
View file

@ -414,6 +414,8 @@ bool CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand
m_vTextures.resize(CCommandBuffer::MAX_TEXTURES);
m_ClearColor.r = m_ClearColor.g = m_ClearColor.b = -1.f;
// fix the alignment to allow even 1byte changes, e.g. for alpha components
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@ -685,7 +687,11 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Clear(const CCommandBuffer::SComma
{
glDisable(GL_SCISSOR_TEST);
}
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
if(pCommand->m_Color.r != m_ClearColor.r || pCommand->m_Color.g != m_ClearColor.g || pCommand->m_Color.b != m_ClearColor.b)
{
glClearColor(pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, 0.0f);
m_ClearColor = pCommand->m_Color;
}
glClear(GL_COLOR_BUFFER_BIT);
if(ClipWasEnabled)
{

2
src/engine/client/backend/opengl/backend_opengl3.h
View file

@ -67,6 +67,8 @@ protected:
std::vector<TWGLuint> m_vBufferObjectIndices;
CCommandBuffer::SColorf m_ClearColor;
void InitPrimExProgram(CGLSLPrimitiveExProgram *pProgram, class CGLSLCompiler *pCompiler, class IStorage *pStorage, bool Textured, bool Rotationless);
bool IsNewApi() override { return true; }

38
src/engine/client/backend/vulkan/backend_vulkan.cpp
View file

@ -1059,6 +1059,8 @@ private:
SDL_Window *m_pWindow;
std::array<float, 4> m_aClearColor = {0, 0, 0, 0};
struct SRenderCommandExecuteBuffer
{
CCommandBuffer::ECommandBufferCMD m_Command;
@ -1075,6 +1077,8 @@ private:
VkBuffer m_IndexBuffer;
bool m_ClearColorInRenderThread = false;
bool m_HasDynamicState = false;
VkViewport m_Viewport;
VkRect2D m_Scissor;
@ -2441,7 +2445,7 @@ protected:
RenderPassInfo.renderArea.offset = {0, 0};
RenderPassInfo.renderArea.extent = m_VKSwapImgAndViewportExtent.m_SwapImageViewport;
VkClearValue ClearColorVal = {{{0.0f, 0.0f, 0.0f, 0.0f}}};
VkClearValue ClearColorVal = {{{m_aClearColor[0], m_aClearColor[1], m_aClearColor[2], m_aClearColor[3]}}};
RenderPassInfo.clearValueCount = 1;
RenderPassInfo.pClearValues = &ClearColorVal;
@ -6711,19 +6715,37 @@ public:
void Cmd_Clear_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_Clear *pCommand)
{
if(!pCommand->m_ForceClear)
{
bool ColorChanged = m_aClearColor[0] != pCommand->m_Color.r || m_aClearColor[1] != pCommand->m_Color.g ||
m_aClearColor[2] != pCommand->m_Color.b || m_aClearColor[3] != pCommand->m_Color.a;
m_aClearColor[0] = pCommand->m_Color.r;
m_aClearColor[1] = pCommand->m_Color.g;
m_aClearColor[2] = pCommand->m_Color.b;
m_aClearColor[3] = pCommand->m_Color.a;
if(ColorChanged)
ExecBuffer.m_ClearColorInRenderThread = true;
}
else
{
ExecBuffer.m_ClearColorInRenderThread = true;
}
ExecBuffer.m_EstimatedRenderCallCount = 0;
}
[[nodiscard]] bool Cmd_Clear(const SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_Clear *pCommand)
{
std::array<VkClearAttachment, 1> aAttachments = {VkClearAttachment{VK_IMAGE_ASPECT_COLOR_BIT, 0, VkClearValue{VkClearColorValue{{0.0f, 0.0f, 0.0f, 0.0f}}}}};
std::array<VkClearRect, 1> aClearRects = {VkClearRect{{{0, 0}, m_VKSwapImgAndViewportExtent.m_SwapImageViewport}, 0, 1}};
if(ExecBuffer.m_ClearColorInRenderThread)
{
std::array<VkClearAttachment, 1> aAttachments = {VkClearAttachment{VK_IMAGE_ASPECT_COLOR_BIT, 0, VkClearValue{VkClearColorValue{{pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, pCommand->m_Color.a}}}}};
std::array<VkClearRect, 1> aClearRects = {VkClearRect{{{0, 0}, m_VKSwapImgAndViewportExtent.m_SwapImageViewport}, 0, 1}};
VkCommandBuffer *pCommandBuffer;
if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
return false;
auto &CommandBuffer = *pCommandBuffer;
vkCmdClearAttachments(CommandBuffer, aAttachments.size(), aAttachments.data(), aClearRects.size(), aClearRects.data());
VkCommandBuffer *pCommandBuffer;
if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
return false;
auto &CommandBuffer = *pCommandBuffer;
vkCmdClearAttachments(CommandBuffer, aAttachments.size(), aAttachments.data(), aClearRects.size(), aClearRects.data());
}
return true;
}

16
src/engine/client/client.cpp
View file

@ -891,7 +891,17 @@ const char *CClient::ErrorString() const
void CClient::Render()
{
Graphics()->Clear();
if(g_Config.m_ClOverlayEntities)
{
ColorRGBA bg = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClBackgroundEntitiesColor));
Graphics()->Clear(bg.r, bg.g, bg.b);
}
else
{
ColorRGBA bg = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClBackgroundColor));
Graphics()->Clear(bg.r, bg.g, bg.b);
}
GameClient()->OnRender();
DebugRender();
@ -2718,7 +2728,7 @@ void CClient::Run()
}
// make sure the first frame just clears everything to prevent undesired colors when waiting for io
Graphics()->Clear();
Graphics()->Clear(0, 0, 0);
Graphics()->Swap();
// init sound, allowed to fail
@ -3773,7 +3783,7 @@ void CClient::UpdateAndSwap()
{
Input()->Update();
Graphics()->Swap();
Graphics()->Clear();
Graphics()->Clear(0, 0, 0);
}
void CClient::ServerBrowserUpdate()

7
src/engine/client/graphics_threaded.cpp
View file

@ -833,9 +833,14 @@ void CGraphics_Threaded::TextureSet(CTextureHandle TextureId)
m_State.m_Texture = TextureId.Id();
}
void CGraphics_Threaded::Clear()
void CGraphics_Threaded::Clear(float r, float g, float b, bool ForceClearNow)
{
CCommandBuffer::SCommand_Clear Cmd;
Cmd.m_Color.r = r;
Cmd.m_Color.g = g;
Cmd.m_Color.b = b;
Cmd.m_Color.a = 0;
Cmd.m_ForceClear = ForceClearNow;
AddCmd(Cmd);
}

4
src/engine/client/graphics_threaded.h
View file

@ -213,6 +213,8 @@ public:
{
SCommand_Clear() :
SCommand(CMD_CLEAR) {}
SColorf m_Color;
bool m_ForceClear;
};
struct SCommand_Signal : public SCommand
@ -989,7 +991,7 @@ public:
void TextureSet(CTextureHandle TextureId) override;
void Clear() override;
void Clear(float r, float g, float b, bool ForceClearNow = false) override;
void QuadsBegin() override;
void QuadsEnd() override;

3
src/engine/graphics.h
View file

@ -306,7 +306,8 @@ public:
virtual void WindowDestroyNtf(uint32_t WindowId) = 0;
virtual void WindowCreateNtf(uint32_t WindowId) = 0;
virtual void Clear() = 0;
// ForceClearNow forces the backend to trigger a clear, even at performance cost, else it might be delayed by one frame
virtual void Clear(float r, float g, float b, bool ForceClearNow = false) = 0;
virtual void ClipEnable(int x, int y, int w, int h) = 0;
virtual void ClipDisable() = 0;

17
src/game/client/components/maplayers.cpp
View file

@ -1412,23 +1412,6 @@ void CMapLayers::OnRender()
CUIRect Screen;
Graphics()->GetScreen(&Screen.x, &Screen.y, &Screen.w, &Screen.h);
if(m_Type == TYPE_BACKGROUND || m_Type == TYPE_BACKGROUND_FORCE)
{
Graphics()->TextureClear();
Graphics()->QuadsBegin();
if(g_Config.m_ClOverlayEntities)
{
Graphics()->SetColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClBackgroundEntitiesColor)));
}
else
{
Graphics()->SetColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClBackgroundColor)));
}
IGraphics::CQuadItem QuadItem(Screen.x, Screen.y, Screen.w, Screen.h);
Graphics()->QuadsDrawTL(&QuadItem, 1);
Graphics()->QuadsEnd();
}
vec2 Center = GetCurCamera()->m_Center;
bool PassedGameLayer = false;

4
src/game/client/gameclient.cpp
View file

@ -1092,12 +1092,12 @@ void CGameClient::RenderShutdownMessage()
dbg_assert(false, "Invalid client state for quitting message");
// This function only gets called after the render loop has already terminated, so we have to call Swap manually.
Graphics()->Clear();
Graphics()->Clear(0.0f, 0.0f, 0.0f);
Ui()->MapScreen();
TextRender()->TextColor(TextRender()->DefaultTextColor());
Ui()->DoLabel(Ui()->Screen(), pMessage, 16.0f, TEXTALIGN_MC);
Graphics()->Swap();
Graphics()->Clear();
Graphics()->Clear(0.0f, 0.0f, 0.0f);
}
void CGameClient::OnRconType(bool UsernameReq)

2
src/game/editor/editor.cpp
View file

@ -7718,7 +7718,7 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
void CEditor::Render()
{
// basic start
Graphics()->Clear();
Graphics()->Clear(0.0f, 0.0f, 0.0f);
CUIRect View = *Ui()->Screen();
Ui()->MapScreen();
m_CursorType = CURSOR_NORMAL;