mirror of
https://github.com/wine-mirror/wine
synced 2024-07-08 03:45:57 +00:00
opengl32: Use default calling convention for WGL driver entry points.
This commit is contained in:
Jacek Caban
Alexandre Julliard
parent
60bddb6b7d
commit
ecf31ba4c7
|
|
@ -509,16 +509,16 @@ sub generate_wow64_thunk($$$)
|
|||
return $ret;
|
||||
}
|
||||
|
||||
sub generate_null_func($$$)
|
||||
sub generate_null_func($$)
|
||||
{
|
||||
my ($name, $func, $callconv) = @_;
|
||||
my ($name, $func) = @_;
|
||||
my $decl_args = get_func_args( $func, 1, 1, "" );
|
||||
my $func_ret = get_func_ret( $func, 1 );
|
||||
my $ret = "";
|
||||
|
||||
return "" if $name eq "glDebugEntry";
|
||||
|
||||
$ret .= "static $func_ret$callconv null_$name($decl_args)";
|
||||
$ret .= "static $func_ret null_$name($decl_args)";
|
||||
$ret .= " {";
|
||||
if ($name eq "glGetError")
|
||||
{
|
||||
|
|
@ -887,7 +887,7 @@ foreach (sort keys %wgl_functions)
|
|||
next if defined $manual_win_functions{$_};
|
||||
my $decl_args = get_func_args( $wgl_functions{$_}, 1, 1, "" );
|
||||
my $func_ret = get_func_ret( $wgl_functions{$_}, 1 );
|
||||
printf HEADER " %-10s (WINAPI *p_$_)($decl_args);\n", $func_ret;
|
||||
printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret;
|
||||
}
|
||||
print HEADER " } wgl;\n\n";
|
||||
|
||||
|
|
@ -1274,17 +1274,17 @@ print OUT "#endif\n\n";
|
|||
foreach (sort keys %wgl_functions)
|
||||
{
|
||||
next if defined $manual_win_functions{$_};
|
||||
print OUT generate_null_func($_, $wgl_functions{$_}, " WINAPI");
|
||||
print OUT generate_null_func($_, $wgl_functions{$_});
|
||||
}
|
||||
foreach (sort keys %norm_functions)
|
||||
{
|
||||
next if defined $manual_win_functions{$_};
|
||||
print OUT generate_null_func($_, $norm_functions{$_}, "");
|
||||
print OUT generate_null_func($_, $norm_functions{$_});
|
||||
}
|
||||
foreach (sort keys %ext_functions)
|
||||
{
|
||||
next if defined $manual_win_functions{$_};
|
||||
print OUT generate_null_func($_, $ext_functions{$_}, "");
|
||||
print OUT generate_null_func($_, $ext_functions{$_});
|
||||
}
|
||||
print OUT "\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -95370,16 +95370,16 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
|
|||
|
||||
#endif
|
||||
|
||||
static BOOL WINAPI null_wglCopyContext( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ) { return 0; }
|
||||
static struct wgl_context * WINAPI null_wglCreateContext( HDC hDc ) { return 0; }
|
||||
static BOOL WINAPI null_wglDeleteContext( struct wgl_context * oldContext ) { return 0; }
|
||||
static int WINAPI null_wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
|
||||
static int WINAPI null_wglGetPixelFormat( HDC hdc ) { return 0; }
|
||||
static PROC WINAPI null_wglGetProcAddress( LPCSTR lpszProc ) { return 0; }
|
||||
static BOOL WINAPI null_wglMakeCurrent( HDC hDc, struct wgl_context * newContext ) { return 0; }
|
||||
static BOOL WINAPI null_wglSetPixelFormat( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
|
||||
static BOOL WINAPI null_wglShareLists( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource ) { return 0; }
|
||||
static BOOL WINAPI null_wglSwapBuffers( HDC hdc ) { return 0; }
|
||||
static BOOL null_wglCopyContext( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ) { return 0; }
|
||||
static struct wgl_context * null_wglCreateContext( HDC hDc ) { return 0; }
|
||||
static BOOL null_wglDeleteContext( struct wgl_context * oldContext ) { return 0; }
|
||||
static int null_wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
|
||||
static int null_wglGetPixelFormat( HDC hdc ) { return 0; }
|
||||
static PROC null_wglGetProcAddress( LPCSTR lpszProc ) { return 0; }
|
||||
static BOOL null_wglMakeCurrent( HDC hDc, struct wgl_context * newContext ) { return 0; }
|
||||
static BOOL null_wglSetPixelFormat( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
|
||||
static BOOL null_wglShareLists( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource ) { return 0; }
|
||||
static BOOL null_wglSwapBuffers( HDC hdc ) { return 0; }
|
||||
static void null_glAccum( GLenum op, GLfloat value ) { }
|
||||
static void null_glAlphaFunc( GLenum func, GLfloat ref ) { }
|
||||
static GLboolean null_glAreTexturesResident( GLsizei n, const GLuint *textures, GLboolean *residences ) { return 0; }
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ static const struct
|
|||
/**********************************************************************
|
||||
* dibdrv_wglDescribePixelFormat
|
||||
*/
|
||||
static int WINAPI dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr )
|
||||
static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr )
|
||||
{
|
||||
int ret = ARRAY_SIZE( pixel_formats );
|
||||
|
||||
|
|
@ -467,7 +467,7 @@ static int WINAPI dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PI
|
|||
/***********************************************************************
|
||||
* dibdrv_wglCopyContext
|
||||
*/
|
||||
static BOOL WINAPI dibdrv_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
|
||||
static BOOL dibdrv_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
|
||||
{
|
||||
FIXME( "not supported yet\n" );
|
||||
return FALSE;
|
||||
|
|
@ -476,7 +476,7 @@ static BOOL WINAPI dibdrv_wglCopyContext( struct wgl_context *src, struct wgl_co
|
|||
/***********************************************************************
|
||||
* dibdrv_wglDeleteContext
|
||||
*/
|
||||
static BOOL WINAPI dibdrv_wglDeleteContext( struct wgl_context *context )
|
||||
static BOOL dibdrv_wglDeleteContext( struct wgl_context *context )
|
||||
{
|
||||
if (!osmesa_funcs) return FALSE;
|
||||
return osmesa_funcs->delete_context( context );
|
||||
|
|
@ -485,7 +485,7 @@ static BOOL WINAPI dibdrv_wglDeleteContext( struct wgl_context *context )
|
|||
/***********************************************************************
|
||||
* dibdrv_wglGetPixelFormat
|
||||
*/
|
||||
static int WINAPI dibdrv_wglGetPixelFormat( HDC hdc )
|
||||
static int dibdrv_wglGetPixelFormat( HDC hdc )
|
||||
{
|
||||
DC *dc = get_dc_ptr( hdc );
|
||||
int ret = 0;
|
||||
|
|
@ -501,7 +501,7 @@ static int WINAPI dibdrv_wglGetPixelFormat( HDC hdc )
|
|||
/***********************************************************************
|
||||
* dibdrv_wglCreateContext
|
||||
*/
|
||||
static struct wgl_context * WINAPI dibdrv_wglCreateContext( HDC hdc )
|
||||
static struct wgl_context *dibdrv_wglCreateContext( HDC hdc )
|
||||
{
|
||||
PIXELFORMATDESCRIPTOR descr;
|
||||
int format = dibdrv_wglGetPixelFormat( hdc );
|
||||
|
|
@ -516,7 +516,7 @@ static struct wgl_context * WINAPI dibdrv_wglCreateContext( HDC hdc )
|
|||
/***********************************************************************
|
||||
* dibdrv_wglGetProcAddress
|
||||
*/
|
||||
static PROC WINAPI dibdrv_wglGetProcAddress( const char *proc )
|
||||
static PROC dibdrv_wglGetProcAddress( const char *proc )
|
||||
{
|
||||
if (!strncmp( proc, "wgl", 3 )) return NULL;
|
||||
if (!osmesa_funcs) return NULL;
|
||||
|
|
@ -526,7 +526,7 @@ static PROC WINAPI dibdrv_wglGetProcAddress( const char *proc )
|
|||
/***********************************************************************
|
||||
* dibdrv_wglMakeCurrent
|
||||
*/
|
||||
static BOOL WINAPI dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
|
||||
static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
|
||||
{
|
||||
HBITMAP bitmap;
|
||||
BITMAPOBJ *bmp;
|
||||
|
|
@ -563,7 +563,7 @@ static BOOL WINAPI dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
|
|||
/**********************************************************************
|
||||
* dibdrv_wglSetPixelFormat
|
||||
*/
|
||||
static BOOL WINAPI dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr )
|
||||
static BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr )
|
||||
{
|
||||
if (fmt <= 0 || fmt > ARRAY_SIZE( pixel_formats )) return FALSE;
|
||||
return NtGdiSetPixelFormat( hdc, fmt );
|
||||
|
|
@ -572,7 +572,7 @@ static BOOL WINAPI dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMAT
|
|||
/***********************************************************************
|
||||
* dibdrv_wglShareLists
|
||||
*/
|
||||
static BOOL WINAPI dibdrv_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
|
||||
static BOOL dibdrv_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
|
||||
{
|
||||
FIXME( "not supported yet\n" );
|
||||
return FALSE;
|
||||
|
|
@ -581,7 +581,7 @@ static BOOL WINAPI dibdrv_wglShareLists( struct wgl_context *org, struct wgl_con
|
|||
/***********************************************************************
|
||||
* dibdrv_wglSwapBuffers
|
||||
*/
|
||||
static BOOL WINAPI dibdrv_wglSwapBuffers( HDC hdc )
|
||||
static BOOL dibdrv_wglSwapBuffers( HDC hdc )
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format )
|
|||
/***********************************************************************
|
||||
* android_wglCopyContext
|
||||
*/
|
||||
static BOOL WINAPI android_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
|
||||
static BOOL android_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
|
||||
{
|
||||
FIXME( "%p -> %p mask %#x unsupported\n", src, dst, mask );
|
||||
return FALSE;
|
||||
|
|
@ -424,7 +424,7 @@ static BOOL WINAPI android_wglCopyContext( struct wgl_context *src, struct wgl_c
|
|||
/***********************************************************************
|
||||
* android_wglCreateContext
|
||||
*/
|
||||
static struct wgl_context * WINAPI android_wglCreateContext( HDC hdc )
|
||||
static struct wgl_context *android_wglCreateContext( HDC hdc )
|
||||
{
|
||||
int egl_attribs[3] = { EGL_CONTEXT_CLIENT_VERSION, egl_client_version, EGL_NONE };
|
||||
|
||||
|
|
@ -434,7 +434,7 @@ static struct wgl_context * WINAPI android_wglCreateContext( HDC hdc )
|
|||
/***********************************************************************
|
||||
* android_wglDeleteContext
|
||||
*/
|
||||
static BOOL WINAPI android_wglDeleteContext( struct wgl_context *ctx )
|
||||
static BOOL android_wglDeleteContext( struct wgl_context *ctx )
|
||||
{
|
||||
pthread_mutex_lock( &drawable_mutex );
|
||||
list_remove( &ctx->entry );
|
||||
|
|
@ -447,7 +447,7 @@ static BOOL WINAPI android_wglDeleteContext( struct wgl_context *ctx )
|
|||
/***********************************************************************
|
||||
* android_wglDescribePixelFormat
|
||||
*/
|
||||
static int WINAPI android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd )
|
||||
static int android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd )
|
||||
{
|
||||
EGLint val;
|
||||
EGLConfig config;
|
||||
|
|
@ -493,7 +493,7 @@ static int WINAPI android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, P
|
|||
/***********************************************************************
|
||||
* android_wglGetPixelFormat
|
||||
*/
|
||||
static int WINAPI android_wglGetPixelFormat( HDC hdc )
|
||||
static int android_wglGetPixelFormat( HDC hdc )
|
||||
{
|
||||
struct gl_drawable *gl;
|
||||
int ret = 0;
|
||||
|
|
@ -511,7 +511,7 @@ static int WINAPI android_wglGetPixelFormat( HDC hdc )
|
|||
/***********************************************************************
|
||||
* android_wglGetProcAddress
|
||||
*/
|
||||
static PROC WINAPI android_wglGetProcAddress( LPCSTR name )
|
||||
static PROC android_wglGetProcAddress( LPCSTR name )
|
||||
{
|
||||
PROC ret;
|
||||
if (!strncmp( name, "wgl", 3 )) return NULL;
|
||||
|
|
@ -523,7 +523,7 @@ static PROC WINAPI android_wglGetProcAddress( LPCSTR name )
|
|||
/***********************************************************************
|
||||
* android_wglMakeCurrent
|
||||
*/
|
||||
static BOOL WINAPI android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx )
|
||||
static BOOL android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx )
|
||||
{
|
||||
BOOL ret = FALSE;
|
||||
struct gl_drawable *gl;
|
||||
|
|
@ -563,7 +563,7 @@ done:
|
|||
/***********************************************************************
|
||||
* android_wglSetPixelFormat
|
||||
*/
|
||||
static BOOL WINAPI android_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd )
|
||||
static BOOL android_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd )
|
||||
{
|
||||
return set_pixel_format( hdc, format, FALSE );
|
||||
}
|
||||
|
|
@ -571,7 +571,7 @@ static BOOL WINAPI android_wglSetPixelFormat( HDC hdc, int format, const PIXELFO
|
|||
/***********************************************************************
|
||||
* android_wglShareLists
|
||||
*/
|
||||
static BOOL WINAPI android_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
|
||||
static BOOL android_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
|
||||
{
|
||||
FIXME( "%p %p\n", org, dest );
|
||||
return FALSE;
|
||||
|
|
@ -580,7 +580,7 @@ static BOOL WINAPI android_wglShareLists( struct wgl_context *org, struct wgl_co
|
|||
/***********************************************************************
|
||||
* android_wglSwapBuffers
|
||||
*/
|
||||
static BOOL WINAPI android_wglSwapBuffers( HDC hdc )
|
||||
static BOOL android_wglSwapBuffers( HDC hdc )
|
||||
{
|
||||
struct wgl_context *ctx = NtCurrentTeb()->glContext;
|
||||
|
||||
|
|
|
|||
|
|
@ -4303,7 +4303,7 @@ void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, cons
|
|||
/**********************************************************************
|
||||
* macdrv_wglDescribePixelFormat
|
||||
*/
|
||||
static int WINAPI macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr)
|
||||
static int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr)
|
||||
{
|
||||
const pixel_format *pf;
|
||||
const struct color_mode *mode;
|
||||
|
|
@ -4369,7 +4369,7 @@ static int WINAPI macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIX
|
|||
/***********************************************************************
|
||||
* macdrv_wglCopyContext
|
||||
*/
|
||||
static BOOL WINAPI macdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
|
||||
static BOOL macdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
|
||||
{
|
||||
CGLError err;
|
||||
|
||||
|
|
@ -4384,7 +4384,7 @@ static BOOL WINAPI macdrv_wglCopyContext(struct wgl_context *src, struct wgl_con
|
|||
/***********************************************************************
|
||||
* macdrv_wglCreateContext
|
||||
*/
|
||||
static struct wgl_context * WINAPI macdrv_wglCreateContext(HDC hdc)
|
||||
static struct wgl_context *macdrv_wglCreateContext(HDC hdc)
|
||||
{
|
||||
struct wgl_context *context;
|
||||
|
||||
|
|
@ -4398,7 +4398,7 @@ static struct wgl_context * WINAPI macdrv_wglCreateContext(HDC hdc)
|
|||
/***********************************************************************
|
||||
* macdrv_wglDeleteContext
|
||||
*/
|
||||
static BOOL WINAPI macdrv_wglDeleteContext(struct wgl_context *context)
|
||||
static BOOL macdrv_wglDeleteContext(struct wgl_context *context)
|
||||
{
|
||||
TRACE("deleting context %p/%p/%p\n", context, context->context, context->cglcontext);
|
||||
|
||||
|
|
@ -4414,7 +4414,7 @@ static BOOL WINAPI macdrv_wglDeleteContext(struct wgl_context *context)
|
|||
/***********************************************************************
|
||||
* macdrv_wglGetPixelFormat
|
||||
*/
|
||||
static int WINAPI macdrv_wglGetPixelFormat(HDC hdc)
|
||||
static int macdrv_wglGetPixelFormat(HDC hdc)
|
||||
{
|
||||
int format;
|
||||
|
||||
|
|
@ -4436,7 +4436,7 @@ static int WINAPI macdrv_wglGetPixelFormat(HDC hdc)
|
|||
/***********************************************************************
|
||||
* macdrv_wglGetProcAddress
|
||||
*/
|
||||
static PROC WINAPI macdrv_wglGetProcAddress(const char *proc)
|
||||
static PROC macdrv_wglGetProcAddress(const char *proc)
|
||||
{
|
||||
void *ret;
|
||||
|
||||
|
|
@ -4461,7 +4461,7 @@ static PROC WINAPI macdrv_wglGetProcAddress(const char *proc)
|
|||
/***********************************************************************
|
||||
* macdrv_wglMakeCurrent
|
||||
*/
|
||||
static BOOL WINAPI macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context)
|
||||
static BOOL macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context)
|
||||
{
|
||||
TRACE("hdc %p context %p/%p/%p\n", hdc, context, (context ? context->context : NULL),
|
||||
(context ? context->cglcontext : NULL));
|
||||
|
|
@ -4472,7 +4472,7 @@ static BOOL WINAPI macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context)
|
|||
/**********************************************************************
|
||||
* macdrv_wglSetPixelFormat
|
||||
*/
|
||||
static BOOL WINAPI macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr)
|
||||
static BOOL macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr)
|
||||
{
|
||||
return set_pixel_format(hdc, fmt, FALSE);
|
||||
}
|
||||
|
|
@ -4480,7 +4480,7 @@ static BOOL WINAPI macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATD
|
|||
/***********************************************************************
|
||||
* macdrv_wglShareLists
|
||||
*/
|
||||
static BOOL WINAPI macdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
|
||||
static BOOL macdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
|
||||
{
|
||||
macdrv_opengl_context saved_context;
|
||||
CGLContextObj saved_cglcontext;
|
||||
|
|
@ -4533,7 +4533,7 @@ static BOOL WINAPI macdrv_wglShareLists(struct wgl_context *org, struct wgl_cont
|
|||
/**********************************************************************
|
||||
* macdrv_wglSwapBuffers
|
||||
*/
|
||||
static BOOL WINAPI macdrv_wglSwapBuffers(HDC hdc)
|
||||
static BOOL macdrv_wglSwapBuffers(HDC hdc)
|
||||
{
|
||||
struct wgl_context *context = NtCurrentTeb()->glContext;
|
||||
BOOL match = FALSE;
|
||||
|
|
|
|||
|
|
@ -1663,8 +1663,8 @@ static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd,
|
|||
*
|
||||
* Get the pixel-format descriptor associated to the given id
|
||||
*/
|
||||
static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat,
|
||||
UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd)
|
||||
static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat,
|
||||
UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd)
|
||||
{
|
||||
TRACE("(%p,%d,%d,%p)\n", hdc, iPixelFormat, nBytes, ppfd);
|
||||
|
||||
|
|
@ -1683,7 +1683,7 @@ static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat,
|
|||
/***********************************************************************
|
||||
* glxdrv_wglGetPixelFormat
|
||||
*/
|
||||
static int WINAPI glxdrv_wglGetPixelFormat( HDC hdc )
|
||||
static int glxdrv_wglGetPixelFormat( HDC hdc )
|
||||
{
|
||||
struct gl_drawable *gl;
|
||||
int ret = 0;
|
||||
|
|
@ -1703,7 +1703,7 @@ static int WINAPI glxdrv_wglGetPixelFormat( HDC hdc )
|
|||
/***********************************************************************
|
||||
* glxdrv_wglSetPixelFormat
|
||||
*/
|
||||
static BOOL WINAPI glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd )
|
||||
static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd )
|
||||
{
|
||||
return set_pixel_format(hdc, iPixelFormat, FALSE);
|
||||
}
|
||||
|
|
@ -1711,7 +1711,7 @@ static BOOL WINAPI glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PI
|
|||
/***********************************************************************
|
||||
* glxdrv_wglCopyContext
|
||||
*/
|
||||
static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
|
||||
static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
|
||||
{
|
||||
TRACE("%p -> %p mask %#x\n", src, dst, mask);
|
||||
|
||||
|
|
@ -1736,7 +1736,7 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con
|
|||
/***********************************************************************
|
||||
* glxdrv_wglCreateContext
|
||||
*/
|
||||
static struct wgl_context * WINAPI glxdrv_wglCreateContext( HDC hdc )
|
||||
static struct wgl_context *glxdrv_wglCreateContext( HDC hdc )
|
||||
{
|
||||
struct wgl_context *ret;
|
||||
struct gl_drawable *gl;
|
||||
|
|
@ -1764,7 +1764,7 @@ static struct wgl_context * WINAPI glxdrv_wglCreateContext( HDC hdc )
|
|||
/***********************************************************************
|
||||
* glxdrv_wglDeleteContext
|
||||
*/
|
||||
static BOOL WINAPI glxdrv_wglDeleteContext(struct wgl_context *ctx)
|
||||
static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx)
|
||||
{
|
||||
struct wgl_pbuffer *pb;
|
||||
|
||||
|
|
@ -1793,7 +1793,7 @@ static BOOL WINAPI glxdrv_wglDeleteContext(struct wgl_context *ctx)
|
|||
/***********************************************************************
|
||||
* glxdrv_wglGetProcAddress
|
||||
*/
|
||||
static PROC WINAPI glxdrv_wglGetProcAddress(LPCSTR lpszProc)
|
||||
static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc)
|
||||
{
|
||||
if (!strncmp(lpszProc, "wgl", 3)) return NULL;
|
||||
return pglXGetProcAddressARB((const GLubyte*)lpszProc);
|
||||
|
|
@ -1818,7 +1818,7 @@ static void set_context_drawables( struct wgl_context *ctx, struct gl_drawable *
|
|||
/***********************************************************************
|
||||
* glxdrv_wglMakeCurrent
|
||||
*/
|
||||
static BOOL WINAPI glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
|
||||
static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
|
||||
{
|
||||
BOOL ret = FALSE;
|
||||
struct gl_drawable *gl;
|
||||
|
|
@ -1915,7 +1915,7 @@ done:
|
|||
/***********************************************************************
|
||||
* glxdrv_wglShareLists
|
||||
*/
|
||||
static BOOL WINAPI glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
|
||||
static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
|
||||
{
|
||||
TRACE("(%p, %p)\n", org, dest);
|
||||
|
||||
|
|
@ -3323,7 +3323,7 @@ static void X11DRV_WineGL_LoadExtensions(void)
|
|||
*
|
||||
* Swap the buffers of this DC
|
||||
*/
|
||||
static BOOL WINAPI glxdrv_wglSwapBuffers( HDC hdc )
|
||||
static BOOL glxdrv_wglSwapBuffers( HDC hdc )
|
||||
{
|
||||
struct x11drv_escape_flush_gl_drawable escape;
|
||||
struct gl_drawable *gl;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#define WINE_GLAPI
|
||||
#endif
|
||||
|
||||
#define WINE_WGL_DRIVER_VERSION 22
|
||||
#define WINE_WGL_DRIVER_VERSION 23
|
||||
|
||||
struct wgl_context;
|
||||
struct wgl_pbuffer;
|
||||
|
|
@ -16,16 +16,16 @@ struct opengl_funcs
|
|||
{
|
||||
struct
|
||||
{
|
||||
BOOL (WINAPI *p_wglCopyContext)( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask );
|
||||
struct wgl_context * (WINAPI *p_wglCreateContext)( HDC hDc );
|
||||
BOOL (WINAPI *p_wglDeleteContext)( struct wgl_context * oldContext );
|
||||
int (WINAPI *p_wglDescribePixelFormat)( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );
|
||||
int (WINAPI *p_wglGetPixelFormat)( HDC hdc );
|
||||
PROC (WINAPI *p_wglGetProcAddress)( LPCSTR lpszProc );
|
||||
BOOL (WINAPI *p_wglMakeCurrent)( HDC hDc, struct wgl_context * newContext );
|
||||
BOOL (WINAPI *p_wglSetPixelFormat)( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd );
|
||||
BOOL (WINAPI *p_wglShareLists)( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource );
|
||||
BOOL (WINAPI *p_wglSwapBuffers)( HDC hdc );
|
||||
BOOL (WINE_GLAPI *p_wglCopyContext)( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask );
|
||||
struct wgl_context * (WINE_GLAPI *p_wglCreateContext)( HDC hDc );
|
||||
BOOL (WINE_GLAPI *p_wglDeleteContext)( struct wgl_context * oldContext );
|
||||
int (WINE_GLAPI *p_wglDescribePixelFormat)( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );
|
||||
int (WINE_GLAPI *p_wglGetPixelFormat)( HDC hdc );
|
||||
PROC (WINE_GLAPI *p_wglGetProcAddress)( LPCSTR lpszProc );
|
||||
BOOL (WINE_GLAPI *p_wglMakeCurrent)( HDC hDc, struct wgl_context * newContext );
|
||||
BOOL (WINE_GLAPI *p_wglSetPixelFormat)( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd );
|
||||
BOOL (WINE_GLAPI *p_wglShareLists)( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource );
|
||||
BOOL (WINE_GLAPI *p_wglSwapBuffers)( HDC hdc );
|
||||
} wgl;
|
||||
|
||||
struct
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user