wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 03fa4cfaffd4c10f56a2f8bfd383f4eaf67d364c.

Browse Source 
[ntdll-WinSqm]
Removed patch to add WinSqm[Start|End]Session implementation (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-06-02 22:04:13 +02:00
parent 4705d850ea
commit 3d1995983f
5 changed files with 12 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@@ -4477,7 +4477,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
{
ERR("Failed to create sampler.\n");
sampler = NULL;
@@ -4572,8 +4607,13 @@
@@ -4580,8 +4615,13 @@
static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@@ -4491,7 +4491,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
const struct wined3d_gl_info *gl_info = context->gl_info;
struct wined3d_viewport vp = state->viewport;
unsigned int width, height;
@@ -4759,7 +4799,11 @@
@@ -4767,7 +4807,11 @@
}
else
{
@@ -4503,7 +4503,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
UINT height;
UINT width;
@@ -4827,7 +4871,11 @@
@@ -4835,7 +4879,11 @@
TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id);