marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dcompiler: Always expect D3D_COMPILER_VERSION to be defined. 

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Matteo Bruni 2019-11-12 19:47:23 +01:00 committed by Alexandre Julliard
parent 4346d68e1b
commit 4ed07d8586
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d10/Makefile.in
View File

@ -1,6 +1,7 @@
MODULE = d3d10.dll
IMPORTLIB = d3d10
IMPORTS = uuid d3d10core d3dcompiler dxgi
EXTRADEFS = -DD3D_COMPILER_VERSION=0
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -mno-cygwin

2
dlls/d3dcompiler_43/reflection.c
View File

@ -1807,7 +1807,7 @@ err_out:
}
/* d3d10 reflection methods. */
#ifndef D3D_COMPILER_VERSION
#if !D3D_COMPILER_VERSION
static inline struct d3dcompiler_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface)
{
return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D10ShaderReflection_iface);

2
dlls/d3dcompiler_43/utils.c
View File

@ -758,7 +758,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, __ms
}
}
#ifdef D3D_COMPILER_VERSION
#if D3D_COMPILER_VERSION
BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var)
{
struct hlsl_ir_var *var;