[Bf-blender-cvs] [99886f91a92] tmp-vulkan: Merge commit 'master@{2-weeks-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: 99886f91a92d3a57c5c3637aaacaf485f64cefae
Author: Jeroen Bakker
Date:   Mon Jun 28 15:04:21 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB99886f91a92d3a57c5c3637aaacaf485f64cefae

Merge commit 'master@{2-weeks-ago}' into tmp-vulkan

===================================================================



===================================================================

diff --cc source/blender/gpu/CMakeLists.txt
index 03e44d47690,8468985309f..52496f89bc9
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -443,8 -394,8 +443,10 @@@ if(WITH_GTESTS
    if(WITH_OPENGL_DRAW_TESTS)
      set(TEST_SRC
        tests/gpu_testing.cc
 +      tests/gpu_shader_compiler_test.cc
 +      tests/gpu_shader_builtin_test.cc
+ 
+       tests/gpu_index_buffer_test.cc
        tests/gpu_shader_test.cc
  
        tests/gpu_testing.hh
diff --cc source/blender/windowmanager/intern/wm_window.c
index 619551ddac1,6aedfb10dde..967bea08d5e
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -549,15 -549,8 +549,15 @@@ static void wm_window_ghostwindow_add(w
      glSettings.flags |= GHOST_glDebugContext;
    }
  
 +  GHOST_TDrawingContextType contextType = GHOST_kDrawingContextTypeOpenGL;
 +#ifdef WITH_VULKAN
 +  if (G.debug & G_DEBUG_VK_CONTEXT) {
 +    contextType = GHOST_kDrawingContextTypeVulkan;
 +  }
 +#endif
 +
    int scr_w, scr_h;
-   wm_get_screensize(&scr_w, &scr_h);
+   wm_get_desktopsize(&scr_w, &scr_h);
    int posy = (scr_h - win->posy - win->sizey);
  
    /* Clear drawable so we can set the new window. */