Skip to content

W
wine-cw
Commit 4c077900 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

opengl32: Move the wgl functions to the main OpenGL function table.

parent 782e96b9
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 152 deletions
dlls/gdi32/driver.c
View file @ 4c077900
...@@ -50,7 +50,6 @@ static struct list drivers = LIST_INIT( drivers ); ...@@ -50,7 +50,6 @@ static struct list drivers = LIST_INIT( drivers );
static struct graphics_driver *display_driver; static struct graphics_driver *display_driver;
const struct gdi_dc_funcs *font_driver = NULL; const struct gdi_dc_funcs *font_driver = NULL;
static const struct wgl_funcs null_wgl_driver;
static CRITICAL_SECTION driver_section; static CRITICAL_SECTION driver_section;
static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION_DEBUG critsect_debug =
...@@ -387,11 +386,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT ...@@ -387,11 +386,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT
return 0; return 0;
} }
static INT nulldrv_GetPixelFormat( HDC hdc )
{
return 0;
}
static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries )
{ {
return 0; return 0;
...@@ -666,59 +660,9 @@ static BOOL nulldrv_UnrealizePalette( HPALETTE palette ) ...@@ -666,59 +660,9 @@ static BOOL nulldrv_UnrealizePalette( HPALETTE palette )
return FALSE; return FALSE;
} }
static BOOL nulldrv_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask ) static struct opengl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
{
return FALSE;
}
static struct wgl_context *nulldrv_wglCreateContext( HDC hdc )
{
return 0;
}
static struct wgl_context *nulldrv_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *share_ctx,
const int *attribs )
{
return 0;
}
static void nulldrv_wglDeleteContext( struct wgl_context *context )
{
}
static HDC nulldrv_wglGetCurrentDC( struct wgl_context *context )
{
return 0;
}
static PROC nulldrv_wglGetProcAddress( LPCSTR name )
{
return NULL;
}
static BOOL nulldrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct wgl_context *context )
{
return FALSE;
}
static BOOL nulldrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
{ {
return FALSE; return (void *)-1;
}
static BOOL nulldrv_wglShareLists( struct wgl_context *org, struct wgl_context *dst )
{
return FALSE;
}
static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
{
if (version != WINE_GDI_DRIVER_VERSION)
{
ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_GDI_DRIVER_VERSION );
return NULL;
}
return &null_wgl_driver;
} }
const struct gdi_dc_funcs null_driver = const struct gdi_dc_funcs null_driver =
...@@ -857,19 +801,6 @@ const struct gdi_dc_funcs null_driver = ...@@ -857,19 +801,6 @@ const struct gdi_dc_funcs null_driver =
GDI_PRIORITY_NULL_DRV /* priority */ GDI_PRIORITY_NULL_DRV /* priority */
}; };
static const struct wgl_funcs null_wgl_driver =
{
nulldrv_GetPixelFormat, /* p_GetPixelFormat */
nulldrv_wglCopyContext, /* p_wglCopyContext */
nulldrv_wglCreateContext, /* p_wglCreateContext */
nulldrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */
nulldrv_wglDeleteContext, /* p_wglDeleteContext */
nulldrv_wglGetCurrentDC, /* p_wglGetCurrentDC */
nulldrv_wglGetProcAddress, /* p_wglGetProcAddress */
nulldrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */
nulldrv_wglMakeCurrent, /* p_wglMakeCurrent */
nulldrv_wglShareLists, /* p_wglShareLists */
};
/***************************************************************************** /*****************************************************************************
* DRIVER_GetDriverName * DRIVER_GetDriverName
......
dlls/gdi32/opengl.c
View file @ 4c077900
...@@ -47,9 +47,9 @@ static BOOL (WINAPI *wglSwapBuffers)(HDC); ...@@ -47,9 +47,9 @@ static BOOL (WINAPI *wglSwapBuffers)(HDC);
/*********************************************************************** /***********************************************************************
* __wine_get_wgl_driver (GDI32.@) * __wine_get_wgl_driver (GDI32.@)
*/ */
const struct wgl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version )
{ {
const struct wgl_funcs *ret = NULL; struct opengl_funcs *ret = NULL;
DC * dc = get_dc_ptr( hdc ); DC * dc = get_dc_ptr( hdc );
if (dc) if (dc)
......
dlls/opengl32/make_opengl
View file @ 4c077900
...@@ -582,6 +582,29 @@ my %ext_functions = ...@@ -582,6 +582,29 @@ my %ext_functions =
"glDeleteObjectBufferATI" => [ "void", [ [ "GLuint", "buffer" ] ], "GL_ATI_vertex_array_object" ] "glDeleteObjectBufferATI" => [ "void", [ [ "GLuint", "buffer" ] ], "GL_ATI_vertex_array_object" ]
); );
my %wgl_functions =
(
"wglCopyContext" => [ "BOOL", [ [ "struct wgl_context *", "src" ],
[ "struct wgl_context *", "dst" ],
[ "UINT", "mask" ] ] ],
"wglCreateContext" => [ "struct wgl_context *", [ [ "HDC", "hdc" ] ] ],
"wglCreateContextAttribsARB" => [ "struct wgl_context *", [ [ "HDC", "hdc" ],
[ "struct wgl_context *", "share_ctx" ],
[ "const int *", "attribs" ] ] ],
"wglDeleteContext" => [ "void", [ [ "struct wgl_context *", "context" ] ] ],
"wglGetCurrentDC" => [ "HDC", [ [ "struct wgl_context *", "context" ] ] ],
"wglGetPixelFormat" => [ "INT", [ [ "HDC", "hdc" ] ] ],
"wglGetProcAddress" => [ "PROC", [ [ "LPCSTR", "name" ] ] ],
"wglMakeContextCurrentARB" => [ "BOOL", [ [ "HDC", "draw_hdc" ],
[ "HDC", "read_hdc" ],
[ "struct wgl_context *", "context" ] ] ],
"wglMakeCurrent" => [ "BOOL", [ [ "HDC", "hdc" ],
[ "struct wgl_context *", "context" ] ] ],
"wglShareLists" => [ "BOOL", [ [ "struct wgl_context *", "org" ],
[ "struct wgl_context *", "dst" ] ] ],
);
my @arg_names; my @arg_names;
my %arg_types; my %arg_types;
while (my $line = <REGISTRY>) { while (my $line = <REGISTRY>) {
...@@ -707,8 +730,17 @@ print HEADER "#endif\n\n"; ...@@ -707,8 +730,17 @@ print HEADER "#endif\n\n";
printf HEADER "#define WINE_WGL_DRIVER_VERSION %u\n\n", $wgl_version + 1; printf HEADER "#define WINE_WGL_DRIVER_VERSION %u\n\n", $wgl_version + 1;
print HEADER "struct wgl_context;\n\n";
print HEADER "struct opengl_funcs\n{\n"; print HEADER "struct opengl_funcs\n{\n";
print HEADER " struct\n {\n"; print HEADER " struct\n {\n";
foreach (sort keys %wgl_functions)
{
printf HEADER " %s;\n", get_func_proto($_, $wgl_functions{$_});
}
print HEADER " } wgl;\n\n";
print HEADER " struct\n {\n";
foreach (sort keys %norm_functions) foreach (sort keys %norm_functions)
{ {
next if $_ eq "glDebugEntry"; next if $_ eq "glDebugEntry";
...@@ -732,6 +764,7 @@ foreach (sort keys %norm_functions) ...@@ -732,6 +764,7 @@ foreach (sort keys %norm_functions)
} }
print HEADER "\n\n"; print HEADER "\n\n";
print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n";
print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n";
close HEADER; close HEADER;
...@@ -805,15 +838,20 @@ foreach (sort keys %norm_functions) { ...@@ -805,15 +838,20 @@ foreach (sort keys %norm_functions) {
print NORM "\n$string" if $string; print NORM "\n$string" if $string;
} }
print NORM "\n"; foreach (sort keys %wgl_functions) {
print NORM generate_null_func($_, $wgl_functions{$_});
}
foreach (sort keys %norm_functions) { foreach (sort keys %norm_functions) {
print NORM generate_null_func($_, $norm_functions{$_}); print NORM generate_null_func($_, $norm_functions{$_});
} }
print NORM "\n#define USE_GL_FUNC(name) null_##name,\n"; print NORM "\nstruct opengl_funcs null_opengl_funcs =\n{\n {\n";
print NORM "struct opengl_funcs null_opengl_funcs = { { ALL_WGL_FUNCS } };\n"; foreach (sort keys %wgl_functions) { print NORM " null_$_,\n"; }
print NORM " },\n";
print NORM "#define USE_GL_FUNC(name) null_##name,\n";
print NORM " { ALL_WGL_FUNCS }\n";
print NORM "#undef USE_GL_FUNC\n"; print NORM "#undef USE_GL_FUNC\n";
print NORM "};\n";
close(NORM); close(NORM);
......
dlls/opengl32/opengl_norm.c
View file @ 4c077900
...@@ -3024,7 +3024,16 @@ void WINAPI wine_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) { ...@@ -3024,7 +3024,16 @@ void WINAPI wine_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) {
TRACE("(%d, %d, %d, %d)\n", x, y, width, height ); TRACE("(%d, %d, %d, %d)\n", x, y, width, height );
funcs->gl.p_glViewport( x, y, width, height ); funcs->gl.p_glViewport( x, y, width, height );
} }
static BOOL null_wglCopyContext( struct wgl_context * src, struct wgl_context * dst, UINT mask ) { return 0; }
static struct wgl_context * null_wglCreateContext( HDC hdc ) { return 0; }
static struct wgl_context * null_wglCreateContextAttribsARB( HDC hdc, struct wgl_context * share_ctx, const int * attribs ) { return 0; }
static void null_wglDeleteContext( struct wgl_context * context ) { }
static HDC null_wglGetCurrentDC( struct wgl_context * context ) { return 0; }
static INT null_wglGetPixelFormat( HDC hdc ) { return 0; }
static PROC null_wglGetProcAddress( LPCSTR name ) { return 0; }
static BOOL null_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct wgl_context * context ) { return 0; }
static BOOL null_wglMakeCurrent( HDC hdc, struct wgl_context * context ) { return 0; }
static BOOL null_wglShareLists( struct wgl_context * org, struct wgl_context * dst ) { return 0; }
static void null_glAccum( GLenum op, GLfloat value ) { } static void null_glAccum( GLenum op, GLfloat value ) { }
static void null_glAlphaFunc( GLenum func, GLfloat ref ) { } static void null_glAlphaFunc( GLenum func, GLfloat ref ) { }
static GLboolean null_glAreTexturesResident( GLsizei n, const GLuint* textures, GLboolean* residences ) { return 0; } static GLboolean null_glAreTexturesResident( GLsizei n, const GLuint* textures, GLboolean* residences ) { return 0; }
...@@ -3362,6 +3371,21 @@ static void null_glVertex4sv( const GLshort* v ) { } ...@@ -3362,6 +3371,21 @@ static void null_glVertex4sv( const GLshort* v ) { }
static void null_glVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* pointer ) { } static void null_glVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* pointer ) { }
static void null_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) { } static void null_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) { }
struct opengl_funcs null_opengl_funcs =
{
{
null_wglCopyContext,
null_wglCreateContext,
null_wglCreateContextAttribsARB,
null_wglDeleteContext,
null_wglGetCurrentDC,
null_wglGetPixelFormat,
null_wglGetProcAddress,
null_wglMakeContextCurrentARB,
null_wglMakeCurrent,
null_wglShareLists,
},
#define USE_GL_FUNC(name) null_##name, #define USE_GL_FUNC(name) null_##name,
struct opengl_funcs null_opengl_funcs = { { ALL_WGL_FUNCS } }; { ALL_WGL_FUNCS }
#undef USE_GL_FUNC #undef USE_GL_FUNC
};
dlls/opengl32/wgl.c
View file @ 4c077900
...@@ -78,10 +78,10 @@ extern BOOL WINAPI GdiSwapBuffers( HDC hdc ); ...@@ -78,10 +78,10 @@ extern BOOL WINAPI GdiSwapBuffers( HDC hdc );
struct wgl_handle struct wgl_handle
{ {
UINT handle; UINT handle;
DWORD tid; DWORD tid;
struct wgl_context * context; struct wgl_context *context;
const struct wgl_funcs *funcs; struct opengl_funcs *funcs;
}; };
static struct wgl_handle wgl_handles[MAX_WGL_HANDLES]; static struct wgl_handle wgl_handles[MAX_WGL_HANDLES];
...@@ -97,9 +97,11 @@ static CRITICAL_SECTION_DEBUG critsect_debug = ...@@ -97,9 +97,11 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
}; };
static CRITICAL_SECTION wgl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION wgl_section = { &critsect_debug, -1, 0, 0, 0, 0 };
static inline const struct wgl_funcs *get_dc_funcs( HDC hdc ) static inline struct opengl_funcs *get_dc_funcs( HDC hdc )
{ {
return __wine_get_wgl_driver( hdc, WINE_GDI_DRIVER_VERSION ); struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION );
if (funcs == (void *)-1) funcs = &null_opengl_funcs;
return funcs;
} }
static inline HGLRC next_handle( struct wgl_handle *ptr ) static inline HGLRC next_handle( struct wgl_handle *ptr )
...@@ -135,7 +137,7 @@ static void release_handle_ptr( struct wgl_handle *ptr ) ...@@ -135,7 +137,7 @@ static void release_handle_ptr( struct wgl_handle *ptr )
if (ptr) LeaveCriticalSection( &wgl_section ); if (ptr) LeaveCriticalSection( &wgl_section );
} }
static HGLRC alloc_handle( struct wgl_context *context, const struct wgl_funcs *funcs ) static HGLRC alloc_handle( struct wgl_context *context, struct opengl_funcs *funcs )
{ {
HGLRC handle = 0; HGLRC handle = 0;
struct wgl_handle *ptr = NULL; struct wgl_handle *ptr = NULL;
...@@ -187,7 +189,7 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) ...@@ -187,7 +189,7 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
if ((dst = get_handle_ptr( hglrcDst ))) if ((dst = get_handle_ptr( hglrcDst )))
{ {
if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE );
else ret = src->funcs->p_wglCopyContext( src->context, dst->context, mask ); else ret = src->funcs->wgl.p_wglCopyContext( src->context, dst->context, mask );
} }
release_handle_ptr( dst ); release_handle_ptr( dst );
release_handle_ptr( src ); release_handle_ptr( src );
...@@ -210,7 +212,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) ...@@ -210,7 +212,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc)
return FALSE; return FALSE;
} }
if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 );
ptr->funcs->p_wglDeleteContext( ptr->context ); ptr->funcs->wgl.p_wglDeleteContext( ptr->context );
free_handle_ptr( ptr ); free_handle_ptr( ptr );
return TRUE; return TRUE;
} }
...@@ -228,12 +230,13 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) ...@@ -228,12 +230,13 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc)
if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; if (!(ptr = get_handle_ptr( hglrc ))) return FALSE;
if (!ptr->tid || ptr->tid == GetCurrentThreadId()) if (!ptr->tid || ptr->tid == GetCurrentThreadId())
{ {
ret = ptr->funcs->p_wglMakeCurrent( hdc, ptr->context ); ret = ptr->funcs->wgl.p_wglMakeCurrent( hdc, ptr->context );
if (ret) if (ret)
{ {
if (prev) prev->tid = 0; if (prev) prev->tid = 0;
ptr->tid = GetCurrentThreadId(); ptr->tid = GetCurrentThreadId();
NtCurrentTeb()->glCurrentRC = hglrc; NtCurrentTeb()->glCurrentRC = hglrc;
NtCurrentTeb()->glTable = ptr->funcs;
} }
} }
else else
...@@ -245,7 +248,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) ...@@ -245,7 +248,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc)
} }
else if (prev) else if (prev)
{ {
if (!prev->funcs->p_wglMakeCurrent( 0, NULL )) return FALSE; if (!prev->funcs->wgl.p_wglMakeCurrent( 0, NULL )) return FALSE;
prev->tid = 0; prev->tid = 0;
NtCurrentTeb()->glCurrentRC = 0; NtCurrentTeb()->glCurrentRC = 0;
NtCurrentTeb()->glTable = &null_opengl_funcs; NtCurrentTeb()->glTable = &null_opengl_funcs;
...@@ -266,15 +269,15 @@ static HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int ...@@ -266,15 +269,15 @@ static HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int
HGLRC ret = 0; HGLRC ret = 0;
struct wgl_context *context; struct wgl_context *context;
struct wgl_handle *share_ptr = NULL; struct wgl_handle *share_ptr = NULL;
const struct wgl_funcs *funcs = get_dc_funcs( hdc ); struct opengl_funcs *funcs = get_dc_funcs( hdc );
if (!funcs) return 0; if (!funcs) return 0;
if (share && !(share_ptr = get_handle_ptr( share ))) return 0; if (share && !(share_ptr = get_handle_ptr( share ))) return 0;
if ((context = funcs->p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->context : NULL, if ((context = funcs->wgl.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->context : NULL,
attribs ))) attribs )))
{ {
ret = alloc_handle( context, funcs ); ret = alloc_handle( context, funcs );
if (!ret) funcs->p_wglDeleteContext( context ); if (!ret) funcs->wgl.p_wglDeleteContext( context );
} }
release_handle_ptr( share_ptr ); release_handle_ptr( share_ptr );
return ret; return ret;
...@@ -294,12 +297,13 @@ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC h ...@@ -294,12 +297,13 @@ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC h
if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; if (!(ptr = get_handle_ptr( hglrc ))) return FALSE;
if (!ptr->tid || ptr->tid == GetCurrentThreadId()) if (!ptr->tid || ptr->tid == GetCurrentThreadId())
{ {
ret = ptr->funcs->p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context ); ret = ptr->funcs->wgl.p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context );
if (ret) if (ret)
{ {
if (prev) prev->tid = 0; if (prev) prev->tid = 0;
ptr->tid = GetCurrentThreadId(); ptr->tid = GetCurrentThreadId();
NtCurrentTeb()->glCurrentRC = hglrc; NtCurrentTeb()->glCurrentRC = hglrc;
NtCurrentTeb()->glTable = ptr->funcs;
} }
} }
else else
...@@ -311,7 +315,7 @@ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC h ...@@ -311,7 +315,7 @@ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC h
} }
else if (prev) else if (prev)
{ {
if (!prev->funcs->p_wglMakeCurrent( 0, NULL )) return FALSE; if (!prev->funcs->wgl.p_wglMakeCurrent( 0, NULL )) return FALSE;
prev->tid = 0; prev->tid = 0;
NtCurrentTeb()->glCurrentRC = 0; NtCurrentTeb()->glCurrentRC = 0;
NtCurrentTeb()->glTable = &null_opengl_funcs; NtCurrentTeb()->glTable = &null_opengl_funcs;
...@@ -331,7 +335,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst) ...@@ -331,7 +335,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst)
if ((dst = get_handle_ptr( hglrcDst ))) if ((dst = get_handle_ptr( hglrcDst )))
{ {
if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE );
else ret = src->funcs->p_wglShareLists( src->context, dst->context ); else ret = src->funcs->wgl.p_wglShareLists( src->context, dst->context );
} }
release_handle_ptr( dst ); release_handle_ptr( dst );
release_handle_ptr( src ); release_handle_ptr( src );
...@@ -345,7 +349,7 @@ HDC WINAPI wglGetCurrentDC(void) ...@@ -345,7 +349,7 @@ HDC WINAPI wglGetCurrentDC(void)
{ {
struct wgl_handle *context = get_current_handle_ptr(); struct wgl_handle *context = get_current_handle_ptr();
if (!context) return 0; if (!context) return 0;
return context->funcs->p_wglGetCurrentDC( context->context ); return context->funcs->wgl.p_wglGetCurrentDC( context->context );
} }
/*********************************************************************** /***********************************************************************
...@@ -355,12 +359,12 @@ HGLRC WINAPI wglCreateContext(HDC hdc) ...@@ -355,12 +359,12 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
{ {
HGLRC ret = 0; HGLRC ret = 0;
struct wgl_context *context; struct wgl_context *context;
const struct wgl_funcs *funcs = get_dc_funcs( hdc ); struct opengl_funcs *funcs = get_dc_funcs( hdc );
if (!funcs) return 0; if (!funcs) return 0;
if (!(context = funcs->p_wglCreateContext( hdc ))) return 0; if (!(context = funcs->wgl.p_wglCreateContext( hdc ))) return 0;
ret = alloc_handle( context, funcs ); ret = alloc_handle( context, funcs );
if (!ret) funcs->p_wglDeleteContext( context ); if (!ret) funcs->wgl.p_wglDeleteContext( context );
return ret; return ret;
} }
...@@ -549,9 +553,9 @@ INT WINAPI wglDescribePixelFormat(HDC hdc, INT iPixelFormat, UINT nBytes, ...@@ -549,9 +553,9 @@ INT WINAPI wglDescribePixelFormat(HDC hdc, INT iPixelFormat, UINT nBytes,
*/ */
INT WINAPI wglGetPixelFormat(HDC hdc) INT WINAPI wglGetPixelFormat(HDC hdc)
{ {
const struct wgl_funcs *funcs = get_dc_funcs( hdc ); struct opengl_funcs *funcs = get_dc_funcs( hdc );
if (!funcs) return 0; if (!funcs) return 0;
return funcs->p_GetPixelFormat( hdc ); return funcs->wgl.p_wglGetPixelFormat( hdc );
} }
/*********************************************************************** /***********************************************************************
...@@ -701,7 +705,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { ...@@ -701,7 +705,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
/* If the function name starts with a 'w', it is a WGL extension */ /* If the function name starts with a 'w', it is a WGL extension */
if(lpszProc[0] == 'w') if(lpszProc[0] == 'w')
{ {
local_func = context->funcs->p_wglGetProcAddress( lpszProc ); local_func = context->funcs->wgl.p_wglGetProcAddress( lpszProc );
if (local_func == (void *)1) /* special function that needs a wrapper */ if (local_func == (void *)1) /* special function that needs a wrapper */
{ {
ext_ret = bsearch( &ext, wgl_extensions, sizeof(wgl_extensions)/sizeof(wgl_extensions[0]), ext_ret = bsearch( &ext, wgl_extensions, sizeof(wgl_extensions)/sizeof(wgl_extensions[0]),
...@@ -724,7 +728,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { ...@@ -724,7 +728,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
WARN("Extension '%s' required by function '%s' not supported!\n", ext_ret->extension, lpszProc); WARN("Extension '%s' required by function '%s' not supported!\n", ext_ret->extension, lpszProc);
} }
local_func = context->funcs->p_wglGetProcAddress( ext_ret->name ); local_func = context->funcs->wgl.p_wglGetProcAddress( ext_ret->name );
/* After that, look at the extensions defined in the Linux OpenGL library */ /* After that, look at the extensions defined in the Linux OpenGL library */
if (local_func == NULL) { if (local_func == NULL) {
......
dlls/wined3d/directx.c
View file @ 4c077900
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "wined3d_private.h" #include "wined3d_private.h"
#ifndef USE_WIN32_OPENGL #ifndef USE_WIN32_OPENGL
#include "wine/gdi_driver.h" #include "wine/wgl_driver.h"
#endif #endif
WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DEFAULT_DEBUG_CHANNEL(d3d);
...@@ -5415,9 +5415,13 @@ static BOOL InitAdapters(struct wined3d *wined3d) ...@@ -5415,9 +5415,13 @@ static BOOL InitAdapters(struct wined3d *wined3d)
/* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 instead of opengl32 */ /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 instead of opengl32 */
{ {
HDC hdc = GetDC( 0 ); HDC hdc = GetDC( 0 );
const struct wgl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_GDI_DRIVER_VERSION ); const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION );
pwglGetProcAddress = wgl_driver->p_wglGetProcAddress;
if (wgl_driver && wgl_driver != (void *)-1)
pwglGetProcAddress = wgl_driver->wgl.p_wglGetProcAddress;
ReleaseDC( 0, hdc ); ReleaseDC( 0, hdc );
if (!pwglGetProcAddress) goto nogl_adapter;
} }
#define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn);
#endif #endif
......
dlls/winex11.drv/opengl.c
View file @ 4c077900
...@@ -197,7 +197,6 @@ struct glx_physdev ...@@ -197,7 +197,6 @@ struct glx_physdev
Pixmap pixmap; /* pixmap for a DL_GL_PIXMAP_WIN drawable */ Pixmap pixmap; /* pixmap for a DL_GL_PIXMAP_WIN drawable */
}; };
static const struct wgl_funcs glxdrv_wgl_funcs;
static const struct gdi_dc_funcs glxdrv_funcs; static const struct gdi_dc_funcs glxdrv_funcs;
static inline struct glx_physdev *get_glxdrv_dev( PHYSDEV dev ) static inline struct glx_physdev *get_glxdrv_dev( PHYSDEV dev )
...@@ -1309,9 +1308,9 @@ static int glxdrv_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, ...@@ -1309,9 +1308,9 @@ static int glxdrv_DescribePixelFormat(PHYSDEV dev, int iPixelFormat,
} }
/*********************************************************************** /***********************************************************************
* glxdrv_GetPixelFormat * glxdrv_wglGetPixelFormat
*/ */
static int glxdrv_GetPixelFormat( HDC hdc ) static int glxdrv_wglGetPixelFormat( HDC hdc )
{ {
struct x11drv_escape_get_drawable escape; struct x11drv_escape_get_drawable escape;
WineGLPixelFormat *fmt; WineGLPixelFormat *fmt;
...@@ -1625,7 +1624,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ...@@ -1625,7 +1624,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
if (ret) if (ret)
{ {
NtCurrentTeb()->glTable = &opengl_funcs;
NtCurrentTeb()->glContext = ctx; NtCurrentTeb()->glContext = ctx;
ctx->has_been_current = TRUE; ctx->has_been_current = TRUE;
...@@ -1697,7 +1695,6 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct ...@@ -1697,7 +1695,6 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct
ctx->drawables[0] = escape_draw.gl_drawable; ctx->drawables[0] = escape_draw.gl_drawable;
ctx->drawables[1] = escape_read.gl_drawable; ctx->drawables[1] = escape_read.gl_drawable;
ctx->refresh_drawables = FALSE; ctx->refresh_drawables = FALSE;
NtCurrentTeb()->glTable = &opengl_funcs;
NtCurrentTeb()->glContext = ctx; NtCurrentTeb()->glContext = ctx;
} }
else else
...@@ -3404,15 +3401,15 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d ...@@ -3404,15 +3401,15 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
/********************************************************************** /**********************************************************************
* glxdrv_wine_get_wgl_driver * glxdrv_wine_get_wgl_driver
*/ */
static const struct wgl_funcs * glxdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) static struct opengl_funcs * glxdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
{ {
if (version != WINE_GDI_DRIVER_VERSION) if (version != WINE_WGL_DRIVER_VERSION)
{ {
ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_GDI_DRIVER_VERSION ); ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_WGL_DRIVER_VERSION );
return NULL; return NULL;
} }
if (has_opengl()) return &glxdrv_wgl_funcs; if (has_opengl()) return &opengl_funcs;
dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver );
return dev->funcs->wine_get_wgl_driver( dev, version ); return dev->funcs->wine_get_wgl_driver( dev, version );
...@@ -3553,18 +3550,20 @@ static const struct gdi_dc_funcs glxdrv_funcs = ...@@ -3553,18 +3550,20 @@ static const struct gdi_dc_funcs glxdrv_funcs =
GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */
}; };
static const struct wgl_funcs glxdrv_wgl_funcs = static struct opengl_funcs opengl_funcs =
{ {
glxdrv_GetPixelFormat, /* p_GetPixelFormat */ {
glxdrv_wglCopyContext, /* p_wglCopyContext */ glxdrv_wglCopyContext, /* p_wglCopyContext */
glxdrv_wglCreateContext, /* p_wglCreateContext */ glxdrv_wglCreateContext, /* p_wglCreateContext */
glxdrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ glxdrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */
glxdrv_wglDeleteContext, /* p_wglDeleteContext */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */
glxdrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ glxdrv_wglGetCurrentDC, /* p_wglGetCurrentDC */
glxdrv_wglGetProcAddress, /* p_wglGetProcAddress */ glxdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */
glxdrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */ glxdrv_wglGetProcAddress, /* p_wglGetProcAddress */
glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */ glxdrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */
glxdrv_wglShareLists, /* p_wglShareLists */ glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */
glxdrv_wglShareLists, /* p_wglShareLists */
}
}; };
const struct gdi_dc_funcs *get_glx_driver(void) const struct gdi_dc_funcs *get_glx_driver(void)
......
include/wine/gdi_driver.h
View file @ 4c077900
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H
struct gdi_dc_funcs; struct gdi_dc_funcs;
struct wgl_funcs; struct opengl_funcs;
typedef struct gdi_physdev typedef struct gdi_physdev
{ {
...@@ -191,14 +191,14 @@ struct gdi_dc_funcs ...@@ -191,14 +191,14 @@ struct gdi_dc_funcs
BOOL (*pSwapBuffers)(PHYSDEV); BOOL (*pSwapBuffers)(PHYSDEV);
BOOL (*pUnrealizePalette)(HPALETTE); BOOL (*pUnrealizePalette)(HPALETTE);
BOOL (*pWidenPath)(PHYSDEV); BOOL (*pWidenPath)(PHYSDEV);
const struct wgl_funcs * (*wine_get_wgl_driver)(PHYSDEV,UINT); struct opengl_funcs * (*wine_get_wgl_driver)(PHYSDEV,UINT);
/* priority order for the driver on the stack */ /* priority order for the driver on the stack */
UINT priority; UINT priority;
}; };
/* increment this when you change the DC function table */ /* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 41 #define WINE_GDI_DRIVER_VERSION 42
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
...@@ -224,24 +224,6 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g ...@@ -224,24 +224,6 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g
*dev = physdev; *dev = physdev;
} }
/* OpenGL support */
struct wgl_context;
struct wgl_funcs
{
INT (*p_GetPixelFormat)(HDC);
BOOL (*p_wglCopyContext)(struct wgl_context*,struct wgl_context*,UINT);
struct wgl_context* (*p_wglCreateContext)(HDC);
struct wgl_context* (*p_wglCreateContextAttribsARB)(HDC,struct wgl_context*,const int*);
void (*p_wglDeleteContext)(struct wgl_context*);
HDC (*p_wglGetCurrentDC)(struct wgl_context*);
PROC (*p_wglGetProcAddress)(LPCSTR);
BOOL (*p_wglMakeContextCurrentARB)(HDC,HDC,struct wgl_context*);
BOOL (*p_wglMakeCurrent)(HDC,struct wgl_context*);
BOOL (*p_wglShareLists)(struct wgl_context*,struct wgl_context*);
};
/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ /* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */
#define DCHC_INVALIDVISRGN 0x0001 #define DCHC_INVALIDVISRGN 0x0001
...@@ -257,6 +239,6 @@ WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); ...@@ -257,6 +239,6 @@ WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD);
extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set );
extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect );
extern const struct wgl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );
#endif /* __WINE_WINE_GDI_DRIVER_H */ #endif /* __WINE_WINE_GDI_DRIVER_H */
include/wine/wgl_driver.h
View file @ 4c077900
...@@ -7,12 +7,28 @@ ...@@ -7,12 +7,28 @@
#define WINE_GLAPI #define WINE_GLAPI
#endif #endif
#define WINE_WGL_DRIVER_VERSION 1 #define WINE_WGL_DRIVER_VERSION 2
struct wgl_context;
struct opengl_funcs struct opengl_funcs
{ {
struct struct
{ {
BOOL (WINE_GLAPI *p_wglCopyContext)(struct wgl_context *,struct wgl_context *,UINT);
struct wgl_context * (WINE_GLAPI *p_wglCreateContext)(HDC);
struct wgl_context * (WINE_GLAPI *p_wglCreateContextAttribsARB)(HDC,struct wgl_context *,const int *);
void (WINE_GLAPI *p_wglDeleteContext)(struct wgl_context *);
HDC (WINE_GLAPI *p_wglGetCurrentDC)(struct wgl_context *);
INT (WINE_GLAPI *p_wglGetPixelFormat)(HDC);
PROC (WINE_GLAPI *p_wglGetProcAddress)(LPCSTR);
BOOL (WINE_GLAPI *p_wglMakeContextCurrentARB)(HDC,HDC,struct wgl_context *);
BOOL (WINE_GLAPI *p_wglMakeCurrent)(HDC,struct wgl_context *);
BOOL (WINE_GLAPI *p_wglShareLists)(struct wgl_context *,struct wgl_context *);
} wgl;
struct
{
void (WINE_GLAPI *p_glAccum)(GLenum,GLfloat); void (WINE_GLAPI *p_glAccum)(GLenum,GLfloat);
void (WINE_GLAPI *p_glAlphaFunc)(GLenum,GLfloat); void (WINE_GLAPI *p_glAlphaFunc)(GLenum,GLfloat);
GLboolean (WINE_GLAPI *p_glAreTexturesResident)(GLsizei,const GLuint*,GLboolean*); GLboolean (WINE_GLAPI *p_glAreTexturesResident)(GLsizei,const GLuint*,GLboolean*);
...@@ -2758,4 +2774,6 @@ struct opengl_funcs ...@@ -2758,4 +2774,6 @@ struct opengl_funcs
USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glVertexPointer) \
USE_GL_FUNC(glViewport) USE_GL_FUNC(glViewport)
extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );
#endif /* __WINE_WGL_DRIVER_H */ #endif /* __WINE_WGL_DRIVER_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment