update headers to Filament v1.25.0

ios/include/gltfio/MaterialProvider.h

@@ -26,7 +26,7 @@
 #include <array>
 #include <string>
 
-namespace gltfio {
+namespace filament::gltfio {
 
 enum class AlphaMode : uint8_t {
     OPAQUE,
@@ -118,12 +118,12 @@ inline uint8_t getNumUvSets(const UvMap& uvmap) {
  * \class MaterialProvider MaterialProvider.h gltfio/MaterialProvider.h
  * \brief Interface to a provider of glTF materials (has two implementations).
  *
- * - The \c MaterialGenerator implementation generates materials at run time (which can be slow) and
- *   requires the filamat library, but produces streamlined shaders. See createMaterialGenerator().
+ * - The \c JitShaderProvider implementation generates materials at run time (which can be slow) and
+ *   requires the filamat library, but produces streamlined shaders. See createJitShaderProvider().
  *
- * - The \c UbershaderLoader implementation uses a small number of pre-built materials with complex
+ * - The \c UbershaderProvider implementation uses a small number of pre-built materials with complex
  *   fragment shaders, but does not require any run time work or usage of filamat. See
- *   createUbershaderLoader().
+ *   createUbershaderProvider().
  *
  * Both implementations of MaterialProvider maintain a small cache of materials which must be
  * explicitly freed using destroyMaterials(). These materials are not freed automatically when the
@@ -186,23 +186,22 @@ void processShaderString(std::string* shader, const UvMap& uvmap,
  *
  * Requires \c libfilamat to be linked in. Not available in \c libgltfio_core.
  *
- * @see createUbershaderLoader
+ * @see createUbershaderProvider
  */
 UTILS_PUBLIC
-MaterialProvider* createMaterialGenerator(filament::Engine* engine, bool optimizeShaders = false);
+MaterialProvider* createJitShaderProvider(filament::Engine* engine, bool optimizeShaders = false);
 
 /**
  * Creates a material provider that loads a small set of pre-built materials.
  *
  * @return New material provider that can quickly load a material from a cache.
  *
- * Requires \c libgltfio_resources to be linked in.
- *
- * @see createMaterialGenerator
+ * @see createJitShaderProvider
  */
 UTILS_PUBLIC
-MaterialProvider* createUbershaderLoader(filament::Engine* engine);
+MaterialProvider* createUbershaderProvider(filament::Engine* engine, const void* archive,
+        size_t archiveByteCount);
 
-} // namespace gltfio
+} // namespace filament::gltfio
 
 #endif // GLTFIO_MATERIALPROVIDER_H