Rebase against 2d0e84e60196693d1caa6e2d70422051b56cfe08.

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From fb1dbda120ff9777832d125ad31fee292fdd2123 Mon Sep 17 00:00:00 2001
+From dc71919fd156f8fabcb47594cb13ee3210ff571c Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Do not enumerate the registry in
@@ -9,21 +9,21 @@ not the complete list from the registry.
 ---
  dlls/user32/input.c       |  1 -
  dlls/user32/tests/input.c | 35 +++++++++++++++++++++++++++++++++++
- dlls/win32u/input.c       | 33 +--------------------------------
- 3 files changed, 36 insertions(+), 33 deletions(-)
+ dlls/win32u/input.c       | 35 ++---------------------------------
+ 3 files changed, 37 insertions(+), 34 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 08a00c0e647..ae496e5d703 100644
+index 6cf60abeae2..3907430dd22 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -809,7 +809,6 @@ BOOL WINAPI BlockInput(BOOL fBlockIt)
-     return FALSE;
+@@ -802,7 +802,6 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent,
+     }
  }
  
 -
  /***********************************************************************
-  *		RegisterHotKey (USER32.@)
-  */
+  * TrackMouseEvent [USER32]
+  *
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
 index 79f3dfc3dc0..b3c1bd560ae 100644
 --- a/dlls/user32/tests/input.c
@@ -78,10 +78,10 @@ index 79f3dfc3dc0..b3c1bd560ae 100644
      if(pGetMouseMovePointsEx)
          test_GetMouseMovePointsEx(argv[0]);
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index 90a77639d1a..1fe2fb88911 100644
+index 72af32fd471..a18f81fc331 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -621,11 +621,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -821,11 +821,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index 90a77639d1a..1fe2fb88911 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -639,33 +635,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -839,33 +835,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -129,5 +129,5 @@ index 90a77639d1a..1fe2fb88911 100644
  
      return count;
 -- 
-2.33.0
+2.34.1
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "7ea710c69ba46f6255c0e049b5c29bc3e06b6433"
+	echo "2d0e84e60196693d1caa6e2d70422051b56cfe08"
 }
 
 # Show version information

patches/wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch

@@ -1,4 +1,4 @@
-From 0690735af120711ffa1e759bd3af1281de627dc1 Mon Sep 17 00:00:00 2001
+From d8873b3ae77d5a6697a3eb0e3c8a3763cfa74282 Mon Sep 17 00:00:00 2001
 From: Andrew Wesie <awesie@gmail.com>
 Date: Tue, 2 Oct 2018 23:28:01 -0500
 Subject: [PATCH] wined3d: Use bindless textures for GLSL shaders.
@@ -17,7 +17,7 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
  8 files changed, 247 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
-index 0a98720a5ae..8b45be19f49 100644
+index 6d542713d2a..189955aa05c 100644
 --- a/dlls/wined3d/adapter_gl.c
 +++ b/dlls/wined3d/adapter_gl.c
 @@ -58,6 +58,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -28,7 +28,7 @@ index 0a98720a5ae..8b45be19f49 100644
      {"GL_ARB_blend_func_extended",          ARB_BLEND_FUNC_EXTENDED       },
      {"GL_ARB_buffer_storage",               ARB_BUFFER_STORAGE            },
      {"GL_ARB_clear_buffer_object",          ARB_CLEAR_BUFFER_OBJECT       },
-@@ -2121,6 +2122,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
+@@ -2120,6 +2121,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
      /* GL_ARB_base_instance */
      USE_GL_FUNC(glDrawArraysInstancedBaseInstance)
      USE_GL_FUNC(glDrawElementsInstancedBaseVertexBaseInstance)
@@ -41,10 +41,10 @@ index 0a98720a5ae..8b45be19f49 100644
      USE_GL_FUNC(glBindFragDataLocationIndexed)
      USE_GL_FUNC(glGetFragDataIndex)
 diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
-index 9fd2ed67dcc..e569cab599d 100644
+index b82849f8470..e77afe96ace 100644
 --- a/dlls/wined3d/context_gl.c
 +++ b/dlls/wined3d/context_gl.c
-@@ -3757,6 +3757,12 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
+@@ -3930,6 +3930,12 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
      if (!(shader = state->shader[shader_type]))
          return;
  
@@ -58,10 +58,10 @@ index 9fd2ed67dcc..e569cab599d 100644
              &shader->reg_maps.shader_version, &base, &count);
  
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index a6e361021ea..9d5eb0af5e9 100644
+index d0f0f7407bd..beca9108000 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -577,6 +577,59 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device)
+@@ -580,6 +580,59 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device)
      device->null_sampler = NULL;
  }
  
@@ -121,7 +121,7 @@ index a6e361021ea..9d5eb0af5e9 100644
  static bool wined3d_null_image_vk_init(struct wined3d_image_vk *image, struct wined3d_context_vk *context_vk,
          VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int layer_count, unsigned int sample_count)
  {
-@@ -1036,6 +1089,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object)
+@@ -1274,6 +1327,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object)
  
      wined3d_device_gl_create_dummy_textures(device_gl, context_gl);
      wined3d_device_create_default_samplers(device, context);
@@ -130,7 +130,7 @@ index a6e361021ea..9d5eb0af5e9 100644
  }
  
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index c8709344ada..70dc9fe4f3c 100644
+index 1945c35f996..94b966e03ea 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
 @@ -746,6 +746,113 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b
@@ -247,7 +247,7 @@ index c8709344ada..70dc9fe4f3c 100644
  /* Context activation is done by the caller. */
  static void shader_glsl_load_samplers(const struct wined3d_context *context,
          struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps)
-@@ -2566,7 +2673,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
+@@ -2553,7 +2660,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
                  break;
          }
  
@@ -258,7 +258,7 @@ index c8709344ada..70dc9fe4f3c 100644
              shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, version, entry->bind_idx);
          shader_addline(buffer, "uniform %s%s %s_sampler%u;\n",
                  sampler_type_prefix, sampler_type, prefix, entry->bind_idx);
-@@ -7759,6 +7868,8 @@ static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *b
+@@ -7654,6 +7763,8 @@ static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *b
  static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer,
          const struct wined3d_gl_info *gl_info)
  {
@@ -267,7 +267,7 @@ index c8709344ada..70dc9fe4f3c 100644
      if (gl_info->supported[ARB_CULL_DISTANCE])
          shader_addline(buffer, "#extension GL_ARB_cull_distance : enable\n");
      if (gl_info->supported[ARB_GPU_SHADER5])
-@@ -11907,6 +12018,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
+@@ -11793,6 +11904,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
      shader_glsl_get_caps,
      shader_glsl_color_fixup_supported,
      shader_glsl_has_ffp_proj_control,
@@ -276,10 +276,10 @@ index c8709344ada..70dc9fe4f3c 100644
  };
  
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index 99aa6a5598a..8a10abf07d9 100644
+index 003aca3aecb..75ca4ffcef5 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -1191,7 +1191,7 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_
+@@ -1240,7 +1240,7 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_
  }
  
  /* Context activation is done by the caller. */
@@ -288,7 +288,7 @@ index 99aa6a5598a..8a10abf07d9 100644
          struct wined3d_context_gl *context_gl, BOOL srgb)
  {
      const struct wined3d_format *format = texture_gl->t.resource.format;
-@@ -1215,10 +1215,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
+@@ -1264,10 +1264,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
      target = texture_gl->target;
  
      if (gl_tex->name)
@@ -300,7 +300,7 @@ index 99aa6a5598a..8a10abf07d9 100644
  
      gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name);
      checkGLcall("glGenTextures");
-@@ -1227,7 +1224,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
+@@ -1276,7 +1273,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
      if (!gl_tex->name)
      {
          ERR("Failed to generate a texture name.\n");
@@ -309,7 +309,7 @@ index 99aa6a5598a..8a10abf07d9 100644
      }
  
      /* Initialise the state of the texture object to the OpenGL defaults, not
-@@ -1311,6 +1308,15 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
+@@ -1360,6 +1357,15 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
          gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle);
          checkGLcall("set format swizzle");
      }
@@ -326,7 +326,7 @@ index 99aa6a5598a..8a10abf07d9 100644
  
  /* Context activation is done by the caller. */
 diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
-index efa98ea13eb..4a2678b3952 100644
+index a345626cf5e..f4c24f2d2a6 100644
 --- a/dlls/wined3d/view.c
 +++ b/dlls/wined3d/view.c
 @@ -1203,6 +1203,36 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl
@@ -379,7 +379,7 @@ index 75c4cd732ab..ccc1ce2f0ff 100644
      ARB_BUFFER_STORAGE,
      ARB_CLEAR_BUFFER_OBJECT,
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index ed3b8f63fbd..d8d1d22270d 100644
+index 7d5bb0391bc..89751c56748 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
 @@ -94,6 +94,7 @@ struct wined3d_adapter;
@@ -390,7 +390,7 @@ index ed3b8f63fbd..d8d1d22270d 100644
  struct wined3d_gl_info;
  struct wined3d_state;
  struct wined3d_swapchain_gl;
-@@ -1534,6 +1535,8 @@ struct wined3d_shader_backend_ops
+@@ -1543,6 +1544,8 @@ struct wined3d_shader_backend_ops
      void (*shader_get_caps)(const struct wined3d_adapter *adapter, struct shader_caps *caps);
      BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup);
      BOOL (*shader_has_ffp_proj_control)(void *shader_priv);
@@ -399,7 +399,7 @@ index ed3b8f63fbd..d8d1d22270d 100644
      uint64_t (*shader_compile)(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc,
          enum wined3d_shader_type shader_type);
  };
-@@ -3852,6 +3855,21 @@ struct wined3d_dummy_textures
+@@ -3888,6 +3891,21 @@ struct wined3d_dummy_textures
      GLuint tex_2d_ms_array;
  };
  
@@ -421,7 +421,7 @@ index ed3b8f63fbd..d8d1d22270d 100644
  #define WINED3D_UNMAPPED_STAGE ~0u
  
  /* Multithreaded flag. Removed from the public header to signal that
-@@ -3927,6 +3945,9 @@ struct wined3d_device
+@@ -3963,6 +3981,9 @@ struct wined3d_device
      struct wined3d_sampler *default_sampler;
      struct wined3d_sampler *null_sampler;
  
@@ -431,16 +431,16 @@ index ed3b8f63fbd..d8d1d22270d 100644
      /* Command stream */
      struct wined3d_cs *cs;
  
-@@ -4560,6 +4581,8 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture,
+@@ -4658,6 +4679,8 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture,
+ void wined3d_texture_get_bo_address(const struct wined3d_texture *texture,
+         unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) DECLSPEC_HIDDEN;
  GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN;
- void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx,
-         struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN;
 +GLuint wined3d_texture_get_name(struct wined3d_texture_gl *texture_gl,
 +        struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN;
  void wined3d_texture_invalidate_location(struct wined3d_texture *texture,
          unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;
  void wined3d_texture_load(struct wined3d_texture *texture,
-@@ -5327,6 +5350,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view
+@@ -5415,6 +5438,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view
          void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
  void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl,
          struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;

staging/upstream-commit

@@ -1 +1 @@
-7ea710c69ba46f6255c0e049b5c29bc3e06b6433
+2d0e84e60196693d1caa6e2d70422051b56cfe08