Mesa (master): d3d1x: work around crash in widl
Luca Barbieri
lb at kemper.freedesktop.org
Mon Sep 27 22:26:20 UTC 2010
Module: Mesa
Branch: master
Commit: a73c6ce67b272b71dc814b3384d8c1c99f6c75e3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a73c6ce67b272b71dc814b3384d8c1c99f6c75e3
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Tue Sep 28 00:16:22 2010 +0200
d3d1x: work around crash in widl
---
.../d3d1x/gd3dapi/galliumd3d10_1.idl | 7 ++++++-
.../state_trackers/d3d1x/gd3dapi/galliumd3d11.idl | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
index 40a0d6a..dddb343 100644
--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
@@ -27,4 +27,9 @@
import "ocidl.idl";
import "d3d10_1.idl";
-HRESULT __stdcall GalliumD3D10DeviceCreate1(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D10Device1** ppDevice);
+// just adding __stdcall to the function makes at least one version of widl crash
+[object, local]
+interface IDummyInterfaceToPutWidlInComModeForGalliumD3D10
+{}
+
+HRESULT GalliumD3D10DeviceCreate1(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D10Device1** ppDevice);
diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
index 4dca1bc..76f8a7f 100644
--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
@@ -27,5 +27,10 @@
import "ocidl.idl";
import "d3d11.idl";
-HRESULT __stdcall GalliumD3D11DeviceCreate(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D11Device** ppDevice);
+// just adding __stdcall to the function makes at least one version of widl crash
+[object, local]
+interface IDummyInterfaceToPutWidlInComModeForGalliumD3D11
+{}
+
+HRESULT GalliumD3D11DeviceCreate(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D11Device** ppDevice);
More information about the mesa-commit
mailing list