[PATCH 3/5] d3dx9: Add / improve traces in some shader-related functions. (resend)
Matteo Bruni
mbruni at codeweavers.com
Tue Sep 3 09:29:42 CDT 2013
---
dlls/d3dx9_36/shader.c | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 531fed8..7987fe2 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -310,6 +310,9 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR
HRESULT hr;
struct D3DXIncludeImpl includefromfile;
+ TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n",
+ debugstr_w(filename), defines, include, flags, shader, error_messages);
+
if(FAILED(map_view_of_file(filename, &buffer, &len)))
return D3DXERR_INVALIDDATA;
@@ -333,6 +336,9 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou
HRSRC res;
DWORD len;
+ TRACE("module %p, resource %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n",
+ module, debugstr_a(resource), defines, include, flags, shader, error_messages);
+
if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA)))
return D3DXERR_INVALIDDATA;
if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
@@ -365,8 +371,10 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO
{
HRESULT hr;
- TRACE("data %p, length %u, defines %p, include %p, function %s, profile %s, flags %#x, shader %p, error_msgs %p, constant_table %p\n",
- data, length, defines, include, function, profile, flags, shader, error_msgs, constant_table);
+ TRACE("data %s, length %u, defines %p, include %p, function %s, profile %s, "
+ "flags %#x, shader %p, error_msgs %p, constant_table %p.\n",
+ debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile),
+ flags, shader, error_msgs, constant_table);
hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include,
function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs);
@@ -422,6 +430,11 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO
struct D3DXIncludeImpl includefromfile;
char *filename_a;
+ TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, "
+ "flags %#x, shader %p, error_messages %p, constant_table %p.\n",
+ debugstr_w(filename), defines, include, debugstr_a(entrypoint), debugstr_a(profile),
+ flags, shader, error_messages, constant_table);
+
if (FAILED(map_view_of_file(filename, &buffer, &len)))
return D3DXERR_INVALIDDATA;
@@ -461,6 +474,11 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour
HRSRC res;
DWORD len;
+ TRACE("module %p, resource %s, defines %p, include %p, entrypoint %s, profile %s, "
+ "flags %#x, shader %p, error_messages %p, constant_table %p.\n",
+ module, debugstr_a(resource), defines, include, debugstr_a(entrypoint), debugstr_a(profile),
+ flags, shader, error_messages, constant_table);
+
if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA)))
return D3DXERR_INVALIDDATA;
if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
@@ -493,7 +511,9 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines,
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
- TRACE("Forward to D3DPreprocess\n");
+ TRACE("data %s, data_len %u, defines %p, include %p, shader %p, error_messages %p.\n",
+ debugstr_a(data), data_len, defines, include, shader, error_messages);
+
return D3DPreprocess(data, data_len, NULL,
(const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include,
(ID3DBlob **)shader, (ID3DBlob **)error_messages);
@@ -506,6 +526,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC
DWORD len;
HRESULT ret;
+ TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n",
+ debugstr_a(filename), defines, include, shader, error_messages);
+
if (!filename) return D3DXERR_INVALIDDATA;
len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0);
@@ -527,6 +550,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA
HRESULT hr;
struct D3DXIncludeImpl includefromfile;
+ TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n",
+ debugstr_w(filename), defines, include, shader, error_messages);
+
if (FAILED(map_view_of_file(filename, &buffer, &len)))
return D3DXERR_INVALIDDATA;
@@ -552,6 +578,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res
HRSRC res;
DWORD len;
+ TRACE("module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.\n",
+ module, debugstr_a(resource), defines, include, shader, error_messages);
+
if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA)))
return D3DXERR_INVALIDDATA;
if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
@@ -567,6 +596,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re
HRSRC res;
DWORD len;
+ TRACE("module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.\n",
+ module, debugstr_w(resource), defines, include, shader, error_messages);
+
if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA)))
return D3DXERR_INVALIDDATA;
if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
--
1.8.1.5
More information about the wine-patches
mailing list