4 files changed, 31 insertions, 16 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index e9061f1a029..cef90d57ef5 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -151,7 +151,10 @@ static bool gpu_pbvh_vert_buf_data_set(GPU_PBVH_Buffers *buffers, uint vert_len)
     /* Initialize vertex buffer (match 'VertexBufferFormat'). */
     buffers->vert_buf = GPU_vertbuf_create_with_format_ex(&g_vbo_id.format, GPU_USAGE_STATIC);
   }
-  GPU_vertbuf_data_alloc(buffers->vert_buf, vert_len);
+  if (buffers->vert_buf->data == NULL || buffers->vert_buf->vertex_len != vert_len) {
+    /* Allocate buffer if not allocated yet or size changed. */
+    GPU_vertbuf_data_alloc(buffers->vert_buf, vert_len);
+  }
 #endif
 
   return buffers->vert_buf->data != NULL;
@@ -1083,13 +1086,24 @@ short GPU_pbvh_buffers_material_index_get(GPU_PBVH_Buffers *buffers)
   return buffers->material_index;
 }
 
+static void gpu_pbvh_buffers_clear(GPU_PBVH_Buffers *buffers)
+{
+  GPU_BATCH_DISCARD_SAFE(buffers->lines);
+  GPU_BATCH_DISCARD_SAFE(buffers->lines_fast);
+  GPU_BATCH_DISCARD_SAFE(buffers->triangles);
+  GPU_BATCH_DISCARD_SAFE(buffers->triangles_fast);
+  GPU_INDEXBUF_DISCARD_SAFE(buffers->index_lines_buf_fast);
+  GPU_INDEXBUF_DISCARD_SAFE(buffers->index_lines_buf);
+  GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf_fast);
+  GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf);
+  GPU_VERTBUF_DISCARD_SAFE(buffers->vert_buf);
+}
+
 void GPU_pbvh_buffers_update_flush(GPU_PBVH_Buffers *buffers)
 {
   /* Free empty bmesh node buffers. */
   if (buffers->clear_bmesh_on_flush) {
-    GPU_BATCH_DISCARD_SAFE(buffers->triangles);
-    GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf);
-    GPU_VERTBUF_DISCARD_SAFE(buffers->vert_buf);
+    gpu_pbvh_buffers_clear(buffers);
     buffers->clear_bmesh_on_flush = false;
   }
 
@@ -1102,16 +1116,7 @@ void GPU_pbvh_buffers_update_flush(GPU_PBVH_Buffers *buffers)
 void GPU_pbvh_buffers_free(GPU_PBVH_Buffers *buffers)
 {
   if (buffers) {
-    GPU_BATCH_DISCARD_SAFE(buffers->lines);
-    GPU_BATCH_DISCARD_SAFE(buffers->lines_fast);
-    GPU_BATCH_DISCARD_SAFE(buffers->triangles);
-    GPU_BATCH_DISCARD_SAFE(buffers->triangles_fast);
-    GPU_INDEXBUF_DISCARD_SAFE(buffers->index_lines_buf_fast);
-    GPU_INDEXBUF_DISCARD_SAFE(buffers->index_lines_buf);
-    GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf_fast);
-    GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf);
-    GPU_VERTBUF_DISCARD_SAFE(buffers->vert_buf);
-
+    gpu_pbvh_buffers_clear(buffers);
     MEM_freeN(buffers);
   }
 }
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 2a8a4d416d8..7871907a7d4 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -905,7 +905,7 @@ GPUTexture *GPU_texture_from_blender(Image *ima, ImageUser *iuser, ImBuf *ibuf,
     bindcode = gpu_texture_create_tile_array(ima, ibuf_intern);
   }
   else if (textarget == GL_TEXTURE_1D_ARRAY) {
-    bindcode = gpu_texture_create_tile_mapping(ima, iuser->multiview_eye);
+    bindcode = gpu_texture_create_tile_mapping(ima, iuser ? iuser->multiview_eye : 0);
   }
   else {
     bindcode = gpu_texture_create_from_ibuf(ima, ibuf_intern, textarget);
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index e3632b82778..ff745787630 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -304,6 +304,14 @@ void gpu_extensions_init(void)
     GG.context_local_shaders_workaround = GLEW_ARB_get_program_binary;
   }
 
+  /* Special fix for theses specific GPUs. Without thoses workaround, blender crashes on strartup.
+   * (see T72098) */
+  if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) &&
+      (strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) {
+    GG.mip_render_workaround = true;
+    GG.context_local_shaders_workaround = GLEW_ARB_get_program_binary;
+  }
+
   /* df/dy calculation factors, those are dependent on driver */
   GG.dfdyfactors[0] = 1.0;
   GG.dfdyfactors[1] = 1.0;
diff --git a/source/blender/gpu/intern/gpu_shader_interface.c b/source/blender/gpu/intern/gpu_shader_interface.c
index 1caa88d18ae..3218d12bc0d 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.c
+++ b/source/blender/gpu/intern/gpu_shader_interface.c
@@ -261,7 +261,9 @@ GPUShaderInterface *GPU_shaderinterface_create(int32_t program)
       continue;
     }
 
-    shaderface->enabled_attr_mask |= (1 << input->location);
+    if (input->location != -1) {
+      shaderface->enabled_attr_mask |= (1 << input->location);
+    }
 
     set_input_name(shaderface, input, name, name_len);