Nikolay Sivov : d3dx9: Use proper enum member (Clang).
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 27 08:20:49 CST 2015
Module: wine
Branch: master
Commit: 236d97fed913d2e59d5438b569a8555209d908ad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=236d97fed913d2e59d5438b569a8555209d908ad
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Nov 27 11:53:59 2015 +0300
d3dx9: Use proper enum member (Clang).
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/shader.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index e9d893b..e25480d 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -372,7 +372,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR
WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL);
EnterCriticalSection(&from_file_mutex);
- hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len);
+ hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len);
if (FAILED(hr))
{
LeaveCriticalSection(&from_file_mutex);
@@ -507,7 +507,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO
WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL);
EnterCriticalSection(&from_file_mutex);
- hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len);
+ hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len);
if (FAILED(hr))
{
LeaveCriticalSection(&from_file_mutex);
@@ -630,7 +630,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA
WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL);
EnterCriticalSection(&from_file_mutex);
- hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len);
+ hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len);
if (FAILED(hr))
{
LeaveCriticalSection(&from_file_mutex);
More information about the wine-cvs
mailing list