<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Oct 11, 2017 at 11:21 PM, Nicolai Hähnle <span dir="ltr"><<a href="mailto:nhaehnle@gmail.com" target="_blank">nhaehnle@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 11.10.2017 22:38, Jason Ekstrand wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
We're going to want to use the blob for Vulkan pipeline caching so it<br>
makes sense to have it in libcompiler not libglsl.<br>
---<br>
src/compiler/Makefile.sources | 4 ++--<br>
src/compiler/{glsl => }/blob.c | 0<br>
src/compiler/{glsl => }/blob.h | 0<br>
src/mesa/state_tracker/st_shad<wbr>er_cache.h | 2 +-<br>
</blockquote>
<br></span>
This needs to update the Meson build system as well.<br></blockquote><div><br></div><div>Good catch!<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
(That's why I complained about having duplicated source file lists...)<br></blockquote><div><br></div><div>Dylan is working on that problem...<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Cheers,<br>
Nicolai<div><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
4 files changed, 3 insertions(+), 3 deletions(-)<br>
rename src/compiler/{glsl => }/blob.c (100%)<br>
rename src/compiler/{glsl => }/blob.h (100%)<br>
<br>
diff --git a/src/compiler/Makefile.source<wbr>s b/src/compiler/Makefile.source<wbr>s<br>
index 36906f4..b500368 100644<br>
--- a/src/compiler/Makefile.source<wbr>s<br>
+++ b/src/compiler/Makefile.source<wbr>s<br>
@@ -1,4 +1,6 @@<br>
LIBCOMPILER_FILES = \<br>
+ blob.c \<br>
+ blob.h \<br>
builtin_type_macros.h \<br>
glsl_types.cpp \<br>
glsl_types.h \<br>
@@ -17,8 +19,6 @@ LIBGLSL_FILES = \<br>
glsl/ast_function.cpp \<br>
glsl/ast_to_hir.cpp \<br>
glsl/ast_type.cpp \<br>
- glsl/blob.c \<br>
- glsl/blob.h \<br>
glsl/builtin_functions.cpp \<br>
glsl/builtin_functions.h \<br>
glsl/builtin_int64.h \<br>
diff --git a/src/compiler/glsl/blob.c b/src/compiler/blob.c<br>
similarity index 100%<br>
rename from src/compiler/glsl/blob.c<br>
rename to src/compiler/blob.c<br>
diff --git a/src/compiler/glsl/blob.h b/src/compiler/blob.h<br>
similarity index 100%<br>
rename from src/compiler/glsl/blob.h<br>
rename to src/compiler/blob.h<br>
diff --git a/src/mesa/state_tracker/st_sh<wbr>ader_cache.h b/src/mesa/state_tracker/st_sh<wbr>ader_cache.h<br>
index f9e4615..090d7d8 100644<br>
--- a/src/mesa/state_tracker/st_sh<wbr>ader_cache.h<br>
+++ b/src/mesa/state_tracker/st_sh<wbr>ader_cache.h<br>
@@ -22,7 +22,7 @@<br>
*/<br>
#include "st_context.h"<br>
-#include "compiler/glsl/blob.h"<br>
+#include "compiler/blob.h"<br>
#include "main/mtypes.h"<br>
#include "pipe/p_state.h"<br>
#include "util/disk_cache.h"<br>
<br>
</blockquote>
<br>
<br>
-- <br></div></div>
Lerne, wie die Welt wirklich ist,<br>
Aber vergiss niemals, wie sie sein sollte.<br>
</blockquote></div><br></div></div>