summaryrefslogtreecommitdiff
path: root/src/SDL2/include/SDL_system.h
diff options
context:
space:
mode:
authorMAN-AT-ARMS <donny@ecgnetwork.com>2014-03-08 22:00:38 -0500
committerTim Angus <tim@ngus.net>2014-08-28 11:03:31 +0100
commit57e0583885b51fb736589f6187facfcfb9d06a67 (patch)
tree2d48bf168880a3d5a0cbe3f6d5660db4cbb30995 /src/SDL2/include/SDL_system.h
parent482262a75610e63d2a779fea5b37b8206d87e947 (diff)
Update SDL2 to 2.0.2
Diffstat (limited to 'src/SDL2/include/SDL_system.h')
-rw-r--r--src/SDL2/include/SDL_system.h34
1 files changed, 28 insertions, 6 deletions
diff --git a/src/SDL2/include/SDL_system.h b/src/SDL2/include/SDL_system.h
index 26e9eaa0..99ef8223 100644
--- a/src/SDL2/include/SDL_system.h
+++ b/src/SDL2/include/SDL_system.h
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -29,11 +29,9 @@
#define _SDL_system_h
#include "SDL_stdinc.h"
-
-#if defined(__IPHONEOS__) && __IPHONEOS__
-#include "SDL_video.h"
#include "SDL_keyboard.h"
-#endif
+#include "SDL_render.h"
+#include "SDL_video.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -41,6 +39,31 @@
extern "C" {
#endif
+
+/* Platform specific functions for Windows */
+#ifdef __WIN32__
+
+/* Returns the D3D9 adapter index that matches the specified display index.
+ This adapter index can be passed to IDirect3D9::CreateDevice and controls
+ on which monitor a full screen application will appear.
+*/
+extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex );
+
+/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer.
+ Once you are done using the device, you should release it to avoid a resource leak.
+ */
+typedef struct IDirect3DDevice9 IDirect3DDevice9;
+extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer);
+
+/* Returns the DXGI Adapter and Output indices for the specified display index.
+ These can be passed to EnumAdapters and EnumOutputs respectively to get the objects
+ required to create a DX10 or DX11 device and swap chain.
+ */
+extern DECLSPEC void SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex );
+
+#endif /* __WIN32__ */
+
+
/* Platform specific functions for iOS */
#if defined(__IPHONEOS__) && __IPHONEOS__
@@ -93,7 +116,6 @@ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
#endif /* __ANDROID__ */
-
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}