diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 52974502ac..0a77517f5c 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -124,7 +124,7 @@
Use
Level3
ProgramDatabase
- ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
+ ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
stdafx.h;Common/DbgNew.h
MultiThreadedDebug
StreamingSIMDExtensions2
@@ -160,7 +160,7 @@
Use
Level3
ProgramDatabase
- ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
+ ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
stdafx.h;Common/DbgNew.h
MultiThreadedDebug
false
@@ -199,7 +199,7 @@
Use
Level3
ProgramDatabase
- ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
+ ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
stdafx.h
stdafx.h
true
@@ -244,7 +244,7 @@
Use
Level3
ProgramDatabase
- ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
+ ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib
stdafx.h
true
false
@@ -538,4 +538,4 @@
-
+
\ No newline at end of file
diff --git a/dx9sdk b/dx9sdk
index b2e63144e6..a2e5de9de3 160000
--- a/dx9sdk
+++ b/dx9sdk
@@ -1 +1 @@
-Subproject commit b2e63144e61abb371b04c4d394784cd2e77108a6
+Subproject commit a2e5de9de341a8659aa1199e03636f5a4cea1318
diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj
index 3f1d2d2942..91983009a2 100644
--- a/ext/native/native.vcxproj
+++ b/ext/native/native.vcxproj
@@ -79,7 +79,7 @@
Level3
_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
- ..\..\ext;..\..;..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
+ ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
ProgramDatabase
true
false
@@ -101,7 +101,7 @@
Level3
_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
- ..\..\ext;..\..;..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
+ ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
true
false
false
@@ -127,7 +127,7 @@
true
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
- ..\..\ext;..\..;..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
+ ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
StreamingSIMDExtensions2
Fast
true
@@ -153,7 +153,7 @@
true
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
- ..\..\ext;..\..;..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
+ ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories);
NotSet
Fast
true
@@ -750,4 +750,4 @@
-
+
\ No newline at end of file
diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp
index 4ee5c11236..fada98fe3c 100644
--- a/ext/native/thin3d/thin3d_d3d11.cpp
+++ b/ext/native/thin3d/thin3d_d3d11.cpp
@@ -1,11 +1,10 @@
#include "thin3d/thin3d.h"
#include
+#include
namespace Draw {
-#if 0
-
// A problem is that we can't get the D3Dcompiler.dll without using a later SDK than 7.1, which was the last that
// supported XP. A possible solution might be here:
// https://tedwvc.wordpress.com/2014/01/01/how-to-target-xp-with-vc2012-or-vc2013-and-continue-to-use-the-windows-8-x-sdk/
@@ -388,7 +387,7 @@ public:
class D3D11Texture : public Texture {
public:
D3D11Texture() {}
- void SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) override;
+ void SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) {}
};
Texture *D3D11DrawContext::CreateTexture(const TextureDesc &desc) {
@@ -552,6 +551,18 @@ Framebuffer *D3D11DrawContext::CreateFramebuffer(const FramebufferDesc &desc) {
return fb;
}
+void D3D11DrawContext::BindTextures(int start, int count, Texture **textures) {
+
+}
+
+void D3D11DrawContext::BindSamplerStates(int start, int count, SamplerState **states) {
+
+}
+
+void D3D11DrawContext::Clear(int mask, uint32_t colorval, float depthVal, int stencilVal) {
+
+}
+
void D3D11DrawContext::CopyFramebufferImage(Framebuffer *src, int level, int x, int y, int z, Framebuffer *dst, int dstLevel, int dstX, int dstY, int dstZ, int width, int height, int depth) {}
bool D3D11DrawContext::BlitFramebuffer(Framebuffer *src, int srcX1, int srcY1, int srcX2, int srcY2, Framebuffer *dst, int dstX1, int dstY1, int dstX2, int dstY2, int channelBits, FBBlitFilter filter) { return true; }
@@ -570,8 +581,6 @@ void D3D11DrawContext::GetFramebufferDimensions(Framebuffer *fbo, int *w, int *h
*h = fb->height;
}
-#endif
-
DrawContext *T3DCreateD3D11Context(ID3D11Device *device, ID3D11DeviceContext *context) {
return nullptr; // new D3D11DrawContext(device, context);
}