dxgitrace/retrace: Require D3D11.1 headers to support D3D10 and higher.

Simplifies build substantially.

4 files changed, 31 insertions, 53 deletions

diff --git a/dispatch/compat.h b/dispatch/compat.h
index 2f5a9a49..33819896 100644
--- a/dispatch/compat.h
+++ b/dispatch/compat.h
@@ -30,6 +30,9 @@
 #ifdef __MINGW32__
 
 
+#include <windows.h>
+
+
 /*
  * Several of the defines below clash with libstdc++ internal variables,
  * so include the headers now, before they are re-defined.
diff --git a/dispatch/d3d10_1imports.hpp b/dispatch/d3d10_1imports.hpp
deleted file mode 100644
index 2b97cf3c..00000000
--- a/dispatch/d3d10_1imports.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2012 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- **************************************************************************/
-
-/*
- * Central place for all D3D10.1 includes, and respective OS dependent headers.
- */
-
-#ifndef _D3D10_1IMPORTS_HPP_
-#define _D3D10_1IMPORTS_HPP_
-
-
-#include <windows.h>
-
-#include "compat.h"
-
-#include <d3d10_1.h>
-
-#include "d3derr.hpp"
-
-#include "dxgiint.h"
-
-#define D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY 0x0080
-#define D3D10_CREATE_DEVICE_STRICT_VALIDATION                             0x0200
-#define D3D10_CREATE_DEVICE_DEBUGGABLE                                    0x0400
-
-#endif /* _D3D10_1IMPORTS_HPP_ */
diff --git a/dispatch/d3d10imports.hpp b/dispatch/d3d10imports.hpp
index 04d4119d..72118434 100644
--- a/dispatch/d3d10imports.hpp
+++ b/dispatch/d3d10imports.hpp
@@ -35,14 +35,20 @@
 
 #include "compat.h"
 
-#include <d3d10.h>
+#include <d3d10_1.h>
 
 #include "d3derr.hpp"
 
 #include "dxgiint.h"
 
-#define D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY 0x0080
-#define D3D10_CREATE_DEVICE_STRICT_VALIDATION                             0x0200
-#define D3D10_CREATE_DEVICE_DEBUGGABLE                                    0x0400
+
+#ifndef D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS
+#define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS MAKE_D3D10_HRESULT(1)
+#endif
+
+#ifndef D3D10_ERROR_FILE_NOT_FOUND
+#define D3D10_ERROR_FILE_NOT_FOUND MAKE_D3D10_HRESULT(2)
+#endif
+
 
 #endif /* _D3D10IMPORTS_HPP_ */
diff --git a/dispatch/d3d11imports.hpp b/dispatch/d3d11imports.hpp
index b667bf85..05ddef9c 100644
--- a/dispatch/d3d11imports.hpp
+++ b/dispatch/d3d11imports.hpp
@@ -35,11 +35,28 @@
 
 #include "compat.h"
 
-#include <d3d11.h>
+#include <d3d11_1.h>
 
 #include "d3derr.hpp"
 
 #include "dxgiint.h"
 
 
+#ifndef D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS
+#define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS MAKE_D3D11_HRESULT(1)
+#endif
+
+#ifndef D3D11_ERROR_FILE_NOT_FOUND
+#define D3D11_ERROR_FILE_NOT_FOUND MAKE_D3D11_HRESULT(2)
+#endif
+
+#ifndef D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS
+#define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS MAKE_D3D11_HRESULT(3)
+#endif
+
+#ifndef D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD
+#define D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD MAKE_D3D11_HRESULT(4)
+#endif
+
+
 #endif /* _D3D11IMPORTS_HPP_ */