1 files changed, 18 insertions, 8 deletions

diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index ca804a26acd..1da7274b2cd 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -279,6 +279,9 @@ static void gpu_parse_material_library(GHash *hash, GPUMaterialLibrary *library)
       if (!type && gpu_str_prefix(code, "sampler1DArray")) {
         type = GPU_TEX1D_ARRAY;
       }
+      if (!type && gpu_str_prefix(code, "sampler2DArray")) {
+        type = GPU_TEX2D_ARRAY;
+      }
       if (!type && gpu_str_prefix(code, "sampler2D")) {
         type = GPU_TEX2D;
       }
@@ -618,7 +621,7 @@ static void codegen_set_unique_ids(ListBase *nodes)
         input->bindtex = false;
         if (input->ima) {
           /* input is texture from image */
-          codegen_set_texid(bindhash, input, &texid, input->ima, input->image_tile);
+          codegen_set_texid(bindhash, input, &texid, input->ima, input->type);
         }
         else if (input->coba) {
           /* input is color band texture, check coba pointer */
@@ -657,10 +660,18 @@ static int codegen_process_uniforms_functions(GPUMaterial *material, DynStr *ds,
       if (input->source == GPU_SOURCE_TEX) {
         /* create exactly one sampler for each texture */
         if (codegen_input_has_texture(input) && input->bindtex) {
-          BLI_dynstr_appendf(ds,
-                             "uniform %s samp%d;\n",
-                             (input->coba) ? "sampler1DArray" : "sampler2D",
-                             input->texid);
+          const char *type;
+          if (input->coba || input->type == GPU_TEX1D_ARRAY) {
+            type = "sampler1DArray";
+          }
+          else if (input->type == GPU_TEX2D_ARRAY) {
+            type = "sampler2DArray";
+          }
+          else {
+            BLI_assert(input->type == GPU_TEX2D);
+            type = "sampler2D";
+          }
+          BLI_dynstr_appendf(ds, "uniform %s samp%d;\n", type, input->texid);
         }
       }
       else if (input->source == GPU_SOURCE_BUILTIN) {
@@ -1544,10 +1555,10 @@ static void gpu_node_input_link(GPUNode *node, GPUNodeLink *link, const eGPUType
       input->coba = link->coba;
       break;
     case GPU_NODE_LINK_IMAGE_BLENDER:
+    case GPU_NODE_LINK_IMAGE_TILEMAP:
       input->source = GPU_SOURCE_TEX;
       input->ima = link->ima;
       input->iuser = link->iuser;
-      input->image_tile = link->image_tile;
       break;
     case GPU_NODE_LINK_ATTR:
       input->source = GPU_SOURCE_ATTR;
@@ -1792,13 +1803,12 @@ GPUNodeLink *GPU_uniform(float *num)
   return link;
 }
 
-GPUNodeLink *GPU_image(Image *ima, ImageUser *iuser, int tile)
+GPUNodeLink *GPU_image(Image *ima, ImageUser *iuser)
 {
   GPUNodeLink *link = GPU_node_link_create();
   link->link_type = GPU_NODE_LINK_IMAGE_BLENDER;
   link->ima = ima;
   link->iuser = iuser;
-  link->image_tile = tile;
   return link;
 }