cleanup: break dependency filamat->filaflat dependency

libs/filaflat/src/MaterialParser.cpp

@@ -19,7 +19,7 @@
 #include <filaflat/ChunkContainer.h>
 #include <filaflat/ShaderBuilder.h>
 #include <filaflat/Unflattener.h>
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 
 #include "BlobDictionary.h"
 #include "ChunkInterfaceBlock.h"

libs/filamat/CMakeLists.txt

@@ -61,7 +61,7 @@ include_directories(${CMAKE_BINARY_DIR})
 add_library(${TARGET} STATIC ${HDRS} ${PRIVATE_HDRS} ${SRCS})
 target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
 
-target_link_libraries(${TARGET} shaders filabridge filaflat utils smol-v)
+target_link_libraries(${TARGET} shaders filabridge utils smol-v)
 
 # We are being naughty and accessing private headers here
 # For spirv-tools, we're just following glslang's example

libs/filamat/src/eiff/Chunk.h

@@ -21,7 +21,7 @@
 
 #include "Flattener.h"
 
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 
 namespace filamat {
 

libs/filamat/src/eiff/ChunkContainer.h

@@ -22,7 +22,7 @@
 #include "Chunk.h"
 #include "Flattener.h"
 
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 
 namespace filamat {
 

libs/filamat/src/eiff/MaterialInterfaceBlockChunk.cpp

@@ -15,7 +15,7 @@
  */
 #include "MaterialInterfaceBlockChunk.h"
 
-#include "filaflat/FilaflatDefs.h"
+#include "filament/MaterialChunkType.h"
 
 using namespace filament;
 

tools/matinfo/src/main.cpp

@@ -17,7 +17,7 @@
 #include <getopt/getopt.h>
 
 #include <filaflat/ChunkContainer.h>
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 #include <filaflat/MaterialParser.h>
 #include <filaflat/Unflattener.h>
 #include <filaflat/ShaderBuilder.h>