mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-06 09:56:26 +00:00
Windows GDK Support (#5830)
* Added GDK * Simplfied checks in SDL_config_wingdk.h * Added testgdk sample * Added GDK readme * Fixed error in merge of SDL_windows.h * Additional GDK fixes * OpenWatcom should not export _SDL_GDKGetTaskQueue * Formatting fixes * Moved initialization code into SDL_GDKRunApp
This commit is contained in:
@@ -1775,7 +1775,7 @@ SDL_RenderDriver D3D_RenderDriver = {
|
||||
};
|
||||
#endif /* SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED */
|
||||
|
||||
#ifdef __WIN32__
|
||||
#if defined(__WIN32__) || defined(__WINGDK__)
|
||||
/* This function needs to always exist on Windows, for the Dynamic API. */
|
||||
IDirect3DDevice9 *
|
||||
SDL_RenderGetD3D9Device(SDL_Renderer * renderer)
|
||||
@@ -1799,6 +1799,6 @@ SDL_RenderGetD3D9Device(SDL_Renderer * renderer)
|
||||
|
||||
return device;
|
||||
}
|
||||
#endif /* __WIN32__ */
|
||||
#endif /* defined(__WIN32__) || defined(__WINGDK__) */
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
@@ -672,7 +672,7 @@ done:
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifdef __WIN32__
|
||||
#if defined(__WIN32__) || defined(__WINGDK__)
|
||||
|
||||
static DXGI_MODE_ROTATION
|
||||
D3D11_GetCurrentRotation()
|
||||
@@ -681,7 +681,7 @@ D3D11_GetCurrentRotation()
|
||||
return DXGI_MODE_ROTATION_IDENTITY;
|
||||
}
|
||||
|
||||
#endif /* __WIN32__ */
|
||||
#endif /* defined(__WIN32__) || defined(__WINGDK__) */
|
||||
|
||||
static BOOL
|
||||
D3D11_IsDisplayRotated90Degrees(DXGI_MODE_ROTATION rotation)
|
||||
@@ -827,7 +827,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
|
||||
goto done;
|
||||
#endif
|
||||
} else {
|
||||
#ifdef __WIN32__
|
||||
#if defined(__WIN32__) || defined(__WINGDK__)
|
||||
SDL_SysWMinfo windowinfo;
|
||||
SDL_VERSION(&windowinfo.version);
|
||||
SDL_GetWindowWMInfo(renderer->window, &windowinfo);
|
||||
@@ -849,7 +849,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
|
||||
#else
|
||||
SDL_SetError(__FUNCTION__", Unable to find something to attach a swap chain to");
|
||||
goto done;
|
||||
#endif /* ifdef __WIN32__ / else */
|
||||
#endif /* defined(__WIN32__) || defined(__WINGDK__) / else */
|
||||
}
|
||||
data->swapEffect = swapChainDesc.SwapEffect;
|
||||
|
||||
@@ -2473,7 +2473,7 @@ SDL_RenderDriver D3D11_RenderDriver = {
|
||||
|
||||
#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
|
||||
|
||||
#ifdef __WIN32__
|
||||
#if defined(__WIN32__) || defined(__WINGDK__)
|
||||
/* This function needs to always exist on Windows, for the Dynamic API. */
|
||||
ID3D11Device *
|
||||
SDL_RenderGetD3D11Device(SDL_Renderer * renderer)
|
||||
@@ -2497,6 +2497,6 @@ SDL_RenderGetD3D11Device(SDL_Renderer * renderer)
|
||||
|
||||
return device;
|
||||
}
|
||||
#endif /* __WIN32__ */
|
||||
#endif /* defined(__WIN32__) || defined(__WINGDK__) */
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
@@ -3042,7 +3042,7 @@ SDL_RenderDriver D3D12_RenderDriver = {
|
||||
|
||||
#endif /* SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED */
|
||||
|
||||
#ifdef __WIN32__
|
||||
#if defined(__WIN32__) || defined(__GDK__)
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
@@ -3069,6 +3069,6 @@ SDL_RenderGetD3D12Device(SDL_Renderer * renderer)
|
||||
|
||||
return device;
|
||||
}
|
||||
#endif /* __WIN32__ */
|
||||
#endif /* defined(__WIN32__) || defined(__GDK__) */
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
@@ -1715,7 +1715,7 @@ GL_IsProbablyAccelerated(const GL_RenderData *data)
|
||||
/*const char *vendor = (const char *) data->glGetString(GL_VENDOR);*/
|
||||
const char *renderer = (const char *) data->glGetString(GL_RENDERER);
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#if defined(__WINDOWS__) || defined(__WINGDK__)
|
||||
if (SDL_strcmp(renderer, "GDI Generic") == 0) {
|
||||
return SDL_FALSE; /* Microsoft's fallback software renderer. Fix your system! */
|
||||
}
|
||||
|
@@ -32,7 +32,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
|
||||
|
||||
#if SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#if defined(__WIN32__) || defined(__GDK__)
|
||||
#include "../../core/windows/SDL_windows.h"
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user