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

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-15 23:53:46 +02:00
parent 7b016ffde8
commit 54b732863c
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch
View File

@@ -1,4 +1,4 @@
From 10830fe26e7b3828860e1ac24831f153ec1257cc Mon Sep 17 00:00:00 2001
From 8d34e3ec8ce01e63d65469ab8064c1fde6a289b3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 12 Feb 2016 02:39:07 +0100
Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling
@@ -13,10 +13,10 @@ Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling
5 files changed, 110 insertions(+), 18 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 45e3f720ea6..c79934727bc 100755
index 44d58ec7bba..10fca6d724f 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -239,6 +239,11 @@ sub GenerateThunk($$$$)
@@ -243,6 +243,11 @@ sub GenerateThunk($$$)
return "" if $name eq "glDebugEntry";
return "" if $name eq "glGetIntegerv";
return "" if $name eq "glGetString";
@@ -27,12 +27,12 @@ index 45e3f720ea6..c79934727bc 100755
+
return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/;
# If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-)
$ret .= ConvertType($func_ref->[0]) . " WINAPI $name( ";
diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c
index 2a3b4355173..e216ec42e30 100644
index a8d267793e0..1f99991f1f3 100644
--- a/dlls/opengl32/opengl_ext.c
+++ b/dlls/opengl32/opengl_ext.c
@@ -1954,24 +1954,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
@@ -1990,24 +1990,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
funcs->ext.p_glCurrentPaletteMatrixARB( index );
}
@@ -71,7 +71,7 @@ index 4f1791a6436..8bffba05023 100644
+
#endif /* __DLLS_OPENGL32_OPENGL_EXT_H */
diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
index 5d3a2455051..6b67850c5ee 100644
index fd68a994153..f6845aabfef 100644
--- a/dlls/opengl32/tests/opengl.c
+++ b/dlls/opengl32/tests/opengl.c
@@ -71,6 +71,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB);
@@ -138,7 +138,7 @@ index 5d3a2455051..6b67850c5ee 100644
static void test_setpixelformat(HDC winhdc)
{
int res = 0;
@@ -1785,6 +1828,7 @@ START_TEST(opengl)
@@ -1810,6 +1853,7 @@ START_TEST(opengl)
}
test_choosepixelformat();
@@ -147,7 +147,7 @@ index 5d3a2455051..6b67850c5ee 100644
test_destroy(hdc);
test_sharelists(hdc);
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index dafafb66507..48d7a28f245 100644
index dacf0b38d49..271d29405bc 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -63,6 +63,9 @@ struct opengl_context
@@ -160,7 +160,7 @@ index dafafb66507..48d7a28f245 100644
GLubyte *extensions; /* extension string */
GLuint *disabled_exts; /* indices of disabled extensions */
struct wgl_context *drv_ctx; /* driver context */
@@ -1938,6 +1941,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
@@ -1943,6 +1946,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
return ret;
}
@@ -222,5 +222,5 @@ index dafafb66507..48d7a28f245 100644
* OpenGL initialisation routine
*/
--
2.13.1
2.14.1