mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
Add null backend
Thanks to @Jupeyy for the idea. Replacing graphics_threaded_null.h with a null backend makes code maintenance and memory cleanup easier.
This commit is contained in:
parent
e81ebfb0bb
commit
9ee3534ec6
|
|
@ -1824,6 +1824,8 @@ if(CLIENT)
|
|||
backend/backend_base.h
|
||||
backend/glsl_shader_compiler.cpp
|
||||
backend/glsl_shader_compiler.h
|
||||
backend/null/backend_null.cpp
|
||||
backend/null/backend_null.h
|
||||
backend/opengl/backend_opengl.cpp
|
||||
backend/opengl/backend_opengl.h
|
||||
backend/opengl/backend_opengl3.cpp
|
||||
|
|
@ -1858,7 +1860,6 @@ if(CLIENT)
|
|||
graphics_defines.h
|
||||
graphics_threaded.cpp
|
||||
graphics_threaded.h
|
||||
graphics_threaded_null.h
|
||||
http.cpp
|
||||
http.h
|
||||
input.cpp
|
||||
|
|
|
|||
59
src/engine/client/backend/null/backend_null.cpp
Normal file
59
src/engine/client/backend/null/backend_null.cpp
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
#include "backend_null.h"
|
||||
|
||||
bool CCommandProcessorFragment_Null::RunCommand(const CCommandBuffer::SCommand *pBaseCommand)
|
||||
{
|
||||
switch(pBaseCommand->m_Cmd)
|
||||
{
|
||||
case CCommandProcessorFragment_Null::CMD_INIT:
|
||||
Cmd_Init(static_cast<const SCommand_Init *>(pBaseCommand));
|
||||
break;
|
||||
case CCommandBuffer::CMD_TEXTURE_CREATE:
|
||||
Cmd_Texture_Create(static_cast<const CCommandBuffer::SCommand_Texture_Create *>(pBaseCommand));
|
||||
break;
|
||||
case CCommandBuffer::CMD_TEXT_TEXTURES_CREATE:
|
||||
Cmd_TextTextures_Create(static_cast<const CCommandBuffer::SCommand_TextTextures_Create *>(pBaseCommand));
|
||||
break;
|
||||
case CCommandBuffer::CMD_TEXT_TEXTURE_UPDATE:
|
||||
Cmd_TextTexture_Update(static_cast<const CCommandBuffer::SCommand_TextTexture_Update *>(pBaseCommand));
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CCommandProcessorFragment_Null::Cmd_Init(const SCommand_Init *pCommand)
|
||||
{
|
||||
pCommand->m_pCapabilities->m_TileBuffering = false;
|
||||
pCommand->m_pCapabilities->m_QuadBuffering = false;
|
||||
pCommand->m_pCapabilities->m_TextBuffering = false;
|
||||
pCommand->m_pCapabilities->m_QuadContainerBuffering = false;
|
||||
|
||||
pCommand->m_pCapabilities->m_MipMapping = false;
|
||||
pCommand->m_pCapabilities->m_NPOTTextures = false;
|
||||
pCommand->m_pCapabilities->m_3DTextures = false;
|
||||
pCommand->m_pCapabilities->m_2DArrayTextures = false;
|
||||
pCommand->m_pCapabilities->m_2DArrayTexturesAsExtension = false;
|
||||
pCommand->m_pCapabilities->m_ShaderSupport = false;
|
||||
|
||||
pCommand->m_pCapabilities->m_TrianglesAsQuads = false;
|
||||
|
||||
pCommand->m_pCapabilities->m_ContextMajor = 0;
|
||||
pCommand->m_pCapabilities->m_ContextMinor = 0;
|
||||
pCommand->m_pCapabilities->m_ContextPatch = 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
void CCommandProcessorFragment_Null::Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
|
||||
{
|
||||
free(pCommand->m_pData);
|
||||
}
|
||||
|
||||
void CCommandProcessorFragment_Null::Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand)
|
||||
{
|
||||
free(pCommand->m_pTextData);
|
||||
free(pCommand->m_pTextOutlineData);
|
||||
}
|
||||
|
||||
void CCommandProcessorFragment_Null::Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
|
||||
{
|
||||
free(pCommand->m_pData);
|
||||
}
|
||||
16
src/engine/client/backend/null/backend_null.h
Normal file
16
src/engine/client/backend/null/backend_null.h
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
#ifndef ENGINE_CLIENT_BACKEND_NULL_BACKEND_NULL_H
|
||||
#define ENGINE_CLIENT_BACKEND_NULL_BACKEND_NULL_H
|
||||
|
||||
#include <engine/client/backend/backend_base.h>
|
||||
|
||||
class CCommandProcessorFragment_Null : public CCommandProcessorFragment_GLBase
|
||||
{
|
||||
virtual bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, uint32_t &Format, std::vector<uint8_t> &DstData) { return false; };
|
||||
virtual bool RunCommand(const CCommandBuffer::SCommand *pBaseCommand);
|
||||
bool Cmd_Init(const SCommand_Init *pCommand);
|
||||
virtual void Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand);
|
||||
virtual void Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand);
|
||||
virtual void Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -34,6 +34,8 @@
|
|||
|
||||
#include "backend_sdl.h"
|
||||
|
||||
#include "backend/null/backend_null.h"
|
||||
|
||||
#if !defined(CONF_BACKEND_OPENGL_ES)
|
||||
#include "backend/opengl/backend_opengl3.h"
|
||||
#endif
|
||||
|
|
@ -266,6 +268,9 @@ CCommandProcessor_SDL_GL::CCommandProcessor_SDL_GL(EBackendType BackendType, int
|
|||
{
|
||||
m_BackendType = BackendType;
|
||||
|
||||
#if defined(CONF_HEADLESS_CLIENT)
|
||||
m_pGLBackend = new CCommandProcessorFragment_Null();
|
||||
#else
|
||||
if(BackendType == BACKEND_TYPE_OPENGL_ES)
|
||||
{
|
||||
#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
|
||||
|
|
@ -306,6 +311,7 @@ CCommandProcessor_SDL_GL::CCommandProcessor_SDL_GL(EBackendType BackendType, int
|
|||
m_pGLBackend = CreateVulkanCommandProcessorFragment();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
CCommandProcessor_SDL_GL::~CCommandProcessor_SDL_GL()
|
||||
|
|
@ -858,6 +864,15 @@ CGraphicsBackend_SDL_GL::CGraphicsBackend_SDL_GL()
|
|||
|
||||
int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth, int *pHeight, int *pRefreshRate, int FsaaSamples, int Flags, int *pDesktopWidth, int *pDesktopHeight, int *pCurrentWidth, int *pCurrentHeight, IStorage *pStorage)
|
||||
{
|
||||
#if defined(CONF_HEADLESS_CLIENT)
|
||||
int InitError = 0;
|
||||
const char *pErrorStr = NULL;
|
||||
int GlewMajor = 0;
|
||||
int GlewMinor = 0;
|
||||
int GlewPatch = 0;
|
||||
IsVersionSupportedGlew(m_BackendType, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, GlewMajor, GlewMinor, GlewPatch);
|
||||
BackendInitGlew(m_BackendType, GlewMajor, GlewMinor, GlewPatch);
|
||||
#else
|
||||
// print sdl version
|
||||
{
|
||||
SDL_version Compiled;
|
||||
|
|
@ -1102,6 +1117,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
|
|||
|
||||
return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_VERSION_FAILED;
|
||||
}
|
||||
#endif // CONF_HEADLESS_CLIENT
|
||||
|
||||
// start the command processor
|
||||
dbg_assert(m_pProcessor == nullptr, "Processor was not cleaned up properly.");
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#endif
|
||||
|
||||
#include "graphics_threaded.h"
|
||||
#include "graphics_threaded_null.h"
|
||||
|
||||
static CVideoMode g_aFakeModes[] = {
|
||||
{8192, 4320, 8192, 4320, 0, 8, 8, 8, 0}, {7680, 4320, 7680, 4320, 0, 8, 8, 8, 0}, {5120, 2880, 5120, 2880, 0, 8, 8, 8, 0},
|
||||
|
|
@ -2842,9 +2841,5 @@ int CGraphics_Threaded::GetVideoModes(CVideoMode *pModes, int MaxModes, int Scre
|
|||
|
||||
extern IEngineGraphics *CreateEngineGraphicsThreaded()
|
||||
{
|
||||
#ifdef CONF_HEADLESS_CLIENT
|
||||
return new CGraphics_ThreadedNull();
|
||||
#else
|
||||
return new CGraphics_Threaded();
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,216 +0,0 @@
|
|||
#ifndef ENGINE_CLIENT_GRAPHICS_THREADED_NULL_H
|
||||
#define ENGINE_CLIENT_GRAPHICS_THREADED_NULL_H
|
||||
|
||||
#include <engine/graphics.h>
|
||||
#include <engine/shared/config.h>
|
||||
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
|
||||
class CGraphics_ThreadedNull : public IEngineGraphics
|
||||
{
|
||||
public:
|
||||
CGraphics_ThreadedNull()
|
||||
{
|
||||
m_ScreenWidth = 800;
|
||||
m_ScreenHeight = 600;
|
||||
m_ScreenRefreshRate = 24;
|
||||
m_ScreenHiDPIScale = 1.0f;
|
||||
};
|
||||
|
||||
void ClipEnable(int x, int y, int w, int h) override{};
|
||||
void ClipDisable() override{};
|
||||
|
||||
void BlendNone() override{};
|
||||
void BlendNormal() override{};
|
||||
void BlendAdditive() override{};
|
||||
|
||||
void WrapNormal() override{};
|
||||
void WrapClamp() override{};
|
||||
|
||||
uint64_t TextureMemoryUsage() const override { return 0; }
|
||||
uint64_t BufferMemoryUsage() const override { return 0; }
|
||||
uint64_t StreamedMemoryUsage() const override { return 0; }
|
||||
uint64_t StagingMemoryUsage() const override { return 0; }
|
||||
|
||||
TTWGraphicsGPUList m_FakeGPUList;
|
||||
const TTWGraphicsGPUList &GetGPUs() const override { return m_FakeGPUList; }
|
||||
|
||||
void MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY) override{};
|
||||
void GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY) override
|
||||
{
|
||||
*pTopLeftX = 0;
|
||||
*pTopLeftY = 0;
|
||||
*pBottomRightX = 800;
|
||||
*pBottomRightY = 600;
|
||||
};
|
||||
|
||||
void LinesBegin() override{};
|
||||
void LinesEnd() override{};
|
||||
void LinesDraw(const CLineItem *pArray, int Num) override{};
|
||||
|
||||
int UnloadTexture(IGraphics::CTextureHandle *pIndex) override { return 0; }
|
||||
IGraphics::CTextureHandle LoadTextureRaw(int Width, int Height, int Format, const void *pData, int StoreFormat, int Flags, const char *pTexName = NULL) override { return CreateTextureHandle(0); }
|
||||
int LoadTextureRawSub(IGraphics::CTextureHandle TextureID, int x, int y, int Width, int Height, int Format, const void *pData) override { return 0; }
|
||||
|
||||
bool LoadTextTextures(int Width, int Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData) override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
bool UnloadTextTextures(CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture) override { return false; }
|
||||
bool UpdateTextTexture(CTextureHandle TextureID, int x, int y, int Width, int Height, const void *pData) override { return false; }
|
||||
|
||||
CTextureHandle LoadSpriteTexture(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) override { return CreateTextureHandle(0); };
|
||||
CTextureHandle LoadSpriteTexture(CImageInfo &FromImageInfo, struct client_data7::CDataSprite *pSprite) override { return CreateTextureHandle(0); };
|
||||
|
||||
bool IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h) override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
bool IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, struct client_data7::CDataSprite *pSprite) override { return false; }
|
||||
|
||||
// simple uncompressed RGBA loaders
|
||||
IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int StoreFormat, int Flags) override { return CreateTextureHandle(0); }
|
||||
int LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType) override { return 0; }
|
||||
void FreePNG(CImageInfo *pImg) override{};
|
||||
|
||||
bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) override { return false; }
|
||||
bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) override { return false; }
|
||||
|
||||
void CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, int FullWidth, int FullHeight, int ColorChannelCount, int SubOffsetX, int SubOffsetY, int SubCopyWidth, int SubCopyHeight) override{};
|
||||
void CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, int DestWidth, int DestHeight, uint8_t *pSourceBuffer, int SrcWidth, int SrcHeight, int ColorChannelCount, int SrcSubOffsetX, int SrcSubOffsetY, int SrcSubCopyWidth, int SrcSubCopyHeight) override{};
|
||||
|
||||
void TextureSet(CTextureHandle TextureID) override{};
|
||||
|
||||
void Clear(float r, float g, float b, bool ForceClearNow = false) override{};
|
||||
|
||||
void QuadsBegin() override{};
|
||||
void QuadsEnd() override{};
|
||||
void QuadsTex3DBegin() override{};
|
||||
void QuadsTex3DEnd() override{};
|
||||
void TrianglesBegin() override{};
|
||||
void TrianglesEnd() override{};
|
||||
void QuadsEndKeepVertices() override{};
|
||||
void QuadsDrawCurrentVertices(bool KeepVertices = true) override{};
|
||||
void QuadsSetRotation(float Angle) override{};
|
||||
|
||||
void SetColorVertex(const CColorVertex *pArray, int Num) override{};
|
||||
void SetColor(float r, float g, float b, float a) override{};
|
||||
void SetColor(ColorRGBA rgb) override{};
|
||||
void SetColor4(vec4 TopLeft, vec4 TopRight, vec4 BottomLeft, vec4 BottomRight) override{};
|
||||
|
||||
// go through all vertices and change their color (only works for quads)
|
||||
void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) override{};
|
||||
void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) override{};
|
||||
|
||||
void QuadsSetSubset(float TlU, float TlV, float BrU, float BrV) override{};
|
||||
void QuadsSetSubsetFree(
|
||||
float x0, float y0, float x1, float y1,
|
||||
float x2, float y2, float x3, float y3, int Index = -1) override{};
|
||||
|
||||
void QuadsDraw(CQuadItem *pArray, int Num) override{};
|
||||
|
||||
void QuadsDrawTL(const CQuadItem *pArray, int Num) override{};
|
||||
|
||||
void QuadsTex3DDrawTL(const CQuadItem *pArray, int Num) override{};
|
||||
|
||||
void QuadsDrawFreeform(const CFreeformItem *pArray, int Num) override{};
|
||||
void QuadsText(float x, float y, float Size, const char *pText) override{};
|
||||
|
||||
GL_STexCoord m_aTexCoords[4];
|
||||
GL_SColor m_aColors[4];
|
||||
const GL_STexCoord *GetCurTextureCoordinates() override { return m_aTexCoords; }
|
||||
const GL_SColor *GetCurColor() override { return m_aColors; }
|
||||
|
||||
int CreateQuadContainer(bool AutomaticUpload = true) override { return -1; }
|
||||
void QuadContainerChangeAutomaticUpload(int ContainerIndex, bool AutomaticUpload) override {}
|
||||
void QuadContainerUpload(int ContainerIndex) override{};
|
||||
void QuadContainerAddQuads(int ContainerIndex, CQuadItem *pArray, int Num) override{};
|
||||
void QuadContainerAddQuads(int ContainerIndex, CFreeformItem *pArray, int Num) override{};
|
||||
void QuadContainerReset(int ContainerIndex) override{};
|
||||
void DeleteQuadContainer(int ContainerIndex) override{};
|
||||
void RenderQuadContainer(int ContainerIndex, int QuadDrawNum) override{};
|
||||
void RenderQuadContainer(int ContainerIndex, int QuadOffset, int QuadDrawNum, bool ChangeWrapMode = true) override{};
|
||||
void RenderQuadContainerEx(int ContainerIndex, int QuadOffset, int QuadDrawNum, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) override{};
|
||||
void RenderQuadContainerAsSprite(int ContainerIndex, int QuadOffset, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) override{};
|
||||
void RenderQuadContainerAsSpriteMultiple(int ContainerIndex, int QuadOffset, int DrawCount, SRenderSpriteInfo *pRenderInfo) override{};
|
||||
|
||||
void FlushVertices(bool KeepVertices = false) override{};
|
||||
void FlushVerticesTex3D() override{};
|
||||
|
||||
void RenderTileLayer(int BufferContainerIndex, float *pColor, char **pOffsets, unsigned int *IndicedVertexDrawNum, size_t NumIndicesOffset) override{};
|
||||
void RenderBorderTiles(int BufferContainerIndex, float *pColor, char *pIndexBufferOffset, float *pOffset, float *pDir, int JumpIndex, unsigned int DrawNum) override{};
|
||||
void RenderBorderTileLines(int BufferContainerIndex, float *pColor, char *pIndexBufferOffset, float *pOffset, float *pDir, unsigned int IndexDrawNum, unsigned int RedrawNum) override{};
|
||||
void RenderQuadLayer(int BufferContainerIndex, SQuadRenderInfo *pQuadInfo, int QuadNum, int QuadOffset) override{};
|
||||
void RenderText(int BufferContainerIndex, int TextQuadNum, int TextureSize, int TextureTextIndex, int TextureTextOutlineIndex, float *pTextColor, float *pTextoutlineColor) override{};
|
||||
|
||||
// modern GL functions
|
||||
int CreateBufferObject(size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer = false) override { return 0; };
|
||||
void RecreateBufferObject(int BufferIndex, size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer = false) override{};
|
||||
void DeleteBufferObject(int BufferIndex) override{};
|
||||
|
||||
int CreateBufferContainer(SBufferContainerInfo *pContainerInfo) override { return 0; }
|
||||
// destroying all buffer objects means, that all referenced VBOs are destroyed automatically, so the user does not need to save references to them
|
||||
void DeleteBufferContainer(int ContainerIndex, bool DestroyAllBO = true) override{};
|
||||
void IndicesNumRequiredNotify(unsigned int RequiredIndicesCount) override{};
|
||||
|
||||
int GetNumScreens() const override { return 0; }
|
||||
void Minimize() override{};
|
||||
void Maximize() override{};
|
||||
void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override{};
|
||||
bool SetWindowScreen(int Index) override { return false; }
|
||||
void Move(int x, int y) override{};
|
||||
void Resize(int w, int h, int RefreshRate) override{};
|
||||
void GotResized(int w, int h, int RefreshRate) override{};
|
||||
void AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc, void *pUser) override{};
|
||||
int GetWindowScreen() override { return 0; }
|
||||
|
||||
void WindowDestroyNtf(uint32_t WindowID) override{};
|
||||
void WindowCreateNtf(uint32_t WindowID) override{};
|
||||
|
||||
int WindowActive() override { return 1; }
|
||||
int WindowOpen() override { return 0; }
|
||||
|
||||
void SetWindowGrab(bool Grab) override{};
|
||||
void NotifyWindow() override{};
|
||||
|
||||
int Init() override { return 0; }
|
||||
void Shutdown() override{};
|
||||
|
||||
void TakeScreenshot(const char *pFilename) override{};
|
||||
void TakeCustomScreenshot(const char *pFilename) override{};
|
||||
void Swap() override{};
|
||||
bool SetVSync(bool State) override { return false; }
|
||||
|
||||
int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen) override { return 0; }
|
||||
|
||||
virtual int GetDesktopScreenWidth() const { return g_Config.m_GfxDesktopWidth; }
|
||||
virtual int GetDesktopScreenHeight() const { return g_Config.m_GfxDesktopHeight; }
|
||||
|
||||
// synchronization
|
||||
void InsertSignal(CSemaphore *pSemaphore) override{};
|
||||
bool IsIdle() const override { return true; }
|
||||
void WaitForIdle() override{};
|
||||
|
||||
SWarning *GetCurWarning() override { return NULL; }
|
||||
|
||||
bool GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType) override { return false; }
|
||||
bool IsConfigModernAPI() override { return false; }
|
||||
bool IsTileBufferingEnabled() override { return false; }
|
||||
bool IsQuadBufferingEnabled() override { return false; }
|
||||
bool IsTextBufferingEnabled() override { return false; }
|
||||
bool IsQuadContainerBufferingEnabled() override { return false; }
|
||||
bool HasTextureArrays() override { return false; }
|
||||
|
||||
const char *GetVendorString() override
|
||||
{
|
||||
return "headless";
|
||||
};
|
||||
const char *GetVersionString() override { return "headless"; };
|
||||
const char *GetRendererString() override { return "headless"; };
|
||||
|
||||
TGLBackendReadPresentedImageData m_FakeGetPresentedImageDataFunc;
|
||||
TGLBackendReadPresentedImageData &GetReadPresentedImageDataFuncUnsafe() override { return m_FakeGetPresentedImageDataFunc; };
|
||||
};
|
||||
|
||||
#endif // ENGINE_CLIENT_GRAPHICS_THREADED_NULL_H
|
||||
Loading…
Reference in a new issue