mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-09 06:48:06 +02:00
wgl: Move wgl* non-extension definitions to libgl-gdi
Reviewed By: Bill Kristiansen <billkris@microsoft.com> Reviewed-by: Charmaine Lee >charmainel@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12677>
This commit is contained in:
parent
a153c78d6e
commit
739fb1057d
5 changed files with 8 additions and 8 deletions
|
|
@ -43,7 +43,6 @@ libwgl = static_library(
|
|||
'stw_pixelformat.c',
|
||||
'stw_st.c',
|
||||
'stw_tls.c',
|
||||
'stw_wgl.c',
|
||||
),
|
||||
c_args : [
|
||||
'-D_GDI32_', # prevent wgl* being declared __declspec(dllimport)
|
||||
|
|
|
|||
|
|
@ -210,3 +210,9 @@ wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc)
|
|||
|
||||
return stw_make_current(hDrawDC, hReadDC, dhglrc);
|
||||
}
|
||||
|
||||
HDC APIENTRY
|
||||
wglGetCurrentReadDCARB(VOID)
|
||||
{
|
||||
return stw_get_current_read_dc();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ ogldef = files('opengl32.def')[0]
|
|||
|
||||
libopengl32 = shared_library(
|
||||
'opengl32',
|
||||
['libgl_gdi.c'],
|
||||
['libgl_gdi.c', 'stw_wgl.c'],
|
||||
vs_module_defs : ogldef,
|
||||
include_directories : [
|
||||
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_wgl, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers,
|
||||
|
|
@ -41,6 +41,7 @@ libopengl32 = shared_library(
|
|||
dep_ws2_32, idep_nir, idep_mesautil, driver_swrast, driver_swr,
|
||||
driver_d3d12, driver_zink, winsys_d3d12_wgl
|
||||
],
|
||||
c_args : ['-D_GDI32_'],
|
||||
link_args : opengl32_link_args,
|
||||
name_prefix : '', # otherwise mingw will create libopengl32.dll
|
||||
install : true,
|
||||
|
|
|
|||
|
|
@ -100,12 +100,6 @@ wglGetCurrentDC( VOID )
|
|||
return stw_get_current_dc();
|
||||
}
|
||||
|
||||
WINGDIAPI HDC APIENTRY
|
||||
wglGetCurrentReadDCARB( VOID )
|
||||
{
|
||||
return stw_get_current_read_dc();
|
||||
}
|
||||
|
||||
|
||||
WINGDIAPI BOOL APIENTRY
|
||||
wglMakeCurrent(
|
||||
Loading…
Add table
Reference in a new issue