Rebase against 03ee99b43c2a01ce0e6f77fc0bbc71570a695336.

This commit is contained in:
Sebastian Lackner
2016-03-15 17:10:26 +01:00
parent c11992eadd
commit 51601eed6f
6 changed files with 36 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
From e978148d40107aa9ec6d1affc65f4386188940eb Mon Sep 17 00:00:00 2001
From af160ceb1fc68b5c3edb35d9bbe0ab3bc2bb7563 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sat, 13 Feb 2016 15:29:37 +0100
Subject: d3dx9_36: Implement D3DXDisassembleShader. (v2)
@@ -10,7 +10,7 @@ Changes in v2 (by Christian Costa):
1 file changed, 328 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 50d5669..d2ee03f 100644
index 0f6e226..4b63f4c 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -1,7 +1,7 @@
@@ -28,9 +28,9 @@ index 50d5669..d2ee03f 100644
#include "wine/port.h"
+#include <stdio.h>
#include "wine/debug.h"
#include "wine/unicode.h"
@@ -2147,10 +2148,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
#include "d3dx9_private.h"
#include "d3dcommon.h"
@@ -2142,10 +2143,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
return D3D_OK;
}