Rebase against bfb845f9fccb2ff5bff0b0ba3238fec7f9f7b710.

This commit is contained in:
Sebastian Lackner
2015-11-05 17:26:02 +01:00
parent 4205b76407
commit 9afe850d99
16 changed files with 219 additions and 992 deletions

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
@@ -2001,7 +2001,9 @@
@@ -2002,7 +2002,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)
@@ -2027,7 +2029,9 @@
@@ -2028,7 +2030,9 @@
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;