mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-21 09:54:19 +00:00
winex11.drv: Move WGL extension code to winex11.drv.
This commit is contained in:
Roderick Colenbrander
Alexandre Julliard
parent
489d87d1e5
commit
12dbce5c93
|
|
@ -65,6 +65,7 @@ typedef struct wine_wgl_s {
|
|||
HGLRC WINAPI (*p_wglGetCurrentContext)(void);
|
||||
HDC WINAPI (*p_wglGetCurrentDC)(void);
|
||||
HDC WINAPI (*p_wglGetCurrentReadDCARB)(void);
|
||||
PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc);
|
||||
BOOL WINAPI (*p_wglMakeCurrent)(HDC hdc, HGLRC hglrc);
|
||||
BOOL WINAPI (*p_wglMakeContextCurrentARB)(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
|
||||
BOOL WINAPI (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2);
|
||||
|
|
@ -309,11 +310,6 @@ static int compar(const void *elt_a, const void *elt_b) {
|
|||
((const OpenGL_extension *) elt_b)->name);
|
||||
}
|
||||
|
||||
static int wgl_compar(const void *elt_a, const void *elt_b) {
|
||||
return strcmp(((const WGL_extension *) elt_a)->func_name,
|
||||
((const WGL_extension *) elt_b)->func_name);
|
||||
}
|
||||
|
||||
PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
|
||||
void *local_func;
|
||||
OpenGL_extension ext;
|
||||
|
|
@ -337,47 +333,10 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
|
|||
ext_ret = (const OpenGL_extension *) bsearch(&ext, extension_registry,
|
||||
extension_registry_size, sizeof(OpenGL_extension), compar);
|
||||
|
||||
/* If nothing was found, we are looking for a WGL extension */
|
||||
if (ext_ret == NULL) {
|
||||
WGL_extension wgl_ext, *wgl_ext_ret;
|
||||
|
||||
/* Try to find the function in the WGL extensions ... */
|
||||
wgl_ext.func_name = (char *) lpszProc;
|
||||
wgl_ext_ret = (WGL_extension *) bsearch(&wgl_ext, wgl_extension_registry,
|
||||
wgl_extension_registry_size, sizeof(WGL_extension), wgl_compar);
|
||||
|
||||
if (wgl_ext_ret == NULL) {
|
||||
/* Some sanity checks :-) */
|
||||
ENTER_GL();
|
||||
local_func = p_glXGetProcAddressARB( (const GLubyte *) lpszProc);
|
||||
LEAVE_GL();
|
||||
if (local_func != NULL) {
|
||||
WARN("Extension %s defined in the OpenGL library but NOT in opengl_ext.c...\n", lpszProc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
WARN("Did not find extension %s in either Wine or your OpenGL library.\n", lpszProc);
|
||||
return NULL;
|
||||
} else {
|
||||
void *ret = NULL;
|
||||
|
||||
if (wgl_ext_ret->func_init != NULL) {
|
||||
const char *err_msg;
|
||||
if ((err_msg = wgl_ext_ret->func_init(p_glXGetProcAddressARB,
|
||||
wgl_ext_ret->context)) == NULL) {
|
||||
ret = wgl_ext_ret->func_address;
|
||||
} else {
|
||||
WARN("Error when getting WGL extension '%s' : %s.\n", debugstr_a(lpszProc), err_msg);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
ret = wgl_ext_ret->func_address;
|
||||
}
|
||||
|
||||
if (ret)
|
||||
TRACE(" returning WGL function (%p)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
} else {
|
||||
return wine_wgl.p_wglGetProcAddress(lpszProc);
|
||||
} else { /* We are looking for an OpenGL extension */
|
||||
const char *glx_name = ext_ret->glx_name ? ext_ret->glx_name : ext_ret->name;
|
||||
ENTER_GL();
|
||||
local_func = p_glXGetProcAddressARB( (const GLubyte*)glx_name);
|
||||
|
|
@ -1062,6 +1021,7 @@ static BOOL process_attach(void)
|
|||
wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod, "wglGetCurrentContext");
|
||||
wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod, "wglGetCurrentDC");
|
||||
wine_wgl.p_wglGetCurrentReadDCARB = (void *)GetProcAddress(mod, "wglGetCurrentReadDCARB");
|
||||
wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress");
|
||||
wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod, "wglMakeCurrent");
|
||||
wine_wgl.p_wglMakeContextCurrentARB = (void *)GetProcAddress(mod, "wglMakeContextCurrentARB");
|
||||
wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists");
|
||||
|
|
@ -1125,7 +1085,6 @@ static BOOL process_attach(void)
|
|||
{
|
||||
/* After context initialize also the list of supported WGL extensions. */
|
||||
wgl_initialize_glx(default_display, DefaultScreen(default_display), p_glXGetProcAddressARB);
|
||||
wgl_ext_initialize_extensions(default_display, DefaultScreen(default_display), p_glXGetProcAddressARB, internal_gl_disabled_extensions);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -1137,8 +1096,6 @@ static void process_detach(void)
|
|||
{
|
||||
glXDestroyContext(default_display, default_cx);
|
||||
|
||||
/* Do not leak memory... */
|
||||
wgl_ext_finalize_extensions();
|
||||
HeapFree(GetProcessHeap(), 0, internal_gl_extensions);
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -135,6 +135,7 @@
|
|||
@ cdecl wglGetCurrentDC() X11DRV_wglGetCurrentDC
|
||||
@ cdecl wglGetCurrentReadDCARB() X11DRV_wglGetCurrentReadDCARB
|
||||
@ cdecl wglGetIntegerv(long ptr) X11DRV_wglGetIntegerv
|
||||
@ cdecl wglGetProcAddress(ptr) X11DRV_wglGetProcAddress
|
||||
@ cdecl wglMakeContextCurrentARB(long long long) X11DRV_wglMakeContextCurrentARB
|
||||
@ cdecl wglMakeCurrent(long long) X11DRV_wglMakeCurrent
|
||||
@ cdecl wglShareLists(long long) X11DRV_wglShareLists
|
||||
|
|
|
|||
180
include/wine/wgl.h
Normal file
180
include/wine/wgl.h
Normal file
|
|
@ -0,0 +1,180 @@
|
|||
/*
|
||||
* Wine WGL extension + ATI GLX extension defines
|
||||
*
|
||||
* Copyright (c) 2004 Lionel Ulmer
|
||||
* Copyright (c) 2005 Alex Woods
|
||||
* Copyright (c) 2005 Raphael Junqueira
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#define HPBUFFERARB void *
|
||||
|
||||
#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000
|
||||
#define WGL_DRAW_TO_WINDOW_ARB 0x2001
|
||||
#define WGL_DRAW_TO_BITMAP_ARB 0x2002
|
||||
#define WGL_ACCELERATION_ARB 0x2003
|
||||
#define WGL_NEED_PALETTE_ARB 0x2004
|
||||
#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005
|
||||
#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006
|
||||
#define WGL_SWAP_METHOD_ARB 0x2007
|
||||
#define WGL_NUMBER_OVERLAYS_ARB 0x2008
|
||||
#define WGL_NUMBER_UNDERLAYS_ARB 0x2009
|
||||
#define WGL_TRANSPARENT_ARB 0x200A
|
||||
#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037
|
||||
#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
|
||||
#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
|
||||
#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
|
||||
#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
|
||||
#define WGL_SHARE_DEPTH_ARB 0x200C
|
||||
#define WGL_SHARE_STENCIL_ARB 0x200D
|
||||
#define WGL_SHARE_ACCUM_ARB 0x200E
|
||||
#define WGL_SUPPORT_GDI_ARB 0x200F
|
||||
#define WGL_SUPPORT_OPENGL_ARB 0x2010
|
||||
#define WGL_DOUBLE_BUFFER_ARB 0x2011
|
||||
#define WGL_STEREO_ARB 0x2012
|
||||
#define WGL_PIXEL_TYPE_ARB 0x2013
|
||||
#define WGL_COLOR_BITS_ARB 0x2014
|
||||
#define WGL_RED_BITS_ARB 0x2015
|
||||
#define WGL_RED_SHIFT_ARB 0x2016
|
||||
#define WGL_GREEN_BITS_ARB 0x2017
|
||||
#define WGL_GREEN_SHIFT_ARB 0x2018
|
||||
#define WGL_BLUE_BITS_ARB 0x2019
|
||||
#define WGL_BLUE_SHIFT_ARB 0x201A
|
||||
#define WGL_ALPHA_BITS_ARB 0x201B
|
||||
#define WGL_ALPHA_SHIFT_ARB 0x201C
|
||||
#define WGL_ACCUM_BITS_ARB 0x201D
|
||||
#define WGL_ACCUM_RED_BITS_ARB 0x201E
|
||||
#define WGL_ACCUM_GREEN_BITS_ARB 0x201F
|
||||
#define WGL_ACCUM_BLUE_BITS_ARB 0x2020
|
||||
#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021
|
||||
#define WGL_DEPTH_BITS_ARB 0x2022
|
||||
#define WGL_STENCIL_BITS_ARB 0x2023
|
||||
#define WGL_AUX_BUFFERS_ARB 0x2024
|
||||
|
||||
#define WGL_NO_ACCELERATION_ARB 0x2025
|
||||
#define WGL_GENERIC_ACCELERATION_ARB 0x2026
|
||||
#define WGL_FULL_ACCELERATION_ARB 0x2027
|
||||
|
||||
#define WGL_PBUFFER_WIDTH_ARB 0x2034
|
||||
#define WGL_PBUFFER_HEIGHT_ARB 0x2035
|
||||
#define WGL_PBUFFER_LOST_ARB 0x2036
|
||||
#define WGL_DRAW_TO_PBUFFER_ARB 0x202D
|
||||
#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E
|
||||
#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F
|
||||
#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030
|
||||
#define WGL_PBUFFER_LARGEST_ARB 0x2033
|
||||
|
||||
#define WGL_TYPE_RGBA_ARB 0x202B
|
||||
#define WGL_TYPE_COLORINDEX_ARB 0x202C
|
||||
|
||||
#define WGL_SAMPLE_BUFFERS_ARB 0x2041
|
||||
#define WGL_SAMPLES_ARB 0x2042
|
||||
|
||||
/**
|
||||
* WGL_render_texture
|
||||
*/
|
||||
/** GetPixelFormat/ChoosePixelFormat */
|
||||
#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070
|
||||
#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071
|
||||
/** CreatePbuffer / QueryPbuffer */
|
||||
#define WGL_TEXTURE_FORMAT_ARB 0x2072
|
||||
#define WGL_TEXTURE_TARGET_ARB 0x2073
|
||||
#define WGL_MIPMAP_TEXTURE_ARB 0x2074
|
||||
/** CreatePbuffer / QueryPbuffer */
|
||||
#define WGL_TEXTURE_RGB_ARB 0x2075
|
||||
#define WGL_TEXTURE_RGBA_ARB 0x2076
|
||||
#define WGL_NO_TEXTURE_ARB 0x2077
|
||||
/** CreatePbuffer / QueryPbuffer */
|
||||
#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078
|
||||
#define WGL_TEXTURE_1D_ARB 0x2079
|
||||
#define WGL_TEXTURE_2D_ARB 0x207A
|
||||
#define WGL_NO_TEXTURE_ARB 0x2077
|
||||
/** SetPbufferAttribARB/QueryPbufferARB parameters */
|
||||
#define WGL_MIPMAP_LEVEL_ARB 0x207B
|
||||
#define WGL_CUBE_MAP_FACE_ARB 0x207C
|
||||
/** SetPbufferAttribARB/QueryPbufferARB attribs */
|
||||
#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
|
||||
#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
|
||||
#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
|
||||
#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
|
||||
#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
|
||||
#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
|
||||
/** BindTexImageARB/ReleaseTexImageARB */
|
||||
#define WGL_FRONT_LEFT_ARB 0x2083
|
||||
#define WGL_FRONT_RIGHT_ARB 0x2084
|
||||
#define WGL_BACK_LEFT_ARB 0x2085
|
||||
#define WGL_BACK_RIGHT_ARB 0x2086
|
||||
#define WGL_AUX0_ARB 0x2087
|
||||
#define WGL_AUX1_ARB 0x2088
|
||||
#define WGL_AUX2_ARB 0x2089
|
||||
#define WGL_AUX3_ARB 0x208A
|
||||
#define WGL_AUX4_ARB 0x208B
|
||||
#define WGL_AUX5_ARB 0x208C
|
||||
#define WGL_AUX6_ARB 0x208D
|
||||
#define WGL_AUX7_ARB 0x208E
|
||||
#define WGL_AUX8_ARB 0x208F
|
||||
#define WGL_AUX9_ARB 0x2090
|
||||
|
||||
/**
|
||||
* WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float
|
||||
*/
|
||||
#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0
|
||||
#define GL_RGBA_FLOAT_MODE_ATI 0x8820
|
||||
#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
|
||||
#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A
|
||||
#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B
|
||||
#define GL_CLAMP_READ_COLOR_ARB 0x891C
|
||||
/** GLX_ATI_pixel_format_float */
|
||||
#define GLX_RGBA_FLOAT_ATI_BIT 0x00000100
|
||||
/** GLX_ARB_pixel_format_float */
|
||||
#define GLX_RGBA_FLOAT_BIT 0x00000004
|
||||
#define GLX_RGBA_FLOAT_TYPE 0x20B9
|
||||
/** GLX_ATI_render_texture */
|
||||
#define GLX_BIND_TO_TEXTURE_RGB_ATI 0x9800
|
||||
#define GLX_BIND_TO_TEXTURE_RGBA_ATI 0x9801
|
||||
#define GLX_TEXTURE_FORMAT_ATI 0x9802
|
||||
#define GLX_TEXTURE_TARGET_ATI 0x9803
|
||||
#define GLX_MIPMAP_TEXTURE_ATI 0x9804
|
||||
#define GLX_TEXTURE_RGB_ATI 0x9805
|
||||
#define GLX_TEXTURE_RGBA_ATI 0x9806
|
||||
#define GLX_NO_TEXTURE_ATI 0x9807
|
||||
#define GLX_TEXTURE_CUBE_MAP_ATI 0x9808
|
||||
#define GLX_TEXTURE_1D_ATI 0x9809
|
||||
#define GLX_TEXTURE_2D_ATI 0x980A
|
||||
#define GLX_MIPMAP_LEVEL_ATI 0x980B
|
||||
#define GLX_CUBE_MAP_FACE_ATI 0x980C
|
||||
#define GLX_TEXTURE_CUBE_MAP_POSITIVE_X_ATI 0x980D
|
||||
#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_X_ATI 0x980E
|
||||
#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Y_ATI 0x980F
|
||||
#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Y_ATI 0x9810
|
||||
#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Z_ATI 0x9811
|
||||
#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Z_ATI 0x9812
|
||||
#define GLX_FRONT_LEFT_ATI 0x9813
|
||||
#define GLX_FRONT_RIGHT_ATI 0x9814
|
||||
#define GLX_BACK_LEFT_ATI 0x9815
|
||||
#define GLX_BACK_RIGHT_ATI 0x9816
|
||||
#define GLX_AUX0_ATI 0x9817
|
||||
#define GLX_AUX1_ATI 0x9818
|
||||
#define GLX_AUX2_ATI 0x9819
|
||||
#define GLX_AUX3_ATI 0x981A
|
||||
#define GLX_AUX4_ATI 0x981B
|
||||
#define GLX_AUX5_ATI 0x981C
|
||||
#define GLX_AUX6_ATI 0x981D
|
||||
#define GLX_AUX7_ATI 0x981E
|
||||
#define GLX_AUX8_ATI 0x981F
|
||||
#define GLX_AUX9_ATI 0x9820
|
||||
#define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI 0x9821
|
||||
#define GLX_BIND_TO_TEXTURE_INTENSITY_ATI 0x9822
|
||||
Loading…
Reference in a new issue