Henri Verbeet : d3d10: Add D3D10_DRIVER_TYPE_WARP.
Alexandre Julliard
julliard at winehq.org
Mon Jan 27 13:32:54 CST 2014
Module: wine
Branch: master
Commit: 2d06703dc752e00b05710125d8bc3fb505ca4beb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d06703dc752e00b05710125d8bc3fb505ca4beb
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Jan 27 10:07:53 2014 +0100
d3d10: Add D3D10_DRIVER_TYPE_WARP.
---
dlls/d3d10/d3d10_main.c | 5 +++++
dlls/d3d10/utils.c | 1 +
include/d3d10misc.h | 1 +
3 files changed, 7 insertions(+)
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index 01fefba..6d4d626 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -121,6 +121,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver
}
break;
}
+
+ default:
+ FIXME("Unhandled driver type %#x.\n", driver_type);
+ IDXGIFactory_Release(factory);
+ return E_FAIL;
}
}
diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c
index 6bb7d05..9ffff13 100644
--- a/dlls/d3d10/utils.c
+++ b/dlls/d3d10/utils.c
@@ -34,6 +34,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type)
WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE);
WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL);
WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE);
+ WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP);
default:
FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type);
return "unrecognized";
diff --git a/include/d3d10misc.h b/include/d3d10misc.h
index 9f7f8e9..f8f5617 100644
--- a/include/d3d10misc.h
+++ b/include/d3d10misc.h
@@ -30,6 +30,7 @@ typedef enum D3D10_DRIVER_TYPE {
D3D10_DRIVER_TYPE_REFERENCE = 1,
D3D10_DRIVER_TYPE_NULL = 2,
D3D10_DRIVER_TYPE_SOFTWARE = 3,
+ D3D10_DRIVER_TYPE_WARP = 5,
} D3D10_DRIVER_TYPE;
HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,
More information about the wine-cvs
mailing list