* Commit of version 1.9.7 of the ivb patch.

3 files changed, 53 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72007e52d8fd..ed7123d52617 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 13:31:18 UTC 2016
+# Tue Apr  5 11:25:45 UTC 2016
 pkgbase = wine-ivb
 	pkgdesc = A compatibility layer for running Windows programs: indexed vertex blending - https://bugs.winehq.org/show_bug.cgi?id=39057
-	pkgver = 1.9.3
+	pkgver = 1.9.7
 	pkgrel = 1
 	url = http://www.winehq.com
 	install = wine.install
@@ -121,24 +121,24 @@ pkgbase = wine-ivb
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = bin32-wine=1.9.3
-	provides = wine=1.9.3
-	provides = wine-wow64=1.9.3
+	provides = bin32-wine=1.9.7
+	provides = wine=1.9.7
+	provides = wine-wow64=1.9.7
 	conflicts = bin32-wine
 	conflicts = wine
 	conflicts = wine-wow64
 	replaces = bin32-wine
 	replaces = wine
 	options = staticlibs
-	source = https://dl.winehq.org/wine/source/1.9/wine-1.9.3.tar.bz2
-	source = https://dl.winehq.org/wine/source/1.9/wine-1.9.3.tar.bz2.sign
+	source = https://dl.winehq.org/wine/source/1.9/wine-1.9.7.tar.bz2
+	source = https://dl.winehq.org/wine/source/1.9/wine-1.9.7.tar.bz2.sign
 	source = 30-win32-aliases.conf
-	source = patch-1.9.3-ivb.patch
+	source = patch-1.9.7-ivb.patch
 	source = patch_temp_constants.patch
-	sha512sums = be44c0c16205ba6187fd07b715de8b888ebe97464aaa938962aaf130729177f434d1547170761c4b22f5418b16de4c00a234ac47205e2c444ef828bc38d417a4
+	sha512sums = 9946d3c69941f26e56ab78cde3c91d91debb7fc5d63f8758aa5a4e0bcdfb78c86d43f3b736b81b761bb5924479491ed00727a739e0117d3e9d5e3b8c3a90004a
 	sha512sums = SKIP
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
-	sha512sums = 71a8614e9044cc750fcf80431dff6fe383b5abe906e05224082fefcdb4d4429f8c118eb775689e59386b863e01fd1376e5ae2569a292418212ac8b84156d62e7
+	sha512sums = 7b6d0076846c8f0b1c45971fecf43d57bb9ec381e403641f22a7c1b10bf4329f0a4a88d2362a8bbec7d0a601a667eb1002d5192b64c204e4a7e333878ef92c8d
 	sha512sums = 83583553d8db60e671679adcddedb87a2f8a740d36e5cdffef4a0cf2b995e48be216e53a7d1ee3bbeafd5bf9d0938b4c32b42265620c8e7c5bba967da893be11
 
 pkgname = wine-ivb
diff --git a/PKGBUILD b/PKGBUILD
index 1411e577019d..0edaf6044547 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 _basename=wine
 pkgname=wine-ivb
-pkgver=1.9.3
+pkgver=1.9.7
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
@@ -16,10 +16,10 @@ source=(https://dl.winehq.org/wine/source/1.9/$_basename-$_pkgbasever.tar.bz2{,.
         30-win32-aliases.conf
         patch-$pkgver-ivb.patch
         patch_temp_constants.patch)
-sha512sums=('be44c0c16205ba6187fd07b715de8b888ebe97464aaa938962aaf130729177f434d1547170761c4b22f5418b16de4c00a234ac47205e2c444ef828bc38d417a4'
+sha512sums=('9946d3c69941f26e56ab78cde3c91d91debb7fc5d63f8758aa5a4e0bcdfb78c86d43f3b736b81b761bb5924479491ed00727a739e0117d3e9d5e3b8c3a90004a'
             'SKIP'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            '71a8614e9044cc750fcf80431dff6fe383b5abe906e05224082fefcdb4d4429f8c118eb775689e59386b863e01fd1376e5ae2569a292418212ac8b84156d62e7'
+            '7b6d0076846c8f0b1c45971fecf43d57bb9ec381e403641f22a7c1b10bf4329f0a4a88d2362a8bbec7d0a601a667eb1002d5192b64c204e4a7e333878ef92c8d'
             '83583553d8db60e671679adcddedb87a2f8a740d36e5cdffef4a0cf2b995e48be216e53a7d1ee3bbeafd5bf9d0938b4c32b42265620c8e7c5bba967da893be11')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
               DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
@@ -106,7 +106,7 @@ if [[ $CARCH == i686 ]]; then
 else
   makedepends=(${makedepends[@]} ${_depends[@]})
   provides=("bin32-wine=$pkgver" "wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts=('bin32-wine' 'wine' 'wine-wow64')
+  conflicts=("bin32-wine" 'wine' 'wine-wow64')
   replaces=('bin32-wine' 'wine')
 fi
 
diff --git a/patch-1.9.3-ivb.patch b/patch-1.9.7-ivb.patch
index 7f1823146335..dce2a2f89da1 100644
--- a/patch-1.9.3-ivb.patch
+++ b/patch-1.9.7-ivb.patch
@@ -1,8 +1,8 @@
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
-index 8b56dbe..bdefc8b 100644
+index c337c6c..1236208 100644
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -19617,6 +19617,261 @@ done:
+@@ -19602,6 +19602,261 @@ done:
      DestroyWindow(window);
  }
  
@@ -264,7 +264,7 @@ index 8b56dbe..bdefc8b 100644
  static void test_updatetexture(void)
  {
      IDirect3DDevice9 *device;
-@@ -21537,6 +21792,7 @@ START_TEST(visual)
+@@ -21790,6 +22045,7 @@ START_TEST(visual)
      test_multisample_mismatch();
      test_texcoordindex();
      test_vertex_blending();
@@ -273,10 +273,10 @@ index 8b56dbe..bdefc8b 100644
      test_depthbias();
      test_flip();
 diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
-index 490c20f..e2f8476 100644
+index 33b5664..9b94035 100644
 --- a/dlls/wined3d/context.c
 +++ b/dlls/wined3d/context.c
-@@ -3256,6 +3256,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de
+@@ -3415,6 +3415,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de
      {
          device->shader_backend->shader_load_constants(device->shader_priv, context, state);
          context->constant_update_mask = 0;
@@ -286,13 +286,13 @@ index 490c20f..e2f8476 100644
  
      if (context->update_shader_resource_bindings)
 diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
-index 316ccb8..46437a8 100644
+index 3692c6b..2ce0966 100644
 --- a/dlls/wined3d/cs.c
 +++ b/dlls/wined3d/cs.c
-@@ -859,7 +859,8 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat
+@@ -857,7 +857,8 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat
      const struct wined3d_cs_set_transform *op = data;
  
-     cs->state.transforms[op->state] = *op->matrix;
+     cs->state.transforms[op->state] = op->matrix;
 -    if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->d3d_info.limits.ffp_vertex_blend_matrices))
 +    if (op->state < WINED3D_TS_WORLD_MATRIX(max(cs->device->adapter->d3d_info.limits.ffp_vertex_blend_matrices,
 +        cs->device->adapter->d3d_info.limits.ffp_max_vertex_blend_matrix_index + 1)))
@@ -300,10 +300,10 @@ index 316ccb8..46437a8 100644
  }
  
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index 039a867..98d4d54 100644
+index 35bf521..09a206b 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -3285,10 +3285,14 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d
+@@ -3264,10 +3264,14 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d
  
  HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps)
  {
@@ -320,10 +320,10 @@ index 039a867..98d4d54 100644
  
  HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
-index 1407da6..3552a7d 100644
+index d193897..e81a9a3 100644
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -3733,6 +3733,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
+@@ -3788,6 +3788,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD
      adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw;
      adapter->d3d_info.ffp_generic_attributes = vertex_caps.ffp_generic_attributes;
      adapter->d3d_info.limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices;
@@ -332,10 +332,10 @@ index 1407da6..3552a7d 100644
  
      adapter->fragment_pipe->get_caps(gl_info, &fragment_caps);
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index 1b82858..ccae158 100644
+index d24a117..8338268 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -109,6 +109,10 @@ struct shader_glsl_priv {
+@@ -110,6 +110,10 @@ struct shader_glsl_priv {
      struct wine_rb_tree ffp_fragment_shaders;
      BOOL ffp_proj_control;
      BOOL legacy_lighting;
@@ -346,7 +346,7 @@ index 1b82858..ccae158 100644
  };
  
  struct glsl_vs_program
-@@ -121,7 +125,8 @@ struct glsl_vs_program
+@@ -122,7 +126,8 @@ struct glsl_vs_program
      GLint uniform_b_locations[MAX_CONST_B];
      GLint pos_fixup_location;
  
@@ -356,7 +356,7 @@ index 1b82858..ccae158 100644
      GLint projection_matrix_location;
      GLint normal_matrix_location;
      GLint texture_matrix_location[MAX_TEXTURES];
-@@ -1331,18 +1336,47 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
+@@ -1361,18 +1366,47 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
          shader_glsl_ffp_vertex_normalmatrix_uniform(context, state, prog);
      }
  
@@ -410,7 +410,7 @@ index 1b82858..ccae158 100644
          }
      }
  
-@@ -5969,8 +6003,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
+@@ -6058,8 +6092,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
      {
          {"vec4", "ffp_attrib_position"},        /* WINED3D_FFP_POSITION */
          {"vec4", "ffp_attrib_blendweight"},     /* WINED3D_FFP_BLENDWEIGHT */
@@ -420,7 +420,7 @@ index 1b82858..ccae158 100644
          {"vec3", "ffp_attrib_normal"},          /* WINED3D_FFP_NORMAL */
          {"float", "ffp_attrib_psize"},          /* WINED3D_FFP_PSIZE */
          {"vec4", "ffp_attrib_diffuse"},         /* WINED3D_FFP_DIFFUSE */
-@@ -5982,10 +6015,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
+@@ -6071,10 +6104,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
      unsigned int i;
      BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT];
      BOOL output_legacy_fogcoord = legacy_context;
@@ -436,7 +436,7 @@ index 1b82858..ccae158 100644
  
      for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i)
      {
-@@ -5995,7 +6033,16 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
+@@ -6084,7 +6122,16 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
      }
      shader_addline(buffer, "\n");
  
@@ -454,7 +454,7 @@ index 1b82858..ccae158 100644
      shader_addline(buffer, "uniform mat4 ffp_projection_matrix;\n");
      shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n");
      shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", MAX_TEXTURES);
-@@ -6054,6 +6101,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
+@@ -6143,6 +6190,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
      shader_addline(buffer, "\nvoid main()\n{\n");
      shader_addline(buffer, "float m;\n");
      shader_addline(buffer, "vec3 r;\n");
@@ -463,7 +463,7 @@ index 1b82858..ccae158 100644
  
      for (i = 0; i < ARRAY_SIZE(attrib_info); ++i)
      {
-@@ -6083,9 +6132,24 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
+@@ -6171,9 +6220,24 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
          for (i = 0; i < settings->vertexblends; ++i)
              shader_addline(buffer, "ffp_attrib_blendweight[%u] -= ffp_attrib_blendweight[%u];\n", settings->vertexblends, i);
  
@@ -491,7 +491,7 @@ index 1b82858..ccae158 100644
  
          shader_addline(buffer, "gl_Position = ffp_projection_matrix * ec_pos;\n");
          if (settings->clipping)
-@@ -6103,7 +6167,18 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
+@@ -6191,7 +6255,18 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
          else
          {
              for (i = 0; i < settings->vertexblends + 1; ++i)
@@ -511,7 +511,7 @@ index 1b82858..ccae158 100644
          }
  
          if (settings->normalize)
-@@ -6937,11 +7012,35 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *
+@@ -7034,11 +7109,35 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *
  
      vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "posFixup"));
  
@@ -548,7 +548,7 @@ index 1b82858..ccae158 100644
      vs->projection_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_projection_matrix"));
      vs->normal_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_normal_matrix"));
      for (i = 0; i < MAX_TEXTURES; ++i)
-@@ -7313,7 +7412,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+@@ -7420,7 +7519,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
          entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW
                  | WINED3D_SHADER_CONST_FFP_PROJ;
  
@@ -557,7 +557,7 @@ index 1b82858..ccae158 100644
          {
              if (entry->vs.modelview_matrix_location[i] != -1)
              {
-@@ -7322,6 +7421,9 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+@@ -7429,6 +7528,9 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
              }
          }
  
@@ -567,7 +567,7 @@ index 1b82858..ccae158 100644
          for (i = 0; i < MAX_TEXTURES; ++i)
          {
              if (entry->vs.texture_matrix_location[i] != -1)
-@@ -7561,7 +7663,12 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex
+@@ -7668,7 +7770,12 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex
          checkGLcall("glUseProgram");
  
          if (program_id)
@@ -580,7 +580,7 @@ index 1b82858..ccae158 100644
      }
  }
  
-@@ -7879,6 +7986,8 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
+@@ -7988,6 +8095,8 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
      fragment_pipe->get_caps(gl_info, &fragment_caps);
      priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL;
      priv->legacy_lighting = device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING;
@@ -589,7 +589,7 @@ index 1b82858..ccae158 100644
  
      device->vertex_priv = vertex_priv;
      device->fragment_priv = fragment_priv;
-@@ -7924,6 +8033,11 @@ static void shader_glsl_free(struct wined3d_device *device)
+@@ -8033,6 +8142,11 @@ static void shader_glsl_free(struct wined3d_device *device)
      string_buffer_free(&priv->shader_buffer);
      priv->fragment_pipe->free_private(device);
      priv->vertex_pipe->vp_free(device);
@@ -601,7 +601,7 @@ index 1b82858..ccae158 100644
  
      HeapFree(GetProcessHeap(), 0, device->shader_priv);
      device->shader_priv = NULL;
-@@ -8214,7 +8328,11 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info,
+@@ -8350,7 +8464,11 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info,
      caps->ffp_generic_attributes = TRUE;
      caps->max_active_lights = MAX_ACTIVE_LIGHTS;
      caps->max_vertex_blend_matrices = MAX_VERTEX_BLENDS;
@@ -614,7 +614,7 @@ index 1b82858..ccae158 100644
      caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN
              | WINED3DVTXPCAPS_MATERIALSOURCE7
              | WINED3DVTXPCAPS_VERTEXFOG
-@@ -8357,23 +8475,38 @@ static void glsl_vertex_pipe_vs(struct wined3d_context *context,
+@@ -8493,23 +8611,38 @@ static void glsl_vertex_pipe_vs(struct wined3d_context *context,
  static void glsl_vertex_pipe_world(struct wined3d_context *context,
          const struct wined3d_state *state, DWORD state_id)
  {
@@ -653,7 +653,7 @@ index 1b82858..ccae158 100644
  
      for (k = 0; k < gl_info->limits.clipplanes; ++k)
      {
-@@ -8531,6 +8664,258 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] =
+@@ -8676,6 +8809,258 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] =
      {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(1)),                {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(1)),                glsl_vertex_pipe_vertexblend }, WINED3D_GL_EXT_NONE    },
      {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(2)),                {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(2)),                glsl_vertex_pipe_vertexblend }, WINED3D_GL_EXT_NONE    },
      {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(3)),                {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(3)),                glsl_vertex_pipe_vertexblend }, WINED3D_GL_EXT_NONE    },
@@ -913,10 +913,10 @@ index 1b82858..ccae158 100644
      {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE       },
      {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE       },
 diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
-index 1d80fa0..37dca92 100644
+index 937df15..7c6f0cb 100644
 --- a/dlls/wined3d/state.c
 +++ b/dlls/wined3d/state.c
-@@ -5790,7 +5790,8 @@ static void prune_invalid_states(struct StateEntry *state_table, const struct wi
+@@ -5817,7 +5817,8 @@ static void prune_invalid_states(struct StateEntry *state_table, const struct wi
          state_table[i].apply = state_undefined;
      }
  
@@ -927,10 +927,10 @@ index 1d80fa0..37dca92 100644
      for (i = start; i <= last; ++i)
      {
 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
-index 923d70a..2fddda2 100644
+index 33dce4c..7280670 100644
 --- a/dlls/wined3d/utils.c
 +++ b/dlls/wined3d/utils.c
-@@ -4969,6 +4969,10 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
+@@ -5380,6 +5380,10 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
          settings->flatshading = FALSE;
  
      settings->padding = 0;
@@ -963,7 +963,7 @@ index 9eb5907..eec23e9 100644
              switch(element->format)
              {
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index ccd0c60..9cf8b76 100644
+index 180add8..87e8de4 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
 @@ -186,6 +186,9 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN;
@@ -976,7 +976,7 @@ index ccd0c60..9cf8b76 100644
  
  struct min_lookup
  {
-@@ -1278,6 +1281,7 @@ struct wined3d_context
+@@ -1355,6 +1358,7 @@ struct wined3d_context
      DWORD padding : 14;
      DWORD shader_update_mask;
      DWORD constant_update_mask;
@@ -984,7 +984,7 @@ index ccd0c60..9cf8b76 100644
      DWORD                   numbered_array_mask;
      GLenum                  tracking_parm;     /* Which source is tracking current colour         */
      GLenum                  untracked_materials[2];
-@@ -1850,6 +1854,7 @@ struct wined3d_d3d_limits
+@@ -1936,6 +1940,7 @@ struct wined3d_d3d_limits
      UINT ffp_textures;
      UINT ffp_blend_stages;
      UINT ffp_vertex_blend_matrices;
@@ -992,7 +992,7 @@ index ccd0c60..9cf8b76 100644
  };
  
  typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data);
-@@ -2027,7 +2032,8 @@ struct wined3d_ffp_vs_settings
+@@ -2114,7 +2119,8 @@ struct wined3d_ffp_vs_settings
      DWORD texcoords       : 8;  /* MAX_TEXTURES */
      DWORD ortho_fog       : 1;
      DWORD flatshading     : 1;