d3d10: Implement D3D10CompileShader, forward to d3dcompiler.

diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index 79b2bbcdd87e9c73deaf45e87472efd49e9a4857..f48a1eb928ffa721c825a151a96d7987b199d876 100644 (file)
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d10.dll
 IMPORTLIB = d3d10
-IMPORTS   = dxguid uuid d3d10core dxgi
+IMPORTS   = dxguid uuid d3d10core d3dcompiler dxgi
 
 C_SRCS = \
        d3d10_main.c \

diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec
index e108a5c48900fa385a33662e1aebddf20efc65e0..1d62aea609f12ed0a2ee25e034b5f00841022dfa 100644 (file)
--- a/dlls/d3d10/d3d10.spec
+++ b/dlls/d3d10/d3d10.spec
@@ -1,5 +1,5 @@
 @ stub D3D10CompileEffectFromMemory
-@ stub D3D10CompileShader
+@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr)
 @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob
 @ stdcall D3D10CreateDevice(ptr long ptr long long ptr)
 @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr)

diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index 77a35295da2d567b6877da15749269579304b261..20871aee0cfae0d6027be6c6c1c917adb8896081 100644 (file)
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -28,6 +28,7 @@
 #include "objbase.h"
 
 #include "d3d10.h"
+#include "d3dcompiler.h"
 
 /*
  * This doesn't belong here, but for some functions it is possible to return that value,

diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c
index d5d9e1655070fc5a65cefe586a1a3a3228a96125..29d789746c8b9faef0ed0d12433ca27aba5a1c12 100644 (file)
--- a/dlls/d3d10/shader.c
+++ b/dlls/d3d10/shader.c
@@ -133,3 +133,12 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl =
     d3d10_shader_reflection_GetInputParameterDesc,
     d3d10_shader_reflection_GetOutputParameterDesc,
 };
+
+HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint,
+        const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages)
+{
+    /* Forward to d3dcompiler */
+    return D3DCompile(data, data_size, filename, defines, include,
+            entrypoint, profile, flags, 0, shader, error_messages);
+}