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

added support for video modes

Browse source
This commit is contained in:
Magnus Auvinen 2012-01-01 14:30:45 +01:00
parent d7fe3ddaab
commit c31c82a584
2 changed files with 60 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -371,6 +371,39 @@ class CCommandProcessorFragment_SDL
SDL_GL_SwapBuffers(); SDL_GL_SwapBuffers();
} }
void Cmd_VideoModes(const CCommandBuffer::SCommand_VideoModes *pCommand)
{
// TODO: fix this code on osx or windows
SDL_Rect **ppModes = SDL_ListModes(NULL, SDL_OPENGL|SDL_GL_DOUBLEBUFFER|SDL_FULLSCREEN);
if(ppModes == NULL)
{
// no modes
*pCommand->m_pNumModes = 0;
}
else if(ppModes == (SDL_Rect**)-1)
{
// no modes
*pCommand->m_pNumModes = 0;
}
else
{
int NumModes = 0;
for(int i = 0; ppModes[i]; ++i)
{
if(NumModes == pCommand->m_MaxModes)
break;
pCommand->m_pModes[NumModes].m_Width = ppModes[i]->w;
pCommand->m_pModes[NumModes].m_Height = ppModes[i]->h;
pCommand->m_pModes[NumModes].m_Red = 8;
pCommand->m_pModes[NumModes].m_Green = 8;
pCommand->m_pModes[NumModes].m_Blue = 8;
NumModes++;
}
*pCommand->m_pNumModes = NumModes;
}
}
public: public:
CCommandProcessorFragment_SDL() CCommandProcessorFragment_SDL()
{ {
@ -385,6 +418,7 @@ public:
case CCommandBuffer::CMD_INIT: Cmd_Init(static_cast<const CCommandBuffer::SCommand_Init *>(pBaseCommand)); break; case CCommandBuffer::CMD_INIT: Cmd_Init(static_cast<const CCommandBuffer::SCommand_Init *>(pBaseCommand)); break;
case CCommandBuffer::CMD_SHUTDOWN: Cmd_Shutdown(static_cast<const CCommandBuffer::SCommand_Shutdown *>(pBaseCommand)); break; case CCommandBuffer::CMD_SHUTDOWN: Cmd_Shutdown(static_cast<const CCommandBuffer::SCommand_Shutdown *>(pBaseCommand)); break;
case CCommandBuffer::CMD_SWAP: Cmd_Swap(static_cast<const CCommandBuffer::SCommand_Swap *>(pBaseCommand)); break; case CCommandBuffer::CMD_SWAP: Cmd_Swap(static_cast<const CCommandBuffer::SCommand_Swap *>(pBaseCommand)); break;
case CCommandBuffer::CMD_VIDEOMODES: Cmd_VideoModes(static_cast<const CCommandBuffer::SCommand_VideoModes *>(pBaseCommand)); break;
default: return false; default: return false;
} }
@ -1306,11 +1340,7 @@ void CGraphics_Threaded::WaitForIdle()
int CGraphics_Threaded::GetVideoModes(CVideoMode *pModes, int MaxModes) int CGraphics_Threaded::GetVideoModes(CVideoMode *pModes, int MaxModes)
{ {
// TODO: fix support for video modes, using fake modes for now if(g_Config.m_GfxDisplayAllModes)
//int NumModes = sizeof(g_aFakeModes)/sizeof(CVideoMode);
//SDL_Rect **ppModes;
//if(g_Config.m_GfxDisplayAllModes)
{ {
int Count = sizeof(g_aFakeModes)/sizeof(CVideoMode); int Count = sizeof(g_aFakeModes)/sizeof(CVideoMode);
mem_copy(pModes, g_aFakeModes, sizeof(g_aFakeModes)); mem_copy(pModes, g_aFakeModes, sizeof(g_aFakeModes));
@ -1319,37 +1349,21 @@ int CGraphics_Threaded::GetVideoModes(CVideoMode *pModes, int MaxModes)
return Count; return Count;
} }
// TODO: fix this code on osx or windows // add videomodes command
/* CImageInfo Image;
mem_zero(&Image, sizeof(Image));
ppModes = SDL_ListModes(NULL, SDL_OPENGL|SDL_GL_DOUBLEBUFFER|SDL_FULLSCREEN); int NumModes = 0;
if(ppModes == NULL) CCommandBuffer::SCommand_VideoModes Cmd;
{ Cmd.m_pModes = pModes;
// no modes Cmd.m_MaxModes = MaxModes;
NumModes = 0; Cmd.m_pNumModes = &NumModes;
} m_pCommandBuffer->AddCommand(Cmd);
else if(ppModes == (SDL_Rect**)-1)
{
// all modes
}
else
{
NumModes = 0;
for(int i = 0; ppModes[i]; ++i)
{
if(NumModes == MaxModes)
break;
pModes[NumModes].m_Width = ppModes[i]->w;
pModes[NumModes].m_Height = ppModes[i]->h;
pModes[NumModes].m_Red = 8;
pModes[NumModes].m_Green = 8;
pModes[NumModes].m_Blue = 8;
NumModes++;
}
}
return NumModes;*/ // kick the buffer and wait for the result and return it
KickCommandBuffer();
WaitForIdle();
return NumModes;
} }
extern IEngineGraphics *CreateEngineGraphicsThreaded() { return new CGraphics_Threaded(); } extern IEngineGraphics *CreateEngineGraphicsThreaded() { return new CGraphics_Threaded(); }

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

@ -79,8 +79,9 @@ public:
// swap // swap
CMD_SWAP, CMD_SWAP,
// // misc
CMD_SCREENSHOT, CMD_SCREENSHOT,
CMD_VIDEOMODES,
}; };
enum enum
@ -192,7 +193,7 @@ public:
SState m_State; SState m_State;
unsigned m_PrimType; unsigned m_PrimType;
unsigned m_PrimCount; unsigned m_PrimCount;
SVertex *m_pVertices; SVertex *m_pVertices; // you should use the command buffer data to allocate vertices for this command
}; };
struct SCommand_Screenshot : public SCommand struct SCommand_Screenshot : public SCommand
@ -201,6 +202,15 @@ public:
CImageInfo *m_pImage; // processor will fill this out, the one who adds this command must free the data as well CImageInfo *m_pImage; // processor will fill this out, the one who adds this command must free the data as well
}; };
struct SCommand_VideoModes : public SCommand
{
SCommand_VideoModes() : SCommand(CMD_VIDEOMODES) {}
CVideoMode *m_pModes; // processor will fill this in
int m_MaxModes; // maximum of modes the processor can write to the m_pModes
int *m_pNumModes; // processor will write to this pointer
};
struct SCommand_Swap : public SCommand struct SCommand_Swap : public SCommand
{ {
SCommand_Swap() : SCommand(CMD_SWAP) {} SCommand_Swap() : SCommand(CMD_SWAP) {}