system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:39:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

opengl32: Split opengl_ext.h into private.h and unix_private.h.

Browse source
This commit is contained in:
Rémi Bernon 2022-11-07 16:24:08 +01:00 committed by Alexandre Julliard
parent 2e1d5af702
commit cb4fecc208
8 changed files with 98 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/opengl32/make_opengl
View file

@ -868,8 +868,8 @@ print OUT "#include \"windef.h\"\n";
print OUT "#include \"winbase.h\"\n";
print OUT "#include \"wingdi.h\"\n\n";
print OUT "#include \"unixlib.h\"\n\n";
print OUT "#include \"opengl_ext.h\"\n\n";
print OUT "#include \"unixlib.h\"\n";
print OUT "#include \"private.h\"\n\n";
print OUT "#include \"wine/debug.h\"\n\n";
print OUT "WINE_DEFAULT_DEBUG_CHANNEL(opengl);\n";
@ -926,8 +926,8 @@ print OUT "#include \"windef.h\"\n";
print OUT "#include \"winbase.h\"\n";
print OUT "#include \"wingdi.h\"\n\n";
print OUT "#include \"unixlib.h\"\n\n";
print OUT "#include \"opengl_ext.h\"\n\n";
print OUT "#include \"unixlib.h\"\n";
print OUT "#include \"unix_private.h\"\n\n";
foreach (sort keys %wgl_functions)
{

54
dlls/opengl32/opengl_ext.h
View file

@ -1,54 +0,0 @@
/* Typedefs for extensions loading
Copyright (c) 2000 Lionel Ulmer
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __DLLS_OPENGL32_OPENGL_EXT_H
#define __DLLS_OPENGL32_OPENGL_EXT_H
#include <stdarg.h>
#include <stddef.h>
#include "windef.h"
#include "winbase.h"
#include "winternl.h"
#include "wingdi.h"
#include "wine/wgl.h"
#include "wine/wgl_driver.h"
struct registry_entry
{
const char *name; /* name of the extension */
const char *extension; /* name of the GL/WGL extension */
};
extern const struct registry_entry extension_registry[] DECLSPEC_HIDDEN;
extern const int extension_registry_size DECLSPEC_HIDDEN;
extern const void *extension_procs[] DECLSPEC_HIDDEN;
extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN;
static inline struct opengl_funcs *get_dc_funcs( HDC hdc )
{
struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION );
if (!funcs) SetLastError( ERROR_INVALID_HANDLE );
else if (funcs == (void *)-1) funcs = &null_opengl_funcs;
return funcs;
}
extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );
#endif /* __DLLS_OPENGL32_OPENGL_EXT_H */

35
dlls/opengl32/private.h Normal file
View file

@ -0,0 +1,35 @@
/*
* Copyright (c) 2000 Lionel Ulmer
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_OPENGL32_PRIVATE_H
#define __WINE_OPENGL32_PRIVATE_H
#include <stdarg.h>
#include <stddef.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winternl.h"
#include "wingdi.h"
extern const void *extension_procs[] DECLSPEC_HIDDEN;
extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );
#endif /* __WINE_OPENGL32_PRIVATE_H */

3
dlls/opengl32/thunks.c
View file

@ -10,8 +10,7 @@
#include "wingdi.h"
#include "unixlib.h"
#include "opengl_ext.h"
#include "private.h"
#include "wine/debug.h"

53
dlls/opengl32/unix_private.h Normal file
View file

@ -0,0 +1,53 @@
/*
* Copyright (c) 2000 Lionel Ulmer
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_OPENGL32_UNIX_PRIVATE_H
#define __WINE_OPENGL32_UNIX_PRIVATE_H
#include <stdarg.h>
#include <stddef.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winternl.h"
#include "wingdi.h"
#include "wine/wgl.h"
#include "wine/wgl_driver.h"
struct registry_entry
{
const char *name; /* name of the extension */
const char *extension; /* name of the GL/WGL extension */
};
extern const struct registry_entry extension_registry[] DECLSPEC_HIDDEN;
extern const int extension_registry_size DECLSPEC_HIDDEN;
extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN;
static inline struct opengl_funcs *get_dc_funcs( HDC hdc )
{
struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION );
if (!funcs) SetLastError( ERROR_INVALID_HANDLE );
else if (funcs == (void *)-1) funcs = &null_opengl_funcs;
return funcs;
}
#endif /* __WINE_OPENGL32_UNIX_PRIVATE_H */

3
dlls/opengl32/unix_thunks.c
View file

@ -10,8 +10,7 @@
#include "wingdi.h"
#include "unixlib.h"
#include "opengl_ext.h"
#include "unix_private.h"
extern NTSTATUS wgl_wglCopyContext( void *args ) DECLSPEC_HIDDEN;
extern NTSTATUS wgl_wglCreateContext( void *args ) DECLSPEC_HIDDEN;

3
dlls/opengl32/unix_wgl.c
View file

@ -30,9 +30,8 @@
#include "winreg.h"
#include "ntuser.h"
#include "opengl_ext.h"
#include "unixlib.h"
#include "unix_private.h"
#include "wine/debug.h"

5
dlls/opengl32/wgl.c
View file

@ -31,9 +31,8 @@
#include "winreg.h"
#include "ntuser.h"
#include "opengl_ext.h"
#include "unixlib.h"
#include "private.h"
#include "wine/glu.h"
#include "wine/debug.h"
@ -866,6 +865,8 @@ static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_mess
return TRUE;
}
extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN;
/***********************************************************************
* OpenGL initialisation routine
*/