Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk (revision 51270) @@ -177,4 +177,5 @@ VBOX_WITH_WINE_FIX_CURVBO \ VBOX_WITH_WINE_FIX_ZEROVERTATTR \ + VBOX_WITH_WINE_FIX_FTOA \ VBOX_WITH_WINE_DBG #wined3d_DEFS += VBOX_WITH_WINE_FIXES Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d8/surface.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d8/surface.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d8/surface.c (revision 51270) @@ -283,6 +283,14 @@ wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { locked_rect->Pitch = map_desc.row_pitch; locked_rect->pBits = map_desc.data; + } + else + { + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } return hr; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/d3d9_private.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/d3d9_private.h (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/d3d9_private.h (revision 51270) @@ -204,5 +204,5 @@ struct d3d9_swapchain { - IDirect3DSwapChain9 IDirect3DSwapChain9_iface; + IDirect3DSwapChain9Ex IDirect3DSwapChain9Ex_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; @@ -355,4 +355,9 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; +static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) +{ + return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); +} + #ifdef VBOX_WITH_WDDM struct d3d9_volume *unsafe_impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface) DECLSPEC_HIDDEN; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c (revision 51270) @@ -241,9 +241,4 @@ } -static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) -{ - return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); -} - static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { @@ -563,5 +558,5 @@ wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) - *swapchain = &object->IDirect3DSwapChain9_iface; + *swapchain = (IDirect3DSwapChain9 *)&object->IDirect3DSwapChain9Ex_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); @@ -583,6 +578,6 @@ { swapchain_impl = wined3d_swapchain_get_parent(wined3d_swapchain); - *swapchain = &swapchain_impl->IDirect3DSwapChain9_iface; - IDirect3DSwapChain9_AddRef(*swapchain); + *swapchain = (IDirect3DSwapChain9 *)&swapchain_impl->IDirect3DSwapChain9Ex_iface; + IDirect3DSwapChain9Ex_AddRef(*swapchain); hr = D3D_OK; } @@ -3714,5 +3709,5 @@ *swapchain = d3d_swapchain->wined3d_swapchain; wined3d_swapchain_incref(*swapchain); - IDirect3DSwapChain9_Release(&d3d_swapchain->IDirect3DSwapChain9_iface); + IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); return hr; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/surface.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/surface.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/surface.c (revision 51270) @@ -303,6 +303,9 @@ wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { locked_rect->Pitch = map_desc.row_pitch; locked_rect->pBits = map_desc.data; + } return hr; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/swapchain.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/swapchain.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/swapchain.c (revision 51270) @@ -35,10 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9(IDirect3DSwapChain9 *iface) -{ - return CONTAINING_RECORD(iface, struct d3d9_swapchain, IDirect3DSwapChain9_iface); -} - -static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9 *iface, REFIID riid, void **out) +static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9Ex(IDirect3DSwapChain9Ex *iface) +{ + return CONTAINING_RECORD(iface, struct d3d9_swapchain, IDirect3DSwapChain9Ex_iface); +} + +static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9Ex *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -47,9 +47,28 @@ || IsEqualGUID(riid, &IID_IUnknown)) { - IDirect3DSwapChain9_AddRef(iface); + IDirect3DSwapChain9Ex_AddRef(iface); *out = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9Ex)) + { + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); + + /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. + * It doesn't matter with which function the device was created. */ + if (!device->d3d_parent->extended) + { + WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n"); + *out = NULL; + return E_NOINTERFACE; + } + + IDirect3DSwapChain9Ex_AddRef(iface); + *out = iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); @@ -58,7 +77,7 @@ } -static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9 *iface) -{ - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); +static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); @@ -78,7 +97,7 @@ } -static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9 *iface) -{ - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); +static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); ULONG refcount = InterlockedDecrement(&swapchain->refcount); @@ -101,9 +120,9 @@ } -static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChain9 *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChain9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); HRESULT hr; @@ -120,7 +139,7 @@ } -static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9 *iface, IDirect3DSurface9 *surface) -{ - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); +static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9Ex *iface, IDirect3DSurface9 *surface) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(surface); HRESULT hr; @@ -135,8 +154,8 @@ } -static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9 *iface, +static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct wined3d_surface *wined3d_surface = NULL; struct d3d9_surface *surface_impl; @@ -163,7 +182,7 @@ } -static HRESULT WINAPI d3d9_swapchain_GetRasterStatus(IDirect3DSwapChain9 *iface, D3DRASTER_STATUS *raster_status) -{ - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); +static HRESULT WINAPI d3d9_swapchain_GetRasterStatus(IDirect3DSwapChain9Ex *iface, D3DRASTER_STATUS *raster_status) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); HRESULT hr; @@ -178,7 +197,7 @@ } -static HRESULT WINAPI d3d9_swapchain_GetDisplayMode(IDirect3DSwapChain9 *iface, D3DDISPLAYMODE *mode) -{ - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); +static HRESULT WINAPI d3d9_swapchain_GetDisplayMode(IDirect3DSwapChain9Ex *iface, D3DDISPLAYMODE *mode) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -201,7 +220,7 @@ } -static HRESULT WINAPI d3d9_swapchain_GetDevice(IDirect3DSwapChain9 *iface, IDirect3DDevice9 **device) -{ - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); +static HRESULT WINAPI d3d9_swapchain_GetDevice(IDirect3DSwapChain9Ex *iface, IDirect3DDevice9 **device) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -215,8 +234,8 @@ } -static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *iface, +static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9Ex *iface, D3DPRESENT_PARAMETERS *parameters) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct wined3d_swapchain_desc desc; @@ -231,10 +250,62 @@ } - -static const struct IDirect3DSwapChain9Vtbl d3d9_swapchain_vtbl = -{ +static HRESULT WINAPI d3d9_swapchain_GetLastPresentCount(IDirect3DSwapChain9Ex *iface, + UINT *last_present_count) +{ + FIXME("iface %p, last_present_count %p, stub!\n", iface, last_present_count); + + if (last_present_count) + *last_present_count = 0; + + return D3D_OK; +} + +static HRESULT WINAPI d3d9_swapchain_GetPresentStatistics(IDirect3DSwapChain9Ex *iface, + D3DPRESENTSTATS *present_stats) +{ + FIXME("iface %p, present_stats %p, stub!\n", iface, present_stats); + + if (present_stats) + memset(present_stats, 0, sizeof(*present_stats)); + + return D3D_OK; +} + +static HRESULT WINAPI d3d9_swapchain_GetDisplayModeEx(IDirect3DSwapChain9Ex *iface, + D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); + struct wined3d_display_mode wined3d_mode; + HRESULT hr; + + TRACE("iface %p, mode %p, rotation %p.\n", iface, mode, rotation); + + if (mode->Size != sizeof(*mode)) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + hr = wined3d_swapchain_get_display_mode(swapchain->wined3d_swapchain, &wined3d_mode, + (enum wined3d_display_rotation *)rotation); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + { + mode->Width = wined3d_mode.width; + mode->Height = wined3d_mode.height; + mode->RefreshRate = wined3d_mode.refresh_rate; + mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); + mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + } + + return hr; +} + +static const struct IDirect3DSwapChain9ExVtbl d3d9_swapchain_vtbl = +{ + /* IUnknown */ d3d9_swapchain_QueryInterface, d3d9_swapchain_AddRef, d3d9_swapchain_Release, + /* IDirect3DSwapChain9 */ d3d9_swapchain_Present, d3d9_swapchain_GetFrontBufferData, @@ -244,4 +315,8 @@ d3d9_swapchain_GetDevice, d3d9_swapchain_GetPresentParameters, + /* IDirect3DSwapChain9Ex */ + d3d9_swapchain_GetLastPresentCount, + d3d9_swapchain_GetPresentStatistics, + d3d9_swapchain_GetDisplayModeEx }; @@ -262,5 +337,5 @@ swapchain->refcount = 1; - swapchain->IDirect3DSwapChain9_iface.lpVtbl = &d3d9_swapchain_vtbl; + swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; wined3d_mutex_lock(); @@ -307,5 +382,5 @@ IDirect3DSurface9 *surf) /* use the given surface as a frontbuffer content source */ { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct d3d9_surface *rt = unsafe_impl_from_IDirect3DSurface9(surf); HRESULT hr; @@ -318,5 +393,5 @@ VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DSwapchain9GetHostWinID(IDirect3DSwapChain9 *iface, int32_t *pi32Id) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); HRESULT hr; wined3d_mutex_lock(); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/d3d9.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/d3d9.h (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/d3d9.h (revision 51270) @@ -413,15 +413,15 @@ { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DSwapChain9 methods ***/ - STDMETHOD(Present)(THIS_ CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) PURE; - STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9* pDestSurface) PURE; - STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9** ppBackBuffer) PURE; - STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS* pRasterStatus) PURE; - STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE; - STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9** ppDevice) PURE; - STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE; + STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; + STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9 *pDestSurface) PURE; + STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9 **ppBackBuffer) PURE; + STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; + STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE *pMode) PURE; + STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **ppDevice) PURE; + STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters) PURE; }; #undef INTERFACE @@ -453,4 +453,65 @@ #define IDirect3DSwapChain9_GetDevice(p,a) (p)->GetDevice(a) #define IDirect3DSwapChain9_GetPresentParameters(p,a) (p)->GetPresentParameters(a) +#endif + +/***************************************************************************** + * IDirect3DSwapChain9Ex interface + */ +#define INTERFACE IDirect3DSwapChain9Ex +DECLARE_INTERFACE_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDirect3DSwapChain9 methods ***/ + STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; + STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9 *pDestSurface) PURE; + STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9 **ppBackBuffer) PURE; + STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; + STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE *pMode) PURE; + STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **ppDevice) PURE; + STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters) PURE; + /*** IDirect3DSwapChain9Ex methods ***/ + STDMETHOD(GetLastPresentCount)(THIS_ UINT *pLastPresentCount) PURE; + STDMETHOD(GetPresentStats)(THIS_ D3DPRESENTSTATS *pPresentationStatistics) PURE; + STDMETHOD(GetDisplayModeEx)(THIS_ D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DSwapChain9Ex_Release(p) (p)->lpVtbl->Release(p) +/*** IDirect3DSwapChain9 methods ***/ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) +#define IDirect3DSwapChain9EX_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) +#define IDirect3DSwapChain9EX_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a) +/*** IDirect3DSwapChain9Ex methods ***/ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->lpVtbl->GetLastPresentCount(p,a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->lpVtbl->GetPresentStats(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->lpVtbl->GetDisplayModeEx(p,a,b) +#else +/*** IUnknown methods ***/ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->AddRef() +#define IDirect3DSwapChain9Ex_Release(p) (p)->Release() +/*** IDirect3DSwapChain9 methods ***/ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->Present(a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->GetFrontBufferData(a) +#define IDirect3DSwapChain9Ex_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) +#define IDirect3DSwapChain9Ex_GetRasterStatus(p,a) (p)->GetRasterStatus(a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->GetDisplayMode(a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->GetDevice(a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->GetPresentParameters(a) +/*** IDirect3DSwapChain9Ex methods ***/ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->GetLastPresentCount(a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->GetPresentStats(a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->GetDisplayModeEx(a,b) #endif Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wgl.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wgl.h (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wgl.h (revision 51270) @@ -1,3 +1,3 @@ -/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */ +/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */ #ifndef __WINE_WGL_H @@ -15,6 +15,8 @@ typedef double GLclampd; typedef float GLclampf; +typedef int GLclampx; typedef double GLdouble; typedef unsigned int GLenum; +typedef int GLfixed; typedef float GLfloat; typedef unsigned short GLhalfNV; @@ -22,4 +24,5 @@ typedef int GLint; typedef INT64 GLint64; +typedef INT64 GLint64EXT; typedef INT_PTR GLintptr; typedef INT_PTR GLintptrARB; @@ -33,4 +36,5 @@ typedef unsigned int GLuint; typedef UINT64 GLuint64; +typedef UINT64 GLuint64EXT; typedef unsigned short GLushort; typedef INT_PTR GLvdpauSurfaceNV; @@ -120,4 +124,5 @@ #define GL_ALL_SHADER_BITS 0xFFFFFFFF #define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF +#define GL_ALL_STATIC_DATA_IBM 103060 #define GL_ALPHA 0x1906 #define GL_ALPHA12 0x803D @@ -125,4 +130,5 @@ #define GL_ALPHA16 0x803E #define GL_ALPHA16F_ARB 0x881C +#define GL_ALPHA16F_EXT 0x881C #define GL_ALPHA16I_EXT 0x8D8A #define GL_ALPHA16UI_EXT 0x8D78 @@ -130,4 +136,5 @@ #define GL_ALPHA16_SNORM 0x9018 #define GL_ALPHA32F_ARB 0x8816 +#define GL_ALPHA32F_EXT 0x8816 #define GL_ALPHA32I_EXT 0x8D84 #define GL_ALPHA32UI_EXT 0x8D72 @@ -138,4 +145,5 @@ #define GL_ALPHA8UI_EXT 0x8D7E #define GL_ALPHA8_EXT 0x803C +#define GL_ALPHA8_OES 0x803C #define GL_ALPHA8_SNORM 0x9014 #define GL_ALPHA_BIAS 0x0D1D @@ -234,5 +242,7 @@ #define GL_BGR 0x80E0 #define GL_BGRA 0x80E1 +#define GL_BGRA8_EXT 0x93A1 #define GL_BGRA_EXT 0x80E1 +#define GL_BGRA_IMG 0x80E1 #define GL_BGRA_INTEGER 0x8D9B #define GL_BGRA_INTEGER_EXT 0x8D9B @@ -250,4 +260,5 @@ #define GL_BITMAP_TOKEN 0x0704 #define GL_BLEND 0x0BE2 +#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #define GL_BLEND_COLOR 0x8005 #define GL_BLEND_COLOR_EXT 0x8005 @@ -268,4 +279,6 @@ #define GL_BLEND_EQUATION_RGB_EXT 0x8009 #define GL_BLEND_EQUATION_RGB_OES 0x8009 +#define GL_BLEND_OVERLAP_NV 0x9281 +#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 #define GL_BLEND_SRC 0x0BE1 #define GL_BLEND_SRC_ALPHA 0x80CB @@ -284,4 +297,5 @@ #define GL_BLUE_MAX_CLAMP_INGR 0x8566 #define GL_BLUE_MIN_CLAMP_INGR 0x8562 +#define GL_BLUE_NV 0x1905 #define GL_BLUE_SCALE 0x0D1A #define GL_BOLD_BIT_NV 0x01 @@ -296,4 +310,5 @@ #define GL_BOUNDING_BOX_NV 0x908D #define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C +#define GL_BROWSER_DEFAULT_WEBGL 0x9244 #define GL_BUFFER 0x82E0 #define GL_BUFFER_ACCESS 0x88BB @@ -305,4 +320,6 @@ #define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 #define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D +#define GL_BUFFER_IMMUTABLE_STORAGE 0x821F +#define GL_BUFFER_KHR 0x82E0 #define GL_BUFFER_MAPPED 0x88BC #define GL_BUFFER_MAPPED_ARB 0x88BC @@ -318,4 +335,5 @@ #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_SIZE_ARB 0x8764 +#define GL_BUFFER_STORAGE_FLAGS 0x8220 #define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200 #define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 @@ -347,4 +365,5 @@ #define GL_CLAMP_TO_BORDER 0x812D #define GL_CLAMP_TO_BORDER_ARB 0x812D +#define GL_CLAMP_TO_BORDER_NV 0x812D #define GL_CLAMP_TO_BORDER_SGIS 0x812D #define GL_CLAMP_TO_EDGE 0x812F @@ -354,9 +373,12 @@ #define GL_CLEAR 0x1500 #define GL_CLEAR_BUFFER 0x82B4 +#define GL_CLEAR_TEXTURE 0x9365 #define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 #define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 #define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF #define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000 #define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +#define GL_CLIENT_STORAGE_BIT 0x0200 #define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 #define GL_CLIP_DISTANCE0 0x3000 @@ -372,9 +394,15 @@ #define GL_CLIP_NEAR_HINT_PGI 0x1A220 #define GL_CLIP_PLANE0 0x3000 +#define GL_CLIP_PLANE0_IMG 0x3000 #define GL_CLIP_PLANE1 0x3001 +#define GL_CLIP_PLANE1_IMG 0x3001 #define GL_CLIP_PLANE2 0x3002 +#define GL_CLIP_PLANE2_IMG 0x3002 #define GL_CLIP_PLANE3 0x3003 +#define GL_CLIP_PLANE3_IMG 0x3003 #define GL_CLIP_PLANE4 0x3004 +#define GL_CLIP_PLANE4_IMG 0x3004 #define GL_CLIP_PLANE5 0x3005 +#define GL_CLIP_PLANE5_IMG 0x3005 #define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 #define GL_CLOSE_PATH_NV 0x00 @@ -387,4 +415,6 @@ #define GL_COLOR3_BIT_PGI 0x00010000 #define GL_COLOR4_BIT_PGI 0x00020000 +#define GL_COLORBURN_NV 0x929A +#define GL_COLORDODGE_NV 0x9299 #define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 #define GL_COLOR_ARRAY 0x8076 @@ -457,4 +487,12 @@ #define GL_COLOR_ATTACHMENT_EXT 0x90F0 #define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 +#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 +#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 +#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 +#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 +#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 +#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 +#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 #define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 #define GL_COLOR_CLEAR_VALUE 0x0C22 @@ -559,4 +597,5 @@ #define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 #define GL_COMPRESSED_R11_EAC 0x9270 +#define GL_COMPRESSED_R11_EAC_OES 0x9270 #define GL_COMPRESSED_RED 0x8225 #define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD @@ -565,14 +604,34 @@ #define GL_COMPRESSED_RG 0x8226 #define GL_COMPRESSED_RG11_EAC 0x9272 +#define GL_COMPRESSED_RG11_EAC_OES 0x9272 #define GL_COMPRESSED_RGB 0x84ED #define GL_COMPRESSED_RGB8_ETC2 0x9274 +#define GL_COMPRESSED_RGB8_ETC2_OES 0x9274 #define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 +#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES 0x9276 #define GL_COMPRESSED_RGBA 0x84EE #define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 +#define GL_COMPRESSED_RGBA8_ETC2_EAC_OES 0x9278 #define GL_COMPRESSED_RGBA_ARB 0x84EE +#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD +#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 #define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C #define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 +#define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137 #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 +#define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138 #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 #define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 @@ -591,8 +650,10 @@ #define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 #define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 +#define GL_COMPRESSED_SIGNED_R11_EAC_OES 0x9271 #define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE #define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC #define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC #define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 +#define GL_COMPRESSED_SIGNED_RG11_EAC_OES 0x9273 #define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE #define GL_COMPRESSED_SLUMINANCE 0x8C4A @@ -601,18 +662,44 @@ #define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A #define GL_COMPRESSED_SRGB 0x8C48 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 #define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 +#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_OES 0x9279 #define GL_COMPRESSED_SRGB8_ETC2 0x9275 +#define GL_COMPRESSED_SRGB8_ETC2_OES 0x9275 #define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 +#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES 0x9277 #define GL_COMPRESSED_SRGB_ALPHA 0x8C49 #define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D #define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 +#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56 +#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57 #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F #define GL_COMPRESSED_SRGB_EXT 0x8C48 +#define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54 +#define GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55 #define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C +#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C #define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 #define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#define GL_COMPUTE_LOCAL_WORK_SIZE 0x8267 +#define GL_COMPUTE_PROGRAM_NV 0x90FB +#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC #define GL_COMPUTE_SHADER 0x91B9 #define GL_COMPUTE_SHADER_BIT 0x00000020 @@ -620,7 +707,9 @@ #define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 #define GL_COMPUTE_TEXTURE 0x82A0 +#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267 #define GL_COMP_BIT_ATI 0x00000002 #define GL_CONDITION_SATISFIED 0x911C #define GL_CONDITION_SATISFIED_APPLE 0x911C +#define GL_CONJOINT_NV 0x9284 #define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD #define GL_CONSTANT 0x8576 @@ -641,8 +730,12 @@ #define GL_CONTEXT_FLAGS 0x821E #define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 +#define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 +#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001 #define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 +#define GL_CONTEXT_LOST_WEBGL 0x9242 #define GL_CONTEXT_PROFILE_MASK 0x9126 +#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 #define GL_CONTINUOUS_AMD 0x9007 +#define GL_CONTRAST_NV 0x92A1 #define GL_CONVEX_HULL_NV 0x908B #define GL_CONVOLUTION_1D 0x8010 @@ -700,9 +793,14 @@ #define GL_COORD_REPLACE_ARB 0x8862 #define GL_COORD_REPLACE_NV 0x8862 +#define GL_COORD_REPLACE_OES 0x8862 #define GL_COPY 0x1503 #define GL_COPY_INVERTED 0x150C #define GL_COPY_PIXEL_TOKEN 0x0706 +#define GL_COPY_READ_BUFFER 0x8F36 #define GL_COPY_READ_BUFFER_BINDING 0x8F36 +#define GL_COPY_READ_BUFFER_NV 0x8F36 +#define GL_COPY_WRITE_BUFFER 0x8F37 #define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 +#define GL_COPY_WRITE_BUFFER_NV 0x8F37 #define GL_COUNTER_RANGE_AMD 0x8BC1 #define GL_COUNTER_TYPE_AMD 0x8BC0 @@ -717,5 +815,5 @@ #define GL_COVERAGE_COMPONENT_NV 0x8ED0 #define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 -#define GL_COVERAGE_SAMPLES_NV 0x80A9 +#define GL_COVERAGE_SAMPLES_NV 0x8ED4 #define GL_CPU_OPTIMIZED_QCOM 0x8FB1 #define GL_CUBIC_CURVE_TO_NV 0x0C @@ -770,10 +868,13 @@ #define GL_CURRENT_WEIGHT_ARB 0x86A8 #define GL_CW 0x0900 +#define GL_DARKEN_NV 0x9297 #define GL_DATA_BUFFER_AMD 0x9151 #define GL_DEBUG_ASSERT_MESA 0x875B #define GL_DEBUG_CALLBACK_FUNCTION 0x8244 #define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 +#define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244 #define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 #define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 +#define GL_DEBUG_CALLBACK_USER_PARAM_KHR 0x8245 #define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 #define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F @@ -785,51 +886,75 @@ #define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A #define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_DEBUG_GROUP_STACK_DEPTH_KHR 0x826D #define GL_DEBUG_LOGGED_MESSAGES 0x9145 #define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 #define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 +#define GL_DEBUG_LOGGED_MESSAGES_KHR 0x9145 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243 #define GL_DEBUG_OBJECT_MESA 0x8759 #define GL_DEBUG_OUTPUT 0x92E0 +#define GL_DEBUG_OUTPUT_KHR 0x92E0 #define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 #define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 +#define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 #define GL_DEBUG_PRINT_MESA 0x875A #define GL_DEBUG_SEVERITY_HIGH 0x9146 #define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 #define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 +#define GL_DEBUG_SEVERITY_HIGH_KHR 0x9146 #define GL_DEBUG_SEVERITY_LOW 0x9148 #define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 #define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 +#define GL_DEBUG_SEVERITY_LOW_KHR 0x9148 #define GL_DEBUG_SEVERITY_MEDIUM 0x9147 #define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 #define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 +#define GL_DEBUG_SEVERITY_MEDIUM_KHR 0x9147 #define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_DEBUG_SEVERITY_NOTIFICATION_KHR 0x826B #define GL_DEBUG_SOURCE_API 0x8246 #define GL_DEBUG_SOURCE_API_ARB 0x8246 +#define GL_DEBUG_SOURCE_API_KHR 0x8246 #define GL_DEBUG_SOURCE_APPLICATION 0x824A #define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A +#define GL_DEBUG_SOURCE_APPLICATION_KHR 0x824A #define GL_DEBUG_SOURCE_OTHER 0x824B #define GL_DEBUG_SOURCE_OTHER_ARB 0x824B +#define GL_DEBUG_SOURCE_OTHER_KHR 0x824B #define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 #define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 +#define GL_DEBUG_SOURCE_SHADER_COMPILER_KHR 0x8248 #define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 #define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 +#define GL_DEBUG_SOURCE_THIRD_PARTY_KHR 0x8249 #define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 #define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR 0x8247 #define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D #define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR 0x824D #define GL_DEBUG_TYPE_ERROR 0x824C #define GL_DEBUG_TYPE_ERROR_ARB 0x824C +#define GL_DEBUG_TYPE_ERROR_KHR 0x824C #define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_MARKER_KHR 0x8268 #define GL_DEBUG_TYPE_OTHER 0x8251 #define GL_DEBUG_TYPE_OTHER_ARB 0x8251 +#define GL_DEBUG_TYPE_OTHER_KHR 0x8251 #define GL_DEBUG_TYPE_PERFORMANCE 0x8250 #define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 +#define GL_DEBUG_TYPE_PERFORMANCE_KHR 0x8250 #define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_TYPE_POP_GROUP_KHR 0x826A #define GL_DEBUG_TYPE_PORTABILITY 0x824F #define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F +#define GL_DEBUG_TYPE_PORTABILITY_KHR 0x824F #define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_PUSH_GROUP_KHR 0x8269 #define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E #define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR 0x824E #define GL_DECAL 0x2101 #define GL_DECODE_EXT 0x8A49 @@ -859,4 +984,12 @@ #define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 #define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 +#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 +#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 +#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 +#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 +#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 +#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 +#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 #define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF #define GL_DEPTH_CLAMP 0x864F @@ -908,8 +1041,10 @@ #define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A #define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B +#define GL_DIFFERENCE_NV 0x929E #define GL_DIFFUSE 0x1201 #define GL_DISCARD_ATI 0x8763 #define GL_DISCARD_NV 0x8530 #define GL_DISCRETE_AMD 0x9006 +#define GL_DISJOINT_NV 0x9283 #define GL_DISPATCH_INDIRECT_BUFFER 0x90EE #define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF @@ -947,8 +1082,20 @@ #define GL_DOUBLE_MAT2 0x8F46 #define GL_DOUBLE_MAT2_EXT 0x8F46 +#define GL_DOUBLE_MAT2x3 0x8F49 +#define GL_DOUBLE_MAT2x3_EXT 0x8F49 +#define GL_DOUBLE_MAT2x4 0x8F4A +#define GL_DOUBLE_MAT2x4_EXT 0x8F4A #define GL_DOUBLE_MAT3 0x8F47 #define GL_DOUBLE_MAT3_EXT 0x8F47 +#define GL_DOUBLE_MAT3x2 0x8F4B +#define GL_DOUBLE_MAT3x2_EXT 0x8F4B +#define GL_DOUBLE_MAT3x4 0x8F4C +#define GL_DOUBLE_MAT3x4_EXT 0x8F4C #define GL_DOUBLE_MAT4 0x8F48 #define GL_DOUBLE_MAT4_EXT 0x8F48 +#define GL_DOUBLE_MAT4x2 0x8F4D +#define GL_DOUBLE_MAT4x2_EXT 0x8F4D +#define GL_DOUBLE_MAT4x3 0x8F4E +#define GL_DOUBLE_MAT4x3_EXT 0x8F4E #define GL_DOUBLE_VEC2 0x8FFC #define GL_DOUBLE_VEC2_EXT 0x8FFC @@ -961,4 +1108,5 @@ #define GL_DRAW_BUFFER0_ARB 0x8825 #define GL_DRAW_BUFFER0_ATI 0x8825 +#define GL_DRAW_BUFFER0_EXT 0x8825 #define GL_DRAW_BUFFER0_NV 0x8825 #define GL_DRAW_BUFFER1 0x8826 @@ -966,66 +1114,86 @@ #define GL_DRAW_BUFFER10_ARB 0x882F #define GL_DRAW_BUFFER10_ATI 0x882F +#define GL_DRAW_BUFFER10_EXT 0x882F #define GL_DRAW_BUFFER10_NV 0x882F #define GL_DRAW_BUFFER11 0x8830 #define GL_DRAW_BUFFER11_ARB 0x8830 #define GL_DRAW_BUFFER11_ATI 0x8830 +#define GL_DRAW_BUFFER11_EXT 0x8830 #define GL_DRAW_BUFFER11_NV 0x8830 #define GL_DRAW_BUFFER12 0x8831 #define GL_DRAW_BUFFER12_ARB 0x8831 #define GL_DRAW_BUFFER12_ATI 0x8831 +#define GL_DRAW_BUFFER12_EXT 0x8831 #define GL_DRAW_BUFFER12_NV 0x8831 #define GL_DRAW_BUFFER13 0x8832 #define GL_DRAW_BUFFER13_ARB 0x8832 #define GL_DRAW_BUFFER13_ATI 0x8832 +#define GL_DRAW_BUFFER13_EXT 0x8832 #define GL_DRAW_BUFFER13_NV 0x8832 #define GL_DRAW_BUFFER14 0x8833 #define GL_DRAW_BUFFER14_ARB 0x8833 #define GL_DRAW_BUFFER14_ATI 0x8833 +#define GL_DRAW_BUFFER14_EXT 0x8833 #define GL_DRAW_BUFFER14_NV 0x8833 #define GL_DRAW_BUFFER15 0x8834 #define GL_DRAW_BUFFER15_ARB 0x8834 #define GL_DRAW_BUFFER15_ATI 0x8834 +#define GL_DRAW_BUFFER15_EXT 0x8834 #define GL_DRAW_BUFFER15_NV 0x8834 #define GL_DRAW_BUFFER1_ARB 0x8826 #define GL_DRAW_BUFFER1_ATI 0x8826 +#define GL_DRAW_BUFFER1_EXT 0x8826 #define GL_DRAW_BUFFER1_NV 0x8826 #define GL_DRAW_BUFFER2 0x8827 #define GL_DRAW_BUFFER2_ARB 0x8827 #define GL_DRAW_BUFFER2_ATI 0x8827 +#define GL_DRAW_BUFFER2_EXT 0x8827 #define GL_DRAW_BUFFER2_NV 0x8827 #define GL_DRAW_BUFFER3 0x8828 #define GL_DRAW_BUFFER3_ARB 0x8828 #define GL_DRAW_BUFFER3_ATI 0x8828 +#define GL_DRAW_BUFFER3_EXT 0x8828 #define GL_DRAW_BUFFER3_NV 0x8828 #define GL_DRAW_BUFFER4 0x8829 #define GL_DRAW_BUFFER4_ARB 0x8829 #define GL_DRAW_BUFFER4_ATI 0x8829 +#define GL_DRAW_BUFFER4_EXT 0x8829 #define GL_DRAW_BUFFER4_NV 0x8829 #define GL_DRAW_BUFFER5 0x882A #define GL_DRAW_BUFFER5_ARB 0x882A #define GL_DRAW_BUFFER5_ATI 0x882A +#define GL_DRAW_BUFFER5_EXT 0x882A #define GL_DRAW_BUFFER5_NV 0x882A #define GL_DRAW_BUFFER6 0x882B #define GL_DRAW_BUFFER6_ARB 0x882B #define GL_DRAW_BUFFER6_ATI 0x882B +#define GL_DRAW_BUFFER6_EXT 0x882B #define GL_DRAW_BUFFER6_NV 0x882B #define GL_DRAW_BUFFER7 0x882C #define GL_DRAW_BUFFER7_ARB 0x882C #define GL_DRAW_BUFFER7_ATI 0x882C +#define GL_DRAW_BUFFER7_EXT 0x882C #define GL_DRAW_BUFFER7_NV 0x882C #define GL_DRAW_BUFFER8 0x882D #define GL_DRAW_BUFFER8_ARB 0x882D #define GL_DRAW_BUFFER8_ATI 0x882D +#define GL_DRAW_BUFFER8_EXT 0x882D #define GL_DRAW_BUFFER8_NV 0x882D #define GL_DRAW_BUFFER9 0x882E #define GL_DRAW_BUFFER9_ARB 0x882E #define GL_DRAW_BUFFER9_ATI 0x882E +#define GL_DRAW_BUFFER9_EXT 0x882E #define GL_DRAW_BUFFER9_NV 0x882E #define GL_DRAW_BUFFER_EXT 0x0C01 #define GL_DRAW_FRAMEBUFFER 0x8CA9 #define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 #define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 #define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6 #define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_NV 0x8CA9 #define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 #define GL_DRAW_INDIRECT_BUFFER 0x8F3F @@ -1043,5 +1211,10 @@ #define GL_DSDT_NV 0x86F5 #define GL_DST_ALPHA 0x0304 +#define GL_DST_ATOP_NV 0x928F #define GL_DST_COLOR 0x0306 +#define GL_DST_IN_NV 0x928B +#define GL_DST_NV 0x9287 +#define GL_DST_OUT_NV 0x928D +#define GL_DST_OVER_NV 0x9289 #define GL_DS_BIAS_NV 0x8716 #define GL_DS_SCALE_NV 0x8710 @@ -1074,4 +1247,5 @@ #define GL_DYNAMIC_READ 0x88E9 #define GL_DYNAMIC_READ_ARB 0x88E9 +#define GL_DYNAMIC_STORAGE_BIT 0x0100 #define GL_EDGEFLAG_BIT_PGI 0x00040000 #define GL_EDGE_FLAG 0x0B43 @@ -1113,24 +1287,9 @@ #define GL_EQUIV 0x1509 #define GL_ETC1_RGB8_OES 0x8D64 +#define GL_ETC1_SRGB8_NV 0x88EE #define GL_EVAL_2D_NV 0x86C0 #define GL_EVAL_BIT 0x00010000 #define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 #define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_EVAL_VERTEX_ATRRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATRRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATRRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATRRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATRRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATRRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATRRIB15_NV 0x86D5 -#define GL_EVAL_VERTEX_ATRRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATRRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATRRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATRRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATRRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATRRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATRRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATRRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATRRIB9_NV 0x86CF #define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 #define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 @@ -1149,4 +1308,5 @@ #define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE #define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF +#define GL_EXCLUSION_NV 0x92A0 #define GL_EXP 0x0800 #define GL_EXP2 0x0801 @@ -1202,8 +1362,20 @@ #define GL_FLOAT_MAT2 0x8B5A #define GL_FLOAT_MAT2_ARB 0x8B5A +#define GL_FLOAT_MAT2x3 0x8B65 +#define GL_FLOAT_MAT2x3_NV 0x8B65 +#define GL_FLOAT_MAT2x4 0x8B66 +#define GL_FLOAT_MAT2x4_NV 0x8B66 #define GL_FLOAT_MAT3 0x8B5B #define GL_FLOAT_MAT3_ARB 0x8B5B +#define GL_FLOAT_MAT3x2 0x8B67 +#define GL_FLOAT_MAT3x2_NV 0x8B67 +#define GL_FLOAT_MAT3x4 0x8B68 +#define GL_FLOAT_MAT3x4_NV 0x8B68 #define GL_FLOAT_MAT4 0x8B5C #define GL_FLOAT_MAT4_ARB 0x8B5C +#define GL_FLOAT_MAT4x2 0x8B69 +#define GL_FLOAT_MAT4x2_NV 0x8B69 +#define GL_FLOAT_MAT4x3 0x8B6A +#define GL_FLOAT_MAT4x3_NV 0x8B6A #define GL_FLOAT_R16_NV 0x8884 #define GL_FLOAT_R32_NV 0x8885 @@ -1256,8 +1428,6 @@ #define GL_FOG_DISTANCE_MODE_NV 0x855A #define GL_FOG_END 0x0B64 -#define GL_FOG_FACTOR_TO_ALPHA_SGIX 0x836F #define GL_FOG_FUNC_POINTS_SGIS 0x812B #define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_GEN_MODE_NV 0x855A #define GL_FOG_HINT 0x0C54 #define GL_FOG_INDEX 0x0B61 @@ -1265,21 +1435,19 @@ #define GL_FOG_OFFSET_SGIX 0x8198 #define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD #define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC #define GL_FOG_START 0x0B63 -#define GL_FONT_ASCENDER_NV 0x00200000 -#define GL_FONT_DESCENDER_NV 0x00400000 -#define GL_FONT_HAS_KERNING_NV 0x10000000 -#define GL_FONT_HEIGHT_NV 0x00800000 -#define GL_FONT_MAX_ADVANCE_HEIGHT_NV 0x02000000 -#define GL_FONT_MAX_ADVANCE_WIDTH_NV 0x01000000 -#define GL_FONT_UNDERLINE_POSITION_NV 0x04000000 -#define GL_FONT_UNDERLINE_THICKNESS_NV 0x08000000 -#define GL_FONT_UNITS_PER_EM_NV 0x00100000 -#define GL_FONT_X_MAX_BOUNDS_NV 0x00040000 -#define GL_FONT_X_MIN_BOUNDS_NV 0x00010000 -#define GL_FONT_Y_MAX_BOUNDS_NV 0x00080000 -#define GL_FONT_Y_MIN_BOUNDS_NV 0x00020000 +#define GL_FONT_ASCENDER_BIT_NV 0x00200000 +#define GL_FONT_DESCENDER_BIT_NV 0x00400000 +#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000 +#define GL_FONT_HEIGHT_BIT_NV 0x00800000 +#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000 +#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000 +#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000 +#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000 +#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000 +#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000 +#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000 +#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000 +#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000 #define GL_FORCE_BLUE_TO_ONE_NV 0x8860 #define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 @@ -1339,4 +1507,5 @@ #define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 #define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 #define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 #define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 @@ -1385,4 +1554,5 @@ #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES 0x8CD9 @@ -1402,6 +1572,8 @@ #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC @@ -1470,5 +1642,5 @@ #define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA #define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLYPH_HAS_KERNING_NV 0x100 +#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100 #define GL_GLYPH_HEIGHT_BIT_NV 0x02 #define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10 @@ -1480,4 +1652,5 @@ #define GL_GLYPH_WIDTH_BIT_NV 0x01 #define GL_GPU_ADDRESS_NV 0x8F34 +#define GL_GPU_DISJOINT_EXT 0x8FBB #define GL_GPU_OPTIMIZED_QCOM 0x8FB2 #define GL_GREATER 0x0204 @@ -1490,6 +1663,8 @@ #define GL_GREEN_MAX_CLAMP_INGR 0x8565 #define GL_GREEN_MIN_CLAMP_INGR 0x8561 +#define GL_GREEN_NV 0x1904 #define GL_GREEN_SCALE 0x0D18 #define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 +#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 #define GL_HALF_APPLE 0x140B #define GL_HALF_BIAS_NEGATE_NV 0x853B @@ -1500,4 +1675,6 @@ #define GL_HALF_FLOAT_NV 0x140B #define GL_HALF_FLOAT_OES 0x8D61 +#define GL_HARDLIGHT_NV 0x929B +#define GL_HARDMIX_NV 0x92A9 #define GL_HIGH_FLOAT 0x8DF2 #define GL_HIGH_INT 0x8DF5 @@ -1527,4 +1704,8 @@ #define GL_HI_SCALE_NV 0x870E #define GL_HORIZONTAL_LINE_TO_NV 0x06 +#define GL_HSL_COLOR_NV 0x92AF +#define GL_HSL_HUE_NV 0x92AD +#define GL_HSL_LUMINOSITY_NV 0x92B0 +#define GL_HSL_SATURATION_NV 0x92AE #define GL_IDENTITY_NV 0x862A #define GL_IGNORE_BORDER_HP 0x8150 @@ -1632,4 +1813,5 @@ #define GL_INFO_LOG_LENGTH 0x8B84 #define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 +#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 #define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 #define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 @@ -1753,5 +1935,5 @@ #define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 #define GL_INVALID_FRAMEBUFFER_OPERATION_OES 0x0506 -#define GL_INVALID_INDEX 0xFFFFFFFFu +#define GL_INVALID_INDEX 0xFFFFFFFF #define GL_INVALID_OPERATION 0x0502 #define GL_INVALID_VALUE 0x0501 @@ -1763,4 +1945,6 @@ #define GL_INVERT 0x150A #define GL_INVERTED_SCREEN_W_REND 0x8491 +#define GL_INVERT_OVG_NV 0x92B4 +#define GL_INVERT_RGB_NV 0x92A3 #define GL_IR_INSTRUMENT1_SGIX 0x817F #define GL_ISOLINES 0x8E7A @@ -1780,4 +1964,7 @@ #define GL_LAYER_NV 0x8DAA #define GL_LAYER_PROVOKING_VERTEX 0x825E +#define GL_LAYOUT_DEFAULT_INTEL 0 +#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2 +#define GL_LAYOUT_LINEAR_INTEL 1 #define GL_LEFT 0x0406 #define GL_LEQUAL 0x0203 @@ -1792,4 +1979,5 @@ #define GL_LIGHT6 0x4006 #define GL_LIGHT7 0x4007 +#define GL_LIGHTEN_NV 0x9298 #define GL_LIGHTING 0x0B50 #define GL_LIGHTING_BIT 0x00000040 @@ -1803,4 +1991,7 @@ #define GL_LINE 0x1B01 #define GL_LINEAR 0x2601 +#define GL_LINEARBURN_NV 0x92A5 +#define GL_LINEARDODGE_NV 0x92A4 +#define GL_LINEARLIGHT_NV 0x92A7 #define GL_LINEAR_ATTENUATION 0x1208 #define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 @@ -1848,8 +2039,10 @@ #define GL_LOCAL_EXT 0x87C4 #define GL_LOCATION 0x930E +#define GL_LOCATION_COMPONENT 0x934A #define GL_LOCATION_INDEX 0x930F #define GL_LOGIC_OP 0x0BF1 #define GL_LOGIC_OP_MODE 0x0BF0 #define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 +#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 #define GL_LOWER_LEFT 0x8CA1 #define GL_LOW_FLOAT 0x8DF0 @@ -1866,4 +2059,5 @@ #define GL_LUMINANCE16 0x8042 #define GL_LUMINANCE16F_ARB 0x881E +#define GL_LUMINANCE16F_EXT 0x881E #define GL_LUMINANCE16I_EXT 0x8D8C #define GL_LUMINANCE16UI_EXT 0x8D7A @@ -1874,4 +2068,5 @@ #define GL_LUMINANCE16_SNORM 0x9019 #define GL_LUMINANCE32F_ARB 0x8818 +#define GL_LUMINANCE32F_EXT 0x8818 #define GL_LUMINANCE32I_EXT 0x8D86 #define GL_LUMINANCE32UI_EXT 0x8D74 @@ -1879,4 +2074,5 @@ #define GL_LUMINANCE4_ALPHA4 0x8043 #define GL_LUMINANCE4_ALPHA4_EXT 0x8043 +#define GL_LUMINANCE4_ALPHA4_OES 0x8043 #define GL_LUMINANCE4_EXT 0x803F #define GL_LUMINANCE6_ALPHA2 0x8044 @@ -1887,12 +2083,16 @@ #define GL_LUMINANCE8_ALPHA8 0x8045 #define GL_LUMINANCE8_ALPHA8_EXT 0x8045 +#define GL_LUMINANCE8_ALPHA8_OES 0x8045 #define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 #define GL_LUMINANCE8_EXT 0x8040 +#define GL_LUMINANCE8_OES 0x8040 #define GL_LUMINANCE8_SNORM 0x9015 #define GL_LUMINANCE_ALPHA 0x190A #define GL_LUMINANCE_ALPHA16F_ARB 0x881F +#define GL_LUMINANCE_ALPHA16F_EXT 0x881F #define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D #define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B #define GL_LUMINANCE_ALPHA32F_ARB 0x8819 +#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 #define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 #define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 @@ -1915,4 +2115,5 @@ #define GL_MAGNITUDE_SCALE_NV 0x8712 #define GL_MAJOR_VERSION 0x821B +#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 #define GL_MALI_SHADER_BINARY_ARM 0x8F60 #define GL_MANUAL_GENERATE_MIPMAP 0x8294 @@ -1977,4 +2178,5 @@ #define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 #define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 +#define GL_MAP_COHERENT_BIT 0x0080 #define GL_MAP_COLOR 0x0D10 #define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 @@ -1984,4 +2186,5 @@ #define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 #define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 +#define GL_MAP_PERSISTENT_BIT 0x0040 #define GL_MAP_READ_BIT 0x0001 #define GL_MAP_READ_BIT_EXT 0x0001 @@ -2077,4 +2280,5 @@ #define GL_MAX_CLIP_DISTANCES 0x0D32 #define GL_MAX_CLIP_PLANES 0x0D32 +#define GL_MAX_CLIP_PLANES_IMG 0x0D32 #define GL_MAX_COLOR_ATTACHMENTS 0x8CDF #define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF @@ -2092,4 +2296,5 @@ #define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 #define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 +#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39 #define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC #define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E @@ -2101,6 +2306,7 @@ #define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 #define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 +#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB +#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF #define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD -#define GL_MAX_COMPUTE_LOCAL_INVOCATIONS 0x90EB #define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB #define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 @@ -2108,5 +2314,8 @@ #define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB #define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 +#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344 +#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345 #define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE +#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB #define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF #define GL_MAX_CONVOLUTION_HEIGHT 0x801B @@ -2119,10 +2328,15 @@ #define GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES 0x851C #define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR 0x826C #define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 #define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 #define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 +#define GL_MAX_DEBUG_LOGGED_MESSAGES_KHR 0x9144 #define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 #define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143 #define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 +#define GL_MAX_DEBUG_MESSAGE_LENGTH_KHR 0x9143 +#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV 0x90D1 +#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0 #define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 #define GL_MAX_DEPTH 0x8280 @@ -2131,4 +2345,5 @@ #define GL_MAX_DRAW_BUFFERS_ARB 0x8824 #define GL_MAX_DRAW_BUFFERS_ATI 0x8824 +#define GL_MAX_DRAW_BUFFERS_EXT 0x8824 #define GL_MAX_DRAW_BUFFERS_NV 0x8824 #define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC @@ -2192,4 +2407,5 @@ #define GL_MAX_INTEGER_SAMPLES 0x9110 #define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_MAX_LABEL_LENGTH_KHR 0x82E8 #define GL_MAX_LAYERS 0x8281 #define GL_MAX_LIGHTS 0x0D31 @@ -2249,6 +2465,6 @@ #define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 #define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 +#define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT 0x8905 #define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F #define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F #define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F @@ -2268,6 +2484,8 @@ #define GL_MAX_SAMPLES 0x8D57 #define GL_MAX_SAMPLES_ANGLE 0x8D57 +#define GL_MAX_SAMPLES_APPLE 0x8D57 #define GL_MAX_SAMPLES_EXT 0x8D57 #define GL_MAX_SAMPLES_IMG 0x9135 +#define GL_MAX_SAMPLES_NV 0x8D57 #define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 #define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 @@ -2279,6 +2497,9 @@ #define GL_MAX_SHININESS_NV 0x8504 #define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199 +#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199 #define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A +#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A #define GL_MAX_SPARSE_TEXTURE_SIZE_AMD 0x9198 +#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB 0x9198 #define GL_MAX_SPOT_EXPONENT_NV 0x8505 #define GL_MAX_SUBROUTINES 0x8DE7 @@ -2348,4 +2569,5 @@ #define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA #define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 +#define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 #define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 #define GL_MAX_VERTEX_HINT_PGI 0x1A22D @@ -2383,4 +2605,6 @@ #define GL_MINMAX_SINK_EXT 0x8030 #define GL_MINOR_VERSION 0x821C +#define GL_MINUS_CLAMPED_NV 0x92B3 +#define GL_MINUS_NV 0x929F #define GL_MIN_EXT 0x8007 #define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B @@ -2389,4 +2613,5 @@ #define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC #define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 +#define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT 0x8904 #define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 #define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E @@ -2396,4 +2621,5 @@ #define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 #define GL_MIN_SPARSE_LEVEL_AMD 0x919B +#define GL_MIN_SPARSE_LEVEL_ARB 0x919B #define GL_MIPMAP 0x8293 #define GL_MIRRORED_REPEAT 0x8370 @@ -2404,4 +2630,5 @@ #define GL_MIRROR_CLAMP_EXT 0x8742 #define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 +#define GL_MIRROR_CLAMP_TO_EDGE 0x8743 #define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 #define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 @@ -2410,4 +2637,7 @@ #define GL_MODELVIEW 0x1700 #define GL_MODELVIEW0_ARB 0x1700 +#define GL_MODELVIEW0_EXT 0x1700 +#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6 +#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3 #define GL_MODELVIEW10_ARB 0x872A #define GL_MODELVIEW11_ARB 0x872B @@ -2445,5 +2675,4 @@ #define GL_MODELVIEW9_ARB 0x8729 #define GL_MODELVIEW_MATRIX 0x0BA6 -#define GL_MODELVIEW_MATRIX1_EXT 0x8506 #define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D #define GL_MODELVIEW_PROJECTION_NV 0x8629 @@ -2459,4 +2688,5 @@ #define GL_MOV_ATI 0x8961 #define GL_MULT 0x0103 +#define GL_MULTIPLY_NV 0x9294 #define GL_MULTISAMPLE 0x809D #define GL_MULTISAMPLE_3DFX 0x86B2 @@ -2466,4 +2696,12 @@ #define GL_MULTISAMPLE_BIT_ARB 0x20000000 #define GL_MULTISAMPLE_BIT_EXT 0x20000000 +#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 +#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 +#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 +#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 +#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 +#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 +#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 +#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 #define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 #define GL_MULTISAMPLE_EXT 0x809D @@ -2471,5 +2709,4 @@ #define GL_MULTISAMPLE_SGIS 0x809D #define GL_MULTIVIEW_EXT 0x90F1 -#define GL_MULTI_HULLS_NV 0x908C #define GL_MUL_ATI 0x8964 #define GL_MVP_MATRIX_EXT 0x87E3 @@ -2495,7 +2732,9 @@ #define GL_NEGATIVE_Z_EXT 0x87DB #define GL_NEVER 0x0200 +#define GL_NEXT_BUFFER_NV -2 #define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 #define GL_NICEST 0x1102 #define GL_NONE 0 +#define GL_NONE_OES 0 #define GL_NOOP 0x1505 #define GL_NOR 0x1508 @@ -2527,4 +2766,5 @@ #define GL_NO_ERROR 0 #define GL_NO_RESET_NOTIFICATION_ARB 0x8261 +#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 #define GL_NUM_ACTIVE_VARIABLES 0x9304 #define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A @@ -2547,4 +2787,5 @@ #define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 #define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 +#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB 0x91A8 #define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 #define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A @@ -2581,5 +2822,8 @@ #define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 #define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 +#define GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3 +#define GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1 #define GL_OFFSET_TEXTURE_2D_NV 0x86E8 +#define GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2 #define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 #define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 @@ -2684,4 +2928,5 @@ #define GL_OUTPUT_VERTEX_EXT 0x879A #define GL_OUT_OF_MEMORY 0x0505 +#define GL_OVERLAY_NV 0x9296 #define GL_PACK_ALIGNMENT 0x0D05 #define GL_PACK_CMYK_HINT_EXT 0x800E @@ -2720,4 +2965,6 @@ #define GL_PALETTE8_RGBA8_OES 0x8B96 #define GL_PARALLEL_ARRAYS_INTEL 0x83F4 +#define GL_PARAMETER_BUFFER_ARB 0x80EE +#define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF #define GL_PARTIAL_SUCCESS_NV 0x902E #define GL_PASS_THROUGH_NV 0x86E6 @@ -2754,5 +3001,4 @@ #define GL_PATH_MITER_LIMIT_NV 0x907A #define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A -#define GL_PATH_SAMPLE_QUALITY_NV 0x9085 #define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD #define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE @@ -2761,8 +3007,6 @@ #define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9 #define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2 -#define GL_PATH_STROKE_BOUND_NV 0x9086 #define GL_PATH_STROKE_COVER_MODE_NV 0x9083 #define GL_PATH_STROKE_MASK_NV 0x9084 -#define GL_PATH_STROKE_OVERSAMPLE_COUNT_NV 0x9087 #define GL_PATH_STROKE_WIDTH_NV 0x9075 #define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D @@ -2779,4 +3023,5 @@ #define GL_PHONG_HINT_WIN 0x80EB #define GL_PHONG_WIN 0x80EA +#define GL_PINLIGHT_NV 0x92A8 #define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080 #define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 @@ -2847,4 +3092,8 @@ #define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF #define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC +#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2 +#define GL_PLUS_CLAMPED_NV 0x92B1 +#define GL_PLUS_DARKER_NV 0x9292 +#define GL_PLUS_NV 0x9291 #define GL_PN_TRIANGLES_ATI 0x87F0 #define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 @@ -2886,4 +3135,5 @@ #define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 #define GL_POINT_SPRITE_NV 0x8861 +#define GL_POINT_SPRITE_OES 0x8861 #define GL_POINT_SPRITE_R_MODE_NV 0x8863 #define GL_POINT_TOKEN 0x0701 @@ -2964,4 +3214,5 @@ #define GL_PRIMITIVE_RESTART 0x8F9D #define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 +#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 #define GL_PRIMITIVE_RESTART_INDEX 0x8F9E #define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 @@ -2972,4 +3223,5 @@ #define GL_PROGRAM_ATTRIBS_ARB 0x88AC #define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 +#define GL_PROGRAM_BINARY_ANGLE 0x93A6 #define GL_PROGRAM_BINARY_FORMATS 0x87FF #define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF @@ -2986,4 +3238,5 @@ #define GL_PROGRAM_INPUT 0x92E3 #define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 +#define GL_PROGRAM_KHR 0x82E2 #define GL_PROGRAM_LENGTH_ARB 0x8627 #define GL_PROGRAM_LENGTH_NV 0x8627 @@ -3025,6 +3278,4 @@ #define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E #define GL_PROJECTION_STACK_DEPTH 0x0BA4 -#define GL_PROJECTIVE_2D_NV 0x9093 -#define GL_PROJECTIVE_3D_NV 0x9095 #define GL_PROVOKING_VERTEX 0x8E4F #define GL_PROVOKING_VERTEX_EXT 0x8E4F @@ -3080,5 +3331,8 @@ #define GL_QUARTER_BIT_ATI 0x00000010 #define GL_QUERY 0x82E3 +#define GL_QUERY_BUFFER 0x9192 #define GL_QUERY_BUFFER_AMD 0x9192 +#define GL_QUERY_BUFFER_BARRIER_BIT 0x00008000 +#define GL_QUERY_BUFFER_BINDING 0x9193 #define GL_QUERY_BUFFER_BINDING_AMD 0x9193 #define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 @@ -3088,4 +3342,6 @@ #define GL_QUERY_COUNTER_BITS 0x8864 #define GL_QUERY_COUNTER_BITS_ARB 0x8864 +#define GL_QUERY_COUNTER_BITS_EXT 0x8864 +#define GL_QUERY_KHR 0x82E3 #define GL_QUERY_NO_WAIT 0x8E14 #define GL_QUERY_NO_WAIT_NV 0x8E14 @@ -3098,4 +3354,5 @@ #define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 #define GL_QUERY_RESULT_EXT 0x8866 +#define GL_QUERY_RESULT_NO_WAIT 0x9194 #define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194 #define GL_QUERY_WAIT 0x8E13 @@ -3119,4 +3376,5 @@ #define GL_R1UI_V3F_SUN 0x85C4 #define GL_R32F 0x822E +#define GL_R32F_EXT 0x822E #define GL_R32I 0x8235 #define GL_R32UI 0x8236 @@ -3136,7 +3394,12 @@ #define GL_READ_FRAMEBUFFER 0x8CA8 #define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 +#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 #define GL_READ_FRAMEBUFFER_BINDING 0x8CAA +#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA +#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA #define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA +#define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA #define GL_READ_FRAMEBUFFER_EXT 0x8CA8 +#define GL_READ_FRAMEBUFFER_NV 0x8CA8 #define GL_READ_ONLY 0x88B8 #define GL_READ_ONLY_ARB 0x88B8 @@ -3163,4 +3426,5 @@ #define GL_RED_MAX_CLAMP_INGR 0x8564 #define GL_RED_MIN_CLAMP_INGR 0x8560 +#define GL_RED_NV 0x1903 #define GL_RED_SCALE 0x0D14 #define GL_RED_SNORM 0x8F90 @@ -3259,6 +3523,8 @@ #define GL_RENDERBUFFER_SAMPLES 0x8CAB #define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB +#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB #define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB #define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 +#define GL_RENDERBUFFER_SAMPLES_NV 0x8CAB #define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 #define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 @@ -3294,4 +3560,5 @@ #define GL_RESCALE_NORMAL_EXT 0x803A #define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 +#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 #define GL_RESTART_PATH_NV 0xF0 #define GL_RESTART_SUN 0x0001 @@ -3306,4 +3573,5 @@ #define GL_RG16_SNORM 0x8F99 #define GL_RG32F 0x8230 +#define GL_RG32F_EXT 0x8230 #define GL_RG32I 0x823B #define GL_RG32UI 0x823C @@ -3334,4 +3602,5 @@ #define GL_RGB32F 0x8815 #define GL_RGB32F_ARB 0x8815 +#define GL_RGB32F_EXT 0x8815 #define GL_RGB32I 0x8D83 #define GL_RGB32I_EXT 0x8D83 @@ -3354,4 +3623,5 @@ #define GL_RGB8UI_EXT 0x8D7D #define GL_RGB8_EXT 0x8051 +#define GL_RGB8_OES 0x8051 #define GL_RGB8_SNORM 0x8F96 #define GL_RGB9_E5 0x8C3D @@ -3374,4 +3644,5 @@ #define GL_RGBA32F 0x8814 #define GL_RGBA32F_ARB 0x8814 +#define GL_RGBA32F_EXT 0x8814 #define GL_RGBA32I 0x8D82 #define GL_RGBA32I_EXT 0x8D82 @@ -3389,4 +3660,5 @@ #define GL_RGBA8UI_EXT 0x8D7C #define GL_RGBA8_EXT 0x8058 +#define GL_RGBA8_OES 0x8058 #define GL_RGBA8_SNORM 0x8F97 #define GL_RGBA_DXT5_S3TC 0x83A4 @@ -3412,4 +3684,5 @@ #define GL_RGB_INTEGER 0x8D98 #define GL_RGB_INTEGER_EXT 0x8D98 +#define GL_RGB_RAW_422_APPLE 0x8A51 #define GL_RGB_S3TC 0x83A0 #define GL_RGB_SCALE 0x8573 @@ -3438,4 +3711,5 @@ #define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 #define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 +#define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4 #define GL_SAMPLER_2D_MULTISAMPLE 0x9108 #define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B @@ -3462,5 +3736,7 @@ #define GL_SAMPLER_CUBE_SHADOW 0x8DC5 #define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 +#define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5 #define GL_SAMPLER_EXTERNAL_OES 0x8D66 +#define GL_SAMPLER_KHR 0x82E6 #define GL_SAMPLER_OBJECT_AMD 0x9155 #define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 @@ -3519,4 +3795,5 @@ #define GL_SCISSOR_TEST 0x0C11 #define GL_SCREEN_COORDINATES_REND 0x8490 +#define GL_SCREEN_NV 0x9295 #define GL_SECONDARY_COLOR_ARRAY 0x845E #define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 @@ -3564,9 +3841,10 @@ #define GL_SHADER_IMAGE_STORE 0x82A5 #define GL_SHADER_INCLUDE_ARB 0x8DAE +#define GL_SHADER_KHR 0x82E1 #define GL_SHADER_OBJECT_ARB 0x8B48 #define GL_SHADER_OBJECT_EXT 0x8B48 #define GL_SHADER_OPERATION_NV 0x86DF #define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000 +#define GL_SHADER_STORAGE_BARRIER_BIT 0x00002000 #define GL_SHADER_STORAGE_BLOCK 0x92E6 #define GL_SHADER_STORAGE_BUFFER 0x90D2 @@ -3613,4 +3891,8 @@ #define GL_SINGLE_COLOR 0x81F9 #define GL_SINGLE_COLOR_EXT 0x81F9 +#define GL_SKIP_COMPONENTS1_NV -6 +#define GL_SKIP_COMPONENTS2_NV -5 +#define GL_SKIP_COMPONENTS3_NV -4 +#define GL_SKIP_COMPONENTS4_NV -3 #define GL_SKIP_DECODE_EXT 0x8A4A #define GL_SKIP_MISSING_GLYPH_NV 0x90A9 @@ -3623,8 +3905,12 @@ #define GL_SLUMINANCE8_ALPHA8 0x8C45 #define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 +#define GL_SLUMINANCE8_ALPHA8_NV 0x8C45 #define GL_SLUMINANCE8_EXT 0x8C47 +#define GL_SLUMINANCE8_NV 0x8C47 #define GL_SLUMINANCE_ALPHA 0x8C44 #define GL_SLUMINANCE_ALPHA_EXT 0x8C44 +#define GL_SLUMINANCE_ALPHA_NV 0x8C44 #define GL_SLUMINANCE_EXT 0x8C46 +#define GL_SLUMINANCE_NV 0x8C46 #define GL_SMALL_CCW_ARC_TO_NV 0x12 #define GL_SMALL_CW_ARC_TO_NV 0x14 @@ -3636,4 +3922,5 @@ #define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 #define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E +#define GL_SOFTLIGHT_NV 0x929C #define GL_SOURCE0_ALPHA 0x8588 #define GL_SOURCE0_ALPHA_ARB 0x8588 @@ -3659,4 +3946,5 @@ #define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 #define GL_SPARE1_NV 0x852F +#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9 #define GL_SPECULAR 0x1202 #define GL_SPHERE_MAP 0x2402 @@ -3681,5 +3969,10 @@ #define GL_SRC_ALPHA 0x0302 #define GL_SRC_ALPHA_SATURATE 0x0308 +#define GL_SRC_ATOP_NV 0x928E #define GL_SRC_COLOR 0x0300 +#define GL_SRC_IN_NV 0x928A +#define GL_SRC_NV 0x9286 +#define GL_SRC_OUT_NV 0x928C +#define GL_SRC_OVER_NV 0x9288 #define GL_SRGB 0x8C40 #define GL_SRGB8 0x8C41 @@ -3687,4 +3980,5 @@ #define GL_SRGB8_ALPHA8_EXT 0x8C43 #define GL_SRGB8_EXT 0x8C41 +#define GL_SRGB8_NV 0x8C41 #define GL_SRGB_ALPHA 0x8C42 #define GL_SRGB_ALPHA_EXT 0x8C42 @@ -3694,5 +3988,7 @@ #define GL_SRGB_WRITE 0x8298 #define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_OVERFLOW_KHR 0x0503 #define GL_STACK_UNDERFLOW 0x0504 +#define GL_STACK_UNDERFLOW_KHR 0x0504 #define GL_STANDARD_FONT_NAME_NV 0x9072 #define GL_STATE_RESTORE 0x8BDC @@ -3704,4 +4000,5 @@ #define GL_STATIC_READ 0x88E5 #define GL_STATIC_READ_ARB 0x88E5 +#define GL_STATIC_VERTEX_ARRAY_IBM 103061 #define GL_STENCIL 0x1802 #define GL_STENCIL_ATTACHMENT 0x8D20 @@ -3722,4 +4019,12 @@ #define GL_STENCIL_BITS 0x0D57 #define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 +#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 +#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 +#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 +#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 +#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 +#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 +#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 #define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 #define GL_STENCIL_CLEAR_VALUE 0x0B91 @@ -3943,4 +4248,5 @@ #define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 #define GL_TEXTURE_BINDING_3D 0x806A +#define GL_TEXTURE_BINDING_3D_OES 0x806A #define GL_TEXTURE_BINDING_BUFFER 0x8C2C #define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C @@ -3964,7 +4270,9 @@ #define GL_TEXTURE_BORDER 0x1005 #define GL_TEXTURE_BORDER_COLOR 0x1004 +#define GL_TEXTURE_BORDER_COLOR_NV 0x1004 #define GL_TEXTURE_BORDER_VALUES_NV 0x871A #define GL_TEXTURE_BUFFER 0x8C2A #define GL_TEXTURE_BUFFER_ARB 0x8C2A +#define GL_TEXTURE_BUFFER_BINDING 0x8C2A #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D @@ -4085,4 +4393,5 @@ #define GL_TEXTURE_GATHER_SHADOW 0x82A3 #define GL_TEXTURE_GEN_MODE 0x2500 +#define GL_TEXTURE_GEN_MODE_OES 0x2500 #define GL_TEXTURE_GEN_Q 0x0C63 #define GL_TEXTURE_GEN_R 0x0C62 @@ -4102,4 +4411,5 @@ #define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 #define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F +#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F #define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF #define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED @@ -4134,7 +4444,9 @@ #define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A #define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D #define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D #define GL_TEXTURE_MAX_LOD 0x813B #define GL_TEXTURE_MAX_LOD_SGIS 0x813B +#define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF #define GL_TEXTURE_MIN_FILTER 0x2801 #define GL_TEXTURE_MIN_LOD 0x813A @@ -4167,4 +4479,5 @@ #define GL_TEXTURE_SHARED_SIZE 0x8C3F #define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F +#define GL_TEXTURE_SPARSE_ARB 0x91A6 #define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 #define GL_TEXTURE_STACK_DEPTH 0x0BA5 @@ -4206,7 +4519,8 @@ #define GL_TIMEOUT_EXPIRED 0x911B #define GL_TIMEOUT_EXPIRED_APPLE 0x911B -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull -#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull +#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF +#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFF #define GL_TIMESTAMP 0x8E28 +#define GL_TIMESTAMP_EXT 0x8E28 #define GL_TIME_ELAPSED 0x88BF #define GL_TIME_ELAPSED_EXT 0x88BF @@ -4233,4 +4547,5 @@ #define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 #define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 #define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 #define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F @@ -4238,8 +4553,10 @@ #define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F #define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B #define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F #define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F #define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F #define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 #define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 #define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 @@ -4249,4 +4566,5 @@ #define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 #define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 +#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C #define GL_TRANSFORM_FEEDBACK_NV 0x8E22 #define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23 @@ -4278,6 +4596,4 @@ #define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 #define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_PROJECTIVE_2D_NV 0x9097 -#define GL_TRANSPOSE_PROJECTIVE_3D_NV 0x9099 #define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 #define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 @@ -4296,5 +4612,5 @@ #define GL_TRUE 1 #define GL_TYPE 0x92FA -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 +#define GL_UNCORRELATED_NV 0x9282 #define GL_UNDEFINED_APPLE 0x8A1C #define GL_UNDEFINED_VERTEX 0x8260 @@ -4331,7 +4647,9 @@ #define GL_UNIFORM_TYPE 0x8A37 #define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 +#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 #define GL_UNPACK_ALIGNMENT 0x0CF5 #define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 #define GL_UNPACK_CMYK_HINT_EXT 0x800F +#define GL_UNPACK_COLORSPACE_CONVERSION_WEBGL 0x9243 #define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129 #define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128 @@ -4340,16 +4658,21 @@ #define GL_UNPACK_COMPRESSED_SIZE_SGIX 0x831A #define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 +#define GL_UNPACK_FLIP_Y_WEBGL 0x9240 #define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 #define GL_UNPACK_IMAGE_HEIGHT 0x806E #define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E #define GL_UNPACK_LSB_FIRST 0x0CF1 +#define GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL 0x9241 #define GL_UNPACK_RESAMPLE_OML 0x8985 #define GL_UNPACK_RESAMPLE_SGIX 0x842D #define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 #define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2 #define GL_UNPACK_SKIP_IMAGES 0x806D #define GL_UNPACK_SKIP_IMAGES_EXT 0x806D #define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4 #define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3 #define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 #define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 @@ -4369,4 +4692,5 @@ #define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 #define GL_UNSIGNED_INT64_AMD 0x8BC2 +#define GL_UNSIGNED_INT64_ARB 0x140F #define GL_UNSIGNED_INT64_NV 0x140F #define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 @@ -4450,5 +4774,4 @@ #define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 #define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_UNSIGNED_NEGATE_NV 0x853D #define GL_UNSIGNED_NORMALIZED 0x8C17 #define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 @@ -4463,4 +4786,5 @@ #define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 #define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 #define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 #define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 @@ -4498,14 +4822,7 @@ #define GL_VENDOR 0x1F00 #define GL_VERSION 0x1F02 -#define GL_VERSION_1_1 1 -#define GL_VERSION_1_2 1 -#define GL_VERSION_1_3 1 -#define GL_VERSION_1_4 1 -#define GL_VERSION_1_5 1 -#define GL_VERSION_2_0 1 -#define GL_VERSION_2_1 1 -#define GL_VERSION_3_0 1 -#define GL_VERSION_3_1 1 -#define GL_VERSION_3_2 1 +#define GL_VERSION_ES_CL_1_0 1 +#define GL_VERSION_ES_CL_1_1 1 +#define GL_VERSION_ES_CM_1_1 1 #define GL_VERTEX23_BIT_PGI 0x00000004 #define GL_VERTEX4_BIT_PGI 0x00000008 @@ -4514,8 +4831,10 @@ #define GL_VERTEX_ARRAY_BINDING 0x85B5 #define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 +#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 #define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 #define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 #define GL_VERTEX_ARRAY_COUNT_EXT 0x807D #define GL_VERTEX_ARRAY_EXT 0x8074 +#define GL_VERTEX_ARRAY_KHR 0x8074 #define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B #define GL_VERTEX_ARRAY_LIST_IBM 103070 @@ -4565,7 +4884,10 @@ #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT 0x88FE +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV 0x88FE #define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 #define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 #define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD +#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD #define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD #define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A @@ -4600,5 +4922,7 @@ #define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B #define GL_VERTEX_DATA_HINT_PGI 0x1A22A +#define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4 #define GL_VERTEX_ID_NV 0x8C7B +#define GL_VERTEX_ID_SWIZZLE_AMD 0x91A5 #define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF #define GL_VERTEX_PRECLIP_SGIX 0x83EE @@ -4607,5 +4931,5 @@ #define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8BB7 #define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8BB6 -#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8BB4 +#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8BB5 #define GL_VERTEX_PROGRAM_NV 0x8620 #define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 @@ -4687,7 +5011,12 @@ #define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF #define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 +#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB 0x91A7 #define GL_VIRTUAL_PAGE_SIZE_X_AMD 0x9195 +#define GL_VIRTUAL_PAGE_SIZE_X_ARB 0x9195 #define GL_VIRTUAL_PAGE_SIZE_Y_AMD 0x9196 +#define GL_VIRTUAL_PAGE_SIZE_Y_ARB 0x9196 #define GL_VIRTUAL_PAGE_SIZE_Z_AMD 0x9197 +#define GL_VIRTUAL_PAGE_SIZE_Z_ARB 0x9197 +#define GL_VIVIDLIGHT_NV 0x92A6 #define GL_VOLATILE_APPLE 0x8A1A #define GL_WAIT_FAILED 0x911D @@ -4719,4 +5048,5 @@ #define GL_W_EXT 0x87D8 #define GL_XOR 0x1506 +#define GL_XOR_NV 0x1506 #define GL_X_EXT 0x87D5 #define GL_YCBAYCR8A_4224_NV 0x9032 @@ -4750,5 +5080,5 @@ void GLAPIENTRY glBlendFunc(GLenum,GLenum); void GLAPIENTRY glCallList(GLuint); -void GLAPIENTRY glCallLists(GLsizei,GLenum,const GLvoid*); +void GLAPIENTRY glCallLists(GLsizei,GLenum,const void*); void GLAPIENTRY glClear(GLbitfield); void GLAPIENTRY glClearAccum(GLfloat,GLfloat,GLfloat,GLfloat); @@ -4792,5 +5122,5 @@ void GLAPIENTRY glColorMask(GLboolean,GLboolean,GLboolean,GLboolean); void GLAPIENTRY glColorMaterial(GLenum,GLenum); -void GLAPIENTRY glColorPointer(GLint,GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glColorPointer(GLint,GLenum,GLsizei,const void*); void GLAPIENTRY glCopyPixels(GLint,GLint,GLsizei,GLsizei,GLenum); void GLAPIENTRY glCopyTexImage1D(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLint); @@ -4809,8 +5139,8 @@ void GLAPIENTRY glDrawArrays(GLenum,GLint,GLsizei); void GLAPIENTRY glDrawBuffer(GLenum); -void GLAPIENTRY glDrawElements(GLenum,GLsizei,GLenum,const GLvoid*); -void GLAPIENTRY glDrawPixels(GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); +void GLAPIENTRY glDrawElements(GLenum,GLsizei,GLenum,const void*); +void GLAPIENTRY glDrawPixels(GLsizei,GLsizei,GLenum,GLenum,const void*); void GLAPIENTRY glEdgeFlag(GLboolean); -void GLAPIENTRY glEdgeFlagPointer(GLsizei,const GLvoid*); +void GLAPIENTRY glEdgeFlagPointer(GLsizei,const void*); void GLAPIENTRY glEdgeFlagv(const GLboolean*); void GLAPIENTRY glEnable(GLenum); @@ -4857,7 +5187,7 @@ void GLAPIENTRY glGetPixelMapuiv(GLenum,GLuint*); void GLAPIENTRY glGetPixelMapusv(GLenum,GLushort*); -void GLAPIENTRY glGetPointerv(GLenum,GLvoid**); +void GLAPIENTRY glGetPointerv(GLenum,void**); void GLAPIENTRY glGetPolygonStipple(GLubyte*); -const GLubyte * GLAPIENTRY glGetString(GLenum); +const GLubyte* GLAPIENTRY glGetString(GLenum); void GLAPIENTRY glGetTexEnvfv(GLenum,GLenum,GLfloat*); void GLAPIENTRY glGetTexEnviv(GLenum,GLenum,GLint*); @@ -4865,5 +5195,5 @@ void GLAPIENTRY glGetTexGenfv(GLenum,GLenum,GLfloat*); void GLAPIENTRY glGetTexGeniv(GLenum,GLenum,GLint*); -void GLAPIENTRY glGetTexImage(GLenum,GLint,GLenum,GLenum,GLvoid*); +void GLAPIENTRY glGetTexImage(GLenum,GLint,GLenum,GLenum,void*); void GLAPIENTRY glGetTexLevelParameterfv(GLenum,GLint,GLenum,GLfloat*); void GLAPIENTRY glGetTexLevelParameteriv(GLenum,GLint,GLenum,GLint*); @@ -4872,5 +5202,5 @@ void GLAPIENTRY glHint(GLenum,GLenum); void GLAPIENTRY glIndexMask(GLuint); -void GLAPIENTRY glIndexPointer(GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glIndexPointer(GLenum,GLsizei,const void*); void GLAPIENTRY glIndexd(GLdouble); void GLAPIENTRY glIndexdv(const GLdouble*); @@ -4884,5 +5214,5 @@ void GLAPIENTRY glIndexubv(const GLubyte*); void GLAPIENTRY glInitNames(void); -void GLAPIENTRY glInterleavedArrays(GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glInterleavedArrays(GLenum,GLsizei,const void*); GLboolean GLAPIENTRY glIsEnabled(GLenum); GLboolean GLAPIENTRY glIsList(GLuint); @@ -4930,10 +5260,10 @@ void GLAPIENTRY glNormal3s(GLshort,GLshort,GLshort); void GLAPIENTRY glNormal3sv(const GLshort*); -void GLAPIENTRY glNormalPointer(GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glNormalPointer(GLenum,GLsizei,const void*); void GLAPIENTRY glOrtho(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble); void GLAPIENTRY glPassThrough(GLfloat); -void GLAPIENTRY glPixelMapfv(GLenum,GLint,const GLfloat*); -void GLAPIENTRY glPixelMapuiv(GLenum,GLint,const GLuint*); -void GLAPIENTRY glPixelMapusv(GLenum,GLint,const GLushort*); +void GLAPIENTRY glPixelMapfv(GLenum,GLsizei,const GLfloat*); +void GLAPIENTRY glPixelMapuiv(GLenum,GLsizei,const GLuint*); +void GLAPIENTRY glPixelMapusv(GLenum,GLsizei,const GLushort*); void GLAPIENTRY glPixelStoref(GLenum,GLfloat); void GLAPIENTRY glPixelStorei(GLenum,GLint); @@ -4979,5 +5309,5 @@ void GLAPIENTRY glRasterPos4sv(const GLshort*); void GLAPIENTRY glReadBuffer(GLenum); -void GLAPIENTRY glReadPixels(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*); +void GLAPIENTRY glReadPixels(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,void*); void GLAPIENTRY glRectd(GLdouble,GLdouble,GLdouble,GLdouble); void GLAPIENTRY glRectdv(const GLdouble*,const GLdouble*); @@ -5031,5 +5361,5 @@ void GLAPIENTRY glTexCoord4s(GLshort,GLshort,GLshort,GLshort); void GLAPIENTRY glTexCoord4sv(const GLshort*); -void GLAPIENTRY glTexCoordPointer(GLint,GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glTexCoordPointer(GLint,GLenum,GLsizei,const void*); void GLAPIENTRY glTexEnvf(GLenum,GLenum,GLfloat); void GLAPIENTRY glTexEnvfv(GLenum,GLenum,const GLfloat*); @@ -5042,12 +5372,12 @@ void GLAPIENTRY glTexGeni(GLenum,GLenum,GLint); void GLAPIENTRY glTexGeniv(GLenum,GLenum,const GLint*); -void GLAPIENTRY glTexImage1D(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const GLvoid*); -void GLAPIENTRY glTexImage2D(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); +void GLAPIENTRY glTexImage1D(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const void*); +void GLAPIENTRY glTexImage2D(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); void GLAPIENTRY glTexParameterf(GLenum,GLenum,GLfloat); void GLAPIENTRY glTexParameterfv(GLenum,GLenum,const GLfloat*); void GLAPIENTRY glTexParameteri(GLenum,GLenum,GLint); void GLAPIENTRY glTexParameteriv(GLenum,GLenum,const GLint*); -void GLAPIENTRY glTexSubImage1D(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); -void GLAPIENTRY glTexSubImage2D(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); +void GLAPIENTRY glTexSubImage1D(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const void*); +void GLAPIENTRY glTexSubImage2D(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const void*); void GLAPIENTRY glTranslated(GLdouble,GLdouble,GLdouble); void GLAPIENTRY glTranslatef(GLfloat,GLfloat,GLfloat); @@ -5076,5 +5406,5 @@ void GLAPIENTRY glVertex4s(GLshort,GLshort,GLshort,GLshort); void GLAPIENTRY glVertex4sv(const GLshort*); -void GLAPIENTRY glVertexPointer(GLint,GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glVertexPointer(GLint,GLenum,GLsizei,const void*); void GLAPIENTRY glViewport(GLint,GLint,GLsizei,GLsizei); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wgl_driver.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wgl_driver.h (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wgl_driver.h (revision 51270) @@ -1,3 +1,3 @@ -/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */ +/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */ #ifndef __WINE_WGL_DRIVER_H @@ -8,5 +8,5 @@ #endif -#define WINE_WGL_DRIVER_VERSION 10 +#define WINE_WGL_DRIVER_VERSION 11 struct wgl_context; @@ -40,5 +40,5 @@ void (WINE_GLAPI *p_glBlendFunc)(GLenum,GLenum); void (WINE_GLAPI *p_glCallList)(GLuint); - void (WINE_GLAPI *p_glCallLists)(GLsizei,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glCallLists)(GLsizei,GLenum,const void*); void (WINE_GLAPI *p_glClear)(GLbitfield); void (WINE_GLAPI *p_glClearAccum)(GLfloat,GLfloat,GLfloat,GLfloat); @@ -82,5 +82,5 @@ void (WINE_GLAPI *p_glColorMask)(GLboolean,GLboolean,GLboolean,GLboolean); void (WINE_GLAPI *p_glColorMaterial)(GLenum,GLenum); - void (WINE_GLAPI *p_glColorPointer)(GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glColorPointer)(GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glCopyPixels)(GLint,GLint,GLsizei,GLsizei,GLenum); void (WINE_GLAPI *p_glCopyTexImage1D)(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLint); @@ -98,8 +98,8 @@ void (WINE_GLAPI *p_glDrawArrays)(GLenum,GLint,GLsizei); void (WINE_GLAPI *p_glDrawBuffer)(GLenum); - void (WINE_GLAPI *p_glDrawElements)(GLenum,GLsizei,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glDrawPixels)(GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glDrawElements)(GLenum,GLsizei,GLenum,const void*); + void (WINE_GLAPI *p_glDrawPixels)(GLsizei,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glEdgeFlag)(GLboolean); - void (WINE_GLAPI *p_glEdgeFlagPointer)(GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glEdgeFlagPointer)(GLsizei,const void*); void (WINE_GLAPI *p_glEdgeFlagv)(const GLboolean*); void (WINE_GLAPI *p_glEnable)(GLenum); @@ -146,7 +146,7 @@ void (WINE_GLAPI *p_glGetPixelMapuiv)(GLenum,GLuint*); void (WINE_GLAPI *p_glGetPixelMapusv)(GLenum,GLushort*); - void (WINE_GLAPI *p_glGetPointerv)(GLenum,GLvoid**); + void (WINE_GLAPI *p_glGetPointerv)(GLenum,void**); void (WINE_GLAPI *p_glGetPolygonStipple)(GLubyte*); - const GLubyte * (WINE_GLAPI *p_glGetString)(GLenum); + const GLubyte* (WINE_GLAPI *p_glGetString)(GLenum); void (WINE_GLAPI *p_glGetTexEnvfv)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTexEnviv)(GLenum,GLenum,GLint*); @@ -154,5 +154,5 @@ void (WINE_GLAPI *p_glGetTexGenfv)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTexGeniv)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetTexImage)(GLenum,GLint,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetTexImage)(GLenum,GLint,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetTexLevelParameterfv)(GLenum,GLint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTexLevelParameteriv)(GLenum,GLint,GLenum,GLint*); @@ -161,5 +161,5 @@ void (WINE_GLAPI *p_glHint)(GLenum,GLenum); void (WINE_GLAPI *p_glIndexMask)(GLuint); - void (WINE_GLAPI *p_glIndexPointer)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glIndexPointer)(GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glIndexd)(GLdouble); void (WINE_GLAPI *p_glIndexdv)(const GLdouble*); @@ -173,5 +173,5 @@ void (WINE_GLAPI *p_glIndexubv)(const GLubyte*); void (WINE_GLAPI *p_glInitNames)(void); - void (WINE_GLAPI *p_glInterleavedArrays)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glInterleavedArrays)(GLenum,GLsizei,const void*); GLboolean (WINE_GLAPI *p_glIsEnabled)(GLenum); GLboolean (WINE_GLAPI *p_glIsList)(GLuint); @@ -219,10 +219,10 @@ void (WINE_GLAPI *p_glNormal3s)(GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glNormal3sv)(const GLshort*); - void (WINE_GLAPI *p_glNormalPointer)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glNormalPointer)(GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glOrtho)(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glPassThrough)(GLfloat); - void (WINE_GLAPI *p_glPixelMapfv)(GLenum,GLint,const GLfloat*); - void (WINE_GLAPI *p_glPixelMapuiv)(GLenum,GLint,const GLuint*); - void (WINE_GLAPI *p_glPixelMapusv)(GLenum,GLint,const GLushort*); + void (WINE_GLAPI *p_glPixelMapfv)(GLenum,GLsizei,const GLfloat*); + void (WINE_GLAPI *p_glPixelMapuiv)(GLenum,GLsizei,const GLuint*); + void (WINE_GLAPI *p_glPixelMapusv)(GLenum,GLsizei,const GLushort*); void (WINE_GLAPI *p_glPixelStoref)(GLenum,GLfloat); void (WINE_GLAPI *p_glPixelStorei)(GLenum,GLint); @@ -268,5 +268,5 @@ void (WINE_GLAPI *p_glRasterPos4sv)(const GLshort*); void (WINE_GLAPI *p_glReadBuffer)(GLenum); - void (WINE_GLAPI *p_glReadPixels)(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glReadPixels)(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,void*); void (WINE_GLAPI *p_glRectd)(GLdouble,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glRectdv)(const GLdouble*,const GLdouble*); @@ -320,5 +320,5 @@ void (WINE_GLAPI *p_glTexCoord4s)(GLshort,GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glTexCoord4sv)(const GLshort*); - void (WINE_GLAPI *p_glTexCoordPointer)(GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glTexCoordPointer)(GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glTexEnvf)(GLenum,GLenum,GLfloat); void (WINE_GLAPI *p_glTexEnvfv)(GLenum,GLenum,const GLfloat*); @@ -331,12 +331,12 @@ void (WINE_GLAPI *p_glTexGeni)(GLenum,GLenum,GLint); void (WINE_GLAPI *p_glTexGeniv)(GLenum,GLenum,const GLint*); - void (WINE_GLAPI *p_glTexImage1D)(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexImage2D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTexImage1D)(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexImage2D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glTexParameterf)(GLenum,GLenum,GLfloat); void (WINE_GLAPI *p_glTexParameterfv)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glTexParameteri)(GLenum,GLenum,GLint); void (WINE_GLAPI *p_glTexParameteriv)(GLenum,GLenum,const GLint*); - void (WINE_GLAPI *p_glTexSubImage1D)(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexSubImage2D)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTexSubImage1D)(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexSubImage2D)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glTranslated)(GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glTranslatef)(GLfloat,GLfloat,GLfloat); @@ -365,5 +365,5 @@ void (WINE_GLAPI *p_glVertex4s)(GLshort,GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glVertex4sv)(const GLshort*); - void (WINE_GLAPI *p_glVertexPointer)(GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glVertexPointer)(GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glViewport)(GLint,GLint,GLsizei,GLsizei); } gl; @@ -371,4 +371,5 @@ struct { + void (WINE_GLAPI *p_glAccumxOES)(GLenum,GLfixed); void (WINE_GLAPI *p_glActiveProgramEXT)(GLuint); void (WINE_GLAPI *p_glActiveShaderProgram)(GLuint,GLuint); @@ -380,4 +381,5 @@ void (WINE_GLAPI *p_glAlphaFragmentOp2ATI)(GLenum,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glAlphaFragmentOp3ATI)(GLenum,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint); + void (WINE_GLAPI *p_glAlphaFuncxOES)(GLenum,GLfixed); void (WINE_GLAPI *p_glApplyTextureEXT)(GLenum); GLboolean (WINE_GLAPI *p_glAreProgramsResidentNV)(GLsizei,const GLuint*,GLboolean*); @@ -390,4 +392,5 @@ void (WINE_GLAPI *p_glBeginConditionalRender)(GLuint,GLenum); void (WINE_GLAPI *p_glBeginConditionalRenderNV)(GLuint,GLenum); + void (WINE_GLAPI *p_glBeginConditionalRenderNVX)(GLuint); void (WINE_GLAPI *p_glBeginFragmentShaderATI)(void); void (WINE_GLAPI *p_glBeginOcclusionQueryNV)(GLuint); @@ -413,4 +416,6 @@ void (WINE_GLAPI *p_glBindBufferRangeEXT)(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glBindBufferRangeNV)(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr); + void (WINE_GLAPI *p_glBindBuffersBase)(GLenum,GLuint,GLsizei,const GLuint*); + void (WINE_GLAPI *p_glBindBuffersRange)(GLenum,GLuint,GLsizei,const GLuint*,const GLintptr*,const GLsizeiptr*); void (WINE_GLAPI *p_glBindFragDataLocation)(GLuint,GLuint,const GLchar*); void (WINE_GLAPI *p_glBindFragDataLocationEXT)(GLuint,GLuint,const GLchar*); @@ -421,4 +426,5 @@ void (WINE_GLAPI *p_glBindImageTexture)(GLuint,GLuint,GLint,GLboolean,GLint,GLenum,GLenum); void (WINE_GLAPI *p_glBindImageTextureEXT)(GLuint,GLuint,GLint,GLboolean,GLint,GLenum,GLint); + void (WINE_GLAPI *p_glBindImageTextures)(GLuint,GLsizei,const GLuint*); GLuint (WINE_GLAPI *p_glBindLightParameterEXT)(GLenum,GLenum); GLuint (WINE_GLAPI *p_glBindMaterialParameterEXT)(GLenum,GLenum); @@ -431,7 +437,9 @@ void (WINE_GLAPI *p_glBindRenderbufferEXT)(GLenum,GLuint); void (WINE_GLAPI *p_glBindSampler)(GLuint,GLuint); + void (WINE_GLAPI *p_glBindSamplers)(GLuint,GLsizei,const GLuint*); GLuint (WINE_GLAPI *p_glBindTexGenParameterEXT)(GLenum,GLenum,GLenum); void (WINE_GLAPI *p_glBindTextureEXT)(GLenum,GLuint); GLuint (WINE_GLAPI *p_glBindTextureUnitParameterEXT)(GLenum,GLenum); + void (WINE_GLAPI *p_glBindTextures)(GLuint,GLsizei,const GLuint*); void (WINE_GLAPI *p_glBindTransformFeedback)(GLenum,GLuint); void (WINE_GLAPI *p_glBindTransformFeedbackNV)(GLenum,GLuint); @@ -439,4 +447,5 @@ void (WINE_GLAPI *p_glBindVertexArrayAPPLE)(GLuint); void (WINE_GLAPI *p_glBindVertexBuffer)(GLuint,GLuint,GLintptr,GLsizei); + void (WINE_GLAPI *p_glBindVertexBuffers)(GLuint,GLsizei,const GLuint*,const GLintptr*,const GLsizei*); void (WINE_GLAPI *p_glBindVertexShaderEXT)(GLuint); void (WINE_GLAPI *p_glBindVideoCaptureStreamBufferNV)(GLuint,GLuint,GLenum,GLintptrARB); @@ -452,7 +461,10 @@ void (WINE_GLAPI *p_glBinormal3sEXT)(GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glBinormal3svEXT)(const GLshort*); - void (WINE_GLAPI *p_glBinormalPointerEXT)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glBinormalPointerEXT)(GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glBitmapxOES)(GLsizei,GLsizei,GLfixed,GLfixed,GLfixed,GLfixed,const GLubyte*); + void (WINE_GLAPI *p_glBlendBarrierNV)(void); void (WINE_GLAPI *p_glBlendColor)(GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glBlendColorEXT)(GLfloat,GLfloat,GLfloat,GLfloat); + void (WINE_GLAPI *p_glBlendColorxOES)(GLfixed,GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glBlendEquation)(GLenum); void (WINE_GLAPI *p_glBlendEquationEXT)(GLenum); @@ -474,13 +486,15 @@ void (WINE_GLAPI *p_glBlendFunci)(GLuint,GLenum,GLenum); void (WINE_GLAPI *p_glBlendFunciARB)(GLuint,GLenum,GLenum); + void (WINE_GLAPI *p_glBlendParameteriNV)(GLenum,GLint); void (WINE_GLAPI *p_glBlitFramebuffer)(GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLbitfield,GLenum); void (WINE_GLAPI *p_glBlitFramebufferEXT)(GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLbitfield,GLenum); - void (WINE_GLAPI *p_glBufferAddressRangeNV)(GLenum,GLuint,UINT64,GLsizeiptr); - void (WINE_GLAPI *p_glBufferData)(GLenum,GLsizeiptr,const GLvoid*,GLenum); - void (WINE_GLAPI *p_glBufferDataARB)(GLenum,GLsizeiptrARB,const GLvoid*,GLenum); + void (WINE_GLAPI *p_glBufferAddressRangeNV)(GLenum,GLuint,GLuint64EXT,GLsizeiptr); + void (WINE_GLAPI *p_glBufferData)(GLenum,GLsizeiptr,const void*,GLenum); + void (WINE_GLAPI *p_glBufferDataARB)(GLenum,GLsizeiptrARB,const void*,GLenum); void (WINE_GLAPI *p_glBufferParameteriAPPLE)(GLenum,GLenum,GLint); GLuint (WINE_GLAPI *p_glBufferRegionEnabled)(void); - void (WINE_GLAPI *p_glBufferSubData)(GLenum,GLintptr,GLsizeiptr,const GLvoid*); - void (WINE_GLAPI *p_glBufferSubDataARB)(GLenum,GLintptrARB,GLsizeiptrARB,const GLvoid*); + void (WINE_GLAPI *p_glBufferStorage)(GLenum,GLsizeiptr,const void*,GLbitfield); + void (WINE_GLAPI *p_glBufferSubData)(GLenum,GLintptr,GLsizeiptr,const void*); + void (WINE_GLAPI *p_glBufferSubDataARB)(GLenum,GLintptrARB,GLsizeiptrARB,const void*); GLenum (WINE_GLAPI *p_glCheckFramebufferStatus)(GLenum); GLenum (WINE_GLAPI *p_glCheckFramebufferStatusEXT)(GLenum); @@ -488,4 +502,5 @@ void (WINE_GLAPI *p_glClampColor)(GLenum,GLenum); void (WINE_GLAPI *p_glClampColorARB)(GLenum,GLenum); + void (WINE_GLAPI *p_glClearAccumxOES)(GLfixed,GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glClearBufferData)(GLenum,GLenum,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glClearBufferSubData)(GLenum,GLenum,GLintptr,GLsizeiptr,GLenum,GLenum,const void*); @@ -496,17 +511,26 @@ void (WINE_GLAPI *p_glClearColorIiEXT)(GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glClearColorIuiEXT)(GLuint,GLuint,GLuint,GLuint); + void (WINE_GLAPI *p_glClearColorxOES)(GLfixed,GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glClearDepthdNV)(GLdouble); void (WINE_GLAPI *p_glClearDepthf)(GLfloat); + void (WINE_GLAPI *p_glClearDepthfOES)(GLclampf); + void (WINE_GLAPI *p_glClearDepthxOES)(GLfixed); void (WINE_GLAPI *p_glClearNamedBufferDataEXT)(GLuint,GLenum,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glClearNamedBufferSubDataEXT)(GLuint,GLenum,GLenum,GLenum,GLsizeiptr,GLsizeiptr,const void*); + void (WINE_GLAPI *p_glClearTexImage)(GLuint,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glClearTexSubImage)(GLuint,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glClientActiveTexture)(GLenum); void (WINE_GLAPI *p_glClientActiveTextureARB)(GLenum); void (WINE_GLAPI *p_glClientActiveVertexStreamATI)(GLenum); void (WINE_GLAPI *p_glClientAttribDefaultEXT)(GLbitfield); - GLenum (WINE_GLAPI *p_glClientWaitSync)(GLvoid*,GLbitfield,UINT64); + GLenum (WINE_GLAPI *p_glClientWaitSync)(GLsync,GLbitfield,GLuint64); + void (WINE_GLAPI *p_glClipPlanefOES)(GLenum,const GLfloat*); + void (WINE_GLAPI *p_glClipPlanexOES)(GLenum,const GLfixed*); void (WINE_GLAPI *p_glColor3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glColor3fVertex3fvSUN)(const GLfloat*,const GLfloat*); void (WINE_GLAPI *p_glColor3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glColor3hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glColor3xOES)(GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glColor3xvOES)(const GLfixed*); void (WINE_GLAPI *p_glColor4fNormal3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glColor4fNormal3fVertex3fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*); @@ -517,4 +541,6 @@ void (WINE_GLAPI *p_glColor4ubVertex3fSUN)(GLubyte,GLubyte,GLubyte,GLubyte,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glColor4ubVertex3fvSUN)(const GLubyte*,const GLfloat*); + void (WINE_GLAPI *p_glColor4xOES)(GLfixed,GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glColor4xvOES)(const GLfixed*); void (WINE_GLAPI *p_glColorFormatNV)(GLint,GLenum,GLsizei); void (WINE_GLAPI *p_glColorFragmentOp1ATI)(GLenum,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint); @@ -527,16 +553,16 @@ void (WINE_GLAPI *p_glColorP4ui)(GLenum,GLuint); void (WINE_GLAPI *p_glColorP4uiv)(GLenum,const GLuint*); - void (WINE_GLAPI *p_glColorPointerEXT)(GLint,GLenum,GLsizei,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glColorPointerListIBM)(GLint,GLenum,GLint,const GLvoid**,GLint); - void (WINE_GLAPI *p_glColorPointervINTEL)(GLint,GLenum,const GLvoid**); - void (WINE_GLAPI *p_glColorSubTable)(GLenum,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glColorSubTableEXT)(GLenum,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glColorTable)(GLenum,GLenum,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glColorTableEXT)(GLenum,GLenum,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glColorPointerEXT)(GLint,GLenum,GLsizei,GLsizei,const void*); + void (WINE_GLAPI *p_glColorPointerListIBM)(GLint,GLenum,GLint,const void**,GLint); + void (WINE_GLAPI *p_glColorPointervINTEL)(GLint,GLenum,const void**); + void (WINE_GLAPI *p_glColorSubTable)(GLenum,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glColorSubTableEXT)(GLenum,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glColorTable)(GLenum,GLenum,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glColorTableEXT)(GLenum,GLenum,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glColorTableParameterfv)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glColorTableParameterfvSGI)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glColorTableParameteriv)(GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glColorTableParameterivSGI)(GLenum,GLenum,const GLint*); - void (WINE_GLAPI *p_glColorTableSGI)(GLenum,GLenum,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glColorTableSGI)(GLenum,GLenum,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glCombinerInputNV)(GLenum,GLenum,GLenum,GLenum,GLenum,GLenum); void (WINE_GLAPI *p_glCombinerOutputNV)(GLenum,GLenum,GLenum,GLenum,GLenum,GLenum,GLenum,GLboolean,GLboolean,GLboolean); @@ -548,33 +574,33 @@ void (WINE_GLAPI *p_glCompileShader)(GLuint); void (WINE_GLAPI *p_glCompileShaderARB)(GLhandleARB); - void (WINE_GLAPI *p_glCompileShaderIncludeARB)(GLuint,GLsizei,const GLchar**,const GLint*); - void (WINE_GLAPI *p_glCompressedMultiTexImage1DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedMultiTexImage2DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedMultiTexImage3DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedMultiTexSubImage1DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedMultiTexSubImage2DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedMultiTexSubImage3DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexImage1D)(GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexImage1DARB)(GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexImage2D)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexImage2DARB)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexImage3D)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexImage3DARB)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexSubImage1D)(GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexSubImage1DARB)(GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexSubImage2D)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexSubImage2DARB)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTexSubImage3DARB)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTextureImage1DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTextureImage2DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTextureImage3DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTextureSubImage1DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTextureSubImage2DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glCompressedTextureSubImage3DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glConvolutionFilter1D)(GLenum,GLenum,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glConvolutionFilter1DEXT)(GLenum,GLenum,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glConvolutionFilter2D)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glConvolutionFilter2DEXT)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glCompileShaderIncludeARB)(GLuint,GLsizei,const GLchar*const*,const GLint*); + void (WINE_GLAPI *p_glCompressedMultiTexImage1DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedMultiTexImage2DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedMultiTexImage3DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedMultiTexSubImage1DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedMultiTexSubImage2DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedMultiTexSubImage3DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexImage1D)(GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexImage1DARB)(GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexImage2D)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexImage2DARB)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexImage3D)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexImage3DARB)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexSubImage1D)(GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexSubImage1DARB)(GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexSubImage2D)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexSubImage2DARB)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTexSubImage3DARB)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTextureImage1DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTextureImage2DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTextureImage3DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTextureSubImage1DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTextureSubImage2DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glCompressedTextureSubImage3DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glConvolutionFilter1D)(GLenum,GLenum,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glConvolutionFilter1DEXT)(GLenum,GLenum,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glConvolutionFilter2D)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glConvolutionFilter2DEXT)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glConvolutionParameterf)(GLenum,GLenum,GLfloat); void (WINE_GLAPI *p_glConvolutionParameterfEXT)(GLenum,GLenum,GLfloat); @@ -585,4 +611,6 @@ void (WINE_GLAPI *p_glConvolutionParameteriv)(GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glConvolutionParameterivEXT)(GLenum,GLenum,const GLint*); + void (WINE_GLAPI *p_glConvolutionParameterxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glConvolutionParameterxvOES)(GLenum,GLenum,const GLfixed*); void (WINE_GLAPI *p_glCopyBufferSubData)(GLenum,GLenum,GLintptr,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glCopyColorSubTable)(GLenum,GLsizei,GLint,GLint,GLsizei); @@ -613,7 +641,7 @@ void (WINE_GLAPI *p_glCopyTextureSubImage2DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei); void (WINE_GLAPI *p_glCopyTextureSubImage3DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei); - void (WINE_GLAPI *p_glCoverFillPathInstancedNV)(GLsizei,GLenum,const GLvoid*,GLuint,GLenum,GLenum,const GLfloat*); + void (WINE_GLAPI *p_glCoverFillPathInstancedNV)(GLsizei,GLenum,const void*,GLuint,GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glCoverFillPathNV)(GLuint,GLenum); - void (WINE_GLAPI *p_glCoverStrokePathInstancedNV)(GLsizei,GLenum,const GLvoid*,GLuint,GLenum,GLenum,const GLfloat*); + void (WINE_GLAPI *p_glCoverStrokePathInstancedNV)(GLsizei,GLenum,const void*,GLuint,GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glCoverStrokePathNV)(GLuint,GLenum); GLuint (WINE_GLAPI *p_glCreateProgram)(void); @@ -622,12 +650,12 @@ GLhandleARB (WINE_GLAPI *p_glCreateShaderObjectARB)(GLenum); GLuint (WINE_GLAPI *p_glCreateShaderProgramEXT)(GLenum,const GLchar*); - GLuint (WINE_GLAPI *p_glCreateShaderProgramv)(GLenum,GLsizei,const GLchar* const*); - GLvoid* (WINE_GLAPI *p_glCreateSyncFromCLeventARB)(void *,void *,GLbitfield); + GLuint (WINE_GLAPI *p_glCreateShaderProgramv)(GLenum,GLsizei,const GLchar*const*); + GLsync (WINE_GLAPI *p_glCreateSyncFromCLeventARB)(void*,void*,GLbitfield); void (WINE_GLAPI *p_glCullParameterdvEXT)(GLenum,GLdouble*); void (WINE_GLAPI *p_glCullParameterfvEXT)(GLenum,GLfloat*); void (WINE_GLAPI *p_glCurrentPaletteMatrixARB)(GLint); void (WINE_GLAPI *p_glDebugMessageCallback)(void *,const void*); - void (WINE_GLAPI *p_glDebugMessageCallbackAMD)(void *,GLvoid*); - void (WINE_GLAPI *p_glDebugMessageCallbackARB)(void *,const GLvoid*); + void (WINE_GLAPI *p_glDebugMessageCallbackAMD)(void *,void*); + void (WINE_GLAPI *p_glDebugMessageCallbackARB)(void *,const void*); void (WINE_GLAPI *p_glDebugMessageControl)(GLenum,GLenum,GLenum,GLsizei,const GLuint*,GLboolean); void (WINE_GLAPI *p_glDebugMessageControlARB)(GLenum,GLenum,GLenum,GLsizei,const GLuint*,GLboolean); @@ -665,5 +693,5 @@ void (WINE_GLAPI *p_glDeleteSamplers)(GLsizei,const GLuint*); void (WINE_GLAPI *p_glDeleteShader)(GLuint); - void (WINE_GLAPI *p_glDeleteSync)(GLvoid*); + void (WINE_GLAPI *p_glDeleteSync)(GLsync); void (WINE_GLAPI *p_glDeleteTexturesEXT)(GLsizei,const GLuint*); void (WINE_GLAPI *p_glDeleteTransformFeedbacks)(GLsizei,const GLuint*); @@ -678,10 +706,15 @@ void (WINE_GLAPI *p_glDepthRangedNV)(GLdouble,GLdouble); void (WINE_GLAPI *p_glDepthRangef)(GLfloat,GLfloat); + void (WINE_GLAPI *p_glDepthRangefOES)(GLclampf,GLclampf); + void (WINE_GLAPI *p_glDepthRangexOES)(GLfixed,GLfixed); void (WINE_GLAPI *p_glDetachObjectARB)(GLhandleARB,GLhandleARB); void (WINE_GLAPI *p_glDetachShader)(GLuint,GLuint); void (WINE_GLAPI *p_glDetailTexFuncSGIS)(GLenum,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glDisableClientStateIndexedEXT)(GLenum,GLuint); + void (WINE_GLAPI *p_glDisableClientStateiEXT)(GLenum,GLuint); void (WINE_GLAPI *p_glDisableIndexedEXT)(GLenum,GLuint); void (WINE_GLAPI *p_glDisableVariantClientStateEXT)(GLuint); + void (WINE_GLAPI *p_glDisableVertexArrayAttribEXT)(GLuint,GLuint); + void (WINE_GLAPI *p_glDisableVertexArrayEXT)(GLuint,GLenum); void (WINE_GLAPI *p_glDisableVertexAttribAPPLE)(GLuint,GLenum); void (WINE_GLAPI *p_glDisableVertexAttribArray)(GLuint); @@ -689,7 +722,8 @@ void (WINE_GLAPI *p_glDisablei)(GLenum,GLuint); void (WINE_GLAPI *p_glDispatchCompute)(GLuint,GLuint,GLuint); + void (WINE_GLAPI *p_glDispatchComputeGroupSizeARB)(GLuint,GLuint,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glDispatchComputeIndirect)(GLintptr); void (WINE_GLAPI *p_glDrawArraysEXT)(GLenum,GLint,GLsizei); - void (WINE_GLAPI *p_glDrawArraysIndirect)(GLenum,const GLvoid*); + void (WINE_GLAPI *p_glDrawArraysIndirect)(GLenum,const void*); void (WINE_GLAPI *p_glDrawArraysInstanced)(GLenum,GLint,GLsizei,GLsizei); void (WINE_GLAPI *p_glDrawArraysInstancedARB)(GLenum,GLint,GLsizei,GLsizei); @@ -702,18 +736,19 @@ void (WINE_GLAPI *p_glDrawElementArrayAPPLE)(GLenum,GLint,GLsizei); void (WINE_GLAPI *p_glDrawElementArrayATI)(GLenum,GLsizei); - void (WINE_GLAPI *p_glDrawElementsBaseVertex)(GLenum,GLsizei,GLenum,const GLvoid*,GLint); - void (WINE_GLAPI *p_glDrawElementsIndirect)(GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glDrawElementsInstanced)(GLenum,GLsizei,GLenum,const GLvoid*,GLsizei); - void (WINE_GLAPI *p_glDrawElementsInstancedARB)(GLenum,GLsizei,GLenum,const GLvoid*,GLsizei); + void (WINE_GLAPI *p_glDrawElementsBaseVertex)(GLenum,GLsizei,GLenum,const void*,GLint); + void (WINE_GLAPI *p_glDrawElementsIndirect)(GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glDrawElementsInstanced)(GLenum,GLsizei,GLenum,const void*,GLsizei); + void (WINE_GLAPI *p_glDrawElementsInstancedARB)(GLenum,GLsizei,GLenum,const void*,GLsizei); void (WINE_GLAPI *p_glDrawElementsInstancedBaseInstance)(GLenum,GLsizei,GLenum,const void*,GLsizei,GLuint); - void (WINE_GLAPI *p_glDrawElementsInstancedBaseVertex)(GLenum,GLsizei,GLenum,const GLvoid*,GLsizei,GLint); + void (WINE_GLAPI *p_glDrawElementsInstancedBaseVertex)(GLenum,GLsizei,GLenum,const void*,GLsizei,GLint); void (WINE_GLAPI *p_glDrawElementsInstancedBaseVertexBaseInstance)(GLenum,GLsizei,GLenum,const void*,GLsizei,GLint,GLuint); - void (WINE_GLAPI *p_glDrawElementsInstancedEXT)(GLenum,GLsizei,GLenum,const GLvoid*,GLsizei); + void (WINE_GLAPI *p_glDrawElementsInstancedEXT)(GLenum,GLsizei,GLenum,const void*,GLsizei); void (WINE_GLAPI *p_glDrawMeshArraysSUN)(GLenum,GLint,GLsizei,GLsizei); void (WINE_GLAPI *p_glDrawRangeElementArrayAPPLE)(GLenum,GLuint,GLuint,GLint,GLsizei); void (WINE_GLAPI *p_glDrawRangeElementArrayATI)(GLenum,GLuint,GLuint,GLsizei); - void (WINE_GLAPI *p_glDrawRangeElements)(GLenum,GLuint,GLuint,GLsizei,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glDrawRangeElementsBaseVertex)(GLenum,GLuint,GLuint,GLsizei,GLenum,const GLvoid*,GLint); - void (WINE_GLAPI *p_glDrawRangeElementsEXT)(GLenum,GLuint,GLuint,GLsizei,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glDrawRangeElements)(GLenum,GLuint,GLuint,GLsizei,GLenum,const void*); + void (WINE_GLAPI *p_glDrawRangeElementsBaseVertex)(GLenum,GLuint,GLuint,GLsizei,GLenum,const void*,GLint); + void (WINE_GLAPI *p_glDrawRangeElementsEXT)(GLenum,GLuint,GLuint,GLsizei,GLenum,const void*); + void (WINE_GLAPI *p_glDrawTextureNV)(GLuint,GLuint,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glDrawTransformFeedback)(GLenum,GLuint); void (WINE_GLAPI *p_glDrawTransformFeedbackInstanced)(GLenum,GLuint,GLsizei); @@ -724,9 +759,12 @@ void (WINE_GLAPI *p_glEdgeFlagPointerEXT)(GLsizei,GLsizei,const GLboolean*); void (WINE_GLAPI *p_glEdgeFlagPointerListIBM)(GLint,const GLboolean**,GLint); - void (WINE_GLAPI *p_glElementPointerAPPLE)(GLenum,const GLvoid*); - void (WINE_GLAPI *p_glElementPointerATI)(GLenum,const GLvoid*); + void (WINE_GLAPI *p_glElementPointerAPPLE)(GLenum,const void*); + void (WINE_GLAPI *p_glElementPointerATI)(GLenum,const void*); void (WINE_GLAPI *p_glEnableClientStateIndexedEXT)(GLenum,GLuint); + void (WINE_GLAPI *p_glEnableClientStateiEXT)(GLenum,GLuint); void (WINE_GLAPI *p_glEnableIndexedEXT)(GLenum,GLuint); void (WINE_GLAPI *p_glEnableVariantClientStateEXT)(GLuint); + void (WINE_GLAPI *p_glEnableVertexArrayAttribEXT)(GLuint,GLuint); + void (WINE_GLAPI *p_glEnableVertexArrayEXT)(GLuint,GLenum); void (WINE_GLAPI *p_glEnableVertexAttribAPPLE)(GLuint,GLenum); void (WINE_GLAPI *p_glEnableVertexAttribArray)(GLuint); @@ -735,4 +773,5 @@ void (WINE_GLAPI *p_glEndConditionalRender)(void); void (WINE_GLAPI *p_glEndConditionalRenderNV)(void); + void (WINE_GLAPI *p_glEndConditionalRenderNVX)(void); void (WINE_GLAPI *p_glEndFragmentShaderATI)(void); void (WINE_GLAPI *p_glEndOcclusionQueryNV)(void); @@ -746,8 +785,13 @@ void (WINE_GLAPI *p_glEndVertexShaderEXT)(void); void (WINE_GLAPI *p_glEndVideoCaptureNV)(GLuint); + void (WINE_GLAPI *p_glEvalCoord1xOES)(GLfixed); + void (WINE_GLAPI *p_glEvalCoord1xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glEvalCoord2xOES)(GLfixed,GLfixed); + void (WINE_GLAPI *p_glEvalCoord2xvOES)(const GLfixed*); void (WINE_GLAPI *p_glEvalMapsNV)(GLenum,GLenum); void (WINE_GLAPI *p_glExecuteProgramNV)(GLenum,GLuint,const GLfloat*); void (WINE_GLAPI *p_glExtractComponentEXT)(GLuint,GLuint,GLuint); - GLvoid* (WINE_GLAPI *p_glFenceSync)(GLenum,GLbitfield); + void (WINE_GLAPI *p_glFeedbackBufferxOES)(GLsizei,GLenum,const GLfixed*); + GLsync (WINE_GLAPI *p_glFenceSync)(GLenum,GLbitfield); void (WINE_GLAPI *p_glFinalCombinerInputNV)(GLenum,GLenum,GLenum,GLenum); GLint (WINE_GLAPI *p_glFinishAsyncSGIX)(GLuint*); @@ -761,10 +805,11 @@ void (WINE_GLAPI *p_glFlushPixelDataRangeNV)(GLenum); void (WINE_GLAPI *p_glFlushRasterSGIX)(void); - void (WINE_GLAPI *p_glFlushVertexArrayRangeAPPLE)(GLsizei,GLvoid*); + void (WINE_GLAPI *p_glFlushStaticDataIBM)(GLenum); + void (WINE_GLAPI *p_glFlushVertexArrayRangeAPPLE)(GLsizei,void*); void (WINE_GLAPI *p_glFlushVertexArrayRangeNV)(void); void (WINE_GLAPI *p_glFogCoordFormatNV)(GLenum,GLsizei); - void (WINE_GLAPI *p_glFogCoordPointer)(GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glFogCoordPointerEXT)(GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glFogCoordPointerListIBM)(GLenum,GLint,const GLvoid**,GLint); + void (WINE_GLAPI *p_glFogCoordPointer)(GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glFogCoordPointerEXT)(GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glFogCoordPointerListIBM)(GLenum,GLint,const void**,GLint); void (WINE_GLAPI *p_glFogCoordd)(GLdouble); void (WINE_GLAPI *p_glFogCoorddEXT)(GLdouble); @@ -778,4 +823,6 @@ void (WINE_GLAPI *p_glFogCoordhvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glFogFuncSGIS)(GLsizei,const GLfloat*); + void (WINE_GLAPI *p_glFogxOES)(GLenum,GLfixed); + void (WINE_GLAPI *p_glFogxvOES)(GLenum,const GLfixed*); void (WINE_GLAPI *p_glFragmentColorMaterialSGIX)(GLenum,GLenum); void (WINE_GLAPI *p_glFragmentLightModelfSGIX)(GLenum,GLfloat); @@ -814,4 +861,6 @@ void (WINE_GLAPI *p_glFramebufferTextureLayerEXT)(GLenum,GLenum,GLuint,GLint,GLint); void (WINE_GLAPI *p_glFreeObjectBufferATI)(GLuint); + void (WINE_GLAPI *p_glFrustumfOES)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); + void (WINE_GLAPI *p_glFrustumxOES)(GLfixed,GLfixed,GLfixed,GLfixed,GLfixed,GLfixed); GLuint (WINE_GLAPI *p_glGenAsyncMarkersSGIX)(GLsizei); void (WINE_GLAPI *p_glGenBuffers)(GLsizei,GLuint*); @@ -866,14 +915,16 @@ void (WINE_GLAPI *p_glGetBooleanIndexedvEXT)(GLenum,GLuint,GLboolean*); void (WINE_GLAPI *p_glGetBooleani_v)(GLenum,GLuint,GLboolean*); - void (WINE_GLAPI *p_glGetBufferParameteri64v)(GLenum,GLenum,INT64*); + void (WINE_GLAPI *p_glGetBufferParameteri64v)(GLenum,GLenum,GLint64*); void (WINE_GLAPI *p_glGetBufferParameteriv)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetBufferParameterivARB)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetBufferParameterui64vNV)(GLenum,GLenum,UINT64*); - void (WINE_GLAPI *p_glGetBufferPointerv)(GLenum,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetBufferPointervARB)(GLenum,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetBufferSubData)(GLenum,GLintptr,GLsizeiptr,GLvoid*); - void (WINE_GLAPI *p_glGetBufferSubDataARB)(GLenum,GLintptrARB,GLsizeiptrARB,GLvoid*); - void (WINE_GLAPI *p_glGetColorTable)(GLenum,GLenum,GLenum,GLvoid*); - void (WINE_GLAPI *p_glGetColorTableEXT)(GLenum,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetBufferParameterui64vNV)(GLenum,GLenum,GLuint64EXT*); + void (WINE_GLAPI *p_glGetBufferPointerv)(GLenum,GLenum,void**); + void (WINE_GLAPI *p_glGetBufferPointervARB)(GLenum,GLenum,void**); + void (WINE_GLAPI *p_glGetBufferSubData)(GLenum,GLintptr,GLsizeiptr,void*); + void (WINE_GLAPI *p_glGetBufferSubDataARB)(GLenum,GLintptrARB,GLsizeiptrARB,void*); + void (WINE_GLAPI *p_glGetClipPlanefOES)(GLenum,GLfloat*); + void (WINE_GLAPI *p_glGetClipPlanexOES)(GLenum,GLfixed*); + void (WINE_GLAPI *p_glGetColorTable)(GLenum,GLenum,GLenum,void*); + void (WINE_GLAPI *p_glGetColorTableEXT)(GLenum,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetColorTableParameterfv)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetColorTableParameterfvEXT)(GLenum,GLenum,GLfloat*); @@ -882,5 +933,5 @@ void (WINE_GLAPI *p_glGetColorTableParameterivEXT)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetColorTableParameterivSGI)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetColorTableSGI)(GLenum,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetColorTableSGI)(GLenum,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetCombinerInputParameterfvNV)(GLenum,GLenum,GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetCombinerInputParameterivNV)(GLenum,GLenum,GLenum,GLenum,GLint*); @@ -888,14 +939,15 @@ void (WINE_GLAPI *p_glGetCombinerOutputParameterivNV)(GLenum,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetCombinerStageParameterfvNV)(GLenum,GLenum,GLfloat*); - void (WINE_GLAPI *p_glGetCompressedMultiTexImageEXT)(GLenum,GLenum,GLint,GLvoid*); - void (WINE_GLAPI *p_glGetCompressedTexImage)(GLenum,GLint,GLvoid*); - void (WINE_GLAPI *p_glGetCompressedTexImageARB)(GLenum,GLint,GLvoid*); - void (WINE_GLAPI *p_glGetCompressedTextureImageEXT)(GLuint,GLenum,GLint,GLvoid*); - void (WINE_GLAPI *p_glGetConvolutionFilter)(GLenum,GLenum,GLenum,GLvoid*); - void (WINE_GLAPI *p_glGetConvolutionFilterEXT)(GLenum,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetCompressedMultiTexImageEXT)(GLenum,GLenum,GLint,void*); + void (WINE_GLAPI *p_glGetCompressedTexImage)(GLenum,GLint,void*); + void (WINE_GLAPI *p_glGetCompressedTexImageARB)(GLenum,GLint,void*); + void (WINE_GLAPI *p_glGetCompressedTextureImageEXT)(GLuint,GLenum,GLint,void*); + void (WINE_GLAPI *p_glGetConvolutionFilter)(GLenum,GLenum,GLenum,void*); + void (WINE_GLAPI *p_glGetConvolutionFilterEXT)(GLenum,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetConvolutionParameterfv)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetConvolutionParameterfvEXT)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetConvolutionParameteriv)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetConvolutionParameterivEXT)(GLenum,GLenum,GLint*); + void (WINE_GLAPI *p_glGetConvolutionParameterxvOES)(GLenum,GLenum,GLfixed*); GLuint (WINE_GLAPI *p_glGetDebugMessageLog)(GLuint,GLsizei,GLenum*,GLenum*,GLuint*,GLenum*,GLsizei*,GLchar*); GLuint (WINE_GLAPI *p_glGetDebugMessageLogAMD)(GLuint,GLsizei,GLenum*,GLuint*,GLuint*,GLsizei*,GLchar*); @@ -904,9 +956,12 @@ void (WINE_GLAPI *p_glGetDoubleIndexedvEXT)(GLenum,GLuint,GLdouble*); void (WINE_GLAPI *p_glGetDoublei_v)(GLenum,GLuint,GLdouble*); + void (WINE_GLAPI *p_glGetDoublei_vEXT)(GLenum,GLuint,GLdouble*); void (WINE_GLAPI *p_glGetFenceivNV)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetFinalCombinerInputParameterfvNV)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetFinalCombinerInputParameterivNV)(GLenum,GLenum,GLint*); + void (WINE_GLAPI *p_glGetFixedvOES)(GLenum,GLfixed*); void (WINE_GLAPI *p_glGetFloatIndexedvEXT)(GLenum,GLuint,GLfloat*); void (WINE_GLAPI *p_glGetFloati_v)(GLenum,GLuint,GLfloat*); + void (WINE_GLAPI *p_glGetFloati_vEXT)(GLenum,GLuint,GLfloat*); void (WINE_GLAPI *p_glGetFogFuncSGIS)(GLfloat*); GLint (WINE_GLAPI *p_glGetFragDataIndex)(GLuint,const GLchar*); @@ -923,26 +978,29 @@ GLenum (WINE_GLAPI *p_glGetGraphicsResetStatusARB)(void); GLhandleARB (WINE_GLAPI *p_glGetHandleARB)(GLenum); - void (WINE_GLAPI *p_glGetHistogram)(GLenum,GLboolean,GLenum,GLenum,GLvoid*); - void (WINE_GLAPI *p_glGetHistogramEXT)(GLenum,GLboolean,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetHistogram)(GLenum,GLboolean,GLenum,GLenum,void*); + void (WINE_GLAPI *p_glGetHistogramEXT)(GLenum,GLboolean,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetHistogramParameterfv)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetHistogramParameterfvEXT)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetHistogramParameteriv)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetHistogramParameterivEXT)(GLenum,GLenum,GLint*); - UINT64 (WINE_GLAPI *p_glGetImageHandleNV)(GLuint,GLint,GLboolean,GLint,GLenum); + void (WINE_GLAPI *p_glGetHistogramParameterxvOES)(GLenum,GLenum,GLfixed*); + GLuint64 (WINE_GLAPI *p_glGetImageHandleARB)(GLuint,GLint,GLboolean,GLint,GLenum); + GLuint64 (WINE_GLAPI *p_glGetImageHandleNV)(GLuint,GLint,GLboolean,GLint,GLenum); void (WINE_GLAPI *p_glGetImageTransformParameterfvHP)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetImageTransformParameterivHP)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetInfoLogARB)(GLhandleARB,GLsizei,GLsizei*,GLcharARB*); GLint (WINE_GLAPI *p_glGetInstrumentsSGIX)(void); - void (WINE_GLAPI *p_glGetInteger64i_v)(GLenum,GLuint,INT64*); - void (WINE_GLAPI *p_glGetInteger64v)(GLenum,INT64*); + void (WINE_GLAPI *p_glGetInteger64i_v)(GLenum,GLuint,GLint64*); + void (WINE_GLAPI *p_glGetInteger64v)(GLenum,GLint64*); void (WINE_GLAPI *p_glGetIntegerIndexedvEXT)(GLenum,GLuint,GLint*); void (WINE_GLAPI *p_glGetIntegeri_v)(GLenum,GLuint,GLint*); - void (WINE_GLAPI *p_glGetIntegerui64i_vNV)(GLenum,GLuint,UINT64*); - void (WINE_GLAPI *p_glGetIntegerui64vNV)(GLenum,UINT64*); - void (WINE_GLAPI *p_glGetInternalformati64v)(GLenum,GLenum,GLenum,GLsizei,INT64*); + void (WINE_GLAPI *p_glGetIntegerui64i_vNV)(GLenum,GLuint,GLuint64EXT*); + void (WINE_GLAPI *p_glGetIntegerui64vNV)(GLenum,GLuint64EXT*); + void (WINE_GLAPI *p_glGetInternalformati64v)(GLenum,GLenum,GLenum,GLsizei,GLint64*); void (WINE_GLAPI *p_glGetInternalformativ)(GLenum,GLenum,GLenum,GLsizei,GLint*); void (WINE_GLAPI *p_glGetInvariantBooleanvEXT)(GLuint,GLenum,GLboolean*); void (WINE_GLAPI *p_glGetInvariantFloatvEXT)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetInvariantIntegervEXT)(GLuint,GLenum,GLint*); + void (WINE_GLAPI *p_glGetLightxOES)(GLenum,GLenum,GLfixed*); void (WINE_GLAPI *p_glGetListParameterfvSGIX)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetListParameterivSGIX)(GLuint,GLenum,GLint*); @@ -952,9 +1010,11 @@ void (WINE_GLAPI *p_glGetMapAttribParameterfvNV)(GLenum,GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetMapAttribParameterivNV)(GLenum,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetMapControlPointsNV)(GLenum,GLuint,GLenum,GLsizei,GLsizei,GLboolean,GLvoid*); + void (WINE_GLAPI *p_glGetMapControlPointsNV)(GLenum,GLuint,GLenum,GLsizei,GLsizei,GLboolean,void*); void (WINE_GLAPI *p_glGetMapParameterfvNV)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetMapParameterivNV)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetMinmax)(GLenum,GLboolean,GLenum,GLenum,GLvoid*); - void (WINE_GLAPI *p_glGetMinmaxEXT)(GLenum,GLboolean,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetMapxvOES)(GLenum,GLenum,GLfixed*); + void (WINE_GLAPI *p_glGetMaterialxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glGetMinmax)(GLenum,GLboolean,GLenum,GLenum,void*); + void (WINE_GLAPI *p_glGetMinmaxEXT)(GLenum,GLboolean,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetMinmaxParameterfv)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetMinmaxParameterfvEXT)(GLenum,GLenum,GLfloat*); @@ -966,5 +1026,5 @@ void (WINE_GLAPI *p_glGetMultiTexGenfvEXT)(GLenum,GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetMultiTexGenivEXT)(GLenum,GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetMultiTexImageEXT)(GLenum,GLenum,GLint,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetMultiTexImageEXT)(GLenum,GLenum,GLint,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetMultiTexLevelParameterfvEXT)(GLenum,GLenum,GLint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetMultiTexLevelParameterivEXT)(GLenum,GLenum,GLint,GLenum,GLint*); @@ -976,7 +1036,7 @@ void (WINE_GLAPI *p_glGetMultisamplefvNV)(GLenum,GLuint,GLfloat*); void (WINE_GLAPI *p_glGetNamedBufferParameterivEXT)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetNamedBufferParameterui64vNV)(GLuint,GLenum,UINT64*); - void (WINE_GLAPI *p_glGetNamedBufferPointervEXT)(GLuint,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetNamedBufferSubDataEXT)(GLuint,GLintptr,GLsizeiptr,GLvoid*); + void (WINE_GLAPI *p_glGetNamedBufferParameterui64vNV)(GLuint,GLenum,GLuint64EXT*); + void (WINE_GLAPI *p_glGetNamedBufferPointervEXT)(GLuint,GLenum,void**); + void (WINE_GLAPI *p_glGetNamedBufferSubDataEXT)(GLuint,GLintptr,GLsizeiptr,void*); void (WINE_GLAPI *p_glGetNamedFramebufferAttachmentParameterivEXT)(GLuint,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetNamedFramebufferParameterivEXT)(GLuint,GLenum,GLint*); @@ -985,5 +1045,5 @@ void (WINE_GLAPI *p_glGetNamedProgramLocalParameterdvEXT)(GLuint,GLenum,GLuint,GLdouble*); void (WINE_GLAPI *p_glGetNamedProgramLocalParameterfvEXT)(GLuint,GLenum,GLuint,GLfloat*); - void (WINE_GLAPI *p_glGetNamedProgramStringEXT)(GLuint,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetNamedProgramStringEXT)(GLuint,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetNamedProgramivEXT)(GLuint,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetNamedRenderbufferParameterivEXT)(GLuint,GLenum,GLint*); @@ -993,4 +1053,5 @@ void (WINE_GLAPI *p_glGetObjectBufferivATI)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetObjectLabel)(GLenum,GLuint,GLsizei,GLsizei*,GLchar*); + void (WINE_GLAPI *p_glGetObjectLabelEXT)(GLenum,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetObjectParameterfvARB)(GLhandleARB,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetObjectParameterivAPPLE)(GLenum,GLuint,GLenum,GLint*); @@ -1006,23 +1067,25 @@ GLfloat (WINE_GLAPI *p_glGetPathLengthNV)(GLuint,GLsizei,GLsizei); void (WINE_GLAPI *p_glGetPathMetricRangeNV)(GLbitfield,GLuint,GLsizei,GLsizei,GLfloat*); - void (WINE_GLAPI *p_glGetPathMetricsNV)(GLbitfield,GLsizei,GLenum,const GLvoid*,GLuint,GLsizei,GLfloat*); + void (WINE_GLAPI *p_glGetPathMetricsNV)(GLbitfield,GLsizei,GLenum,const void*,GLuint,GLsizei,GLfloat*); void (WINE_GLAPI *p_glGetPathParameterfvNV)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetPathParameterivNV)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetPathSpacingNV)(GLenum,GLsizei,GLenum,const GLvoid*,GLuint,GLfloat,GLfloat,GLenum,GLfloat*); + void (WINE_GLAPI *p_glGetPathSpacingNV)(GLenum,GLsizei,GLenum,const void*,GLuint,GLfloat,GLfloat,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetPathTexGenfvNV)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetPathTexGenivNV)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetPerfMonitorCounterDataAMD)(GLuint,GLenum,GLsizei,GLuint*,GLint*); - void (WINE_GLAPI *p_glGetPerfMonitorCounterInfoAMD)(GLuint,GLuint,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetPerfMonitorCounterInfoAMD)(GLuint,GLuint,GLenum,void*); void (WINE_GLAPI *p_glGetPerfMonitorCounterStringAMD)(GLuint,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetPerfMonitorCountersAMD)(GLuint,GLint*,GLint*,GLsizei,GLuint*); void (WINE_GLAPI *p_glGetPerfMonitorGroupStringAMD)(GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetPerfMonitorGroupsAMD)(GLint*,GLsizei,GLuint*); + void (WINE_GLAPI *p_glGetPixelMapxv)(GLenum,GLint,GLfixed*); void (WINE_GLAPI *p_glGetPixelTexGenParameterfvSGIS)(GLenum,GLfloat*); void (WINE_GLAPI *p_glGetPixelTexGenParameterivSGIS)(GLenum,GLint*); void (WINE_GLAPI *p_glGetPixelTransformParameterfvEXT)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetPixelTransformParameterivEXT)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetPointerIndexedvEXT)(GLenum,GLuint,GLvoid**); - void (WINE_GLAPI *p_glGetPointervEXT)(GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetProgramBinary)(GLuint,GLsizei,GLsizei*,GLenum*,GLvoid*); + void (WINE_GLAPI *p_glGetPointerIndexedvEXT)(GLenum,GLuint,void**); + void (WINE_GLAPI *p_glGetPointeri_vEXT)(GLenum,GLuint,void**); + void (WINE_GLAPI *p_glGetPointervEXT)(GLenum,void**); + void (WINE_GLAPI *p_glGetProgramBinary)(GLuint,GLsizei,GLsizei*,GLenum*,void*); void (WINE_GLAPI *p_glGetProgramEnvParameterIivNV)(GLenum,GLuint,GLint*); void (WINE_GLAPI *p_glGetProgramEnvParameterIuivNV)(GLenum,GLuint,GLuint*); @@ -1047,5 +1110,5 @@ void (WINE_GLAPI *p_glGetProgramResourceiv)(GLuint,GLenum,GLuint,GLsizei,const GLenum*,GLsizei,GLsizei*,GLint*); void (WINE_GLAPI *p_glGetProgramStageiv)(GLuint,GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetProgramStringARB)(GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetProgramStringARB)(GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetProgramStringNV)(GLuint,GLenum,GLubyte*); void (WINE_GLAPI *p_glGetProgramSubroutineParameteruivNV)(GLenum,GLuint,GLuint*); @@ -1054,10 +1117,10 @@ void (WINE_GLAPI *p_glGetProgramivNV)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetQueryIndexediv)(GLenum,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetQueryObjecti64v)(GLuint,GLenum,INT64*); - void (WINE_GLAPI *p_glGetQueryObjecti64vEXT)(GLuint,GLenum,INT64*); + void (WINE_GLAPI *p_glGetQueryObjecti64v)(GLuint,GLenum,GLint64*); + void (WINE_GLAPI *p_glGetQueryObjecti64vEXT)(GLuint,GLenum,GLint64*); void (WINE_GLAPI *p_glGetQueryObjectiv)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetQueryObjectivARB)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetQueryObjectui64v)(GLuint,GLenum,UINT64*); - void (WINE_GLAPI *p_glGetQueryObjectui64vEXT)(GLuint,GLenum,UINT64*); + void (WINE_GLAPI *p_glGetQueryObjectui64v)(GLuint,GLenum,GLuint64*); + void (WINE_GLAPI *p_glGetQueryObjectui64vEXT)(GLuint,GLenum,GLuint64*); void (WINE_GLAPI *p_glGetQueryObjectuiv)(GLuint,GLenum,GLuint*); void (WINE_GLAPI *p_glGetQueryObjectuivARB)(GLuint,GLenum,GLuint*); @@ -1070,6 +1133,6 @@ void (WINE_GLAPI *p_glGetSamplerParameterfv)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetSamplerParameteriv)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetSeparableFilter)(GLenum,GLenum,GLenum,GLvoid*,GLvoid*,GLvoid*); - void (WINE_GLAPI *p_glGetSeparableFilterEXT)(GLenum,GLenum,GLenum,GLvoid*,GLvoid*,GLvoid*); + void (WINE_GLAPI *p_glGetSeparableFilter)(GLenum,GLenum,GLenum,void*,void*,void*); + void (WINE_GLAPI *p_glGetSeparableFilterEXT)(GLenum,GLenum,GLenum,void*,void*,void*); void (WINE_GLAPI *p_glGetShaderInfoLog)(GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetShaderPrecisionFormat)(GLenum,GLenum,GLint*,GLint*); @@ -1078,18 +1141,23 @@ void (WINE_GLAPI *p_glGetShaderiv)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetSharpenTexFuncSGIS)(GLenum,GLfloat*); - const GLubyte * (WINE_GLAPI *p_glGetStringi)(GLenum,GLuint); + const GLubyte* (WINE_GLAPI *p_glGetStringi)(GLenum,GLuint); GLuint (WINE_GLAPI *p_glGetSubroutineIndex)(GLuint,GLenum,const GLchar*); GLint (WINE_GLAPI *p_glGetSubroutineUniformLocation)(GLuint,GLenum,const GLchar*); - void (WINE_GLAPI *p_glGetSynciv)(GLvoid*,GLenum,GLsizei,GLsizei*,GLint*); + void (WINE_GLAPI *p_glGetSynciv)(GLsync,GLenum,GLsizei,GLsizei*,GLint*); void (WINE_GLAPI *p_glGetTexBumpParameterfvATI)(GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTexBumpParameterivATI)(GLenum,GLint*); + void (WINE_GLAPI *p_glGetTexEnvxvOES)(GLenum,GLenum,GLfixed*); void (WINE_GLAPI *p_glGetTexFilterFuncSGIS)(GLenum,GLenum,GLfloat*); + void (WINE_GLAPI *p_glGetTexGenxvOES)(GLenum,GLenum,GLfixed*); + void (WINE_GLAPI *p_glGetTexLevelParameterxvOES)(GLenum,GLint,GLenum,GLfixed*); void (WINE_GLAPI *p_glGetTexParameterIiv)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetTexParameterIivEXT)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetTexParameterIuiv)(GLenum,GLenum,GLuint*); void (WINE_GLAPI *p_glGetTexParameterIuivEXT)(GLenum,GLenum,GLuint*); - void (WINE_GLAPI *p_glGetTexParameterPointervAPPLE)(GLenum,GLenum,GLvoid**); - UINT64 (WINE_GLAPI *p_glGetTextureHandleNV)(GLuint); - void (WINE_GLAPI *p_glGetTextureImageEXT)(GLuint,GLenum,GLint,GLenum,GLenum,GLvoid*); + void (WINE_GLAPI *p_glGetTexParameterPointervAPPLE)(GLenum,GLenum,void**); + void (WINE_GLAPI *p_glGetTexParameterxvOES)(GLenum,GLenum,GLfixed*); + GLuint64 (WINE_GLAPI *p_glGetTextureHandleARB)(GLuint); + GLuint64 (WINE_GLAPI *p_glGetTextureHandleNV)(GLuint); + void (WINE_GLAPI *p_glGetTextureImageEXT)(GLuint,GLenum,GLint,GLenum,GLenum,void*); void (WINE_GLAPI *p_glGetTextureLevelParameterfvEXT)(GLuint,GLenum,GLint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTextureLevelParameterivEXT)(GLuint,GLenum,GLint,GLenum,GLint*); @@ -1098,5 +1166,6 @@ void (WINE_GLAPI *p_glGetTextureParameterfvEXT)(GLuint,GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTextureParameterivEXT)(GLuint,GLenum,GLenum,GLint*); - UINT64 (WINE_GLAPI *p_glGetTextureSamplerHandleNV)(GLuint,GLuint); + GLuint64 (WINE_GLAPI *p_glGetTextureSamplerHandleARB)(GLuint,GLuint); + GLuint64 (WINE_GLAPI *p_glGetTextureSamplerHandleNV)(GLuint,GLuint); void (WINE_GLAPI *p_glGetTrackMatrixivNV)(GLenum,GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetTransformFeedbackVarying)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,GLchar*); @@ -1105,5 +1174,5 @@ GLuint (WINE_GLAPI *p_glGetUniformBlockIndex)(GLuint,const GLchar*); GLint (WINE_GLAPI *p_glGetUniformBufferSizeEXT)(GLuint,GLint); - void (WINE_GLAPI *p_glGetUniformIndices)(GLuint,GLsizei,const GLchar* const*,GLuint*); + void (WINE_GLAPI *p_glGetUniformIndices)(GLuint,GLsizei,const GLchar*const*,GLuint*); GLint (WINE_GLAPI *p_glGetUniformLocation)(GLuint,const GLchar*); GLint (WINE_GLAPI *p_glGetUniformLocationARB)(GLhandleARB,const GLcharARB*); @@ -1113,8 +1182,8 @@ void (WINE_GLAPI *p_glGetUniformfv)(GLuint,GLint,GLfloat*); void (WINE_GLAPI *p_glGetUniformfvARB)(GLhandleARB,GLint,GLfloat*); - void (WINE_GLAPI *p_glGetUniformi64vNV)(GLuint,GLint,INT64*); + void (WINE_GLAPI *p_glGetUniformi64vNV)(GLuint,GLint,GLint64EXT*); void (WINE_GLAPI *p_glGetUniformiv)(GLuint,GLint,GLint*); void (WINE_GLAPI *p_glGetUniformivARB)(GLhandleARB,GLint,GLint*); - void (WINE_GLAPI *p_glGetUniformui64vNV)(GLuint,GLint,UINT64*); + void (WINE_GLAPI *p_glGetUniformui64vNV)(GLuint,GLint,GLuint64EXT*); void (WINE_GLAPI *p_glGetUniformuiv)(GLuint,GLint,GLuint*); void (WINE_GLAPI *p_glGetUniformuivEXT)(GLuint,GLint,GLuint*); @@ -1124,6 +1193,10 @@ void (WINE_GLAPI *p_glGetVariantFloatvEXT)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetVariantIntegervEXT)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetVariantPointervEXT)(GLuint,GLenum,GLvoid**); + void (WINE_GLAPI *p_glGetVariantPointervEXT)(GLuint,GLenum,void**); GLint (WINE_GLAPI *p_glGetVaryingLocationNV)(GLuint,const GLchar*); + void (WINE_GLAPI *p_glGetVertexArrayIntegeri_vEXT)(GLuint,GLuint,GLenum,GLint*); + void (WINE_GLAPI *p_glGetVertexArrayIntegervEXT)(GLuint,GLenum,GLint*); + void (WINE_GLAPI *p_glGetVertexArrayPointeri_vEXT)(GLuint,GLuint,GLenum,void**); + void (WINE_GLAPI *p_glGetVertexArrayPointervEXT)(GLuint,GLenum,void**); void (WINE_GLAPI *p_glGetVertexAttribArrayObjectfvATI)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetVertexAttribArrayObjectivATI)(GLuint,GLenum,GLint*); @@ -1134,9 +1207,10 @@ void (WINE_GLAPI *p_glGetVertexAttribLdv)(GLuint,GLenum,GLdouble*); void (WINE_GLAPI *p_glGetVertexAttribLdvEXT)(GLuint,GLenum,GLdouble*); - void (WINE_GLAPI *p_glGetVertexAttribLi64vNV)(GLuint,GLenum,INT64*); - void (WINE_GLAPI *p_glGetVertexAttribLui64vNV)(GLuint,GLenum,UINT64*); - void (WINE_GLAPI *p_glGetVertexAttribPointerv)(GLuint,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetVertexAttribPointervARB)(GLuint,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetVertexAttribPointervNV)(GLuint,GLenum,GLvoid**); + void (WINE_GLAPI *p_glGetVertexAttribLi64vNV)(GLuint,GLenum,GLint64EXT*); + void (WINE_GLAPI *p_glGetVertexAttribLui64vARB)(GLuint,GLenum,GLuint64EXT*); + void (WINE_GLAPI *p_glGetVertexAttribLui64vNV)(GLuint,GLenum,GLuint64EXT*); + void (WINE_GLAPI *p_glGetVertexAttribPointerv)(GLuint,GLenum,void**); + void (WINE_GLAPI *p_glGetVertexAttribPointervARB)(GLuint,GLenum,void**); + void (WINE_GLAPI *p_glGetVertexAttribPointervNV)(GLuint,GLenum,void**); void (WINE_GLAPI *p_glGetVertexAttribdv)(GLuint,GLenum,GLdouble*); void (WINE_GLAPI *p_glGetVertexAttribdvARB)(GLuint,GLenum,GLdouble*); @@ -1152,22 +1226,22 @@ void (WINE_GLAPI *p_glGetVideoCaptureStreamivNV)(GLuint,GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetVideoCaptureivNV)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetVideoi64vNV)(GLuint,GLenum,INT64*); + void (WINE_GLAPI *p_glGetVideoi64vNV)(GLuint,GLenum,GLint64EXT*); void (WINE_GLAPI *p_glGetVideoivNV)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetVideoui64vNV)(GLuint,GLenum,UINT64*); + void (WINE_GLAPI *p_glGetVideoui64vNV)(GLuint,GLenum,GLuint64EXT*); void (WINE_GLAPI *p_glGetVideouivNV)(GLuint,GLenum,GLuint*); - void (WINE_GLAPI *p_glGetnColorTableARB)(GLenum,GLenum,GLenum,GLsizei,GLvoid*); - void (WINE_GLAPI *p_glGetnCompressedTexImageARB)(GLenum,GLint,GLsizei,GLvoid*); - void (WINE_GLAPI *p_glGetnConvolutionFilterARB)(GLenum,GLenum,GLenum,GLsizei,GLvoid*); - void (WINE_GLAPI *p_glGetnHistogramARB)(GLenum,GLboolean,GLenum,GLenum,GLsizei,GLvoid*); + void (WINE_GLAPI *p_glGetnColorTableARB)(GLenum,GLenum,GLenum,GLsizei,void*); + void (WINE_GLAPI *p_glGetnCompressedTexImageARB)(GLenum,GLint,GLsizei,void*); + void (WINE_GLAPI *p_glGetnConvolutionFilterARB)(GLenum,GLenum,GLenum,GLsizei,void*); + void (WINE_GLAPI *p_glGetnHistogramARB)(GLenum,GLboolean,GLenum,GLenum,GLsizei,void*); void (WINE_GLAPI *p_glGetnMapdvARB)(GLenum,GLenum,GLsizei,GLdouble*); void (WINE_GLAPI *p_glGetnMapfvARB)(GLenum,GLenum,GLsizei,GLfloat*); void (WINE_GLAPI *p_glGetnMapivARB)(GLenum,GLenum,GLsizei,GLint*); - void (WINE_GLAPI *p_glGetnMinmaxARB)(GLenum,GLboolean,GLenum,GLenum,GLsizei,GLvoid*); + void (WINE_GLAPI *p_glGetnMinmaxARB)(GLenum,GLboolean,GLenum,GLenum,GLsizei,void*); void (WINE_GLAPI *p_glGetnPixelMapfvARB)(GLenum,GLsizei,GLfloat*); void (WINE_GLAPI *p_glGetnPixelMapuivARB)(GLenum,GLsizei,GLuint*); void (WINE_GLAPI *p_glGetnPixelMapusvARB)(GLenum,GLsizei,GLushort*); void (WINE_GLAPI *p_glGetnPolygonStippleARB)(GLsizei,GLubyte*); - void (WINE_GLAPI *p_glGetnSeparableFilterARB)(GLenum,GLenum,GLenum,GLsizei,GLvoid*,GLsizei,GLvoid*,GLvoid*); - void (WINE_GLAPI *p_glGetnTexImageARB)(GLenum,GLint,GLenum,GLenum,GLsizei,GLvoid*); + void (WINE_GLAPI *p_glGetnSeparableFilterARB)(GLenum,GLenum,GLenum,GLsizei,void*,GLsizei,void*,void*); + void (WINE_GLAPI *p_glGetnTexImageARB)(GLenum,GLint,GLenum,GLenum,GLsizei,void*); void (WINE_GLAPI *p_glGetnUniformdvARB)(GLuint,GLint,GLsizei,GLdouble*); void (WINE_GLAPI *p_glGetnUniformfvARB)(GLuint,GLint,GLsizei,GLfloat*); @@ -1185,16 +1259,19 @@ void (WINE_GLAPI *p_glHistogram)(GLenum,GLsizei,GLenum,GLboolean); void (WINE_GLAPI *p_glHistogramEXT)(GLenum,GLsizei,GLenum,GLboolean); - void (WINE_GLAPI *p_glIglooInterfaceSGIX)(GLenum,const GLvoid*); + void (WINE_GLAPI *p_glIglooInterfaceSGIX)(GLenum,const void*); void (WINE_GLAPI *p_glImageTransformParameterfHP)(GLenum,GLenum,GLfloat); void (WINE_GLAPI *p_glImageTransformParameterfvHP)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glImageTransformParameteriHP)(GLenum,GLenum,GLint); void (WINE_GLAPI *p_glImageTransformParameterivHP)(GLenum,GLenum,const GLint*); - GLvoid* (WINE_GLAPI *p_glImportSyncEXT)(GLenum,GLintptr,GLbitfield); + GLsync (WINE_GLAPI *p_glImportSyncEXT)(GLenum,GLintptr,GLbitfield); void (WINE_GLAPI *p_glIndexFormatNV)(GLenum,GLsizei); void (WINE_GLAPI *p_glIndexFuncEXT)(GLenum,GLclampf); void (WINE_GLAPI *p_glIndexMaterialEXT)(GLenum,GLenum); - void (WINE_GLAPI *p_glIndexPointerEXT)(GLenum,GLsizei,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glIndexPointerListIBM)(GLenum,GLint,const GLvoid**,GLint); + void (WINE_GLAPI *p_glIndexPointerEXT)(GLenum,GLsizei,GLsizei,const void*); + void (WINE_GLAPI *p_glIndexPointerListIBM)(GLenum,GLint,const void**,GLint); + void (WINE_GLAPI *p_glIndexxOES)(GLfixed); + void (WINE_GLAPI *p_glIndexxvOES)(const GLfixed*); void (WINE_GLAPI *p_glInsertComponentEXT)(GLuint,GLuint,GLuint); + void (WINE_GLAPI *p_glInsertEventMarkerEXT)(GLsizei,const GLchar*); void (WINE_GLAPI *p_glInstrumentsBufferSGIX)(GLsizei,GLint*); void (WINE_GLAPI *p_glInterpolatePathsNV)(GLuint,GLuint,GLuint,GLfloat); @@ -1215,5 +1292,6 @@ GLboolean (WINE_GLAPI *p_glIsFramebuffer)(GLuint); GLboolean (WINE_GLAPI *p_glIsFramebufferEXT)(GLuint); - GLboolean (WINE_GLAPI *p_glIsImageHandleResidentNV)(UINT64); + GLboolean (WINE_GLAPI *p_glIsImageHandleResidentARB)(GLuint64); + GLboolean (WINE_GLAPI *p_glIsImageHandleResidentNV)(GLuint64); GLboolean (WINE_GLAPI *p_glIsNameAMD)(GLenum,GLuint); GLboolean (WINE_GLAPI *p_glIsNamedBufferResidentNV)(GLuint); @@ -1234,7 +1312,8 @@ GLboolean (WINE_GLAPI *p_glIsSampler)(GLuint); GLboolean (WINE_GLAPI *p_glIsShader)(GLuint); - GLboolean (WINE_GLAPI *p_glIsSync)(GLvoid*); + GLboolean (WINE_GLAPI *p_glIsSync)(GLsync); GLboolean (WINE_GLAPI *p_glIsTextureEXT)(GLuint); - GLboolean (WINE_GLAPI *p_glIsTextureHandleResidentNV)(UINT64); + GLboolean (WINE_GLAPI *p_glIsTextureHandleResidentARB)(GLuint64); + GLboolean (WINE_GLAPI *p_glIsTextureHandleResidentNV)(GLuint64); GLboolean (WINE_GLAPI *p_glIsTransformFeedback)(GLuint); GLboolean (WINE_GLAPI *p_glIsTransformFeedbackNV)(GLuint); @@ -1243,5 +1322,11 @@ GLboolean (WINE_GLAPI *p_glIsVertexArrayAPPLE)(GLuint); GLboolean (WINE_GLAPI *p_glIsVertexAttribEnabledAPPLE)(GLuint,GLenum); + void (WINE_GLAPI *p_glLabelObjectEXT)(GLenum,GLuint,GLsizei,const GLchar*); void (WINE_GLAPI *p_glLightEnviSGIX)(GLenum,GLint); + void (WINE_GLAPI *p_glLightModelxOES)(GLenum,GLfixed); + void (WINE_GLAPI *p_glLightModelxvOES)(GLenum,const GLfixed*); + void (WINE_GLAPI *p_glLightxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glLightxvOES)(GLenum,GLenum,const GLfixed*); + void (WINE_GLAPI *p_glLineWidthxOES)(GLfixed); void (WINE_GLAPI *p_glLinkProgram)(GLuint); void (WINE_GLAPI *p_glLinkProgramARB)(GLhandleARB); @@ -1251,4 +1336,5 @@ void (WINE_GLAPI *p_glListParameterivSGIX)(GLuint,GLenum,const GLint*); void (WINE_GLAPI *p_glLoadIdentityDeformationMapSGIX)(GLbitfield); + void (WINE_GLAPI *p_glLoadMatrixxOES)(const GLfixed*); void (WINE_GLAPI *p_glLoadProgramNV)(GLenum,GLuint,GLsizei,const GLubyte*); void (WINE_GLAPI *p_glLoadTransposeMatrixd)(const GLdouble*); @@ -1256,4 +1342,5 @@ void (WINE_GLAPI *p_glLoadTransposeMatrixf)(const GLfloat*); void (WINE_GLAPI *p_glLoadTransposeMatrixfARB)(const GLfloat*); + void (WINE_GLAPI *p_glLoadTransposeMatrixxOES)(const GLfixed*); void (WINE_GLAPI *p_glLockArraysEXT)(GLint,GLsizei); void (WINE_GLAPI *p_glMTexCoord2fSGIS)(GLenum,GLfloat,GLfloat); @@ -1261,25 +1348,36 @@ void (WINE_GLAPI *p_glMakeBufferNonResidentNV)(GLenum); void (WINE_GLAPI *p_glMakeBufferResidentNV)(GLenum,GLenum); - void (WINE_GLAPI *p_glMakeImageHandleNonResidentNV)(UINT64); - void (WINE_GLAPI *p_glMakeImageHandleResidentNV)(UINT64,GLenum); + void (WINE_GLAPI *p_glMakeImageHandleNonResidentARB)(GLuint64); + void (WINE_GLAPI *p_glMakeImageHandleNonResidentNV)(GLuint64); + void (WINE_GLAPI *p_glMakeImageHandleResidentARB)(GLuint64,GLenum); + void (WINE_GLAPI *p_glMakeImageHandleResidentNV)(GLuint64,GLenum); void (WINE_GLAPI *p_glMakeNamedBufferNonResidentNV)(GLuint); void (WINE_GLAPI *p_glMakeNamedBufferResidentNV)(GLuint,GLenum); - void (WINE_GLAPI *p_glMakeTextureHandleNonResidentNV)(UINT64); - void (WINE_GLAPI *p_glMakeTextureHandleResidentNV)(UINT64); - GLvoid* (WINE_GLAPI *p_glMapBuffer)(GLenum,GLenum); - GLvoid* (WINE_GLAPI *p_glMapBufferARB)(GLenum,GLenum); - GLvoid* (WINE_GLAPI *p_glMapBufferRange)(GLenum,GLintptr,GLsizeiptr,GLbitfield); - void (WINE_GLAPI *p_glMapControlPointsNV)(GLenum,GLuint,GLenum,GLsizei,GLsizei,GLint,GLint,GLboolean,const GLvoid*); - GLvoid* (WINE_GLAPI *p_glMapNamedBufferEXT)(GLuint,GLenum); - GLvoid* (WINE_GLAPI *p_glMapNamedBufferRangeEXT)(GLuint,GLintptr,GLsizeiptr,GLbitfield); - GLvoid* (WINE_GLAPI *p_glMapObjectBufferATI)(GLuint); + void (WINE_GLAPI *p_glMakeTextureHandleNonResidentARB)(GLuint64); + void (WINE_GLAPI *p_glMakeTextureHandleNonResidentNV)(GLuint64); + void (WINE_GLAPI *p_glMakeTextureHandleResidentARB)(GLuint64); + void (WINE_GLAPI *p_glMakeTextureHandleResidentNV)(GLuint64); + void (WINE_GLAPI *p_glMap1xOES)(GLenum,GLfixed,GLfixed,GLint,GLint,GLfixed); + void (WINE_GLAPI *p_glMap2xOES)(GLenum,GLfixed,GLfixed,GLint,GLint,GLfixed,GLfixed,GLint,GLint,GLfixed); + void* (WINE_GLAPI *p_glMapBuffer)(GLenum,GLenum); + void* (WINE_GLAPI *p_glMapBufferARB)(GLenum,GLenum); + void* (WINE_GLAPI *p_glMapBufferRange)(GLenum,GLintptr,GLsizeiptr,GLbitfield); + void (WINE_GLAPI *p_glMapControlPointsNV)(GLenum,GLuint,GLenum,GLsizei,GLsizei,GLint,GLint,GLboolean,const void*); + void (WINE_GLAPI *p_glMapGrid1xOES)(GLint,GLfixed,GLfixed); + void (WINE_GLAPI *p_glMapGrid2xOES)(GLint,GLfixed,GLfixed,GLfixed,GLfixed); + void* (WINE_GLAPI *p_glMapNamedBufferEXT)(GLuint,GLenum); + void* (WINE_GLAPI *p_glMapNamedBufferRangeEXT)(GLuint,GLintptr,GLsizeiptr,GLbitfield); + void* (WINE_GLAPI *p_glMapObjectBufferATI)(GLuint); void (WINE_GLAPI *p_glMapParameterfvNV)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glMapParameterivNV)(GLenum,GLenum,const GLint*); + void* (WINE_GLAPI *p_glMapTexture2DINTEL)(GLuint,GLint,GLbitfield,GLint*,GLenum*); void (WINE_GLAPI *p_glMapVertexAttrib1dAPPLE)(GLuint,GLuint,GLdouble,GLdouble,GLint,GLint,const GLdouble*); void (WINE_GLAPI *p_glMapVertexAttrib1fAPPLE)(GLuint,GLuint,GLfloat,GLfloat,GLint,GLint,const GLfloat*); void (WINE_GLAPI *p_glMapVertexAttrib2dAPPLE)(GLuint,GLuint,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble,GLint,GLint,const GLdouble*); void (WINE_GLAPI *p_glMapVertexAttrib2fAPPLE)(GLuint,GLuint,GLfloat,GLfloat,GLint,GLint,GLfloat,GLfloat,GLint,GLint,const GLfloat*); + void (WINE_GLAPI *p_glMaterialxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glMaterialxvOES)(GLenum,GLenum,const GLfixed*); void (WINE_GLAPI *p_glMatrixFrustumEXT)(GLenum,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble); - void (WINE_GLAPI *p_glMatrixIndexPointerARB)(GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glMatrixIndexPointerARB)(GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glMatrixIndexubvARB)(GLint,const GLubyte*); void (WINE_GLAPI *p_glMatrixIndexuivARB)(GLint,const GLuint*); @@ -1309,22 +1407,30 @@ void (WINE_GLAPI *p_glMinmax)(GLenum,GLenum,GLboolean); void (WINE_GLAPI *p_glMinmaxEXT)(GLenum,GLenum,GLboolean); + void (WINE_GLAPI *p_glMultMatrixxOES)(const GLfixed*); void (WINE_GLAPI *p_glMultTransposeMatrixd)(const GLdouble*); void (WINE_GLAPI *p_glMultTransposeMatrixdARB)(const GLdouble*); void (WINE_GLAPI *p_glMultTransposeMatrixf)(const GLfloat*); void (WINE_GLAPI *p_glMultTransposeMatrixfARB)(const GLfloat*); + void (WINE_GLAPI *p_glMultTransposeMatrixxOES)(const GLfixed*); void (WINE_GLAPI *p_glMultiDrawArrays)(GLenum,const GLint*,const GLsizei*,GLsizei); void (WINE_GLAPI *p_glMultiDrawArraysEXT)(GLenum,const GLint*,const GLsizei*,GLsizei); void (WINE_GLAPI *p_glMultiDrawArraysIndirect)(GLenum,const void*,GLsizei,GLsizei); - void (WINE_GLAPI *p_glMultiDrawArraysIndirectAMD)(GLenum,const GLvoid*,GLsizei,GLsizei); + void (WINE_GLAPI *p_glMultiDrawArraysIndirectAMD)(GLenum,const void*,GLsizei,GLsizei); + void (WINE_GLAPI *p_glMultiDrawArraysIndirectBindlessNV)(GLenum,const void*,GLsizei,GLsizei,GLint); + void (WINE_GLAPI *p_glMultiDrawArraysIndirectCountARB)(GLenum,GLintptr,GLintptr,GLsizei,GLsizei); void (WINE_GLAPI *p_glMultiDrawElementArrayAPPLE)(GLenum,const GLint*,const GLsizei*,GLsizei); - void (WINE_GLAPI *p_glMultiDrawElements)(GLenum,const GLsizei*,GLenum,const GLvoid* const*,GLsizei); - void (WINE_GLAPI *p_glMultiDrawElementsBaseVertex)(GLenum,const GLsizei*,GLenum,const GLvoid* const*,GLsizei,const GLint*); - void (WINE_GLAPI *p_glMultiDrawElementsEXT)(GLenum,const GLsizei*,GLenum,const GLvoid**,GLsizei); + void (WINE_GLAPI *p_glMultiDrawElements)(GLenum,const GLsizei*,GLenum,const void*const*,GLsizei); + void (WINE_GLAPI *p_glMultiDrawElementsBaseVertex)(GLenum,const GLsizei*,GLenum,const void*const*,GLsizei,const GLint*); + void (WINE_GLAPI *p_glMultiDrawElementsEXT)(GLenum,const GLsizei*,GLenum,const void*const*,GLsizei); void (WINE_GLAPI *p_glMultiDrawElementsIndirect)(GLenum,GLenum,const void*,GLsizei,GLsizei); - void (WINE_GLAPI *p_glMultiDrawElementsIndirectAMD)(GLenum,GLenum,const GLvoid*,GLsizei,GLsizei); + void (WINE_GLAPI *p_glMultiDrawElementsIndirectAMD)(GLenum,GLenum,const void*,GLsizei,GLsizei); + void (WINE_GLAPI *p_glMultiDrawElementsIndirectBindlessNV)(GLenum,GLenum,const void*,GLsizei,GLsizei,GLint); + void (WINE_GLAPI *p_glMultiDrawElementsIndirectCountARB)(GLenum,GLenum,GLintptr,GLintptr,GLsizei,GLsizei); void (WINE_GLAPI *p_glMultiDrawRangeElementArrayAPPLE)(GLenum,GLuint,GLuint,const GLint*,const GLsizei*,GLsizei); void (WINE_GLAPI *p_glMultiModeDrawArraysIBM)(const GLenum*,const GLint*,const GLsizei*,GLsizei,GLint); - void (WINE_GLAPI *p_glMultiModeDrawElementsIBM)(const GLenum*,const GLsizei*,GLenum,const GLvoid* const*,GLsizei,GLint); + void (WINE_GLAPI *p_glMultiModeDrawElementsIBM)(const GLenum*,const GLsizei*,GLenum,const void*const*,GLsizei,GLint); void (WINE_GLAPI *p_glMultiTexBufferEXT)(GLenum,GLenum,GLenum,GLuint); + void (WINE_GLAPI *p_glMultiTexCoord1bOES)(GLenum,GLbyte); + void (WINE_GLAPI *p_glMultiTexCoord1bvOES)(GLenum,const GLbyte*); void (WINE_GLAPI *p_glMultiTexCoord1d)(GLenum,GLdouble); void (WINE_GLAPI *p_glMultiTexCoord1dARB)(GLenum,GLdouble); @@ -1353,4 +1459,8 @@ void (WINE_GLAPI *p_glMultiTexCoord1svARB)(GLenum,const GLshort*); void (WINE_GLAPI *p_glMultiTexCoord1svSGIS)(GLenum,GLshort *); + void (WINE_GLAPI *p_glMultiTexCoord1xOES)(GLenum,GLfixed); + void (WINE_GLAPI *p_glMultiTexCoord1xvOES)(GLenum,const GLfixed*); + void (WINE_GLAPI *p_glMultiTexCoord2bOES)(GLenum,GLbyte,GLbyte); + void (WINE_GLAPI *p_glMultiTexCoord2bvOES)(GLenum,const GLbyte*); void (WINE_GLAPI *p_glMultiTexCoord2d)(GLenum,GLdouble,GLdouble); void (WINE_GLAPI *p_glMultiTexCoord2dARB)(GLenum,GLdouble,GLdouble); @@ -1379,4 +1489,8 @@ void (WINE_GLAPI *p_glMultiTexCoord2svARB)(GLenum,const GLshort*); void (WINE_GLAPI *p_glMultiTexCoord2svSGIS)(GLenum,GLshort *); + void (WINE_GLAPI *p_glMultiTexCoord2xOES)(GLenum,GLfixed,GLfixed); + void (WINE_GLAPI *p_glMultiTexCoord2xvOES)(GLenum,const GLfixed*); + void (WINE_GLAPI *p_glMultiTexCoord3bOES)(GLenum,GLbyte,GLbyte,GLbyte); + void (WINE_GLAPI *p_glMultiTexCoord3bvOES)(GLenum,const GLbyte*); void (WINE_GLAPI *p_glMultiTexCoord3d)(GLenum,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glMultiTexCoord3dARB)(GLenum,GLdouble,GLdouble,GLdouble); @@ -1405,4 +1519,8 @@ void (WINE_GLAPI *p_glMultiTexCoord3svARB)(GLenum,const GLshort*); void (WINE_GLAPI *p_glMultiTexCoord3svSGIS)(GLenum,GLshort *); + void (WINE_GLAPI *p_glMultiTexCoord3xOES)(GLenum,GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glMultiTexCoord3xvOES)(GLenum,const GLfixed*); + void (WINE_GLAPI *p_glMultiTexCoord4bOES)(GLenum,GLbyte,GLbyte,GLbyte,GLbyte); + void (WINE_GLAPI *p_glMultiTexCoord4bvOES)(GLenum,const GLbyte*); void (WINE_GLAPI *p_glMultiTexCoord4d)(GLenum,GLdouble,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glMultiTexCoord4dARB)(GLenum,GLdouble,GLdouble,GLdouble,GLdouble); @@ -1431,4 +1549,6 @@ void (WINE_GLAPI *p_glMultiTexCoord4svARB)(GLenum,const GLshort*); void (WINE_GLAPI *p_glMultiTexCoord4svSGIS)(GLenum,GLshort *); + void (WINE_GLAPI *p_glMultiTexCoord4xOES)(GLenum,GLfixed,GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glMultiTexCoord4xvOES)(GLenum,const GLfixed*); void (WINE_GLAPI *p_glMultiTexCoordP1ui)(GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glMultiTexCoordP1uiv)(GLenum,GLenum,const GLuint*); @@ -1439,5 +1559,5 @@ void (WINE_GLAPI *p_glMultiTexCoordP4ui)(GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glMultiTexCoordP4uiv)(GLenum,GLenum,const GLuint*); - void (WINE_GLAPI *p_glMultiTexCoordPointerEXT)(GLenum,GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glMultiTexCoordPointerEXT)(GLenum,GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glMultiTexCoordPointerSGIS)(GLenum,GLint,GLenum,GLsizei,GLvoid *); void (WINE_GLAPI *p_glMultiTexEnvfEXT)(GLenum,GLenum,GLenum,GLfloat); @@ -1451,7 +1571,7 @@ void (WINE_GLAPI *p_glMultiTexGeniEXT)(GLenum,GLenum,GLenum,GLint); void (WINE_GLAPI *p_glMultiTexGenivEXT)(GLenum,GLenum,GLenum,const GLint*); - void (WINE_GLAPI *p_glMultiTexImage1DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLint,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glMultiTexImage2DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glMultiTexImage3DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glMultiTexImage1DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glMultiTexImage2DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glMultiTexImage3DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glMultiTexParameterIivEXT)(GLenum,GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glMultiTexParameterIuivEXT)(GLenum,GLenum,GLenum,const GLuint*); @@ -1461,9 +1581,10 @@ void (WINE_GLAPI *p_glMultiTexParameterivEXT)(GLenum,GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glMultiTexRenderbufferEXT)(GLenum,GLenum,GLuint); - void (WINE_GLAPI *p_glMultiTexSubImage1DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glMultiTexSubImage2DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glMultiTexSubImage3DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glNamedBufferDataEXT)(GLuint,GLsizeiptr,const GLvoid*,GLenum); - void (WINE_GLAPI *p_glNamedBufferSubDataEXT)(GLuint,GLintptr,GLsizeiptr,const GLvoid*); + void (WINE_GLAPI *p_glMultiTexSubImage1DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glMultiTexSubImage2DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glMultiTexSubImage3DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glNamedBufferDataEXT)(GLuint,GLsizeiptr,const void*,GLenum); + void (WINE_GLAPI *p_glNamedBufferStorageEXT)(GLuint,GLsizeiptr,const void*,GLbitfield); + void (WINE_GLAPI *p_glNamedBufferSubDataEXT)(GLuint,GLintptr,GLsizeiptr,const void*); void (WINE_GLAPI *p_glNamedCopyBufferSubDataEXT)(GLuint,GLuint,GLintptr,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glNamedFramebufferParameteriEXT)(GLuint,GLenum,GLint); @@ -1486,5 +1607,5 @@ void (WINE_GLAPI *p_glNamedProgramLocalParametersI4ivEXT)(GLuint,GLenum,GLuint,GLsizei,const GLint*); void (WINE_GLAPI *p_glNamedProgramLocalParametersI4uivEXT)(GLuint,GLenum,GLuint,GLsizei,const GLuint*); - void (WINE_GLAPI *p_glNamedProgramStringEXT)(GLuint,GLenum,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glNamedProgramStringEXT)(GLuint,GLenum,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glNamedRenderbufferStorageEXT)(GLuint,GLenum,GLsizei,GLsizei); void (WINE_GLAPI *p_glNamedRenderbufferStorageMultisampleCoverageEXT)(GLuint,GLsizei,GLsizei,GLenum,GLsizei,GLsizei); @@ -1492,15 +1613,17 @@ void (WINE_GLAPI *p_glNamedStringARB)(GLenum,GLint,const GLchar*,GLint,const GLchar*); GLuint (WINE_GLAPI *p_glNewBufferRegion)(GLenum); - GLuint (WINE_GLAPI *p_glNewObjectBufferATI)(GLsizei,const GLvoid*,GLenum); + GLuint (WINE_GLAPI *p_glNewObjectBufferATI)(GLsizei,const void*,GLenum); void (WINE_GLAPI *p_glNormal3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glNormal3fVertex3fvSUN)(const GLfloat*,const GLfloat*); void (WINE_GLAPI *p_glNormal3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glNormal3hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glNormal3xOES)(GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glNormal3xvOES)(const GLfixed*); void (WINE_GLAPI *p_glNormalFormatNV)(GLenum,GLsizei); void (WINE_GLAPI *p_glNormalP3ui)(GLenum,GLuint); void (WINE_GLAPI *p_glNormalP3uiv)(GLenum,const GLuint*); - void (WINE_GLAPI *p_glNormalPointerEXT)(GLenum,GLsizei,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glNormalPointerListIBM)(GLenum,GLint,const GLvoid**,GLint); - void (WINE_GLAPI *p_glNormalPointervINTEL)(GLenum,const GLvoid**); + void (WINE_GLAPI *p_glNormalPointerEXT)(GLenum,GLsizei,GLsizei,const void*); + void (WINE_GLAPI *p_glNormalPointerListIBM)(GLenum,GLint,const void**,GLint); + void (WINE_GLAPI *p_glNormalPointervINTEL)(GLenum,const void**); void (WINE_GLAPI *p_glNormalStream3bATI)(GLenum,GLbyte,GLbyte,GLbyte); void (WINE_GLAPI *p_glNormalStream3bvATI)(GLenum,const GLbyte*); @@ -1517,17 +1640,20 @@ GLenum (WINE_GLAPI *p_glObjectPurgeableAPPLE)(GLenum,GLuint,GLenum); GLenum (WINE_GLAPI *p_glObjectUnpurgeableAPPLE)(GLenum,GLuint,GLenum); + void (WINE_GLAPI *p_glOrthofOES)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); + void (WINE_GLAPI *p_glOrthoxOES)(GLfixed,GLfixed,GLfixed,GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glPNTrianglesfATI)(GLenum,GLfloat); void (WINE_GLAPI *p_glPNTrianglesiATI)(GLenum,GLint); void (WINE_GLAPI *p_glPassTexCoordATI)(GLuint,GLuint,GLenum); + void (WINE_GLAPI *p_glPassThroughxOES)(GLfixed); void (WINE_GLAPI *p_glPatchParameterfv)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glPatchParameteri)(GLenum,GLint); void (WINE_GLAPI *p_glPathColorGenNV)(GLenum,GLenum,GLenum,const GLfloat*); - void (WINE_GLAPI *p_glPathCommandsNV)(GLuint,GLsizei,const GLubyte*,GLsizei,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glPathCoordsNV)(GLuint,GLsizei,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glPathCommandsNV)(GLuint,GLsizei,const GLubyte*,GLsizei,GLenum,const void*); + void (WINE_GLAPI *p_glPathCoordsNV)(GLuint,GLsizei,GLenum,const void*); void (WINE_GLAPI *p_glPathCoverDepthFuncNV)(GLenum); void (WINE_GLAPI *p_glPathDashArrayNV)(GLuint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glPathFogGenNV)(GLenum); - void (WINE_GLAPI *p_glPathGlyphRangeNV)(GLuint,GLenum,const GLvoid*,GLbitfield,GLuint,GLsizei,GLenum,GLuint,GLfloat); - void (WINE_GLAPI *p_glPathGlyphsNV)(GLuint,GLenum,const GLvoid*,GLbitfield,GLsizei,GLenum,const GLvoid*,GLenum,GLuint,GLfloat); + void (WINE_GLAPI *p_glPathGlyphRangeNV)(GLuint,GLenum,const void*,GLbitfield,GLuint,GLsizei,GLenum,GLuint,GLfloat); + void (WINE_GLAPI *p_glPathGlyphsNV)(GLuint,GLenum,const void*,GLbitfield,GLsizei,GLenum,const void*,GLenum,GLuint,GLfloat); void (WINE_GLAPI *p_glPathParameterfNV)(GLuint,GLenum,GLfloat); void (WINE_GLAPI *p_glPathParameterfvNV)(GLuint,GLenum,const GLfloat*); @@ -1536,11 +1662,13 @@ void (WINE_GLAPI *p_glPathStencilDepthOffsetNV)(GLfloat,GLfloat); void (WINE_GLAPI *p_glPathStencilFuncNV)(GLenum,GLint,GLuint); - void (WINE_GLAPI *p_glPathStringNV)(GLuint,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glPathSubCommandsNV)(GLuint,GLsizei,GLsizei,GLsizei,const GLubyte*,GLsizei,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glPathSubCoordsNV)(GLuint,GLsizei,GLsizei,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glPathStringNV)(GLuint,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glPathSubCommandsNV)(GLuint,GLsizei,GLsizei,GLsizei,const GLubyte*,GLsizei,GLenum,const void*); + void (WINE_GLAPI *p_glPathSubCoordsNV)(GLuint,GLsizei,GLsizei,GLenum,const void*); void (WINE_GLAPI *p_glPathTexGenNV)(GLenum,GLenum,GLint,const GLfloat*); void (WINE_GLAPI *p_glPauseTransformFeedback)(void); void (WINE_GLAPI *p_glPauseTransformFeedbackNV)(void); - void (WINE_GLAPI *p_glPixelDataRangeNV)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glPixelDataRangeNV)(GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glPixelMapx)(GLenum,GLint,const GLfixed*); + void (WINE_GLAPI *p_glPixelStorex)(GLenum,GLfixed); void (WINE_GLAPI *p_glPixelTexGenParameterfSGIS)(GLenum,GLfloat); void (WINE_GLAPI *p_glPixelTexGenParameterfvSGIS)(GLenum,const GLfloat*); @@ -1548,8 +1676,10 @@ void (WINE_GLAPI *p_glPixelTexGenParameterivSGIS)(GLenum,const GLint*); void (WINE_GLAPI *p_glPixelTexGenSGIX)(GLenum); + void (WINE_GLAPI *p_glPixelTransferxOES)(GLenum,GLfixed); void (WINE_GLAPI *p_glPixelTransformParameterfEXT)(GLenum,GLenum,GLfloat); void (WINE_GLAPI *p_glPixelTransformParameterfvEXT)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glPixelTransformParameteriEXT)(GLenum,GLenum,GLint); void (WINE_GLAPI *p_glPixelTransformParameterivEXT)(GLenum,GLenum,const GLint*); + void (WINE_GLAPI *p_glPixelZoomxOES)(GLfixed,GLfixed); GLboolean (WINE_GLAPI *p_glPointAlongPathNV)(GLuint,GLsizei,GLsizei,GLfloat,GLfloat*,GLfloat*,GLfloat*,GLfloat*); void (WINE_GLAPI *p_glPointParameterf)(GLenum,GLfloat); @@ -1565,15 +1695,20 @@ void (WINE_GLAPI *p_glPointParameteriv)(GLenum,const GLint*); void (WINE_GLAPI *p_glPointParameterivNV)(GLenum,const GLint*); + void (WINE_GLAPI *p_glPointParameterxvOES)(GLenum,const GLfixed*); + void (WINE_GLAPI *p_glPointSizexOES)(GLfixed); GLint (WINE_GLAPI *p_glPollAsyncSGIX)(GLuint*); GLint (WINE_GLAPI *p_glPollInstrumentsSGIX)(GLint*); void (WINE_GLAPI *p_glPolygonOffsetEXT)(GLfloat,GLfloat); + void (WINE_GLAPI *p_glPolygonOffsetxOES)(GLfixed,GLfixed); void (WINE_GLAPI *p_glPopDebugGroup)(void); - void (WINE_GLAPI *p_glPresentFrameDualFillNV)(GLuint,UINT64,GLuint,GLuint,GLenum,GLenum,GLuint,GLenum,GLuint,GLenum,GLuint,GLenum,GLuint); - void (WINE_GLAPI *p_glPresentFrameKeyedNV)(GLuint,UINT64,GLuint,GLuint,GLenum,GLenum,GLuint,GLuint,GLenum,GLuint,GLuint); + void (WINE_GLAPI *p_glPopGroupMarkerEXT)(void); + void (WINE_GLAPI *p_glPresentFrameDualFillNV)(GLuint,GLuint64EXT,GLuint,GLuint,GLenum,GLenum,GLuint,GLenum,GLuint,GLenum,GLuint,GLenum,GLuint); + void (WINE_GLAPI *p_glPresentFrameKeyedNV)(GLuint,GLuint64EXT,GLuint,GLuint,GLenum,GLenum,GLuint,GLuint,GLenum,GLuint,GLuint); void (WINE_GLAPI *p_glPrimitiveRestartIndex)(GLuint); void (WINE_GLAPI *p_glPrimitiveRestartIndexNV)(GLuint); void (WINE_GLAPI *p_glPrimitiveRestartNV)(void); void (WINE_GLAPI *p_glPrioritizeTexturesEXT)(GLsizei,const GLuint*,const GLclampf*); - void (WINE_GLAPI *p_glProgramBinary)(GLuint,GLenum,const GLvoid*,GLsizei); + void (WINE_GLAPI *p_glPrioritizeTexturesxOES)(GLsizei,const GLuint*,const GLfixed*); + void (WINE_GLAPI *p_glProgramBinary)(GLuint,GLenum,const void*,GLsizei); void (WINE_GLAPI *p_glProgramBufferParametersIivNV)(GLenum,GLuint,GLuint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramBufferParametersIuivNV)(GLenum,GLuint,GLuint,GLsizei,const GLuint*); @@ -1614,5 +1749,5 @@ void (WINE_GLAPI *p_glProgramParameters4dvNV)(GLenum,GLuint,GLsizei,const GLdouble*); void (WINE_GLAPI *p_glProgramParameters4fvNV)(GLenum,GLuint,GLsizei,const GLfloat*); - void (WINE_GLAPI *p_glProgramStringARB)(GLenum,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glProgramStringARB)(GLenum,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glProgramSubroutineParametersuivNV)(GLenum,GLsizei,const GLuint*); void (WINE_GLAPI *p_glProgramUniform1d)(GLuint,GLint,GLdouble); @@ -1625,12 +1760,12 @@ void (WINE_GLAPI *p_glProgramUniform1fvEXT)(GLuint,GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glProgramUniform1i)(GLuint,GLint,GLint); - void (WINE_GLAPI *p_glProgramUniform1i64NV)(GLuint,GLint,INT64); - void (WINE_GLAPI *p_glProgramUniform1i64vNV)(GLuint,GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glProgramUniform1i64NV)(GLuint,GLint,GLint64EXT); + void (WINE_GLAPI *p_glProgramUniform1i64vNV)(GLuint,GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glProgramUniform1iEXT)(GLuint,GLint,GLint); void (WINE_GLAPI *p_glProgramUniform1iv)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform1ivEXT)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform1ui)(GLuint,GLint,GLuint); - void (WINE_GLAPI *p_glProgramUniform1ui64NV)(GLuint,GLint,UINT64); - void (WINE_GLAPI *p_glProgramUniform1ui64vNV)(GLuint,GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glProgramUniform1ui64NV)(GLuint,GLint,GLuint64EXT); + void (WINE_GLAPI *p_glProgramUniform1ui64vNV)(GLuint,GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glProgramUniform1uiEXT)(GLuint,GLint,GLuint); void (WINE_GLAPI *p_glProgramUniform1uiv)(GLuint,GLint,GLsizei,const GLuint*); @@ -1645,12 +1780,12 @@ void (WINE_GLAPI *p_glProgramUniform2fvEXT)(GLuint,GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glProgramUniform2i)(GLuint,GLint,GLint,GLint); - void (WINE_GLAPI *p_glProgramUniform2i64NV)(GLuint,GLint,INT64,INT64); - void (WINE_GLAPI *p_glProgramUniform2i64vNV)(GLuint,GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glProgramUniform2i64NV)(GLuint,GLint,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glProgramUniform2i64vNV)(GLuint,GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glProgramUniform2iEXT)(GLuint,GLint,GLint,GLint); void (WINE_GLAPI *p_glProgramUniform2iv)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform2ivEXT)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform2ui)(GLuint,GLint,GLuint,GLuint); - void (WINE_GLAPI *p_glProgramUniform2ui64NV)(GLuint,GLint,UINT64,UINT64); - void (WINE_GLAPI *p_glProgramUniform2ui64vNV)(GLuint,GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glProgramUniform2ui64NV)(GLuint,GLint,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glProgramUniform2ui64vNV)(GLuint,GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glProgramUniform2uiEXT)(GLuint,GLint,GLuint,GLuint); void (WINE_GLAPI *p_glProgramUniform2uiv)(GLuint,GLint,GLsizei,const GLuint*); @@ -1665,12 +1800,12 @@ void (WINE_GLAPI *p_glProgramUniform3fvEXT)(GLuint,GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glProgramUniform3i)(GLuint,GLint,GLint,GLint,GLint); - void (WINE_GLAPI *p_glProgramUniform3i64NV)(GLuint,GLint,INT64,INT64,INT64); - void (WINE_GLAPI *p_glProgramUniform3i64vNV)(GLuint,GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glProgramUniform3i64NV)(GLuint,GLint,GLint64EXT,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glProgramUniform3i64vNV)(GLuint,GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glProgramUniform3iEXT)(GLuint,GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glProgramUniform3iv)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform3ivEXT)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform3ui)(GLuint,GLint,GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glProgramUniform3ui64NV)(GLuint,GLint,UINT64,UINT64,UINT64); - void (WINE_GLAPI *p_glProgramUniform3ui64vNV)(GLuint,GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glProgramUniform3ui64NV)(GLuint,GLint,GLuint64EXT,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glProgramUniform3ui64vNV)(GLuint,GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glProgramUniform3uiEXT)(GLuint,GLint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glProgramUniform3uiv)(GLuint,GLint,GLsizei,const GLuint*); @@ -1685,17 +1820,19 @@ void (WINE_GLAPI *p_glProgramUniform4fvEXT)(GLuint,GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glProgramUniform4i)(GLuint,GLint,GLint,GLint,GLint,GLint); - void (WINE_GLAPI *p_glProgramUniform4i64NV)(GLuint,GLint,INT64,INT64,INT64,INT64); - void (WINE_GLAPI *p_glProgramUniform4i64vNV)(GLuint,GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glProgramUniform4i64NV)(GLuint,GLint,GLint64EXT,GLint64EXT,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glProgramUniform4i64vNV)(GLuint,GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glProgramUniform4iEXT)(GLuint,GLint,GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glProgramUniform4iv)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform4ivEXT)(GLuint,GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glProgramUniform4ui)(GLuint,GLint,GLuint,GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glProgramUniform4ui64NV)(GLuint,GLint,UINT64,UINT64,UINT64,UINT64); - void (WINE_GLAPI *p_glProgramUniform4ui64vNV)(GLuint,GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glProgramUniform4ui64NV)(GLuint,GLint,GLuint64EXT,GLuint64EXT,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glProgramUniform4ui64vNV)(GLuint,GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glProgramUniform4uiEXT)(GLuint,GLint,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glProgramUniform4uiv)(GLuint,GLint,GLsizei,const GLuint*); void (WINE_GLAPI *p_glProgramUniform4uivEXT)(GLuint,GLint,GLsizei,const GLuint*); - void (WINE_GLAPI *p_glProgramUniformHandleui64NV)(GLuint,GLint,UINT64); - void (WINE_GLAPI *p_glProgramUniformHandleui64vNV)(GLuint,GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glProgramUniformHandleui64ARB)(GLuint,GLint,GLuint64); + void (WINE_GLAPI *p_glProgramUniformHandleui64NV)(GLuint,GLint,GLuint64); + void (WINE_GLAPI *p_glProgramUniformHandleui64vARB)(GLuint,GLint,GLsizei,const GLuint64*); + void (WINE_GLAPI *p_glProgramUniformHandleui64vNV)(GLuint,GLint,GLsizei,const GLuint64*); void (WINE_GLAPI *p_glProgramUniformMatrix2dv)(GLuint,GLint,GLsizei,GLboolean,const GLdouble*); void (WINE_GLAPI *p_glProgramUniformMatrix2dvEXT)(GLuint,GLint,GLsizei,GLboolean,const GLdouble*); @@ -1734,6 +1871,6 @@ void (WINE_GLAPI *p_glProgramUniformMatrix4x3fv)(GLuint,GLint,GLsizei,GLboolean,const GLfloat*); void (WINE_GLAPI *p_glProgramUniformMatrix4x3fvEXT)(GLuint,GLint,GLsizei,GLboolean,const GLfloat*); - void (WINE_GLAPI *p_glProgramUniformui64NV)(GLuint,GLint,UINT64); - void (WINE_GLAPI *p_glProgramUniformui64vNV)(GLuint,GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glProgramUniformui64NV)(GLuint,GLint,GLuint64EXT); + void (WINE_GLAPI *p_glProgramUniformui64vNV)(GLuint,GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glProgramVertexLimitNV)(GLenum,GLint); void (WINE_GLAPI *p_glProvokingVertex)(GLenum); @@ -1741,8 +1878,18 @@ void (WINE_GLAPI *p_glPushClientAttribDefaultEXT)(GLbitfield); void (WINE_GLAPI *p_glPushDebugGroup)(GLenum,GLuint,GLsizei,const GLchar*); + void (WINE_GLAPI *p_glPushGroupMarkerEXT)(GLsizei,const GLchar*); void (WINE_GLAPI *p_glQueryCounter)(GLuint,GLenum); + GLbitfield (WINE_GLAPI *p_glQueryMatrixxOES)(GLfixed*,GLint*); + void (WINE_GLAPI *p_glRasterPos2xOES)(GLfixed,GLfixed); + void (WINE_GLAPI *p_glRasterPos2xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glRasterPos3xOES)(GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glRasterPos3xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glRasterPos4xOES)(GLfixed,GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glRasterPos4xvOES)(const GLfixed*); void (WINE_GLAPI *p_glReadBufferRegion)(GLenum,GLint,GLint,GLsizei,GLsizei); void (WINE_GLAPI *p_glReadInstrumentsSGIX)(GLint); - void (WINE_GLAPI *p_glReadnPixelsARB)(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLsizei,GLvoid*); + void (WINE_GLAPI *p_glReadnPixelsARB)(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLsizei,void*); + void (WINE_GLAPI *p_glRectxOES)(GLfixed,GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glRectxvOES)(const GLfixed*,const GLfixed*); void (WINE_GLAPI *p_glReferencePlaneSGIX)(const GLdouble*); void (WINE_GLAPI *p_glReleaseShaderCompiler)(void); @@ -1752,5 +1899,5 @@ void (WINE_GLAPI *p_glRenderbufferStorageMultisampleCoverageNV)(GLenum,GLsizei,GLsizei,GLenum,GLsizei,GLsizei); void (WINE_GLAPI *p_glRenderbufferStorageMultisampleEXT)(GLenum,GLsizei,GLenum,GLsizei,GLsizei); - void (WINE_GLAPI *p_glReplacementCodePointerSUN)(GLenum,GLsizei,const GLvoid**); + void (WINE_GLAPI *p_glReplacementCodePointerSUN)(GLenum,GLsizei,const void**); void (WINE_GLAPI *p_glReplacementCodeubSUN)(GLubyte); void (WINE_GLAPI *p_glReplacementCodeubvSUN)(const GLubyte*); @@ -1783,6 +1930,8 @@ void (WINE_GLAPI *p_glResumeTransformFeedback)(void); void (WINE_GLAPI *p_glResumeTransformFeedbackNV)(void); + void (WINE_GLAPI *p_glRotatexOES)(GLfixed,GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glSampleCoverage)(GLfloat,GLboolean); void (WINE_GLAPI *p_glSampleCoverageARB)(GLfloat,GLboolean); + void (WINE_GLAPI *p_glSampleCoverageOES)(GLfixed,GLboolean); void (WINE_GLAPI *p_glSampleMapATI)(GLuint,GLuint,GLenum); void (WINE_GLAPI *p_glSampleMaskEXT)(GLclampf,GLboolean); @@ -1798,4 +1947,5 @@ void (WINE_GLAPI *p_glSamplerParameteri)(GLuint,GLenum,GLint); void (WINE_GLAPI *p_glSamplerParameteriv)(GLuint,GLenum,const GLint*); + void (WINE_GLAPI *p_glScalexOES)(GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glScissorArrayv)(GLuint,GLsizei,const GLint*); void (WINE_GLAPI *p_glScissorIndexed)(GLuint,GLint,GLint,GLsizei,GLsizei); @@ -1838,23 +1988,23 @@ void (WINE_GLAPI *p_glSecondaryColorP3ui)(GLenum,GLuint); void (WINE_GLAPI *p_glSecondaryColorP3uiv)(GLenum,const GLuint*); - void (WINE_GLAPI *p_glSecondaryColorPointer)(GLint,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glSecondaryColorPointerEXT)(GLint,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glSecondaryColorPointerListIBM)(GLint,GLenum,GLint,const GLvoid**,GLint); + void (WINE_GLAPI *p_glSecondaryColorPointer)(GLint,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glSecondaryColorPointerEXT)(GLint,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glSecondaryColorPointerListIBM)(GLint,GLenum,GLint,const void**,GLint); void (WINE_GLAPI *p_glSelectPerfMonitorCountersAMD)(GLuint,GLboolean,GLuint,GLint,GLuint*); void (WINE_GLAPI *p_glSelectTextureCoordSetSGIS)(GLenum); void (WINE_GLAPI *p_glSelectTextureSGIS)(GLenum); - void (WINE_GLAPI *p_glSeparableFilter2D)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*,const GLvoid*); - void (WINE_GLAPI *p_glSeparableFilter2DEXT)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*,const GLvoid*); + void (WINE_GLAPI *p_glSeparableFilter2D)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const void*,const void*); + void (WINE_GLAPI *p_glSeparableFilter2DEXT)(GLenum,GLenum,GLsizei,GLsizei,GLenum,GLenum,const void*,const void*); void (WINE_GLAPI *p_glSetFenceAPPLE)(GLuint); void (WINE_GLAPI *p_glSetFenceNV)(GLuint,GLenum); void (WINE_GLAPI *p_glSetFragmentShaderConstantATI)(GLuint,const GLfloat*); - void (WINE_GLAPI *p_glSetInvariantEXT)(GLuint,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glSetLocalConstantEXT)(GLuint,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glSetInvariantEXT)(GLuint,GLenum,const void*); + void (WINE_GLAPI *p_glSetLocalConstantEXT)(GLuint,GLenum,const void*); void (WINE_GLAPI *p_glSetMultisamplefvAMD)(GLenum,GLuint,const GLfloat*); - void (WINE_GLAPI *p_glShaderBinary)(GLsizei,const GLuint*,GLenum,const GLvoid*,GLsizei); + void (WINE_GLAPI *p_glShaderBinary)(GLsizei,const GLuint*,GLenum,const void*,GLsizei); void (WINE_GLAPI *p_glShaderOp1EXT)(GLenum,GLuint,GLuint); void (WINE_GLAPI *p_glShaderOp2EXT)(GLenum,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glShaderOp3EXT)(GLenum,GLuint,GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glShaderSource)(GLuint,GLsizei,const GLchar* const*,const GLint*); + void (WINE_GLAPI *p_glShaderSource)(GLuint,GLsizei,const GLchar*const*,const GLint*); void (WINE_GLAPI *p_glShaderSourceARB)(GLhandleARB,GLsizei,const GLcharARB**,const GLint*); void (WINE_GLAPI *p_glShaderStorageBlockBinding)(GLuint,GLuint,GLuint); @@ -1866,5 +2016,5 @@ void (WINE_GLAPI *p_glStartInstrumentsSGIX)(void); void (WINE_GLAPI *p_glStencilClearTagEXT)(GLsizei,GLuint); - void (WINE_GLAPI *p_glStencilFillPathInstancedNV)(GLsizei,GLenum,const GLvoid*,GLuint,GLenum,GLuint,GLenum,const GLfloat*); + void (WINE_GLAPI *p_glStencilFillPathInstancedNV)(GLsizei,GLenum,const void*,GLuint,GLenum,GLuint,GLenum,const GLfloat*); void (WINE_GLAPI *p_glStencilFillPathNV)(GLuint,GLenum,GLuint); void (WINE_GLAPI *p_glStencilFuncSeparate)(GLenum,GLenum,GLint,GLuint); @@ -1874,9 +2024,10 @@ void (WINE_GLAPI *p_glStencilOpSeparateATI)(GLenum,GLenum,GLenum,GLenum); void (WINE_GLAPI *p_glStencilOpValueAMD)(GLenum,GLuint); - void (WINE_GLAPI *p_glStencilStrokePathInstancedNV)(GLsizei,GLenum,const GLvoid*,GLuint,GLint,GLuint,GLenum,const GLfloat*); + void (WINE_GLAPI *p_glStencilStrokePathInstancedNV)(GLsizei,GLenum,const void*,GLuint,GLint,GLuint,GLenum,const GLfloat*); void (WINE_GLAPI *p_glStencilStrokePathNV)(GLuint,GLint,GLuint); void (WINE_GLAPI *p_glStopInstrumentsSGIX)(GLint); - void (WINE_GLAPI *p_glStringMarkerGREMEDY)(GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glStringMarkerGREMEDY)(GLsizei,const void*); void (WINE_GLAPI *p_glSwizzleEXT)(GLuint,GLuint,GLenum,GLenum,GLenum,GLenum); + void (WINE_GLAPI *p_glSyncTextureINTEL)(GLuint); void (WINE_GLAPI *p_glTagSampleBufferSGIX)(void); void (WINE_GLAPI *p_glTangent3bEXT)(GLbyte,GLbyte,GLbyte); @@ -1890,5 +2041,5 @@ void (WINE_GLAPI *p_glTangent3sEXT)(GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glTangent3svEXT)(const GLshort*); - void (WINE_GLAPI *p_glTangentPointerEXT)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glTangentPointerEXT)(GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glTbufferMask3DFX)(GLuint); void (WINE_GLAPI *p_glTessellationFactorAMD)(GLfloat); @@ -1903,6 +2054,12 @@ void (WINE_GLAPI *p_glTexBumpParameterfvATI)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glTexBumpParameterivATI)(GLenum,const GLint*); + void (WINE_GLAPI *p_glTexCoord1bOES)(GLbyte); + void (WINE_GLAPI *p_glTexCoord1bvOES)(const GLbyte*); void (WINE_GLAPI *p_glTexCoord1hNV)(GLhalfNV); void (WINE_GLAPI *p_glTexCoord1hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glTexCoord1xOES)(GLfixed); + void (WINE_GLAPI *p_glTexCoord1xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glTexCoord2bOES)(GLbyte,GLbyte); + void (WINE_GLAPI *p_glTexCoord2bvOES)(const GLbyte*); void (WINE_GLAPI *p_glTexCoord2fColor3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glTexCoord2fColor3fVertex3fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*); @@ -1917,6 +2074,14 @@ void (WINE_GLAPI *p_glTexCoord2hNV)(GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glTexCoord2hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glTexCoord2xOES)(GLfixed,GLfixed); + void (WINE_GLAPI *p_glTexCoord2xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glTexCoord3bOES)(GLbyte,GLbyte,GLbyte); + void (WINE_GLAPI *p_glTexCoord3bvOES)(const GLbyte*); void (WINE_GLAPI *p_glTexCoord3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glTexCoord3hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glTexCoord3xOES)(GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glTexCoord3xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glTexCoord4bOES)(GLbyte,GLbyte,GLbyte,GLbyte); + void (WINE_GLAPI *p_glTexCoord4bvOES)(const GLbyte*); void (WINE_GLAPI *p_glTexCoord4fColor4fNormal3fVertex4fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glTexCoord4fColor4fNormal3fVertex4fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*,const GLfloat*); @@ -1925,4 +2090,6 @@ void (WINE_GLAPI *p_glTexCoord4hNV)(GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glTexCoord4hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glTexCoord4xOES)(GLfixed,GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glTexCoord4xvOES)(const GLfixed*); void (WINE_GLAPI *p_glTexCoordFormatNV)(GLint,GLenum,GLsizei); void (WINE_GLAPI *p_glTexCoordP1ui)(GLenum,GLuint); @@ -1934,19 +2101,26 @@ void (WINE_GLAPI *p_glTexCoordP4ui)(GLenum,GLuint); void (WINE_GLAPI *p_glTexCoordP4uiv)(GLenum,const GLuint*); - void (WINE_GLAPI *p_glTexCoordPointerEXT)(GLint,GLenum,GLsizei,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glTexCoordPointerListIBM)(GLint,GLenum,GLint,const GLvoid**,GLint); - void (WINE_GLAPI *p_glTexCoordPointervINTEL)(GLint,GLenum,const GLvoid**); + void (WINE_GLAPI *p_glTexCoordPointerEXT)(GLint,GLenum,GLsizei,GLsizei,const void*); + void (WINE_GLAPI *p_glTexCoordPointerListIBM)(GLint,GLenum,GLint,const void**,GLint); + void (WINE_GLAPI *p_glTexCoordPointervINTEL)(GLint,GLenum,const void**); + void (WINE_GLAPI *p_glTexEnvxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glTexEnvxvOES)(GLenum,GLenum,const GLfixed*); void (WINE_GLAPI *p_glTexFilterFuncSGIS)(GLenum,GLenum,GLsizei,const GLfloat*); - void (WINE_GLAPI *p_glTexImage2DMultisample)(GLenum,GLsizei,GLint,GLsizei,GLsizei,GLboolean); + void (WINE_GLAPI *p_glTexGenxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glTexGenxvOES)(GLenum,GLenum,const GLfixed*); + void (WINE_GLAPI *p_glTexImage2DMultisample)(GLenum,GLsizei,GLenum,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTexImage2DMultisampleCoverageNV)(GLenum,GLsizei,GLsizei,GLint,GLsizei,GLsizei,GLboolean); - void (WINE_GLAPI *p_glTexImage3D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexImage3DEXT)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexImage3DMultisample)(GLenum,GLsizei,GLint,GLsizei,GLsizei,GLsizei,GLboolean); + void (WINE_GLAPI *p_glTexImage3D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexImage3DEXT)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexImage3DMultisample)(GLenum,GLsizei,GLenum,GLsizei,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTexImage3DMultisampleCoverageNV)(GLenum,GLsizei,GLsizei,GLint,GLsizei,GLsizei,GLsizei,GLboolean); - void (WINE_GLAPI *p_glTexImage4DSGIS)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTexImage4DSGIS)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexPageCommitmentARB)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTexParameterIiv)(GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glTexParameterIivEXT)(GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glTexParameterIuiv)(GLenum,GLenum,const GLuint*); void (WINE_GLAPI *p_glTexParameterIuivEXT)(GLenum,GLenum,const GLuint*); + void (WINE_GLAPI *p_glTexParameterxOES)(GLenum,GLenum,GLfixed); + void (WINE_GLAPI *p_glTexParameterxvOES)(GLenum,GLenum,const GLfixed*); void (WINE_GLAPI *p_glTexRenderbufferNV)(GLenum,GLuint); void (WINE_GLAPI *p_glTexStorage1D)(GLenum,GLsizei,GLenum,GLsizei); @@ -1956,18 +2130,18 @@ void (WINE_GLAPI *p_glTexStorage3DMultisample)(GLenum,GLsizei,GLenum,GLsizei,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTexStorageSparseAMD)(GLenum,GLenum,GLsizei,GLsizei,GLsizei,GLsizei,GLbitfield); - void (WINE_GLAPI *p_glTexSubImage1DEXT)(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexSubImage2DEXT)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexSubImage3DEXT)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTexSubImage4DSGIS)(GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTexSubImage1DEXT)(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexSubImage2DEXT)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexSubImage3DEXT)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTexSubImage4DSGIS)(GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glTextureBarrierNV)(void); void (WINE_GLAPI *p_glTextureBufferEXT)(GLuint,GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glTextureBufferRangeEXT)(GLuint,GLenum,GLenum,GLuint,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glTextureColorMaskSGIS)(GLboolean,GLboolean,GLboolean,GLboolean); - void (WINE_GLAPI *p_glTextureImage1DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLint,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTextureImage2DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTextureImage1DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTextureImage2DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glTextureImage2DMultisampleCoverageNV)(GLuint,GLenum,GLsizei,GLsizei,GLint,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTextureImage2DMultisampleNV)(GLuint,GLenum,GLsizei,GLint,GLsizei,GLsizei,GLboolean); - void (WINE_GLAPI *p_glTextureImage3DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTextureImage3DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glTextureImage3DMultisampleCoverageNV)(GLuint,GLenum,GLsizei,GLsizei,GLint,GLsizei,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTextureImage3DMultisampleNV)(GLuint,GLenum,GLsizei,GLint,GLsizei,GLsizei,GLsizei,GLboolean); @@ -1975,4 +2149,5 @@ void (WINE_GLAPI *p_glTextureMaterialEXT)(GLenum,GLenum); void (WINE_GLAPI *p_glTextureNormalEXT)(GLenum); + void (WINE_GLAPI *p_glTexturePageCommitmentEXT)(GLuint,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTextureParameterIivEXT)(GLuint,GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glTextureParameterIuivEXT)(GLuint,GLenum,GLenum,const GLuint*); @@ -1981,5 +2156,5 @@ void (WINE_GLAPI *p_glTextureParameteriEXT)(GLuint,GLenum,GLenum,GLint); void (WINE_GLAPI *p_glTextureParameterivEXT)(GLuint,GLenum,GLenum,const GLint*); - void (WINE_GLAPI *p_glTextureRangeAPPLE)(GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glTextureRangeAPPLE)(GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glTextureRenderbufferEXT)(GLuint,GLenum,GLuint); void (WINE_GLAPI *p_glTextureStorage1DEXT)(GLuint,GLenum,GLsizei,GLenum,GLsizei); @@ -1989,15 +2164,16 @@ void (WINE_GLAPI *p_glTextureStorage3DMultisampleEXT)(GLuint,GLenum,GLsizei,GLenum,GLsizei,GLsizei,GLsizei,GLboolean); void (WINE_GLAPI *p_glTextureStorageSparseAMD)(GLuint,GLenum,GLenum,GLsizei,GLsizei,GLsizei,GLsizei,GLbitfield); - void (WINE_GLAPI *p_glTextureSubImage1DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTextureSubImage2DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glTextureSubImage3DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); + void (WINE_GLAPI *p_glTextureSubImage1DEXT)(GLuint,GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTextureSubImage2DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glTextureSubImage3DEXT)(GLuint,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glTextureView)(GLuint,GLenum,GLuint,GLenum,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glTrackMatrixNV)(GLenum,GLuint,GLenum,GLenum); void (WINE_GLAPI *p_glTransformFeedbackAttribsNV)(GLuint,const GLint*,GLenum); void (WINE_GLAPI *p_glTransformFeedbackStreamAttribsNV)(GLsizei,const GLint*,GLsizei,const GLint*,GLenum); - void (WINE_GLAPI *p_glTransformFeedbackVaryings)(GLuint,GLsizei,const GLchar* const*,GLenum); - void (WINE_GLAPI *p_glTransformFeedbackVaryingsEXT)(GLuint,GLsizei,const GLchar**,GLenum); + void (WINE_GLAPI *p_glTransformFeedbackVaryings)(GLuint,GLsizei,const GLchar*const*,GLenum); + void (WINE_GLAPI *p_glTransformFeedbackVaryingsEXT)(GLuint,GLsizei,const GLchar*const*,GLenum); void (WINE_GLAPI *p_glTransformFeedbackVaryingsNV)(GLuint,GLsizei,const GLint*,GLenum); void (WINE_GLAPI *p_glTransformPathNV)(GLuint,GLuint,GLenum,const GLfloat*); + void (WINE_GLAPI *p_glTranslatexOES)(GLfixed,GLfixed,GLfixed); void (WINE_GLAPI *p_glUniform1d)(GLint,GLdouble); void (WINE_GLAPI *p_glUniform1dv)(GLint,GLsizei,const GLdouble*); @@ -2007,12 +2183,12 @@ void (WINE_GLAPI *p_glUniform1fvARB)(GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glUniform1i)(GLint,GLint); - void (WINE_GLAPI *p_glUniform1i64NV)(GLint,INT64); - void (WINE_GLAPI *p_glUniform1i64vNV)(GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glUniform1i64NV)(GLint,GLint64EXT); + void (WINE_GLAPI *p_glUniform1i64vNV)(GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glUniform1iARB)(GLint,GLint); void (WINE_GLAPI *p_glUniform1iv)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform1ivARB)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform1ui)(GLint,GLuint); - void (WINE_GLAPI *p_glUniform1ui64NV)(GLint,UINT64); - void (WINE_GLAPI *p_glUniform1ui64vNV)(GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glUniform1ui64NV)(GLint,GLuint64EXT); + void (WINE_GLAPI *p_glUniform1ui64vNV)(GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glUniform1uiEXT)(GLint,GLuint); void (WINE_GLAPI *p_glUniform1uiv)(GLint,GLsizei,const GLuint*); @@ -2025,12 +2201,12 @@ void (WINE_GLAPI *p_glUniform2fvARB)(GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glUniform2i)(GLint,GLint,GLint); - void (WINE_GLAPI *p_glUniform2i64NV)(GLint,INT64,INT64); - void (WINE_GLAPI *p_glUniform2i64vNV)(GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glUniform2i64NV)(GLint,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glUniform2i64vNV)(GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glUniform2iARB)(GLint,GLint,GLint); void (WINE_GLAPI *p_glUniform2iv)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform2ivARB)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform2ui)(GLint,GLuint,GLuint); - void (WINE_GLAPI *p_glUniform2ui64NV)(GLint,UINT64,UINT64); - void (WINE_GLAPI *p_glUniform2ui64vNV)(GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glUniform2ui64NV)(GLint,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glUniform2ui64vNV)(GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glUniform2uiEXT)(GLint,GLuint,GLuint); void (WINE_GLAPI *p_glUniform2uiv)(GLint,GLsizei,const GLuint*); @@ -2043,12 +2219,12 @@ void (WINE_GLAPI *p_glUniform3fvARB)(GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glUniform3i)(GLint,GLint,GLint,GLint); - void (WINE_GLAPI *p_glUniform3i64NV)(GLint,INT64,INT64,INT64); - void (WINE_GLAPI *p_glUniform3i64vNV)(GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glUniform3i64NV)(GLint,GLint64EXT,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glUniform3i64vNV)(GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glUniform3iARB)(GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glUniform3iv)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform3ivARB)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform3ui)(GLint,GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glUniform3ui64NV)(GLint,UINT64,UINT64,UINT64); - void (WINE_GLAPI *p_glUniform3ui64vNV)(GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glUniform3ui64NV)(GLint,GLuint64EXT,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glUniform3ui64vNV)(GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glUniform3uiEXT)(GLint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glUniform3uiv)(GLint,GLsizei,const GLuint*); @@ -2061,12 +2237,12 @@ void (WINE_GLAPI *p_glUniform4fvARB)(GLint,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glUniform4i)(GLint,GLint,GLint,GLint,GLint); - void (WINE_GLAPI *p_glUniform4i64NV)(GLint,INT64,INT64,INT64,INT64); - void (WINE_GLAPI *p_glUniform4i64vNV)(GLint,GLsizei,const INT64*); + void (WINE_GLAPI *p_glUniform4i64NV)(GLint,GLint64EXT,GLint64EXT,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glUniform4i64vNV)(GLint,GLsizei,const GLint64EXT*); void (WINE_GLAPI *p_glUniform4iARB)(GLint,GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glUniform4iv)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform4ivARB)(GLint,GLsizei,const GLint*); void (WINE_GLAPI *p_glUniform4ui)(GLint,GLuint,GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glUniform4ui64NV)(GLint,UINT64,UINT64,UINT64,UINT64); - void (WINE_GLAPI *p_glUniform4ui64vNV)(GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glUniform4ui64NV)(GLint,GLuint64EXT,GLuint64EXT,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glUniform4ui64vNV)(GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glUniform4uiEXT)(GLint,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glUniform4uiv)(GLint,GLsizei,const GLuint*); @@ -2074,6 +2250,8 @@ void (WINE_GLAPI *p_glUniformBlockBinding)(GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glUniformBufferEXT)(GLuint,GLint,GLuint); - void (WINE_GLAPI *p_glUniformHandleui64NV)(GLint,UINT64); - void (WINE_GLAPI *p_glUniformHandleui64vNV)(GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glUniformHandleui64ARB)(GLint,GLuint64); + void (WINE_GLAPI *p_glUniformHandleui64NV)(GLint,GLuint64); + void (WINE_GLAPI *p_glUniformHandleui64vARB)(GLint,GLsizei,const GLuint64*); + void (WINE_GLAPI *p_glUniformHandleui64vNV)(GLint,GLsizei,const GLuint64*); void (WINE_GLAPI *p_glUniformMatrix2dv)(GLint,GLsizei,GLboolean,const GLdouble*); void (WINE_GLAPI *p_glUniformMatrix2fv)(GLint,GLsizei,GLboolean,const GLfloat*); @@ -2098,6 +2276,6 @@ void (WINE_GLAPI *p_glUniformMatrix4x3fv)(GLint,GLsizei,GLboolean,const GLfloat*); void (WINE_GLAPI *p_glUniformSubroutinesuiv)(GLenum,GLsizei,const GLuint*); - void (WINE_GLAPI *p_glUniformui64NV)(GLint,UINT64); - void (WINE_GLAPI *p_glUniformui64vNV)(GLint,GLsizei,const UINT64*); + void (WINE_GLAPI *p_glUniformui64NV)(GLint,GLuint64EXT); + void (WINE_GLAPI *p_glUniformui64vNV)(GLint,GLsizei,const GLuint64EXT*); void (WINE_GLAPI *p_glUnlockArraysEXT)(void); GLboolean (WINE_GLAPI *p_glUnmapBuffer)(GLenum); @@ -2105,5 +2283,6 @@ GLboolean (WINE_GLAPI *p_glUnmapNamedBufferEXT)(GLuint); void (WINE_GLAPI *p_glUnmapObjectBufferATI)(GLuint); - void (WINE_GLAPI *p_glUpdateObjectBufferATI)(GLuint,GLuint,GLsizei,const GLvoid*,GLenum); + void (WINE_GLAPI *p_glUnmapTexture2DINTEL)(GLuint,GLint); + void (WINE_GLAPI *p_glUpdateObjectBufferATI)(GLuint,GLuint,GLsizei,const void*,GLenum); void (WINE_GLAPI *p_glUseProgram)(GLuint); void (WINE_GLAPI *p_glUseProgramObjectARB)(GLhandleARB); @@ -2112,9 +2291,9 @@ void (WINE_GLAPI *p_glVDPAUFiniNV)(void); void (WINE_GLAPI *p_glVDPAUGetSurfaceivNV)(GLvdpauSurfaceNV,GLenum,GLsizei,GLsizei*,GLint*); - void (WINE_GLAPI *p_glVDPAUInitNV)(const GLvoid*,const GLvoid*); + void (WINE_GLAPI *p_glVDPAUInitNV)(const void*,const void*); void (WINE_GLAPI *p_glVDPAUIsSurfaceNV)(GLvdpauSurfaceNV); void (WINE_GLAPI *p_glVDPAUMapSurfacesNV)(GLsizei,const GLvdpauSurfaceNV*); - GLvdpauSurfaceNV (WINE_GLAPI *p_glVDPAURegisterOutputSurfaceNV)(GLvoid*,GLenum,GLsizei,const GLuint*); - GLvdpauSurfaceNV (WINE_GLAPI *p_glVDPAURegisterVideoSurfaceNV)(const GLvoid*,GLenum,GLsizei,const GLuint*); + GLvdpauSurfaceNV (WINE_GLAPI *p_glVDPAURegisterOutputSurfaceNV)(const void*,GLenum,GLsizei,const GLuint*); + GLvdpauSurfaceNV (WINE_GLAPI *p_glVDPAURegisterVideoSurfaceNV)(const void*,GLenum,GLsizei,const GLuint*); void (WINE_GLAPI *p_glVDPAUSurfaceAccessNV)(GLvdpauSurfaceNV,GLenum); void (WINE_GLAPI *p_glVDPAUUnmapSurfacesNV)(GLsizei,const GLvdpauSurfaceNV*); @@ -2124,5 +2303,5 @@ void (WINE_GLAPI *p_glValidateProgramPipeline)(GLuint); void (WINE_GLAPI *p_glVariantArrayObjectATI)(GLuint,GLenum,GLsizei,GLuint,GLuint); - void (WINE_GLAPI *p_glVariantPointerEXT)(GLuint,GLenum,GLuint,const GLvoid*); + void (WINE_GLAPI *p_glVariantPointerEXT)(GLuint,GLenum,GLuint,const void*); void (WINE_GLAPI *p_glVariantbvEXT)(GLuint,const GLbyte*); void (WINE_GLAPI *p_glVariantdvEXT)(GLuint,const GLdouble*); @@ -2133,20 +2312,44 @@ void (WINE_GLAPI *p_glVariantuivEXT)(GLuint,const GLuint*); void (WINE_GLAPI *p_glVariantusvEXT)(GLuint,const GLushort*); + void (WINE_GLAPI *p_glVertex2bOES)(GLbyte); + void (WINE_GLAPI *p_glVertex2bvOES)(const GLbyte*); void (WINE_GLAPI *p_glVertex2hNV)(GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glVertex2hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glVertex2xOES)(GLfixed); + void (WINE_GLAPI *p_glVertex2xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glVertex3bOES)(GLbyte,GLbyte); + void (WINE_GLAPI *p_glVertex3bvOES)(const GLbyte*); void (WINE_GLAPI *p_glVertex3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glVertex3hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glVertex3xOES)(GLfixed,GLfixed); + void (WINE_GLAPI *p_glVertex3xvOES)(const GLfixed*); + void (WINE_GLAPI *p_glVertex4bOES)(GLbyte,GLbyte,GLbyte); + void (WINE_GLAPI *p_glVertex4bvOES)(const GLbyte*); void (WINE_GLAPI *p_glVertex4hNV)(GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); void (WINE_GLAPI *p_glVertex4hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glVertex4xOES)(GLfixed,GLfixed,GLfixed); + void (WINE_GLAPI *p_glVertex4xvOES)(const GLfixed*); void (WINE_GLAPI *p_glVertexArrayBindVertexBufferEXT)(GLuint,GLuint,GLuint,GLintptr,GLsizei); + void (WINE_GLAPI *p_glVertexArrayColorOffsetEXT)(GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayEdgeFlagOffsetEXT)(GLuint,GLuint,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayFogCoordOffsetEXT)(GLuint,GLuint,GLenum,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayIndexOffsetEXT)(GLuint,GLuint,GLenum,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayMultiTexCoordOffsetEXT)(GLuint,GLuint,GLenum,GLint,GLenum,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayNormalOffsetEXT)(GLuint,GLuint,GLenum,GLsizei,GLintptr); void (WINE_GLAPI *p_glVertexArrayParameteriAPPLE)(GLenum,GLint); - void (WINE_GLAPI *p_glVertexArrayRangeAPPLE)(GLsizei,GLvoid*); - void (WINE_GLAPI *p_glVertexArrayRangeNV)(GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glVertexArrayRangeAPPLE)(GLsizei,void*); + void (WINE_GLAPI *p_glVertexArrayRangeNV)(GLsizei,const void*); + void (WINE_GLAPI *p_glVertexArraySecondaryColorOffsetEXT)(GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayTexCoordOffsetEXT)(GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); void (WINE_GLAPI *p_glVertexArrayVertexAttribBindingEXT)(GLuint,GLuint,GLuint); + void (WINE_GLAPI *p_glVertexArrayVertexAttribDivisorEXT)(GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glVertexArrayVertexAttribFormatEXT)(GLuint,GLuint,GLint,GLenum,GLboolean,GLuint); void (WINE_GLAPI *p_glVertexArrayVertexAttribIFormatEXT)(GLuint,GLuint,GLint,GLenum,GLuint); + void (WINE_GLAPI *p_glVertexArrayVertexAttribIOffsetEXT)(GLuint,GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); void (WINE_GLAPI *p_glVertexArrayVertexAttribLFormatEXT)(GLuint,GLuint,GLint,GLenum,GLuint); void (WINE_GLAPI *p_glVertexArrayVertexAttribLOffsetEXT)(GLuint,GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); + void (WINE_GLAPI *p_glVertexArrayVertexAttribOffsetEXT)(GLuint,GLuint,GLuint,GLint,GLenum,GLboolean,GLsizei,GLintptr); void (WINE_GLAPI *p_glVertexArrayVertexBindingDivisorEXT)(GLuint,GLuint,GLuint); + void (WINE_GLAPI *p_glVertexArrayVertexOffsetEXT)(GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); void (WINE_GLAPI *p_glVertexAttrib1d)(GLuint,GLdouble); void (WINE_GLAPI *p_glVertexAttrib1dARB)(GLuint,GLdouble); @@ -2303,42 +2506,44 @@ void (WINE_GLAPI *p_glVertexAttribIFormat)(GLuint,GLint,GLenum,GLuint); void (WINE_GLAPI *p_glVertexAttribIFormatNV)(GLuint,GLint,GLenum,GLsizei); - void (WINE_GLAPI *p_glVertexAttribIPointer)(GLuint,GLint,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glVertexAttribIPointerEXT)(GLuint,GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glVertexAttribIPointer)(GLuint,GLint,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glVertexAttribIPointerEXT)(GLuint,GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glVertexAttribL1d)(GLuint,GLdouble); void (WINE_GLAPI *p_glVertexAttribL1dEXT)(GLuint,GLdouble); void (WINE_GLAPI *p_glVertexAttribL1dv)(GLuint,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribL1dvEXT)(GLuint,const GLdouble*); - void (WINE_GLAPI *p_glVertexAttribL1i64NV)(GLuint,INT64); - void (WINE_GLAPI *p_glVertexAttribL1i64vNV)(GLuint,const INT64*); - void (WINE_GLAPI *p_glVertexAttribL1ui64NV)(GLuint,UINT64); - void (WINE_GLAPI *p_glVertexAttribL1ui64vNV)(GLuint,const UINT64*); + void (WINE_GLAPI *p_glVertexAttribL1i64NV)(GLuint,GLint64EXT); + void (WINE_GLAPI *p_glVertexAttribL1i64vNV)(GLuint,const GLint64EXT*); + void (WINE_GLAPI *p_glVertexAttribL1ui64ARB)(GLuint,GLuint64EXT); + void (WINE_GLAPI *p_glVertexAttribL1ui64NV)(GLuint,GLuint64EXT); + void (WINE_GLAPI *p_glVertexAttribL1ui64vARB)(GLuint,const GLuint64EXT*); + void (WINE_GLAPI *p_glVertexAttribL1ui64vNV)(GLuint,const GLuint64EXT*); void (WINE_GLAPI *p_glVertexAttribL2d)(GLuint,GLdouble,GLdouble); void (WINE_GLAPI *p_glVertexAttribL2dEXT)(GLuint,GLdouble,GLdouble); void (WINE_GLAPI *p_glVertexAttribL2dv)(GLuint,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribL2dvEXT)(GLuint,const GLdouble*); - void (WINE_GLAPI *p_glVertexAttribL2i64NV)(GLuint,INT64,INT64); - void (WINE_GLAPI *p_glVertexAttribL2i64vNV)(GLuint,const INT64*); - void (WINE_GLAPI *p_glVertexAttribL2ui64NV)(GLuint,UINT64,UINT64); - void (WINE_GLAPI *p_glVertexAttribL2ui64vNV)(GLuint,const UINT64*); + void (WINE_GLAPI *p_glVertexAttribL2i64NV)(GLuint,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glVertexAttribL2i64vNV)(GLuint,const GLint64EXT*); + void (WINE_GLAPI *p_glVertexAttribL2ui64NV)(GLuint,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glVertexAttribL2ui64vNV)(GLuint,const GLuint64EXT*); void (WINE_GLAPI *p_glVertexAttribL3d)(GLuint,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glVertexAttribL3dEXT)(GLuint,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glVertexAttribL3dv)(GLuint,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribL3dvEXT)(GLuint,const GLdouble*); - void (WINE_GLAPI *p_glVertexAttribL3i64NV)(GLuint,INT64,INT64,INT64); - void (WINE_GLAPI *p_glVertexAttribL3i64vNV)(GLuint,const INT64*); - void (WINE_GLAPI *p_glVertexAttribL3ui64NV)(GLuint,UINT64,UINT64,UINT64); - void (WINE_GLAPI *p_glVertexAttribL3ui64vNV)(GLuint,const UINT64*); + void (WINE_GLAPI *p_glVertexAttribL3i64NV)(GLuint,GLint64EXT,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glVertexAttribL3i64vNV)(GLuint,const GLint64EXT*); + void (WINE_GLAPI *p_glVertexAttribL3ui64NV)(GLuint,GLuint64EXT,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glVertexAttribL3ui64vNV)(GLuint,const GLuint64EXT*); void (WINE_GLAPI *p_glVertexAttribL4d)(GLuint,GLdouble,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glVertexAttribL4dEXT)(GLuint,GLdouble,GLdouble,GLdouble,GLdouble); void (WINE_GLAPI *p_glVertexAttribL4dv)(GLuint,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribL4dvEXT)(GLuint,const GLdouble*); - void (WINE_GLAPI *p_glVertexAttribL4i64NV)(GLuint,INT64,INT64,INT64,INT64); - void (WINE_GLAPI *p_glVertexAttribL4i64vNV)(GLuint,const INT64*); - void (WINE_GLAPI *p_glVertexAttribL4ui64NV)(GLuint,UINT64,UINT64,UINT64,UINT64); - void (WINE_GLAPI *p_glVertexAttribL4ui64vNV)(GLuint,const UINT64*); + void (WINE_GLAPI *p_glVertexAttribL4i64NV)(GLuint,GLint64EXT,GLint64EXT,GLint64EXT,GLint64EXT); + void (WINE_GLAPI *p_glVertexAttribL4i64vNV)(GLuint,const GLint64EXT*); + void (WINE_GLAPI *p_glVertexAttribL4ui64NV)(GLuint,GLuint64EXT,GLuint64EXT,GLuint64EXT,GLuint64EXT); + void (WINE_GLAPI *p_glVertexAttribL4ui64vNV)(GLuint,const GLuint64EXT*); void (WINE_GLAPI *p_glVertexAttribLFormat)(GLuint,GLint,GLenum,GLuint); void (WINE_GLAPI *p_glVertexAttribLFormatNV)(GLuint,GLint,GLenum,GLsizei); - void (WINE_GLAPI *p_glVertexAttribLPointer)(GLuint,GLint,GLenum,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glVertexAttribLPointerEXT)(GLuint,GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glVertexAttribLPointer)(GLuint,GLint,GLenum,GLsizei,const void*); + void (WINE_GLAPI *p_glVertexAttribLPointerEXT)(GLuint,GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glVertexAttribP1ui)(GLuint,GLenum,GLboolean,GLuint); void (WINE_GLAPI *p_glVertexAttribP1uiv)(GLuint,GLenum,GLboolean,const GLuint*); @@ -2349,7 +2554,8 @@ void (WINE_GLAPI *p_glVertexAttribP4ui)(GLuint,GLenum,GLboolean,GLuint); void (WINE_GLAPI *p_glVertexAttribP4uiv)(GLuint,GLenum,GLboolean,const GLuint*); - void (WINE_GLAPI *p_glVertexAttribPointer)(GLuint,GLint,GLenum,GLboolean,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glVertexAttribPointerARB)(GLuint,GLint,GLenum,GLboolean,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glVertexAttribPointerNV)(GLuint,GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glVertexAttribParameteriAMD)(GLuint,GLenum,GLint); + void (WINE_GLAPI *p_glVertexAttribPointer)(GLuint,GLint,GLenum,GLboolean,GLsizei,const void*); + void (WINE_GLAPI *p_glVertexAttribPointerARB)(GLuint,GLint,GLenum,GLboolean,GLsizei,const void*); + void (WINE_GLAPI *p_glVertexAttribPointerNV)(GLuint,GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glVertexAttribs1dvNV)(GLuint,GLsizei,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribs1fvNV)(GLuint,GLsizei,const GLfloat*); @@ -2380,7 +2586,7 @@ void (WINE_GLAPI *p_glVertexP4ui)(GLenum,GLuint); void (WINE_GLAPI *p_glVertexP4uiv)(GLenum,const GLuint*); - void (WINE_GLAPI *p_glVertexPointerEXT)(GLint,GLenum,GLsizei,GLsizei,const GLvoid*); - void (WINE_GLAPI *p_glVertexPointerListIBM)(GLint,GLenum,GLint,const GLvoid**,GLint); - void (WINE_GLAPI *p_glVertexPointervINTEL)(GLint,GLenum,const GLvoid**); + void (WINE_GLAPI *p_glVertexPointerEXT)(GLint,GLenum,GLsizei,GLsizei,const void*); + void (WINE_GLAPI *p_glVertexPointerListIBM)(GLint,GLenum,GLint,const void**,GLint); + void (WINE_GLAPI *p_glVertexPointervINTEL)(GLint,GLenum,const void**); void (WINE_GLAPI *p_glVertexStream1dATI)(GLenum,GLdouble); void (WINE_GLAPI *p_glVertexStream1dvATI)(GLenum,const GLdouble*); @@ -2415,10 +2621,10 @@ void (WINE_GLAPI *p_glVertexStream4sATI)(GLenum,GLshort,GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glVertexStream4svATI)(GLenum,const GLshort*); - void (WINE_GLAPI *p_glVertexWeightPointerEXT)(GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glVertexWeightPointerEXT)(GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glVertexWeightfEXT)(GLfloat); void (WINE_GLAPI *p_glVertexWeightfvEXT)(const GLfloat*); void (WINE_GLAPI *p_glVertexWeighthNV)(GLhalfNV); void (WINE_GLAPI *p_glVertexWeighthvNV)(const GLhalfNV*); - GLenum (WINE_GLAPI *p_glVideoCaptureNV)(GLuint,GLuint*,UINT64*); + GLenum (WINE_GLAPI *p_glVideoCaptureNV)(GLuint,GLuint*,GLuint64EXT*); void (WINE_GLAPI *p_glVideoCaptureStreamParameterdvNV)(GLuint,GLuint,GLenum,const GLdouble*); void (WINE_GLAPI *p_glVideoCaptureStreamParameterfvNV)(GLuint,GLuint,GLenum,const GLfloat*); @@ -2427,7 +2633,7 @@ void (WINE_GLAPI *p_glViewportIndexedf)(GLuint,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glViewportIndexedfv)(GLuint,const GLfloat*); - void (WINE_GLAPI *p_glWaitSync)(GLvoid*,GLbitfield,UINT64); + void (WINE_GLAPI *p_glWaitSync)(GLsync,GLbitfield,GLuint64); void (WINE_GLAPI *p_glWeightPathsNV)(GLuint,GLsizei,const GLuint*,const GLfloat*); - void (WINE_GLAPI *p_glWeightPointerARB)(GLint,GLenum,GLsizei,const GLvoid*); + void (WINE_GLAPI *p_glWeightPointerARB)(GLint,GLenum,GLsizei,const void*); void (WINE_GLAPI *p_glWeightbvARB)(GLint,const GLbyte*); void (WINE_GLAPI *p_glWeightdvARB)(GLint,const GLdouble*); @@ -2495,5 +2701,5 @@ void (WINE_GLAPI *p_glWindowPos4svMESA)(const GLshort*); void (WINE_GLAPI *p_glWriteMaskEXT)(GLuint,GLuint,GLenum,GLenum,GLenum,GLenum); - GLvoid* (WINE_GLAPI *p_wglAllocateMemoryNV)(GLsizei,GLfloat,GLfloat,GLfloat); + void* (WINE_GLAPI *p_wglAllocateMemoryNV)(GLsizei,GLfloat,GLfloat,GLfloat); BOOL (WINE_GLAPI *p_wglBindTexImageARB)(struct wgl_pbuffer *,int); BOOL (WINE_GLAPI *p_wglChoosePixelFormatARB)(HDC,const int*,const FLOAT*,UINT,int*,UINT*); @@ -2503,6 +2709,6 @@ void (WINE_GLAPI *p_wglFreeMemoryNV)(void*); HDC (WINE_GLAPI *p_wglGetCurrentReadDCARB)(void); - const GLubyte * (WINE_GLAPI *p_wglGetExtensionsStringARB)(HDC); - const GLubyte * (WINE_GLAPI *p_wglGetExtensionsStringEXT)(void); + const char* (WINE_GLAPI *p_wglGetExtensionsStringARB)(HDC); + const char* (WINE_GLAPI *p_wglGetExtensionsStringEXT)(void); HDC (WINE_GLAPI *p_wglGetPbufferDCARB)(struct wgl_pbuffer *); BOOL (WINE_GLAPI *p_wglGetPixelFormatAttribfvARB)(HDC,int,int,UINT,const int*,FLOAT*); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/arb_program_shader.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/arb_program_shader.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/arb_program_shader.c (revision 51270) @@ -49,11 +49,4 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); -/* sRGB correction constants */ -static const float srgb_cmp = 0.0031308f; -static const float srgb_mul_low = 12.92f; -static const float srgb_pow = 0.41666f; -static const float srgb_mul_high = 1.055f; -static const float srgb_sub_high = 0.055f; - static BOOL shader_is_pshader_version(enum wined3d_shader_type type) { @@ -766,4 +759,15 @@ memset(priv->pshader_const_dirty + start, 1, sizeof(*priv->pshader_const_dirty) * count); priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, start + count); +} + +static void shader_arb_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) +{ + char str[4][16]; + + wined3d_ftoa(values[0], str[0]); + wined3d_ftoa(values[1], str[1]); + wined3d_ftoa(values[2], str[2]); + wined3d_ftoa(values[3], str[3]); + shader_addline(buffer, "{%s, %s, %s, %s}", str[0], str[1], str[2], str[3]); } @@ -872,6 +876,7 @@ const float *value; value = (const float *)lconst->value; - shader_addline(buffer, "PARAM C%u = {%.8e, %.8e, %.8e, %.8e};\n", lconst->idx, - value[0], value[1], value[2], value[3]); + shader_addline(buffer, "PARAM C%u = ", lconst->idx); + shader_arb_append_imm_vec4(buffer, value); + shader_addline(buffer, ";\n"); } } @@ -3446,27 +3451,27 @@ { /* Sigh. MOVC CC doesn't work, so use one of the temps as dummy dest */ - shader_addline(buffer, "SUBC %s, %s.x, srgb_consts1.y;\n", tmp1, fragcolor); + shader_addline(buffer, "SUBC %s, %s.x, srgb_consts1.x;\n", tmp1, fragcolor); /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x (GE), %s.x, srgb_consts1.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "POW %s.y (GE), %s.y, srgb_consts1.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "POW %s.z (GE), %s.z, srgb_consts1.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "MUL %s.xyz (GE), %s, srgb_consts1.w;\n", fragcolor, fragcolor); - shader_addline(buffer, "SUB %s.xyz (GE), %s, srgb_consts2.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.x (GE), %s.x, srgb_consts0.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.y (GE), %s.y, srgb_consts0.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.z (GE), %s.z, srgb_consts0.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "MUL %s.xyz (GE), %s, srgb_consts0.y;\n", fragcolor, fragcolor); + shader_addline(buffer, "SUB %s.xyz (GE), %s, srgb_consts0.z;\n", fragcolor, fragcolor); /* Calculate the < case */ - shader_addline(buffer, "MUL %s.xyz (LT), srgb_consts1.x, %s;\n", fragcolor, fragcolor); + shader_addline(buffer, "MUL %s.xyz (LT), srgb_consts0.w, %s;\n", fragcolor, fragcolor); } else { /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x, %s.x, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.y, %s.y, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.z, %s.z, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "MUL %s, %s, srgb_consts1.w;\n", tmp1, tmp1); - shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); + shader_addline(buffer, "POW %s.x, %s.x, srgb_consts0.x;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_consts0.x;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_consts0.x;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_consts0.y;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_consts0.z;\n", tmp1, tmp1); /* Calculate the < case */ - shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); + shader_addline(buffer, "MUL %s, srgb_consts0.w, %s;\n", tmp2, fragcolor); /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); - shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); + shader_addline(buffer, "SLT %s, srgb_consts1.x, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_consts1.x, %s;\n", tmp4, fragcolor); /* Store the components > 0.0031308 in the destination */ shader_addline(buffer, "MUL %s.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); @@ -3597,4 +3602,5 @@ char srgbtmp[4][4]; + char ftoa_tmp[16]; unsigned int i, found = 0; @@ -3722,5 +3728,6 @@ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); - shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, %1.10f, 0.0 };\n", eps); + wined3d_ftoa(eps, ftoa_tmp); + shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, %s, 0.0 };\n", ftoa_tmp); if (reg_maps->shader_version.major < 2) @@ -3746,9 +3753,12 @@ } - if(args->super.srgb_correction) { - shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", - srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); - shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", - srgb_sub_high, 0.0, 0.0, 0.0); + if (args->super.srgb_correction) + { + shader_addline(buffer, "PARAM srgb_consts0 = "); + shader_arb_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "PARAM srgb_consts1 = "); + shader_arb_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_addline(buffer, ";\n"); } @@ -4207,5 +4217,7 @@ if (need_helper_const(shader_data, reg_maps, gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); + char ftoa_tmp[16]; + wined3d_ftoa(eps, ftoa_tmp); + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %s};\n", ftoa_tmp); } if (need_rel_addr_const(shader_data, reg_maps, gl_info)) @@ -6169,5 +6181,5 @@ UINT lowest_disabled_stage; const char *textype; - const char *instr, *sat; + const char *instr; char colorcor_dst[8]; GLuint ret; @@ -6282,11 +6294,14 @@ shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); } - shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); - - if(settings->sRGB_write) { - shader_addline(&buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", - srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); - shader_addline(&buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", - srgb_sub_high, 0.0, 0.0, 0.0); + shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); + + if (settings->sRGB_write) + { + shader_addline(&buffer, "PARAM srgb_consts0 = "); + shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const0); + shader_addline(&buffer, ";\n"); + shader_addline(&buffer, "PARAM srgb_consts1 = "); + shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const1); + shader_addline(&buffer, ";\n"); } @@ -6308,10 +6323,4 @@ default: textype = "unexpected_textype"; break; } - - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - sat = ""; - else - sat = "_SAT"; if(settings->op[stage].projected == proj_none) { @@ -6349,6 +6358,6 @@ } - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) { @@ -6360,9 +6369,9 @@ shader_addline(&buffer, "MOV ret, fragment.texcoord[%u];\n", stage); shader_addline(&buffer, "MOV ret.w, ret.z;\n"); - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); } else { - shader_addline(&buffer, "%s%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", - instr, sat, stage, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", + instr, stage, stage, stage, textype); } @@ -6888,4 +6897,6 @@ { const char *tex; + static const float yv12_coef[] + = {2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f}; switch(textype) { @@ -6935,6 +6946,7 @@ * go from 0 to d3d_height, whereas the opengl texture height is 1.5 * d3d_height */ - shader_addline(buffer, "PARAM yv12_coef = {%f, %f, %f, %f};\n", - 2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f); + shader_addline(buffer, "PARAM yv12_coef = "); + shader_arb_append_imm_vec4(buffer, yv12_coef); + shader_addline(buffer, ";\n"); shader_addline(buffer, "MOV texcrd, fragment.texcoord[0];\n"); @@ -7453,5 +7465,6 @@ /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE + && !surface_is_offscreen(src_surface)) { /* Without FBO blits transferring from the drawable to the texture is Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/buffer.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/buffer.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/buffer.c (revision 51270) @@ -659,4 +659,5 @@ { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); + struct wined3d_context *context; TRACE("%p decreasing refcount to %u.\n", buffer, refcount); @@ -664,5 +665,13 @@ if (!refcount) { - buffer_unload(&buffer->resource); + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL); + delete_gl_buffer(buffer, context->gl_info); + context_release(context); + + HeapFree(GetProcessHeap(), 0, buffer->conversion_map); + } + resource_cleanup(&buffer->resource); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/context.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/context.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/context.c (revision 51270) @@ -842,4 +842,6 @@ return FALSE; } + + ctx->valid = 1; #else return FALSE; @@ -1030,27 +1032,7 @@ if (context->valid) - { - /* You'd figure ReleaseDC() would fail if the DC doesn't match the - * window. However, that's not what actually happens, and there are - * user32 tests that confirm ReleaseDC() with the wrong window is - * supposed to succeed. So explicitly check that the DC belongs to - * the window, since we want to avoid releasing a DC that belongs to - * some other window if the original window was already destroyed. */ - if (WindowFromDC(context->hdc) != context->win_handle) - { - WARN("DC %p does not belong to window %p.\n", - context->hdc, context->win_handle); - } -#ifndef VBOX - else if (!ReleaseDC(context->win_handle, context->hdc)) -#else - else if (!VBoxExtReleaseDC(context->win_handle, context->hdc)) -#endif - { - ERR("Failed to release device context %p, last error %#x.\n", - context->hdc, GetLastError()); - } - } - else context->valid = 1; + wined3d_release_dc(context->win_handle, context->hdc); + else + context->valid = 1; context->win_handle = context->swapchain->win_handle; @@ -1211,5 +1193,5 @@ # ifndef VBOX_WINE_WITH_SINGLE_CONTEXT # ifndef VBOX - ReleaseDC(context->win_handle, context->hdc); + wined3d_release_dc(context->win_handle, context->hdc); # else VBoxExtReleaseDC(context->win_handle, context->hdc); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c (revision 51270) @@ -1379,4 +1379,5 @@ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); + destroy_dummy_textures(device, gl_info); /* Release the buffers (with sanity checks)*/ @@ -5120,9 +5121,5 @@ else if (swapchain_desc->windowed) { - m.width = swapchain->orig_width; - m.height = swapchain->orig_height; - m.refresh_rate = 0; - m.format_id = swapchain->desc.backbuffer_format; - m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m = swapchain->original_mode; } else Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c (revision 51270) @@ -146,4 +146,5 @@ {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, + {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, #ifdef VBOX_WITH_WINE_FIX_IBMTMR {"GL_IBM_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, @@ -194,4 +195,5 @@ {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, + {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, @@ -307,5 +309,5 @@ } - ReleaseDC(ctx->wnd, ctx->dc); + wined3d_release_dc(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); @@ -1370,4 +1372,5 @@ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650TI, "NVIDIA GeForce GTX 650 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660M, "NVIDIA GeForce GTX 660M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1375,4 +1378,5 @@ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ @@ -1786,8 +1790,10 @@ { {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ + {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ + {"GTX 660M", CARD_NVIDIA_GEFORCE_GTX660M}, /* Geforce 600 - midend high mobile */ {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend high */ {"GTX 650 Ti", CARD_NVIDIA_GEFORCE_GTX650TI}, /* Geforce 600 - lowend */ @@ -3111,4 +3117,14 @@ gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) + { + TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); + gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] = TRUE; + } + if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + { + TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; + } wined3d_adapter_init_limits(gl_info); @@ -3228,5 +3244,5 @@ gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; adapter->d3d_info.valid_rt_mask = 0; @@ -4582,5 +4598,5 @@ caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; @@ -4600,5 +4616,5 @@ caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/drawprim.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/drawprim.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/drawprim.c (revision 51270) @@ -62,5 +62,5 @@ if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED]) + if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) { FIXME("Instanced drawing not supported.\n"); @@ -70,7 +70,16 @@ if (start_instance) FIXME("Start instance (%u) not supported.\n", start_instance); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); checkGLcall("glDrawElementsInstancedBaseVertex"); + } + else + { + GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstancedARB"); + } } } Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/glsl_shader.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/glsl_shader.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/glsl_shader.c (revision 51270) @@ -47,19 +47,4 @@ #include "wined3d_private.h" -#if defined(VBOX) -# if defined(RT_ARCH_AMD64) -# define copysignf _copysignf -# else -# define _VBOX_BITVAL_CAST(_t, _f) (*((const _t*)((const void*)(&(_f))))) -# define _VBOX_BITVAL_TO_FLOATL(_f) _VBOX_BITVAL_CAST(float, _f) -# define _VBOX_BITVAL_FROM_FLOAT(_f) _VBOX_BITVAL_CAST(uint32_t, _f) -DECLINLINE(float) copysignf(float val, float sign) -{ - uint32_t u32Val = ((_VBOX_BITVAL_FROM_FLOAT(val) & 0x7fffffff) | (_VBOX_BITVAL_FROM_FLOAT(sign) & 0x80000000)); - return _VBOX_BITVAL_TO_FLOATL(u32Val); -} -# endif -#endif - WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); @@ -71,7 +56,4 @@ #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 - -static const float srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; /* pow, mul_high, sub_high, mul_low */ -static const float srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; /* cmp */ struct glsl_dst_param @@ -273,59 +255,12 @@ } -/* This should be equivalent to using the %.8e format specifier, but always - * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since - * the GLSL parser wouldn't be able to handle those anyway. */ -static void shader_glsl_ftoa(float value, char *s) -{ - int x, frac, exponent; - const char *sign = ""; - double d; - - d = value; - if (copysignf(1.0f, value) < 0.0f) - { - d = -d; - sign = "-"; - } - - if (d == 0.0f) - { - x = 0; - frac = 0; - exponent = 0; - } - else - { - double t, diff; - - exponent = floorf(log10f(d)); - d /= pow(10.0, exponent); - - x = d; - t = (d - x) * 100000000; - frac = t; - diff = t - frac; - - if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) - { - if (++frac >= 100000000) - { - frac = 0; - ++x; - } - } - } - - sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); -} - static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { char str[4][16]; - shader_glsl_ftoa(values[0], str[0]); - shader_glsl_ftoa(values[1], str[1]); - shader_glsl_ftoa(values[2], str[2]); - shader_glsl_ftoa(values[3], str[3]); + wined3d_ftoa(values[0], str[0]); + wined3d_ftoa(values[1], str[1]); + wined3d_ftoa(values[2], str[2]); + wined3d_ftoa(values[3], str[3]); shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } @@ -534,4 +469,5 @@ const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { + unsigned int start = ~0U, end = 0; int stack_idx = 0; unsigned int heap_idx = 1; @@ -541,5 +477,6 @@ idx = heap->entries[heap_idx].idx; - if (constant_locations[idx] != -1) GL_EXTCALL(glUniform4fvARB(constant_locations[idx], 1, &constants[idx * 4])); + if (constant_locations[idx] != -1) + start = end = idx; stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT; @@ -557,5 +494,10 @@ idx = heap->entries[heap_idx].idx; if (constant_locations[idx] != -1) - GL_EXTCALL(glUniform4fvARB(constant_locations[idx], 1, &constants[idx * 4])); + { + if (start > idx) + start = idx; + if (end < idx) + end = idx; + } stack[stack_idx++] = HEAP_NODE_TRAVERSE_RIGHT; @@ -573,5 +515,10 @@ idx = heap->entries[heap_idx].idx; if (constant_locations[idx] != -1) - GL_EXTCALL(glUniform4fvARB(constant_locations[idx], 1, &constants[idx * 4])); + { + if (start > idx) + start = idx; + if (end < idx) + end = idx; + } stack[stack_idx++] = HEAP_NODE_POP; @@ -587,4 +534,6 @@ } } + if (start <= end) + GL_EXTCALL(glUniform4fvARB(constant_locations[start], end - start + 1, &constants[start * 4])); checkGLcall("walk_constant_heap()"); } @@ -936,14 +885,24 @@ for (i = 0; i < MAX_TEXTURES; ++i) { + if (prog->ps.bumpenv_mat_location[i] == -1) + continue; + GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenv_mat_location[i], 1, 0, (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00])); - GL_EXTCALL(glUniform1fARB(prog->ps.bumpenv_lum_scale_location[i], - *(const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE])); - GL_EXTCALL(glUniform1fARB(prog->ps.bumpenv_lum_offset_location[i], - *(const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET])); - } - + + if (prog->ps.bumpenv_lum_scale_location[i] != -1) + { + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_scale_location[i], 1, + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE])); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_offset_location[i], 1, + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET])); + } + } + + if (prog->ps.tex_factor_location != -1) + { D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_TEXTUREFACTOR], col); - GL_EXTCALL(glUniform4fARB(prog->ps.tex_factor_location, col[0], col[1], col[2], col[3])); + GL_EXTCALL(glUniform4fvARB(prog->ps.tex_factor_location, 1, col)); + } if (state->render_states[WINED3D_RS_SPECULARENABLE]) @@ -1296,8 +1255,8 @@ { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); shader_addline(buffer, ";\n"); } @@ -1682,5 +1641,5 @@ { case WINED3D_DATA_FLOAT: - shader_glsl_ftoa(*(const float *)reg->immconst_data, register_name); + wined3d_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: @@ -1702,8 +1661,8 @@ { case WINED3D_DATA_FLOAT: - shader_glsl_ftoa(*(const float *)®->immconst_data[0], imm_str[0]); - shader_glsl_ftoa(*(const float *)®->immconst_data[1], imm_str[1]); - shader_glsl_ftoa(*(const float *)®->immconst_data[2], imm_str[2]); - shader_glsl_ftoa(*(const float *)®->immconst_data[3], imm_str[3]); + wined3d_ftoa(*(const float *)®->immconst_data[0], imm_str[0]); + wined3d_ftoa(*(const float *)®->immconst_data[1], imm_str[1]); + wined3d_ftoa(*(const float *)®->immconst_data[2], imm_str[2]); + wined3d_ftoa(*(const float *)®->immconst_data[3], imm_str[3]); sprintf(register_name, "vec4(%s, %s, %s, %s)", imm_str[0], imm_str[1], imm_str[2], imm_str[3]); @@ -4977,5 +4936,5 @@ break; shader_addline(buffer, "dir = normalize(dir);\n"); - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) / att;\n", i); if (settings->localviewer) @@ -5002,5 +4961,5 @@ if (!settings->normal) break; - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) * att;\n", i); if (settings->localviewer) @@ -5017,5 +4976,6 @@ break; shader_addline(buffer, "dir = normalize(gl_LightSource[%u].position.xyz);\n", i); - shader_addline(buffer, "diffuse += max(0.0, dot(dir, normal)) * gl_LightSource[%u].diffuse.xyz;\n", i); + shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" + " * gl_LightSource[%u].diffuse.xyz;\n", i); shader_addline(buffer, "t = dot(normal, gl_LightSource[%u].halfVector.xyz);\n", i); shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" @@ -5125,4 +5085,8 @@ case WINED3D_FFP_VS_FOG_DEPTH: + if (settings->ortho_fog) + /* Need to undo the [0.0 - 1.0] -> [-1.0 - 1.0] transformation from D3D to GL coordinates. */ + shader_addline(buffer, "gl_FogFragCoord = gl_Position.z * 0.5 + 0.5;\n"); + else shader_addline(buffer, "gl_FogFragCoord = ec_pos.z;\n"); break; @@ -5523,8 +5487,8 @@ { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); shader_addline(buffer, ";\n"); } @@ -5540,5 +5504,5 @@ const char *texture_function, *coord_mask; char tex_reg_name[8]; - BOOL proj, clamp; + BOOL proj; if (!(tex_map & (1 << stage))) @@ -5559,10 +5523,4 @@ proj = TRUE; } - - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - clamp = FALSE; - else - clamp = TRUE; switch (settings->op[stage].tex_type) @@ -5657,8 +5615,4 @@ } - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, ret.%s), 0.0, 1.0);\n", - stage, texture_function, stage, coord_mask); - else shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", stage, texture_function, stage, coord_mask); @@ -5670,8 +5624,4 @@ else if (settings->op[stage].projected == proj_count3) { - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, gl_TexCoord[%u].xyz), 0.0, 1.0);\n", - stage, texture_function, stage, stage); - else shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", stage, texture_function, stage, stage); @@ -5679,8 +5629,4 @@ else { - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, gl_TexCoord[%u].%s), 0.0, 1.0);\n", - stage, texture_function, stage, stage, coord_mask); - else shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", stage, texture_function, stage, stage, coord_mask); @@ -6800,5 +6746,5 @@ caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; - caps->max_vertex_blend_matrices = 0; + caps->max_vertex_blend_matrices = 1; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN @@ -6874,4 +6820,14 @@ { context->select_shader = 1; +} + +static void glsl_vertex_pipe_projection(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + /* Table fog behavior depends on the projection matrix. */ + if (state->render_states[WINED3D_RS_FOGENABLE] + && state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) + context->select_shader = 1; + transform_projection(context, state, state_id); } @@ -6929,5 +6885,5 @@ /* Transform states */ {STATE_TRANSFORM(WINED3D_TS_VIEW), {STATE_TRANSFORM(WINED3D_TS_VIEW), transform_view }, WINED3D_GL_EXT_NONE }, - {STATE_TRANSFORM(WINED3D_TS_PROJECTION), {STATE_TRANSFORM(WINED3D_TS_PROJECTION), transform_projection }, WINED3D_GL_EXT_NONE }, + {STATE_TRANSFORM(WINED3D_TS_PROJECTION), {STATE_TRANSFORM(WINED3D_TS_PROJECTION), glsl_vertex_pipe_projection}, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE0), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE1), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/nvidia_texture_shader.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/nvidia_texture_shader.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/nvidia_texture_shader.c (revision 51270) @@ -593,4 +593,20 @@ } +static void nvrc_resultarg(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + + TRACE("Setting result arg for stage %u.\n", stage); + + if (!isStateDirty(context, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP))) + { + context_apply_state(context, state, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); + } + if (!isStateDirty(context, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP))) + { + context_apply_state(context, state, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP)); + } +} + static void nvts_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -782,5 +798,5 @@ { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -795,5 +811,5 @@ { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -808,5 +824,5 @@ { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -821,5 +837,5 @@ { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -834,5 +850,5 @@ { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -847,5 +863,5 @@ { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -860,5 +876,5 @@ { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -873,5 +889,5 @@ { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pixelshader }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/shader.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/shader.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/shader.c (revision 51270) @@ -46,4 +46,9 @@ static void shader_chache_put(PVBOXEXT_HASHCACHE pCache, struct wined3d_shader *shader); #endif + +/* pow, mul_high, sub_high, mul_low */ +const float wined3d_srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; +/* cmp */ +const float wined3d_srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; static const char * const shader_opcode_names[] = Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/state.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/state.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/state.c (revision 51270) @@ -4755,8 +4755,4 @@ vp.width, vp.height); } - - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) - state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); - checkGLcall("glViewport"); } @@ -4766,5 +4762,6 @@ if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)) + && state->render_states[WINED3D_RS_POINTSCALEENABLE]) state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); /* Update the position fixup. */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/surface.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/surface.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/surface.c (revision 51270) @@ -4392,11 +4392,4 @@ { ERR("Not supported on swapchain surfaces.\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - /* Flipping is only supported on render targets and overlays. */ - if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY))) - { - WARN("Tried to flip a non-render target, non-overlay surface.\n"); return WINEDDERR_NOTFLIPPABLE; } Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/swapchain.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/swapchain.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/swapchain.c (revision 51270) @@ -158,5 +158,4 @@ { #ifndef VBOX_WITH_WDDM - struct wined3d_display_mode mode; HRESULT hr; #endif @@ -213,11 +212,6 @@ if (!swapchain->desc.windowed && swapchain->desc.auto_restore_display_mode) { - mode.width = swapchain->orig_width; - mode.height = swapchain->orig_height; - mode.refresh_rate = 0; - mode.format_id = swapchain->orig_fmt; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &mode))) + swapchain->device->adapter->ordinal, &swapchain->original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); } @@ -227,5 +221,5 @@ TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); - ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); + wined3d_release_dc(swapchain->backup_wnd, swapchain->backup_dc); DestroyWindow(swapchain->backup_wnd); } @@ -1020,6 +1014,4 @@ const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc surface_desc; - const struct wined3d_format *format; - struct wined3d_display_mode mode; #ifndef VBOX_WITH_WDDM BOOL displaymode_set = FALSE; @@ -1101,11 +1093,12 @@ #endif - wined3d_get_adapter_display_mode(device->wined3d, adapter->ordinal, &mode, NULL); #ifndef VBOX_WITH_WDDM - swapchain->orig_width = mode.width; - swapchain->orig_height = mode.height; - swapchain->orig_fmt = mode.format_id; -#endif - format = wined3d_get_format(&adapter->gl_info, mode.format_id); + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode, NULL))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + goto err; + } +#endif GetClientRect(window, &client_rect); @@ -1129,6 +1122,6 @@ if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) { - desc->backbuffer_format = swapchain->orig_fmt; - TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->orig_fmt)); + desc->backbuffer_format = swapchain->original_mode.format_id; + TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->original_mode.format_id)); } #endif @@ -1177,5 +1170,5 @@ mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, adapter->ordinal, &mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); @@ -1198,5 +1191,5 @@ }; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); @@ -1312,16 +1305,8 @@ if (displaymode_set) { - DEVMODEW devmode; - + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode))) + ERR("Failed to restore display mode.\n"); ClipCursor(NULL); - - /* Change the display settings */ - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); - devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = format->byte_count * CHAR_BIT; - devmode.dmPelsWidth = swapchain->orig_width; - devmode.dmPelsHeight = swapchain->orig_height; - ChangeDisplaySettingsExW(adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); } #endif Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/utils.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/utils.c (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/utils.c (revision 51270) @@ -36,4 +36,6 @@ #include "config.h" #include "wine/port.h" + +#include #include "wined3d_private.h" @@ -847,8 +849,16 @@ NV_TEXTURE_SHADER, NULL}, /* Depth stencil formats */ + {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, + {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, @@ -882,4 +892,8 @@ | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, NULL}, + {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, @@ -899,4 +913,8 @@ WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, convert_s4x4_uint_d24_unorm}, + {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, @@ -3628,8 +3646,17 @@ } + settings->ortho_fog = 0; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) + { settings->fog_mode = WINED3D_FFP_VS_FOG_DEPTH; + + if (state->transforms[WINED3D_TS_PROJECTION].u.m[0][3] == 0.0f + && state->transforms[WINED3D_TS_PROJECTION].u.m[1][3] == 0.0f + && state->transforms[WINED3D_TS_PROJECTION].u.m[2][3] == 0.0f + && state->transforms[WINED3D_TS_PROJECTION].u.m[3][3] == 1.0f) + settings->ortho_fog = 1; + } else if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE) settings->fog_mode = WINED3D_FFP_VS_FOG_FOGCOORD; @@ -3717,2 +3744,43 @@ IntersectRect(rect, rect, &state->scissor_rect); } + +/* Print a floating point value with the %.8e format specifier, always using + * '.' as decimal separator. */ +void wined3d_ftoa(float value, char *s) +{ + int idx = 1; +#ifdef VBOX_WITH_WINE_FIX_FTOA + const char * pszFormat = "%.8e"; +#endif + + if (copysignf(1.0f, value) < 0.0f) + { +#ifdef VBOX_WITH_WINE_FIX_FTOA + /* s passed here is char[16]*/ + pszFormat = "%.7e"; +#endif + ++idx; + } + +#ifdef VBOX_WITH_WINE_FIX_FTOA + sprintf(s, pszFormat, value); +#else + sprintf(s, "%.8e", value); +#endif + if (isfinite(value)) + s[idx] = '.'; +} + +void wined3d_release_dc(HWND window, HDC dc) +{ + /* You'd figure ReleaseDC() would fail if the DC doesn't match the window. + * However, that's not what actually happens, and there are user32 tests + * that confirm ReleaseDC() with the wrong window is supposed to succeed. + * So explicitly check that the DC belongs to the window, since we want to + * avoid releasing a DC that belongs to some other window if the original + * window was already destroyed. */ + if (WindowFromDC(dc) != window) + WARN("DC %p does not belong to window %p.\n", dc, window); + else if (!ReleaseDC(window, dc)) + ERR("Failed to release device context %p, last error %#x.\n", dc, GetLastError()); +} Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_gl.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_gl.h (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_gl.h (revision 51270) @@ -94,4 +94,5 @@ ARB_TEXTURE_FLOAT, ARB_TEXTURE_MIRRORED_REPEAT, + ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, @@ -137,4 +138,5 @@ EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, + EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_private.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_private.h (revision 51269) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_private.h (revision 51270) @@ -1542,4 +1542,5 @@ CARD_NVIDIA_GEFORCE_GTX650TI = 0x11c6, CARD_NVIDIA_GEFORCE_GTX660 = 0x11c0, + CARD_NVIDIA_GEFORCE_GTX660M = 0x0fd4, CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, @@ -1547,4 +1548,5 @@ CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, + CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_INTEL_830M = 0x3577, @@ -1790,4 +1792,8 @@ void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSPEC_HIDDEN; +void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; + +extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; +extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; enum wined3d_ffp_vs_fog_mode @@ -1822,5 +1828,6 @@ DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ - DWORD padding : 15; + DWORD ortho_fog : 1; + DWORD padding : 14; BYTE texgen[MAX_TEXTURES]; @@ -2701,6 +2708,5 @@ struct wined3d_swapchain_desc desc; #ifndef VBOX_WITH_WDDM - DWORD orig_width, orig_height; - enum wined3d_format_id orig_fmt; + struct wined3d_display_mode original_mode; struct wined3d_gamma_ramp orig_gamma; #endif @@ -2837,4 +2843,6 @@ unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; +void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; + struct wined3d_shader_lconst { @@ -3185,3 +3193,21 @@ #endif -#endif +#if defined(VBOX) +# if defined(RT_ARCH_AMD64) +# define copysignf _copysignf +# else +# define _VBOX_BITVAL_CAST(_t, _f) (*((const _t*)((const void*)(&(_f))))) +# define _VBOX_BITVAL_TO_FLOATL(_f) _VBOX_BITVAL_CAST(float, _f) +# define _VBOX_BITVAL_FROM_FLOAT(_f) _VBOX_BITVAL_CAST(uint32_t, _f) +DECLINLINE(float) copysignf(float val, float sign) +{ + uint32_t u32Val = ((_VBOX_BITVAL_FROM_FLOAT(val) & 0x7fffffff) | (_VBOX_BITVAL_FROM_FLOAT(sign) & 0x80000000)); + return _VBOX_BITVAL_TO_FLOATL(u32Val); +} +# endif + +# define isfinite _finite + +#endif + +#endif