diff options
| author | Sven Gothel <[email protected]> | 2015-03-27 02:57:20 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-27 02:57:20 +0100 |
| commit | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (patch) | |
| tree | df5c8e4665669de2bf1b88af6d93db4599c29d1d /LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h | |
| parent | 633f70342fe270fd91bca8f724049aceec602337 (diff) | |
Bug 1116: Oculus SDK 0.4.4 support for JOGL: Use new 'HEADLESS_APP' mode, i.e. drop all display related code.v2.3.1jogamp_0.4.4
HEADLESS_APP (new CPP define) is required to drop all display related code.
TODO: JOGL needs to display the HSW (Health and Safety Warning) messages
to comply w/ license!
Diffstat (limited to 'LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h')
| -rw-r--r-- | LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h b/LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h index e801f4a..097a501 100644 --- a/LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h +++ b/LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h @@ -81,6 +81,8 @@ typedef BOOL (WINAPI *WinGetModuleHandleExW)( DWORD, LPCWSTR, HMODULE* ); typedef void* (WINAPI *WinDirect3DCreate9)(UINT SDKVersion);
typedef HRESULT (WINAPI *WinDirect3DCreate9Ex)(UINT SDKVersion, void** aDevice);
+#if !defined(HEADLESS_APP)
+
// Overridden DXGI entry points
typedef HRESULT (WINAPI *WinCreateDXGIFactory)(
__in REFIID riid,
@@ -98,6 +100,26 @@ typedef HRESULT (WINAPI *WinCreateDXGIFactory2)( __out void **ppFactory
);
+#else /* !defined(HEADLESS_APP) */
+
+typedef HRESULT (WINAPI *WinCreateDXGIFactory)(
+ void ** riid,
+ void **ppFactory
+ );
+
+typedef HRESULT (WINAPI *WinCreateDXGIFactory1)(
+ void ** riid,
+ void **ppFactory
+ );
+
+typedef HRESULT (WINAPI *WinCreateDXGIFactory2)(
+ UINT flags,
+ const IID &riid,
+ void **ppFactory
+ );
+
+#endif /* !defined(HEADLESS_APP) */
+
// Application usermode callbacks from usermode driver. These
// functions are all provided by the calling application that uses
// the filter mode driver
|