From 4c81bb01585eb85aeec9396d43ee86afa450bf6d Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Tue, 14 Jul 2020 09:29:20 -0700
Subject: [PATCH] Fix material parameters enum (#2814)

* Fix material parameters enum

Fixes bug #2812

* Add  missing sampler type to filamat
---
 .../com/google/android/filament/filamat/MaterialBuilder.java  | 1 +
 .../src/main/java/com/google/android/filament/Material.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/filamat-android/src/main/java/com/google/android/filament/filamat/MaterialBuilder.java b/android/filamat-android/src/main/java/com/google/android/filament/filamat/MaterialBuilder.java
index dd4aeb4a51..cecaf3a8ae 100644
--- a/android/filamat-android/src/main/java/com/google/android/filament/filamat/MaterialBuilder.java
+++ b/android/filamat-android/src/main/java/com/google/android/filament/filamat/MaterialBuilder.java
@@ -69,6 +69,7 @@ public class MaterialBuilder {
         SAMPLER_2D_ARRAY,       // 2D array texture
         SAMPLER_CUBEMAP,        // Cube map texture
         SAMPLER_EXTERNAL,       // External texture
+        SAMPLER_3D              // 3D texture
     }
 
     public enum SamplerFormat {
diff --git a/android/filament-android/src/main/java/com/google/android/filament/Material.java b/android/filament-android/src/main/java/com/google/android/filament/Material.java
index c3f9606fec..7c2b73e400 100644
--- a/android/filament-android/src/main/java/com/google/android/filament/Material.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Material.java
@@ -230,8 +230,10 @@ public class Material {
             MAT3,
             MAT4,
             SAMPLER_2D,
+            SAMPLER_2D_ARRAY,
             SAMPLER_CUBEMAP,
-            SAMPLER_EXTERNAL
+            SAMPLER_EXTERNAL,
+            SAMPLER_3D
         }
 
         public enum Precision {