Expose more APIs of filaflat publicly

We now expose things like 

BlobDictionary: dictionary content
MaterialChunk: construct a material from the BlobDictionary
SpirvDictionaryReader: reads a spirv dictionary
TextDictionaryReader: reads an ascii dictionary

All these classes are generic enough and don't have any outside
dependencies.

The only remaining class which has outside dependencies is 
MaterialParser, which will be eliminated soon.
This commit is contained in:
Mathias Agopian
2019-02-28 12:29:56 -08:00
committed by Mathias Agopian
parent 9263eda90e
commit 54283291d1
8 changed files with 18 additions and 22 deletions
@@ -17,13 +17,13 @@
#ifndef TNT_FILAMAT_MATERIAL_CHUNK_H
#define TNT_FILAMAT_MATERIAL_CHUNK_H
#include "BlobDictionary.h"
#include <filament/driver/DriverEnums.h>
#include <filaflat/BlobDictionary.h>
#include <filaflat/ShaderBuilder.h>
#include <filaflat/Unflattener.h>
#include <filament/driver/DriverEnums.h>
#include <tsl/robin_map.h>
namespace filaflat {
@@ -14,14 +14,13 @@
* limitations under the License.
*/
#ifndef TNT_FILAFLAT_DIC_SPIRV_CHUNK_H
#define TNT_FILAFLAT_DIC_SPIRV_CHUNK_H
#ifndef TNT_FILAFLAT_SPIRV_DICTIONARY_READER_H
#define TNT_FILAFLAT_SPIRV_DICTIONARY_READER_H
#include <filaflat/BlobDictionary.h>
#include <filaflat/ChunkContainer.h>
#include <filaflat/Unflattener.h>
#include "BlobDictionary.h"
namespace filaflat {
struct SpirvDictionaryReader {
@@ -14,17 +14,13 @@
* limitations under the License.
*/
#ifndef TNT_FILAFLAT_DIC_GLSL_CHUNK_H
#define TNT_FILAFLAT_DIC_GLSL_CHUNK_H
#ifndef TNT_FILAFLAT_TEXT_DICTIONARY_READER_H
#define TNT_FILAFLAT_TEXT_DICTIONARY_READER_H
#include <filaflat/BlobDictionary.h>
#include <filaflat/ChunkContainer.h>
#include <filaflat/Unflattener.h>
#include "BlobDictionary.h"
#include <vector>
#include <stdint.h>
namespace filaflat {
struct TextDictionaryReader {
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "MaterialChunk.h"
#include <filaflat/MaterialChunk.h>
#include <utils/Log.h>
+6 -5
View File
@@ -14,18 +14,19 @@
* limitations under the License.
*/
#include "filaflat/MaterialParser.h"
#include <filaflat/BlobDictionary.h>
#include <filaflat/ChunkContainer.h>
#include <filaflat/MaterialChunk.h>
#include <filaflat/MaterialParser.h>
#include <filaflat/ShaderBuilder.h>
#include <filaflat/SpirvDictionaryReader.h>
#include <filaflat/TextDictionaryReader.h>
#include <filaflat/Unflattener.h>
#include <filament/MaterialChunkType.h>
#include "BlobDictionary.h"
#include "ChunkInterfaceBlock.h"
#include "MaterialChunk.h"
#include "TextDictionaryReader.h"
#include "SpirvDictionaryReader.h"
#include <private/filament/SamplerInterfaceBlock.h>
#include <private/filament/UniformInterfaceBlock.h>
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "SpirvDictionaryReader.h"
#include <filaflat/SpirvDictionaryReader.h>
#if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN)
#include <utils/Log.h>
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "TextDictionaryReader.h"
#include <filaflat/TextDictionaryReader.h>
#include <utils/Log.h>