[PATCH 2/5] d3dcompiler: Skip search of the parent include for the initial file.
Matteo Bruni
mbruni at codeweavers.com
Mon Sep 2 16:04:48 CDT 2013
The initial file isn't necessarily "" anymore.
---
dlls/d3dcompiler_43/compiler.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c
index ac8fdc5..371f670 100644
--- a/dlls/d3dcompiler_43/compiler.c
+++ b/dlls/d3dcompiler_43/compiler.c
@@ -149,8 +149,10 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n
char *path;
int i;
+ TRACE("Looking for include %s.\n", debugstr_a(filename));
+
parent_include = NULL;
- if(parent_name[0] != '\0')
+ if (strcmp(parent_name, initial_filename))
{
for(i = 0; i < includes_size; i++)
{
@@ -162,7 +164,7 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n
}
if(parent_include == NULL)
{
- ERR("Parent include file missing\n");
+ ERR("Parent include %s missing.\n", debugstr_a(parent_name));
return NULL;
}
}
@@ -178,6 +180,8 @@ static void *wpp_open_mem(const char *filename, int type)
struct mem_file_desc *desc;
HRESULT hr;
+ TRACE("Opening include %s.\n", debugstr_a(filename));
+
if(!strcmp(filename, initial_filename))
{
current_shader.pos = 0;
--
1.8.1.5
More information about the wine-patches
mailing list