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 7f6634b2bd916b530e30ef8a850fefbc0dbdf687.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-11-18 20:30:23 +01:00
parent 9a2af99c65
commit 803e04c3fe
6 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/wined3d-CSMT_Main/0157-Winex11-complain-about-glfinish.patch
View File

@@ -1,4 +1,4 @@
From 422cdfa68ac69e3bbbc08a70b13fdc2afc8fd505 Mon Sep 17 00:00:00 2001
From 7af302e360179e2ef395c66327876b276f30fe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Fri, 29 Aug 2014 12:12:11 +0200
Subject: Winex11: complain about glfinish
@@ -8,10 +8,10 @@ Subject: Winex11: complain about glfinish
1 file changed, 2 insertions(+)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 7b8ba82..42a7498 100644
index 3d0bd24..069dcc5 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1983,6 +1983,7 @@ static void wglFinish(void)
@@ -1962,6 +1962,7 @@ static void wglFinish(void)
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;
@@ -19,7 +19,7 @@ index 7b8ba82..42a7498 100644
if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 )))
{
switch (gl->type)
@@ -2008,6 +2009,7 @@ static void wglFlush(void)
@@ -1987,6 +1988,7 @@ static void wglFlush(void)
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;
@@ -28,5 +28,5 @@ index 7b8ba82..42a7498 100644
{
switch (gl->type)
--
2.1.3
2.6.2

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

@@ -2358,7 +2358,7 @@ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -2002,7 +2002,9 @@
@@ -1980,7 +1980,9 @@
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;
@@ -2368,7 +2368,7 @@ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 )))
{
switch (gl->type)
@@ -2028,7 +2030,9 @@
@@ -2006,7 +2008,9 @@
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;