Attachment 60001 Details for Bug 45292 – Hackish patch to make d3d build

[patch] Hackish patch to make d3d build

d3d_build_fix.patch (text/plain), 8.49 KB, created by Andrew Cook on 2012-04-14 22:52:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Cook

Created: 2012-04-14 22:52:17 UTC

Size: 8.49 KB

patch

obsolete

>diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp b/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp
>index 05d10c1..b8b9888 100644
>--- a/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp
>+++ b/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp
>@@ -24,6 +24,9 @@
>  *
>  **************************************************************************/
> 
>+//hack to prevent timedef redefinition problems
>+#define USE_WS_PREFIX
>+
> #include <memory>
> #include "dxbc.h"
> #include <d3d11shader.h>
>diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl
>index 7edeff9..0d3c521 100644
>--- a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl
>+++ b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl
>@@ -178,7 +178,7 @@ typedef HRESULT (* PFN_D3D10_CREATE_DEVICE_AND_SWAP_CHAIN1)(
> 	[out,optional] ID3D10Device1**
> );
> 
>-HRESULT D3D10CreateDeviceAndSwapChain1(
>+HRESULT __stdcall D3D10CreateDeviceAndSwapChain1(
> 	[in,optional] IDXGIAdapter* a,
> 	[in] D3D10_DRIVER_TYPE b,
> 	[in] HMODULE c,
>diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl
>index 6088a88..a144386 100644
>--- a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl
>+++ b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl
>@@ -71,8 +71,11 @@ typedef D3D10_CBUFFER_TYPE* LPD3D10_CBUFFER_TYPE;
> typedef D3D_NAME D3D10_NAME;
> typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE;
> typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE;
>+
> typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
>-typedef ID3DInclude* LPD3D10INCLUDE;
>+typedef ID3DInclude ID3D10Include;
>+typedef ID3DInclude *LPD3D10INCLUDE;
>+#define IID_ID3D10Include IID_ID3DInclude
> 
> cpp_quote("#define D3D10_SHVER_GET_TYPE(v) (((v) >> 16) & 0xffff)")
> cpp_quote("#define D3D10_SHVER_GET_MAJOR(v) (((v) >> 4) & 0xf)")
>@@ -257,9 +260,9 @@ interface ID3D10ShaderReflection : IUnknown
> HRESULT D3D10CompileShader(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, const D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
> 	LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
> HRESULT D3D10DisassembleShader(const void *pShader, SIZE_T BytecodeLength, BOOL EnableColorCode, LPCSTR pComments, ID3D10Blob** ppDisassembly);
>-LPCSTR D3D10GetPixelShaderProfile(ID3D10Device *pDevice);
>-LPCSTR D3D10GetVertexShaderProfile(ID3D10Device *pDevice);
>-LPCSTR D3D10GetGeometryShaderProfile(ID3D10Device *pDevice);
>+LPCSTR __stdcall D3D10GetPixelShaderProfile(ID3D10Device *pDevice);
>+LPCSTR __stdcall D3D10GetVertexShaderProfile(ID3D10Device *pDevice);
>+LPCSTR __stdcall D3D10GetGeometryShaderProfile(ID3D10Device *pDevice);
> HRESULT D3D10ReflectShader(const void *pShaderBytecode, SIZE_T BytecodeLength, ID3D10ShaderReflection **ppReflector);
> HRESULT D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, const D3D10_SHADER_MACRO* pDefines, 
> 	LPD3D10INCLUDE pInclude, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
>diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl b/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl
>index cac046f..4dfedbf 100644
>--- a/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl
>+++ b/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl
>@@ -2476,7 +2476,7 @@ typedef HRESULT (* PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(
> 	[out,optional] ID3D11DeviceContext**
> );
> 
>-HRESULT D3D11CreateDeviceAndSwapChain(
>+HRESULT __stdcall D3D11CreateDeviceAndSwapChain(
> 	[in,optional] IDXGIAdapter* a,
> 	[in] D3D_DRIVER_TYPE b,
> 	[in] HMODULE c,
>diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl b/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl
>index 86ef261..c419df4 100644
>--- a/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl
>+++ b/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl
>@@ -331,7 +331,7 @@ interface IDXGIFactory : IDXGIObject
> 	);
> }
> 
>-[local] HRESULT CreateDXGIFactory(REFIID riid, void **factory);
>+[local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory);
> 
> [
> 	object,
>@@ -467,4 +467,4 @@ interface IDXGIFactory1 : IDXGIFactory
> 	BOOL IsCurrent();
> };
> 
>-[local] HRESULT CreateDXGIFactory1(REFIID riid, void **factory);
>+[local] HRESULT __stdcall CreateDXGIFactory1(REFIID riid, void **factory);
>diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
>index da3cc23..e461e52 100644
>--- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
>+++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
>@@ -1499,7 +1499,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe>
> 		else if(map_type == D3D11_MAP_READ_WRITE)
> 			usage = PIPE_TRANSFER_READ_WRITE;
> 		else if(map_type == D3D11_MAP_WRITE_DISCARD)
>-			usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD;
>+			usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE;
> 		else if(map_type == D3D11_MAP_WRITE_NO_OVERWRITE)
> 			usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_NOOVERWRITE;
> 		else
>diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
>index 31e59bf..e8c8d3a 100644
>--- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
>+++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
>@@ -847,7 +847,7 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen
> 					box.width = u_minify(width, level);
> 					box.height = u_minify(height, level);
> 					box.depth = u_minify(depth, level);
>-					immediate_pipe->transfer_inline_write(immediate_pipe, resource, level, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | PIPE_TRANSFER_UNSYNCHRONIZED, &box, initial_data->pSysMem, initial_data->SysMemPitch, initial_data->SysMemSlicePitch);
>+					immediate_pipe->transfer_inline_write(immediate_pipe, resource, level, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE | PIPE_TRANSFER_UNSYNCHRONIZED, &box, initial_data->pSysMem, initial_data->SysMemPitch, initial_data->SysMemSlicePitch);
> 					++initial_data;
> 				}
> 			}
>diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
>index dddb343..079866b 100644
>--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
>+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
>@@ -32,4 +32,4 @@ import "d3d10_1.idl";
> interface IDummyInterfaceToPutWidlInComModeForGalliumD3D10
> {}
> 
>-HRESULT GalliumD3D10DeviceCreate1(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D10Device1** ppDevice);
>+HRESULT __stdcall GalliumD3D10DeviceCreate1(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned int 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 76f8a7f..de6830e 100644
>--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
>+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
>@@ -32,5 +32,5 @@ import "d3d11.idl";
> interface IDummyInterfaceToPutWidlInComModeForGalliumD3D11
> {}
> 
>-HRESULT GalliumD3D11DeviceCreate(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D11Device** ppDevice);
>+HRESULT __stdcall GalliumD3D11DeviceCreate(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned int creation_flags, IDXGIAdapter* adapter, ID3D11Device** ppDevice);
> 
>diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl
>index c6233c8..24ea566 100644
>--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl
>+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl
>@@ -119,10 +119,10 @@ interface IGalliumDXGIBackend : IUnknown
> 	);
> }
> 
>-void GalliumDXGIUseNothing();
>+void __stdcall GalliumDXGIUseNothing();
> 
> /* only a subset of these may be available, depending on platform and compilation options */
>-void GalliumDXGIUseX11Display(struct _XDisplay* dpy, IGalliumDXGIBackend* backend);
>+void __stdcall GalliumDXGIUseX11Display(struct _XDisplay* dpy, IGalliumDXGIBackend* backend);
> 
> /* these don't really work for now
> void GalliumDXGIUseDRMCard(int fd);
>@@ -130,5 +130,5 @@ void GalliumDXGIUseFBDev(int fd);
> void GalliumDXGIUseHDC(HDC hdc, IGalliumDXGIGDIBackend* backend);
> */
> 
>-void GalliumDXGIMakeDefault();
>+void __stdcall GalliumDXGIMakeDefault();
>

Actions: View | Splinter Review

Attachments on bug 45292: 56211 | 57383 | 60001 | 64550

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.