Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ waf3*/
.vscode/
.depproj/
source-engine.sln
dxvk-*/
5 changes: 5 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
[submodule "lib"]
path = lib
url = https://github.com/nillerusr/source-engine-libs.git
[submodule "dxvk"]
path = dxvk
url = https://github.com/doitsujin/dxvk.git
update = none
ignore = untracked
5 changes: 5 additions & 0 deletions appframework/sdlmgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -709,13 +709,15 @@ void CSDLMgr::Shutdown()
{
SDLAPP_FUNC;

#if defined( DX_TO_GL_ABSTRACTION )
if (gGL && m_readFBO)
#ifdef TOGLES
gGL->glDeleteFramebuffers(1, &m_readFBO);
#else
gGL->glDeleteFramebuffersEXT(1, &m_readFBO);
#endif
m_readFBO = 0;
#endif

if ( m_Window )
{
Expand Down Expand Up @@ -819,6 +821,9 @@ bool CSDLMgr::CreateHiddenGameWindow( const char *pTitle, int width, int height
int flags = SDL_WINDOW_HIDDEN;
#if defined( DX_TO_GL_ABSTRACTION )
flags |= SDL_WINDOW_OPENGL;
#elif defined( DXVK )
// DXVK-native creates its Vulkan surface on this window (SDL2 WSI); D3D9 presents to it
flags |= SDL_WINDOW_VULKAN;
#endif
m_Window = SDL_CreateWindow( pTitle, x, y, width, height, flags );

Expand Down
2 changes: 2 additions & 0 deletions bitmap/imageformat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#if defined( _WIN32 ) && !defined( _X360 ) && !defined( DX_TO_GL_ABSTRACTION )
#include <windows.h>
#include "../dx9sdk/include/d3d9types.h"
#elif defined( DXVK )
#include "togl/dxvk_d3d9.h"
#endif
#include "bitmap/imageformat.h"
#include "basetypes.h"
Expand Down
1 change: 1 addition & 0 deletions dxvk
Submodule dxvk added at b1a1c9
7 changes: 7 additions & 0 deletions engine/sys_getmodes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ typedef void *HDC;
#endif

#include "appframework/ilaunchermgr.h"
#ifdef DXVK
#include "togl/dxvk_d3d9.h" // Windows types (RECT, GUID, LONG, ...) from DXVK
#endif

#include "basetypes.h"
#include "sysexternal.h"
Expand Down Expand Up @@ -1119,11 +1122,13 @@ void CVideoMode_Common::DrawNullBackground( void *hHDC, int w, int h )

#ifndef _WIN32

#ifndef DXVK // DXVK's windows_base.h has these
typedef unsigned char BYTE;
typedef signed long LONG;
typedef unsigned long ULONG;

typedef char * LPSTR;
#endif

typedef struct tagBITMAPINFOHEADER{
DWORD biSize;
Expand Down Expand Up @@ -1170,7 +1175,9 @@ typedef struct _GUID
} GUID;

#endif
#ifndef DXVK
typedef GUID UUID;
#endif

#endif //WIN32
//-----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion engine/sys_mainwind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,7 @@ void *CGame::GetMainWindow( void )

void *CGame::GetMainDeviceWindow( void )
{
#if defined( DX_TO_GL_ABSTRACTION ) && defined( USE_SDL )
#if ( defined( DX_TO_GL_ABSTRACTION ) || defined( DXVK ) ) && defined( USE_SDL )
return (void*)m_pSDLWindow;
#else
return (void*)m_hWindow;
Expand Down
Loading