From: Alexandros Frantzis alexandros.frantzis@collabora.com
Use the glReserved1 area in the Teb to cache the latest pixel format information requested from the driver. --- dlls/opengl32/wgl.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 018d2674c12..2dffb2c8961 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -42,6 +42,11 @@ WINE_DECLARE_DEBUG_CHANNEL(fps);
static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
+#define WINE_GL_RESERVED_FORMATS_HDC 2 +#define WINE_GL_RESERVED_FORMATS_PTR 3 +#define WINE_GL_RESERVED_FORMATS_NUM 4 +#define WINE_GL_RESERVED_FORMATS_ONSCREEN 5 + #ifndef _WIN64
static char **wow64_strings; @@ -299,8 +304,16 @@ static struct wgl_pixel_format *get_pixel_formats( HDC hdc, UINT *num_formats, UINT *num_onscreen_formats ) { struct get_pixel_formats_params args = { .teb = NtCurrentTeb(), .hdc = hdc }; + PVOID *glReserved = NtCurrentTeb()->glReserved1; NTSTATUS status;
+ if (glReserved[WINE_GL_RESERVED_FORMATS_HDC] == hdc) + { + *num_formats = PtrToUlong( glReserved[WINE_GL_RESERVED_FORMATS_NUM] ); + *num_onscreen_formats = PtrToUlong( glReserved[WINE_GL_RESERVED_FORMATS_ONSCREEN] ); + return glReserved[WINE_GL_RESERVED_FORMATS_PTR]; + } + if ((status = UNIX_CALL( get_pixel_formats, &args ))) goto error; if (!(args.formats = malloc( sizeof(*args.formats) * args.num_formats ))) goto error; args.max_formats = args.num_formats; @@ -308,6 +321,13 @@ static struct wgl_pixel_format *get_pixel_formats( HDC hdc, UINT *num_formats,
*num_formats = args.num_formats; *num_onscreen_formats = args.num_onscreen_formats; + + free( glReserved[WINE_GL_RESERVED_FORMATS_PTR] ); + glReserved[WINE_GL_RESERVED_FORMATS_HDC] = hdc; + glReserved[WINE_GL_RESERVED_FORMATS_PTR] = args.formats; + glReserved[WINE_GL_RESERVED_FORMATS_NUM] = ULongToPtr( args.num_formats ); + glReserved[WINE_GL_RESERVED_FORMATS_ONSCREEN] = ULongToPtr( args.num_onscreen_formats ); + return args.formats;
error: @@ -374,7 +394,6 @@ INT WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDES ppfd->cStencilBits = format->stencil_bits; ppfd->cAuxBuffers = format->aux_buffers;
- free( formats ); return num_onscreen_formats; }
@@ -1415,6 +1434,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) #ifndef _WIN64 cleanup_wow64_strings(); #endif + /* fallthrough */ + case DLL_THREAD_DETACH: + free( NtCurrentTeb()->glReserved1[WINE_GL_RESERVED_FORMATS_PTR] ); return TRUE; } return TRUE;