Rebase against c3dd56c99332c4ad9dbd095935d2c17c53463154.

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -1307,7 +1307,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      /* Initialize the texture unit mapping to a 1:1 mapping */
      for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s)
      {
-@@ -1821,7 +1823,9 @@
+@@ -1830,7 +1832,9 @@
  out:
      device->shader_backend->shader_free_context_data(ret);
      device->adapter->fragment_pipe->free_context_data(ret);
@@ -1317,7 +1317,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      HeapFree(GetProcessHeap(), 0, ret->free_event_queries);
      HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries);
      HeapFree(GetProcessHeap(), 0, ret->free_timestamp_queries);
-@@ -1856,7 +1860,9 @@
+@@ -1865,7 +1869,9 @@
  
      device->shader_backend->shader_free_context_data(context);
      device->adapter->fragment_pipe->free_context_data(context);
@@ -1327,7 +1327,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      HeapFree(GetProcessHeap(), 0, context->draw_buffers);
      HeapFree(GetProcessHeap(), 0, context->blit_targets);
      device_context_remove(device, context);
-@@ -2264,7 +2270,11 @@
+@@ -2273,7 +2279,11 @@
      return TRUE;
  }
  
@@ -1339,7 +1339,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
  static void context_validate_onscreen_formats(struct wined3d_context *context,
          const struct wined3d_rendertarget_view *depth_stencil)
  {
-@@ -2280,6 +2290,7 @@
+@@ -2289,6 +2299,7 @@
      WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n");
  
      /* The currently active context is the necessary context to access the swapchain's onscreen buffers */
@@ -1347,7 +1347,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      wined3d_resource_load_location(&context->current_rt->resource, context, WINED3D_LOCATION_TEXTURE_RGB);
      swapchain->render_to_fbo = TRUE;
      swapchain_update_draw_bindings(swapchain);
-@@ -2294,6 +2305,22 @@
+@@ -2303,6 +2314,22 @@
          return context_generate_rt_mask_from_surface(rt);
      else
          return context_generate_rt_mask(context->offscreenBuffer);
@@ -1370,7 +1370,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
  }
  
  /* Context activation is done by the caller. */
-@@ -2325,7 +2352,11 @@
+@@ -2334,7 +2361,11 @@
      }
      else
      {
@@ -1382,7 +1382,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      }
  
      cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask;
-@@ -2372,7 +2403,11 @@
+@@ -2381,7 +2412,11 @@
      DWORD rt_mask = 0, *cur_mask;
      UINT i;
  
@@ -1394,7 +1394,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
              || rt_count != context->gl_info->limits.buffers)
      {
          if (!context_validate_rt_config(rt_count, rts, dsv))
-@@ -2414,11 +2449,17 @@
+@@ -2423,11 +2458,17 @@
          }
          else
          {
@@ -1412,7 +1412,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      }
      else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO
              && (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource)))
-@@ -2431,7 +2472,11 @@
+@@ -2440,7 +2481,11 @@
      }
      else
      {
@@ -1424,7 +1424,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
                  rt_count ? wined3d_rendertarget_view_get_surface(rts[0]) : NULL);
      }
  
-@@ -2466,6 +2511,7 @@
+@@ -2475,6 +2520,7 @@
      return TRUE;
  }
  
@@ -1432,7 +1432,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
  static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state)
  {
      struct wined3d_rendertarget_view **rts = state->fb.render_targets;
-@@ -2475,6 +2521,18 @@
+@@ -2484,6 +2530,18 @@
  
      if (wined3d_settings.offscreen_rendering_mode != ORM_FBO)
          return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0]));
@@ -1451,7 +1451,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      else if (!context->render_offscreen)
          return context_generate_rt_mask_from_surface(wined3d_rendertarget_view_get_surface(rts[0]));
  
-@@ -2497,8 +2555,14 @@
+@@ -2506,8 +2564,14 @@
  /* Context activation is done by the caller. */
  void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
  {
@@ -1466,7 +1466,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      DWORD *cur_mask;
  
      if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
-@@ -2529,8 +2593,10 @@
+@@ -2538,8 +2602,10 @@
          context_apply_draw_buffers(context, rt_mask);
          *cur_mask = rt_mask;
      }
@@ -1477,7 +1477,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
  }
  
  static void context_map_stage(struct wined3d_context *context, DWORD stage, DWORD unit)
-@@ -2768,12 +2834,22 @@
+@@ -2777,12 +2843,22 @@
  /* Context activation is done by the caller. */
  void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
  {
@@ -1500,7 +1500,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      if (rt_mask != *cur_mask)
      {
          context_apply_draw_buffers(context, rt_mask);
-@@ -2975,7 +3051,11 @@
+@@ -2984,7 +3060,11 @@
      {
          if (state->vertex_declaration->half_float_conv_needed && !stream_info->all_vbo)
          {
@@ -1512,7 +1512,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
              context->use_immediate_mode_draw = TRUE;
          }
          else
-@@ -3115,11 +3195,19 @@
+@@ -3124,11 +3204,19 @@
  }
  
  /* Context activation is done by the caller. */
@@ -1532,7 +1532,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      unsigned int i, j;
      WORD map;
  
-@@ -3151,12 +3239,17 @@
+@@ -3160,12 +3248,17 @@
          for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i)
          {
              if (map & 1)
@@ -1550,7 +1550,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
      }
      if (state->index_buffer)
      {
-@@ -3260,7 +3353,11 @@
+@@ -3269,7 +3362,11 @@
              if (texture->texture_srgb.name)
                  wined3d_texture_load(texture, context, TRUE);
              wined3d_texture_load(texture, context, FALSE);
@@ -9614,7 +9614,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -5395,9 +5395,15 @@
+@@ -5478,9 +5478,15 @@
      DebugBreak();
  }