wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against bd332f53f2d7b618e313572159cd7e70e4efb0fc.

Browse Source 
[ieframe-ITargetFrame2]
Removed patch to fix implementation of impl_from_ITargetFrame2 (accepted
upstream).

[setupapi-Fix_Parser]
Removed patch to fix parsing of inf files containing garbage at the beginning
(accepted upstream).

[wined3d-MESA_GPU_Info]
Disabled patchset, a similar idea was integrated into the development branch.
This commit is contained in:
Sebastian Lackner
2016-03-20 05:53:45 +01:00
parent 17ee57bb51
commit 15c75d5194
7 changed files with 27 additions and 222 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 8e64df5a5161db39c7e1828b138e72f4bbcc7693 Mon Sep 17 00:00:00 2001
From ea32c5954fa372ee12c8566724897e5aba6ca886 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 2b15f58..9a95fa77 100755
index 45e3f72..c799347 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -238,6 +238,11 @@ sub GenerateThunk($$$$)
@@ -239,6 +239,11 @@ sub GenerateThunk($$$$)
return "" if $name eq "glDebugEntry";
return "" if $name eq "glGetIntegerv";
return "" if $name eq "glGetString";
@ -29,10 +29,10 @@ index 2b15f58..9a95fa77 100755
# If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-)
diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c
index e1aeec5..d707f9a 100644
index 2a3b435..e216ec4 100644
--- a/dlls/opengl32/opengl_ext.c
+++ b/dlls/opengl32/opengl_ext.c
@@ -1942,24 +1942,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
@@ -1954,24 +1954,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
funcs->ext.p_glCurrentPaletteMatrixARB( index );
}
@ -58,12 +58,12 @@ index e1aeec5..d707f9a 100644
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE("(%d, %d, %d, %d, %p, %d)\n", source, type, severity, count, ids, enabled );
diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index 2e49d4a..a538434 100644
index 4f1791a..8bffba0 100644
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -33,4 +33,8 @@ extern const int extension_registry_size DECLSPEC_HIDDEN;
extern BOOL WINAPI wglSetPixelFormatWINE( HDC hdc, int format ) DECLSPEC_HIDDEN;
@@ -38,4 +38,8 @@ extern BOOL WINAPI wglQueryRendererIntegerWINE( HDC dc, GLint renderer,
GLenum attribute, GLuint *value ) DECLSPEC_HIDDEN;
extern const GLchar * WINAPI wglQueryRendererStringWINE( HDC dc, GLint renderer, GLenum attribute ) DECLSPEC_HIDDEN;
+extern void WINAPI glDebugMessageCallback( void *callback, const void *userParam ) DECLSPEC_HIDDEN;
+extern void WINAPI glDebugMessageCallbackAMD( void *callback, void *userParam ) DECLSPEC_HIDDEN;
@ -147,7 +147,7 @@ index 3f203ab..59b92ea 100644
test_destroy(hdc);
test_sharelists(hdc);
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index f3f78ef..e5f9a6f 100644
index 932b217..64ebda2 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -62,6 +62,9 @@ struct opengl_context
@ -160,7 +160,7 @@ index f3f78ef..e5f9a6f 100644
GLubyte *extensions; /* extension string */
GLuint *disabled_exts; /* indices of disabled extensions */
struct wgl_context *drv_ctx; /* driver context */
@@ -1919,6 +1922,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
@@ -1975,6 +1978,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
return ret;
}