diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
214 files changed, 10439 insertions, 7979 deletions
diff --git a/libX11/modules/im/ximcp/imCallbk.c b/libX11/modules/im/ximcp/imCallbk.c index 6275bbf00..f57a8de31 100644 --- a/libX11/modules/im/ximcp/imCallbk.c +++ b/libX11/modules/im/ximcp/imCallbk.c @@ -92,17 +92,17 @@ typedef XimCbStatus (*XimCb)( (im->private.proto.read((im),(XPointer)(buf),(buf_len),&(len))) #define _XimFlushData(im) im->private.proto.flush((im)) -Private XimCbStatus _XimGeometryCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimStrConversionCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimPreeditStartCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimPreeditDoneCallback(Xim, Xic, char*, int); -Private void _free_memory_for_text(XIMText*); -Private XimCbStatus _XimPreeditDrawCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimPreeditCaretCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimStatusStartCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimStatusDoneCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimStatusDrawCallback(Xim, Xic, char*, int); -Private XimCbStatus _XimPreeditStateNotifyCallback(Xim, Xic, char *, int); +static XimCbStatus _XimGeometryCallback(Xim, Xic, char*, int); +static XimCbStatus _XimStrConversionCallback(Xim, Xic, char*, int); +static XimCbStatus _XimPreeditStartCallback(Xim, Xic, char*, int); +static XimCbStatus _XimPreeditDoneCallback(Xim, Xic, char*, int); +static void _free_memory_for_text(XIMText*); +static XimCbStatus _XimPreeditDrawCallback(Xim, Xic, char*, int); +static XimCbStatus _XimPreeditCaretCallback(Xim, Xic, char*, int); +static XimCbStatus _XimStatusStartCallback(Xim, Xic, char*, int); +static XimCbStatus _XimStatusDoneCallback(Xim, Xic, char*, int); +static XimCbStatus _XimStatusDrawCallback(Xim, Xic, char*, int); +static XimCbStatus _XimPreeditStateNotifyCallback(Xim, Xic, char *, int); #if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32)) #define RConst /**/ @@ -138,13 +138,13 @@ static RConst XimCb callback_table[] = { }; -Private Bool +static Bool _XimIsReadyForProcess(Xic ic) { return(!ic->private.proto.waitCallback); /* check HM */ } -Private void +static void _XimProcessPendingCallbacks(Xic ic) { XimPendingCallback pcbq; @@ -161,7 +161,7 @@ _XimProcessPendingCallbacks(Xic ic) } } -Private void +static void _XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data) { XimPendingCallback pcbq = ic->private.proto.pend_cb_que; @@ -182,7 +182,7 @@ _XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data) } } -Public Bool +Bool _XimCbDispatch(Xim xim, INT16 len, XPointer data, @@ -261,7 +261,7 @@ _XimCbDispatch(Xim xim, return True; } -Private XimCbStatus +static XimCbStatus _XimGeometryCallback(Xim im, Xic ic, char* proto, @@ -284,7 +284,7 @@ _XimGeometryCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimStrConversionCallback(Xim im, Xic ic, char* proto, @@ -367,7 +367,7 @@ _XimStrConversionCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimPreeditStartCallback(Xim im, Xic ic, char* proto, @@ -416,7 +416,7 @@ _XimPreeditStartCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimPreeditDoneCallback(Xim im, Xic ic, char* proto, @@ -439,7 +439,7 @@ _XimPreeditDoneCallback(Xim im, return XimCbSuccess; } -Private void +static void _read_text_from_packet(Xim im, char* buf, XIMText** text_ptr) @@ -554,7 +554,7 @@ _read_text_from_packet(Xim im, } } -Private void +static void _free_memory_for_text(XIMText* text) { if (text) { @@ -566,7 +566,7 @@ _free_memory_for_text(XIMText* text) } } -Private XimCbStatus +static XimCbStatus _XimPreeditDrawCallback(Xim im, Xic ic, char* proto, @@ -597,7 +597,7 @@ _XimPreeditDrawCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimPreeditCaretCallback(Xim im, Xic ic, char* proto, @@ -649,7 +649,7 @@ _XimPreeditCaretCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimStatusStartCallback(Xim im, Xic ic, char* proto, @@ -672,7 +672,7 @@ _XimStatusStartCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimStatusDoneCallback(Xim im, Xic ic, char* proto, @@ -695,7 +695,7 @@ _XimStatusDoneCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimStatusDrawCallback(Xim im, Xic ic, char* proto, @@ -730,7 +730,7 @@ _XimStatusDrawCallback(Xim im, return XimCbSuccess; } -Private XimCbStatus +static XimCbStatus _XimPreeditStateNotifyCallback( Xim im, Xic ic, char* proto, int len ) { XICCallback *cb = &ic->core.preedit_attr.state_notify_callback; diff --git a/libX11/modules/im/ximcp/imDefFlt.c b/libX11/modules/im/ximcp/imDefFlt.c index 1e4f3895b..44cc68847 100644 --- a/libX11/modules/im/ximcp/imDefFlt.c +++ b/libX11/modules/im/ximcp/imDefFlt.c @@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "Xlcint.h" #include "Ximint.h" -Private long +static long _XimTriggerCheck( Xim im, XKeyEvent *ev, @@ -66,7 +66,7 @@ _XimTriggerCheck( return -1; } -Private long +static long _XimTriggerOnCheck( Xim im, XKeyEvent *ev) @@ -75,7 +75,7 @@ _XimTriggerOnCheck( &im->private.proto.im_onkeylist[1]); } -Private long +static long _XimTriggerOffCheck( Xim im, XKeyEvent *ev) @@ -84,7 +84,7 @@ _XimTriggerOffCheck( &im->private.proto.im_offkeylist[1]); } -Private Bool +static Bool _XimOnKeysCheck( Xic ic, XKeyEvent *ev) @@ -103,7 +103,7 @@ _XimOnKeysCheck( return False; } -Private Bool +static Bool _XimOffKeysCheck( Xic ic, XKeyEvent *ev) @@ -122,7 +122,7 @@ _XimOffKeysCheck( return False; } -Private void +static void _XimPendingFilter( Xic ic) { @@ -135,7 +135,7 @@ _XimPendingFilter( return; } -Private Bool +static Bool _XimProtoKeypressFilter( Xic ic, XKeyEvent *ev) @@ -186,7 +186,7 @@ _XimProtoKeypressFilter( return NOTFILTERD; } -Private Bool +static Bool _XimFilterKeypress( Display *d, Window w, @@ -196,7 +196,7 @@ _XimFilterKeypress( return _XimProtoKeypressFilter((Xic)client_data, (XKeyEvent *)ev ); } -Private Bool +static Bool _XimProtoKeyreleaseFilter( Xic ic, XKeyEvent *ev) @@ -247,7 +247,7 @@ _XimProtoKeyreleaseFilter( return NOTFILTERD; } -Private Bool +static Bool _XimFilterKeyrelease( Display *d, Window w, @@ -257,7 +257,7 @@ _XimFilterKeyrelease( return _XimProtoKeyreleaseFilter((Xic)client_data, (XKeyEvent *)ev); } -Private void +static void _XimRegisterKeyPressFilter( Xic ic) { @@ -274,7 +274,7 @@ _XimRegisterKeyPressFilter( return; } -Private void +static void _XimRegisterKeyReleaseFilter( Xic ic) { @@ -291,7 +291,7 @@ _XimRegisterKeyReleaseFilter( return; } -Private void +static void _XimUnregisterKeyPressFilter( Xic ic) { @@ -307,7 +307,7 @@ _XimUnregisterKeyPressFilter( return; } -Private void +static void _XimUnregisterKeyReleaseFilter( Xic ic) { @@ -323,7 +323,7 @@ _XimUnregisterKeyReleaseFilter( return; } -Public void +void _XimRegisterFilter( Xic ic) { @@ -333,7 +333,7 @@ _XimRegisterFilter( return; } -Public void +void _XimUnregisterFilter( Xic ic) { @@ -342,7 +342,7 @@ _XimUnregisterFilter( return; } -Public void +void _XimReregisterFilter( Xic ic) { @@ -354,7 +354,7 @@ _XimReregisterFilter( return; } -Private Bool +static Bool _XimFilterServerDestroy( Display *d, Window w, @@ -376,7 +376,7 @@ _XimFilterServerDestroy( return True; } -Public void +void _XimRegisterServerFilter( Xim im) { @@ -395,7 +395,7 @@ _XimRegisterServerFilter( return; } -Public void +void _XimUnregisterServerFilter( Xim im) { diff --git a/libX11/modules/im/ximcp/imDefIc.c b/libX11/modules/im/ximcp/imDefIc.c index a06f6a73d..3b5fa4147 100644 --- a/libX11/modules/im/ximcp/imDefIc.c +++ b/libX11/modules/im/ximcp/imDefIc.c @@ -56,7 +56,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "Xlcint.h" #include "Ximint.h" -Private Bool +static Bool _XimCreateICCheck( Xim im, INT16 len, @@ -81,7 +81,7 @@ _XimCreateICCheck( } #ifdef XIM_CONNECTABLE -Public Bool +Bool _XimReCreateIC(ic) Xic ic; { @@ -244,7 +244,7 @@ ErrorOnReCreateIC: return False; } -Private char * +static char * _XimDelayModeGetICValues(ic, arg) Xic ic; XIMArg *arg; @@ -259,7 +259,7 @@ _XimDelayModeGetICValues(ic, arg) } #endif /* XIM_CONNECTABLE */ -Private Bool +static Bool _XimGetICValuesCheck( Xim im, INT16 len, @@ -288,7 +288,7 @@ _XimGetICValuesCheck( return False; } -Private char * +static char * _XimProtoGetICValues( XIC xic, XIMArg *arg) @@ -424,7 +424,7 @@ _XimProtoGetICValues( } #ifdef XIM_CONNECTABLE -Private Bool +static Bool _XimCheckNestQuarkList(quark_list, num_quark, quark, separator) XrmQuark *quark_list; int num_quark; @@ -444,7 +444,7 @@ _XimCheckNestQuarkList(quark_list, num_quark, quark, separator) return False; } -Private Bool +static Bool _XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator) XrmQuark **quark_list; int idx; @@ -485,7 +485,7 @@ _XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator) return True; } -Private Bool +static Bool _XimCheckICQuarkList(quark_list, num_quark, quark, idx) XrmQuark *quark_list; int num_quark; @@ -503,7 +503,7 @@ _XimCheckICQuarkList(quark_list, num_quark, quark, idx) return False; } -Private Bool +static Bool _XimSaveICValues(ic, arg) Xic ic; XIMArg *arg; @@ -610,7 +610,7 @@ _XimSaveICValues(ic, arg) return True; } -Private char * +static char * _XimDelayModeSetICValues(ic, arg) Xic ic; XIMArg *arg; @@ -628,7 +628,7 @@ _XimDelayModeSetICValues(ic, arg) } #endif /* XIM_CONNECTABLE */ -Private Bool +static Bool _XimSetICValuesCheck( Xim im, INT16 len, @@ -657,7 +657,7 @@ _XimSetICValuesCheck( return False; } -Private char * +static char * _XimProtoSetICValues( XIC xic, XIMArg *arg) @@ -807,7 +807,7 @@ _XimProtoSetICValues( return name; } -Private Bool +static Bool _XimDestroyICCheck( Xim im, INT16 len, @@ -837,7 +837,7 @@ _XimDestroyICCheck( return ret; } -Private void +static void _XimProtoICFree( Xic ic) { @@ -884,7 +884,7 @@ _XimProtoICFree( return; } -Private void +static void _XimProtoDestroyIC( XIC xic) { @@ -927,7 +927,7 @@ _XimProtoDestroyIC( return; } -Private void +static void _XimProtoSetFocus( XIC xic) { @@ -972,7 +972,7 @@ _XimProtoSetFocus( return; } -Private void +static void _XimProtoUnsetFocus( XIC xic) { @@ -1017,7 +1017,7 @@ _XimProtoUnsetFocus( return; } -Private Bool +static Bool _XimResetICCheck( Xim im, INT16 len, @@ -1046,7 +1046,7 @@ _XimResetICCheck( return False; } -Private char * +static char * _XimProtoReset( XIC xic, char * (*retfunc) (Xim im, Xic ic, XPointer buf) ) @@ -1117,7 +1117,7 @@ _XimProtoReset( return commit; } -Private char * +static char * _XimCommitedMbString( Xim im, Xic ic, @@ -1167,14 +1167,14 @@ Error_On_Reset: return new_commit; } -Private char * +static char * _XimProtoMbReset( XIC xic) { return _XimProtoReset(xic, _XimCommitedMbString); } -Private wchar_t * +static wchar_t * _XimCommitedWcString( Xim im, Xic ic, @@ -1225,7 +1225,7 @@ Error_On_Reset: return new_commit; } -Private wchar_t * +static wchar_t * _XimProtoWcReset( XIC xic) { @@ -1233,7 +1233,7 @@ _XimProtoWcReset( (char * (*) (Xim, Xic, XPointer)) _XimCommitedWcString); } -Private char * +static char * _XimCommitedUtf8String( Xim im, Xic ic, @@ -1283,14 +1283,14 @@ Error_On_Reset: return new_commit; } -Private char * +static char * _XimProtoUtf8Reset( XIC xic) { return _XimProtoReset(xic, _XimCommitedUtf8String); } -Private XICMethodsRec ic_methods = { +static XICMethodsRec ic_methods = { _XimProtoDestroyIC, /* destroy */ _XimProtoSetFocus, /* set_focus */ _XimProtoUnsetFocus, /* unset_focus */ @@ -1304,7 +1304,7 @@ Private XICMethodsRec ic_methods = { _XimProtoUtf8LookupString /* utf8_lookup_string */ }; -Private Bool +static Bool _XimGetInputStyle( XIMArg *arg, XIMStyle *input_style) @@ -1321,7 +1321,7 @@ _XimGetInputStyle( } #ifdef XIM_CONNECTABLE -Private Bool +static Bool _XimDelayModeCreateIC( Xic ic, XIMArg *values, @@ -1356,7 +1356,7 @@ _XimDelayModeCreateIC( return True; } -Public Bool +Bool _XimReconnectModeCreateIC(ic) Xic ic; { @@ -1382,7 +1382,7 @@ _XimReconnectModeCreateIC(ic) } #endif /* XIM_CONNECTABLE */ -Public XIC +XIC _XimProtoCreateIC( XIM xim, XIMArg *arg) diff --git a/libX11/modules/im/ximcp/imDefIm.c b/libX11/modules/im/ximcp/imDefIm.c index 18a3cc85f..7cac1d300 100644 --- a/libX11/modules/im/ximcp/imDefIm.c +++ b/libX11/modules/im/ximcp/imDefIm.c @@ -63,7 +63,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "Ximint.h" -Public int +int _XimCheckDataSize( XPointer buf, int len) @@ -75,7 +75,7 @@ _XimCheckDataSize( return buf_s[1]; } -Public void +void _XimSetHeader( XPointer buf, CARD8 major_opcode, @@ -93,7 +93,7 @@ _XimSetHeader( return; } -Public char +char _XimGetMyEndian(void) { CARD16 test_card = 1; @@ -104,7 +104,7 @@ _XimGetMyEndian(void) return BIGENDIAN; } -Private Bool +static Bool _XimCheckServerName( Xim im, char *str) @@ -142,7 +142,7 @@ _XimCheckServerName( return True; } -Private char * +static char * _XimCheckLocaleName( Xim im, char *address, @@ -182,7 +182,7 @@ _XimCheckLocaleName( return (char *)NULL; } -Private Bool +static Bool _XimCheckTransport( char *address, int address_len, @@ -226,7 +226,7 @@ _XimCheckTransport( return True; } -Private Bool +static Bool _CheckSNEvent( Display *display, XEvent *xevent, @@ -240,7 +240,7 @@ _CheckSNEvent( return False; } -Private Bool +static Bool _XimGetSelectionNotify( Display *display, Window window, @@ -269,7 +269,7 @@ _XimGetSelectionNotify( return True; } -Private Bool +static Bool _XimPreConnectionIM( Xim im, Atom selection) @@ -387,7 +387,7 @@ Error: return False; } -Private Bool +static Bool _XimPreConnect( Xim im) { @@ -434,7 +434,7 @@ _XimPreConnect( return True; } -Private Bool +static Bool _XimGetAuthProtocolNames( Xim im, CARD16 *buf, @@ -452,7 +452,7 @@ _XimGetAuthProtocolNames( return True; } -Private Bool +static Bool _XimSetAuthReplyData( Xim im, XPointer buf, @@ -465,7 +465,7 @@ _XimSetAuthReplyData( return True; } -Private Bool +static Bool _XimSetAuthNextData( Xim im, XPointer buf, @@ -478,7 +478,7 @@ _XimSetAuthNextData( return True; } -Private Bool +static Bool _XimSetAuthRequiredData( Xim im, XPointer buf, @@ -491,7 +491,7 @@ _XimSetAuthRequiredData( return True; } -Private Bool +static Bool _XimCheckAuthSetupData( Xim im, XPointer buf) @@ -502,7 +502,7 @@ _XimCheckAuthSetupData( return True; } -Private Bool +static Bool _XimCheckAuthNextData( Xim im, XPointer buf) @@ -517,7 +517,7 @@ _XimCheckAuthNextData( #define GOOD_AUTH 1 #define BAD_AUTH 0 -Private int +static int _XimClientAuthCheck( Xim im, XPointer buf) @@ -528,7 +528,7 @@ _XimClientAuthCheck( return NO_MORE_AUTH; } -Private void +static void _XimAuthNG( Xim im) { @@ -542,7 +542,7 @@ _XimAuthNG( return; } -Private Bool +static Bool _XimAllRecv( Xim im, INT16 len, @@ -555,7 +555,7 @@ _XimAllRecv( #define CLIENT_WAIT1 1 #define CLIENT_WAIT2 2 -Private Bool +static Bool _XimConnection( Xim im) { @@ -716,7 +716,7 @@ _XimConnection( return True; } -Private Bool +static Bool _XimDisconnectCheck( Xim im, INT16 len, @@ -735,7 +735,7 @@ _XimDisconnectCheck( return False; } -Private Bool +static Bool _XimDisconnect( Xim im) { @@ -775,7 +775,7 @@ _XimDisconnect( return True; } -Private Bool +static Bool _XimOpenCheck( Xim im, INT16 len, @@ -794,7 +794,7 @@ _XimOpenCheck( return False; } -Private Bool +static Bool _XimOpen( Xim im) { @@ -890,7 +890,7 @@ _XimOpen( return True; } -Private Bool +static Bool _XimCloseCheck( Xim im, INT16 len, @@ -914,7 +914,7 @@ _XimCloseCheck( return False; } -Private Bool +static Bool _XimClose( Xim im) { @@ -972,7 +972,7 @@ _XimClose( return True; } -Public void +void _XimProtoIMFree( Xim im) { @@ -1090,7 +1090,7 @@ _XimProtoIMFree( return; } -Private Status +static Status _XimProtoCloseIM( XIM xim) { @@ -1138,7 +1138,7 @@ _XimProtoCloseIM( } #ifdef XIM_CONNECTABLE -Private Bool +static Bool _XimCheckIMQuarkList( XrmQuark *quark_list, int num_quark, @@ -1154,7 +1154,7 @@ _XimCheckIMQuarkList( return False; } -Private Bool +static Bool _XimSaveIMValues( Xim im, XIMArg *arg) @@ -1203,7 +1203,7 @@ _XimSaveIMValues( return True; } -Private char * +static char * _XimDelayModeSetIMValues( Xim im, XIMArg *arg) @@ -1221,7 +1221,7 @@ _XimDelayModeSetIMValues( } #endif /* XIM_CONNECTABLE */ -Private Bool +static Bool _XimSetIMValuesCheck( Xim im, INT16 len, @@ -1245,7 +1245,7 @@ _XimSetIMValuesCheck( return False; } -Private char * +static char * _XimProtoSetIMValues( XIM xim, XIMArg *arg) @@ -1377,7 +1377,7 @@ _XimProtoSetIMValues( } #ifdef XIM_CONNECTABLE -Private char * +static char * _XimDelayModeGetIMValues( Xim im, XIMArg *arg) @@ -1390,7 +1390,7 @@ _XimDelayModeGetIMValues( } #endif /* XIM_CONNECTABLE */ -Private Bool +static Bool _XimGetIMValuesCheck( Xim im, INT16 len, @@ -1414,7 +1414,7 @@ _XimGetIMValuesCheck( return False; } -Private char * +static char * _XimProtoGetIMValues( XIM xim, XIMArg *arg) @@ -1526,7 +1526,7 @@ _XimProtoGetIMValues( return makeid_name; } -Private XIMMethodsRec im_methods = { +static XIMMethodsRec im_methods = { _XimProtoCloseIM, /* close */ _XimProtoSetIMValues, /* set_values */ _XimProtoGetIMValues, /* get_values */ @@ -1536,7 +1536,7 @@ Private XIMMethodsRec im_methods = { _Ximctstoutf8 /* ctstoutf8 */ }; -Private Bool +static Bool _XimSetEncodingByName( Xim im, char **buf, @@ -1569,7 +1569,7 @@ _XimSetEncodingByName( return True; } -Private Bool +static Bool _XimSetEncodingByDetail( Xim im, char **buf, @@ -1580,7 +1580,7 @@ _XimSetEncodingByDetail( return True; } -Private Bool +static Bool _XimGetEncoding( Xim im, CARD16 *buf, @@ -1669,7 +1669,7 @@ _XimGetEncoding( return True; } -Private Bool +static Bool _XimEncodingNegoCheck( Xim im, INT16 len, @@ -1693,7 +1693,7 @@ _XimEncodingNegoCheck( return False; } -Private Bool +static Bool _XimEncodingNegotiation( Xim im) { @@ -1799,7 +1799,7 @@ free_name_ptr: } #ifdef XIM_CONNECTABLE -Private Bool +static Bool _XimSendSavedIMValues( Xim im) { @@ -1909,7 +1909,7 @@ _XimSendSavedIMValues( return True; } -Private void +static void _XimDelayModeIMFree( Xim im) { @@ -1932,7 +1932,7 @@ _XimDelayModeIMFree( return; } -Public Bool +Bool _XimConnectServer( Xim im) { @@ -1956,7 +1956,7 @@ _XimConnectServer( return False; } -Public Bool +Bool _XimDelayModeSetAttr( Xim im) { @@ -1988,7 +1988,7 @@ _XimDelayModeSetAttr( return True; } -Private Bool +static Bool _XimReconnectModeSetAttr( Xim im) { @@ -2015,7 +2015,7 @@ _XimReconnectModeSetAttr( } #endif /* XIM_CONNECTABLE */ -Public Bool +Bool _XimProtoOpenIM( Xim im) { diff --git a/libX11/modules/im/ximcp/imDefLkup.c b/libX11/modules/im/ximcp/imDefLkup.c index cf7591909..0a9553a41 100644 --- a/libX11/modules/im/ximcp/imDefLkup.c +++ b/libX11/modules/im/ximcp/imDefLkup.c @@ -34,7 +34,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "Xlcint.h" #include "Ximint.h" -Public Xic +Xic _XimICOfXICID( Xim im, XICID icid) @@ -48,7 +48,7 @@ _XimICOfXICID( return (Xic)0; } -Private void +static void _XimProcIMSetEventMask( Xim im, XPointer buf) @@ -60,7 +60,7 @@ _XimProcIMSetEventMask( return; } -Private void +static void _XimProcICSetEventMask( Xic ic, XPointer buf) @@ -73,7 +73,7 @@ _XimProcICSetEventMask( return; } -Public Bool +Bool _XimSetEventMaskCallback( Xim xim, INT16 len, @@ -98,7 +98,7 @@ _XimSetEventMaskCallback( return False; } -Private Bool +static Bool _XimSyncCheck( Xim im, INT16 len, @@ -127,7 +127,7 @@ _XimSyncCheck( return False; } -Public Bool +Bool _XimSync( Xim im, Xic ic) @@ -185,7 +185,7 @@ _XimSync( return True; } -Public Bool +Bool _XimProcSyncReply( Xim im, Xic ic) @@ -208,7 +208,7 @@ _XimProcSyncReply( return True; } -Public Bool +Bool _XimRespSyncReply( Xic ic, BITMASK16 mode) @@ -219,7 +219,7 @@ _XimRespSyncReply( return True; } -Public Bool +Bool _XimSyncCallback( Xim xim, INT16 len, @@ -240,7 +240,7 @@ _XimSyncCallback( return False; } -Private INT16 +static INT16 _XimSetEventToWire( XEvent *ev, xEvent *event) @@ -252,7 +252,7 @@ _XimSetEventToWire( return sz_xEvent; } -Private Bool +static Bool _XimForwardEventCore( Xic ic, XEvent *ev, @@ -324,7 +324,7 @@ _XimForwardEventCore( return True; } -Public Bool +Bool _XimForwardEvent( Xic ic, XEvent *ev, @@ -338,7 +338,7 @@ _XimForwardEvent( return _XimForwardEventCore(ic, ev, sync); } -Private void +static void _XimProcEvent( Display *d, Xic ic, @@ -356,7 +356,7 @@ _XimProcEvent( return; } -Private Bool +static Bool _XimForwardEventRecv( Xim im, Xic ic, @@ -375,7 +375,7 @@ _XimForwardEventRecv( return True; } -Public Bool +Bool _XimForwardEventCallback( Xim xim, INT16 len, @@ -396,7 +396,7 @@ _XimForwardEventCallback( return False; } -Private Bool +static Bool _XimRegisterTriggerkey( Xim im, XPointer buf) @@ -443,7 +443,7 @@ _XimRegisterTriggerkey( return True; } -Public Bool +Bool _XimRegisterTriggerKeysCallback( Xim xim, INT16 len, @@ -457,7 +457,7 @@ _XimRegisterTriggerKeysCallback( return True; } -Public EVENTMASK +EVENTMASK _XimGetWindowEventmask( Xic ic) { @@ -470,7 +470,7 @@ _XimGetWindowEventmask( } -Private Bool +static Bool _XimTriggerNotifyCheck( Xim im, INT16 len, @@ -499,7 +499,7 @@ _XimTriggerNotifyCheck( return False; } -Public Bool +Bool _XimTriggerNotify( Xim im, Xic ic, @@ -567,7 +567,7 @@ _XimTriggerNotify( return True; } -Private Bool +static Bool _XimRegCommitInfo( Xic ic, char *string, @@ -588,7 +588,7 @@ _XimRegCommitInfo( return True; } -Private void +static void _XimUnregCommitInfo( Xic ic) { @@ -606,7 +606,7 @@ _XimUnregCommitInfo( return; } -Public void +void _XimFreeCommitInfo( Xic ic) { @@ -615,7 +615,7 @@ _XimFreeCommitInfo( return; } -Private Bool +static Bool _XimProcKeySym( Xic ic, CARD32 sym, @@ -635,7 +635,7 @@ _XimProcKeySym( return True; } -Private Bool +static Bool _XimProcCommit( Xic ic, BYTE *buf, @@ -659,7 +659,7 @@ _XimProcCommit( return True; } -Private Bool +static Bool _XimCommitRecv( Xim im, Xic ic, @@ -718,7 +718,7 @@ _XimCommitRecv( return True; } -Public Bool +Bool _XimCommitCallback( Xim xim, INT16 len, @@ -739,7 +739,7 @@ _XimCommitCallback( return False; } -Public void +void _XimProcError( Xim im, Xic ic, @@ -748,7 +748,7 @@ _XimProcError( return; } -Public Bool +Bool _XimErrorCallback( Xim xim, INT16 len, @@ -777,7 +777,7 @@ _XimErrorCallback( return True; } -Public Bool +Bool _XimError( Xim im, Xic ic, @@ -821,7 +821,7 @@ _XimError( return True; } -Private int +static int _Ximctsconvert( XlcConv conv, char *from, @@ -887,7 +887,7 @@ _Ximctsconvert( return to_cnvlen; } -Public int +int _Ximctstombs(XIM xim, char *from, int from_len, char *to, int to_len, Status *state) { @@ -895,7 +895,7 @@ _Ximctstombs(XIM xim, char *from, int from_len, from, from_len, to, to_len, state); } -Public int +int _Ximctstowcs( XIM xim, char *from, @@ -963,7 +963,7 @@ _Ximctstowcs( return to_cnvlen; } -Public int +int _Ximctstoutf8( XIM xim, char *from, @@ -976,7 +976,7 @@ _Ximctstoutf8( from, from_len, to, to_len, state); } -Public int +int _XimProtoMbLookupString( XIC xic, XKeyEvent *ev, @@ -1039,7 +1039,7 @@ _XimProtoMbLookupString( return ret; } -Public int +int _XimProtoWcLookupString( XIC xic, XKeyEvent *ev, @@ -1102,7 +1102,7 @@ _XimProtoWcLookupString( return ret; } -Public int +int _XimProtoUtf8LookupString( XIC xic, XKeyEvent *ev, diff --git a/libX11/modules/im/ximcp/imDispch.c b/libX11/modules/im/ximcp/imDispch.c index 3d67909ee..10c73ac0f 100644 --- a/libX11/modules/im/ximcp/imDispch.c +++ b/libX11/modules/im/ximcp/imDispch.c @@ -1,104 +1,104 @@ -/******************************************************************
-
- Copyright 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
- Author: Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xlib.h>
-#include "Xlibint.h"
-#include "Xutil.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-
-Public Bool
-_XimRegProtoIntrCallback(
- Xim im,
- CARD16 major_code,
- CARD16 minor_code,
- Bool (*proc)(
- Xim, INT16, XPointer, XPointer
- ),
-
- XPointer call_data)
-{
- XimProtoIntrRec *rec;
-
- if (!(rec = (XimProtoIntrRec *)Xmalloc(sizeof(XimProtoIntrRec))))
- return False;
- rec->func = proc;
- rec->major_code = major_code;
- rec->minor_code = minor_code;
- rec->call_data = call_data;
- rec->next = im->private.proto.intrproto;
- im->private.proto.intrproto = rec;
- return True;
-}
-
-Public void
-_XimFreeProtoIntrCallback(Xim im)
-{
- register XimProtoIntrRec *rec, *next;
-
- for (rec = im->private.proto.intrproto; rec;) {
- next = rec->next;
- Xfree(rec);
- rec = next;
- }
- im->private.proto.intrproto = NULL;
- return;
-}
-
-Private Bool
-_XimTransportIntr(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data)
-{
- Xim call_im = (Xim)call_data;
- XimProtoIntrRec *rec = call_im->private.proto.intrproto;
- CARD8 major_opcode = *((CARD8 *)data);
- CARD8 minor_opcode = *((CARD8 *)data + 1);
-
- for (; rec; rec = rec->next) {
- if ((major_opcode == (CARD8)rec->major_code)
- && (minor_opcode == (CARD8)rec->minor_code))
- if ((*rec->func)(call_im, len, data, rec->call_data))
- return True;
- }
- return False;
-}
-
-Public Bool
-_XimDispatchInit(Xim im)
-{
- if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im))
- return True;
- return False;
-}
+/****************************************************************** + + Copyright 1993, 1994 by FUJITSU LIMITED + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of FUJITSU LIMITED +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +FUJITSU LIMITED makes no representations about the suitability of +this software for any purpose. +It is provided "as is" without express or implied warranty. + +FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + Author: Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <X11/Xlib.h> +#include "Xlibint.h" +#include "Xutil.h" +#include "Xlcint.h" +#include "Ximint.h" + + +Bool +_XimRegProtoIntrCallback( + Xim im, + CARD16 major_code, + CARD16 minor_code, + Bool (*proc)( + Xim, INT16, XPointer, XPointer + ), + + XPointer call_data) +{ + XimProtoIntrRec *rec; + + if (!(rec = (XimProtoIntrRec *)Xmalloc(sizeof(XimProtoIntrRec)))) + return False; + rec->func = proc; + rec->major_code = major_code; + rec->minor_code = minor_code; + rec->call_data = call_data; + rec->next = im->private.proto.intrproto; + im->private.proto.intrproto = rec; + return True; +} + +void +_XimFreeProtoIntrCallback(Xim im) +{ + register XimProtoIntrRec *rec, *next; + + for (rec = im->private.proto.intrproto; rec;) { + next = rec->next; + Xfree(rec); + rec = next; + } + im->private.proto.intrproto = NULL; + return; +} + +static Bool +_XimTransportIntr( + Xim im, + INT16 len, + XPointer data, + XPointer call_data) +{ + Xim call_im = (Xim)call_data; + XimProtoIntrRec *rec = call_im->private.proto.intrproto; + CARD8 major_opcode = *((CARD8 *)data); + CARD8 minor_opcode = *((CARD8 *)data + 1); + + for (; rec; rec = rec->next) { + if ((major_opcode == (CARD8)rec->major_code) + && (minor_opcode == (CARD8)rec->minor_code)) + if ((*rec->func)(call_im, len, data, rec->call_data)) + return True; + } + return False; +} + +Bool +_XimDispatchInit(Xim im) +{ + if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im)) + return True; + return False; +} diff --git a/libX11/modules/im/ximcp/imExten.c b/libX11/modules/im/ximcp/imExten.c index 65e59bcb4..e5a0b2723 100644 --- a/libX11/modules/im/ximcp/imExten.c +++ b/libX11/modules/im/ximcp/imExten.c @@ -55,7 +55,7 @@ typedef struct _XIM_QueryExtRec { int idx; } XIM_QueryExtRec; -Private XIM_QueryExtRec extensions[] = { +static XIM_QueryExtRec extensions[] = { {False, "XIM_EXT_SET_EVENT_MASK", 0, 0, 0, XIM_EXT_SET_EVENT_MASK_IDX}, #ifdef EXT_FORWARD @@ -68,7 +68,7 @@ Private XIM_QueryExtRec extensions[] = { {False, NULL, 0, 0, 0, 0} /* dummy */ }; -Private int +static int _XimIsSupportExt( int idx) { @@ -86,7 +86,7 @@ _XimIsSupportExt( return -1; } -Private Bool +static Bool _XimProcExtSetEventMask( Xim im, Xic ic, @@ -113,7 +113,7 @@ _XimProcExtSetEventMask( return True; } -Private Bool +static Bool _XimExtSetEventMaskCallback( Xim xim, INT16 len, @@ -135,7 +135,7 @@ _XimExtSetEventMaskCallback( } #ifdef EXT_FORWARD -Private Bool +static Bool _XimProcExtForwardKeyEvent( Xim im, Xic ic, @@ -164,7 +164,7 @@ _XimProcExtForwardKeyEvent( return True; } -Private Bool +static Bool _XimExtForwardKeyEventCallback( Xim xim, INT16 len, @@ -185,7 +185,7 @@ _XimExtForwardKeyEventCallback( return False; } -Private Bool +static Bool _XimExtForwardKeyEventCheck( Xim im, INT16 len, @@ -213,7 +213,7 @@ _XimExtForwardKeyEventCheck( return False; } -Public Bool +Bool _XimExtForwardKeyEvent( Xic ic, XKeyEvent *ev, @@ -295,7 +295,7 @@ _XimExtForwardKeyEvent( } #endif /* EXT_FORWARD */ -Private int +static int _XimCheckExtensionListSize(void) { register int i; @@ -312,7 +312,7 @@ _XimCheckExtensionListSize(void) return total; } -Private void +static void _XimSetExtensionList( CARD8 *buf) { @@ -330,7 +330,7 @@ _XimSetExtensionList( return; } -Private unsigned int +static unsigned int _XimCountNumberOfExtension( INT16 total, CARD8 *ext) @@ -352,7 +352,7 @@ _XimCountNumberOfExtension( return n; } -Private Bool +static Bool _XimParseExtensionList( Xim im, CARD16 *data) @@ -388,7 +388,7 @@ _XimParseExtensionList( return True; } -Private Bool +static Bool _XimQueryExtensionCheck( Xim im, INT16 len, @@ -412,7 +412,7 @@ _XimQueryExtensionCheck( return False; } -Public Bool +Bool _XimExtension( Xim im) { @@ -518,7 +518,7 @@ _XimExtension( /* length of XPoint attribute */ #define XIM_Xpoint_length 12 -Private Bool +static Bool _XimExtMove( Xim im, Xic ic, @@ -551,7 +551,7 @@ _XimExtMove( return True; } -Public BITMASK32 +BITMASK32 _XimExtenArgCheck( XIMArg *arg) { @@ -561,7 +561,7 @@ _XimExtenArgCheck( return flag; } -Public Bool +Bool _XimExtenMove( Xim im, Xic ic, diff --git a/libX11/modules/im/ximcp/imImSw.c b/libX11/modules/im/ximcp/imImSw.c index dfa6d6699..28b1725a6 100644 --- a/libX11/modules/im/ximcp/imImSw.c +++ b/libX11/modules/im/ximcp/imImSw.c @@ -1,55 +1,55 @@ -/******************************************************************
-
- Copyright 1992, 1993 by FUJITSU LIMITED
- Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission. FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose. It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
- Author: Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
- Modifier: Franky Ling Digital Equipment Corporation
- frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XimImSw.h"
-
-Private Bool
-_XimCheckIfDefault(
- Xim im)
-{
- return(True);
-}
-
-XimImsportSW _XimImSportRec[] = {
- { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree },
- { _XimCheckIfThaiProcessing, _XimThaiOpenIM, _XimThaiIMFree },
- { _XimCheckIfDefault, _XimProtoOpenIM, _XimProtoIMFree },
- { NULL, NULL, NULL },
-};
+/****************************************************************** + + Copyright 1992, 1993 by FUJITSU LIMITED + Copyright 1993 by Digital Equipment Corporation + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of FUJITSU LIMITED and +Digital Equipment Corporation not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. FUJITSU LIMITED and Digital Equipment Corporation +makes no representations about the suitability of this software for +any purpose. It is provided "as is" without express or implied +warranty. + +FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + Author: Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + Modifier: Franky Ling Digital Equipment Corporation + frankyling@hgrd01.enet.dec.com + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "Xlibint.h" +#include "Xlcint.h" +#include "Ximint.h" +#include "XimImSw.h" + +static Bool +_XimCheckIfDefault( + Xim im) +{ + return(True); +} + +XimImsportSW _XimImSportRec[] = { + { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree }, + { _XimCheckIfThaiProcessing, _XimThaiOpenIM, _XimThaiIMFree }, + { _XimCheckIfDefault, _XimProtoOpenIM, _XimProtoIMFree }, + { NULL, NULL, NULL }, +}; diff --git a/libX11/modules/im/ximcp/imInsClbk.c b/libX11/modules/im/ximcp/imInsClbk.c index 263dec6d9..b867d2f6f 100644 --- a/libX11/modules/im/ximcp/imInsClbk.c +++ b/libX11/modules/im/ximcp/imInsClbk.c @@ -1,288 +1,288 @@ -/******************************************************************
-
- Copyright 1993, 1994 by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sony Corporation
- not be used in advertising or publicity pertaining to distribution
- of the software without specific, written prior permission.
-Sony Corporation makes no representations about the suitability of
- this software for any purpose. It is provided "as is" without
- express or implied warranty.
-
-SONY CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
- Author: Makoto Wakamatsu Sony Corporation
- makoto@sm.sony.co.jp
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xatom.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPublic.h"
-#include "Ximint.h"
-
-
-typedef struct _XimInstCallback {
- Bool call;
- Bool destroy;
- Display *display;
- XLCd lcd;
- char name[XIM_MAXLCNAMELEN];
- char *modifiers;
- XrmDatabase rdb;
- char *res_name;
- char *res_class;
- XIDProc callback;
- XPointer client_data;
- struct _XimInstCallback *next;
-} XimInstCallbackRec, *XimInstCallback;
-
-
-Private XimInstCallback callback_list = NULL;
-Private Bool lock = False;
-
-
-Private void
-MakeLocale( XLCd lcd, char locale[] )
-{
- char *language, *territory, *codeset;
-
- _XGetLCValues( lcd, XlcNLanguage, &language, XlcNTerritory, &territory,
- XlcNCodeset, &codeset, NULL );
-
- strcpy( locale, language );
- if( territory && *territory ) {
- strcat( locale, "_" );
- strcat( locale, territory );
- }
- if( codeset && *codeset ) {
- strcat( locale, "." );
- strcat( locale, codeset );
- }
-}
-
-
-Private Bool
-_XimFilterPropertyNotify(
- Display *display,
- Window window,
- XEvent *event,
- XPointer client_data)
-{
- Atom ims, actual_type, *atoms;
- int actual_format;
- unsigned long nitems, bytes_after;
- int ii;
- XIM xim;
- Bool flag = False;
- XimInstCallback icb, picb, tmp;
-
- if( (ims = XInternAtom( display, XIM_SERVERS, True )) == None ||
- event->xproperty.atom != ims ||
- event->xproperty.state == PropertyDelete )
- return( False );
-
- if( XGetWindowProperty( display, RootWindow(display, 0), ims, 0L, 1000000L,
- False, XA_ATOM, &actual_type, &actual_format,
- &nitems, &bytes_after, (unsigned char **)&atoms )
- != Success ) {
- return( False );
- }
- if( actual_type != XA_ATOM || actual_format != 32 ) {
- XFree( atoms );
- return( False );
- }
-
- lock = True;
- for( ii = 0; ii < nitems; ii++, atoms ) {
- if(XGetSelectionOwner (display, atoms[ii])) {
- for( icb = callback_list; icb; icb = icb->next ) {
- if( !icb->call && !icb->destroy ) {
- xim = (*icb->lcd->methods->open_im)( icb->lcd, display,
- icb->rdb,
- icb->res_name,
- icb->res_class );
- if( xim ) {
- xim->methods->close( (XIM)xim );
- flag = True;
- icb->call = True;
- icb->callback( icb->display, icb->client_data, NULL );
- }
- }
- }
- break;
- }
- }
- XFree( atoms );
-
- for( icb = callback_list, picb = NULL; icb; ) {
- if( icb->destroy ) {
- if( picb )
- picb->next = icb->next;
- else
- callback_list = icb->next;
- tmp = icb;
- icb = icb->next;
- XFree( tmp );
- }
- else {
- picb = icb;
- icb = icb->next;
- }
- }
- lock = False;
-
- return( flag );
-}
-
-
-Public Bool
-_XimRegisterIMInstantiateCallback(
- XLCd lcd,
- Display *display,
- XrmDatabase rdb,
- char *res_name,
- char *res_class,
- XIDProc callback,
- XPointer client_data)
-{
- XimInstCallback icb, tmp;
- XIM xim;
- Window root;
- XWindowAttributes attr;
-
- if( lock )
- return( False );
-
- icb = (XimInstCallback)Xmalloc(sizeof(XimInstCallbackRec));
- if( !icb )
- return( False );
- icb->call = icb->destroy = False;
- icb->display = display;
- icb->lcd = lcd;
- MakeLocale( lcd, icb->name );
- icb->modifiers = lcd->core->modifiers; /* XXXXX */
- icb->rdb = rdb;
- icb->res_name = res_name;
- icb->res_class = res_class;
- icb->callback = callback;
- icb->client_data = client_data;
- icb->next = NULL;
-
- if( !callback_list )
- callback_list = icb;
- else {
- for( tmp = callback_list; tmp->next; tmp = tmp->next );
- tmp->next = icb;
- }
-
- xim = (*lcd->methods->open_im)( lcd, display, rdb, res_name, res_class );
-
- if( icb == callback_list ) {
- root = RootWindow( display, 0 );
- XGetWindowAttributes( display, root, &attr );
- _XRegisterFilterByType( display, root, PropertyNotify, PropertyNotify,
- _XimFilterPropertyNotify, (XPointer)NULL );
- XSelectInput( display, root,
- attr.your_event_mask | PropertyChangeMask );
- }
-
- if( xim ) {
- lock = True;
- xim->methods->close( (XIM)xim );
- lock = False;
- icb->call = True;
- callback( display, client_data, NULL );
- }
-
- return( True );
-}
-
-
-Public Bool
-_XimUnRegisterIMInstantiateCallback(
- XLCd lcd,
- Display *display,
- XrmDatabase rdb,
- char *res_name,
- char *res_class,
- XIDProc callback,
- XPointer client_data)
-{
- char locale[XIM_MAXLCNAMELEN];
- XimInstCallback icb, picb;
-
- if( !callback_list )
- return( False );
-
- MakeLocale( lcd, locale );
-
- for( icb = callback_list, picb = NULL; icb; picb = icb, icb = icb->next ) {
- if( !strcmp( locale, icb->name ) &&
- (lcd->core->modifiers == icb->modifiers || /* XXXXX */
- (lcd->core->modifiers && icb->modifiers &&
- !strcmp( lcd->core->modifiers, icb->modifiers ))) &&
- rdb == icb->rdb && /* XXXXX */
- ((res_name == NULL && icb->res_name == NULL) ||
- (res_name != NULL && icb->res_name != NULL &&
- !strcmp( res_name, icb->res_name ))) &&
- ((res_class == NULL && icb->res_class == NULL) ||
- (res_class != NULL && icb->res_class != NULL &&
- !strcmp( res_class, icb->res_class ))) &&
- (callback == icb->callback) &&
- (client_data == icb->client_data) && /* XXXXX */
- !icb->destroy ) {
- if( lock )
- icb->destroy = True;
- else {
- if( !picb ) {
- callback_list = icb->next;
- _XUnregisterFilter( display, RootWindow(display, 0),
- _XimFilterPropertyNotify,
- (XPointer)NULL );
- }
- else
- picb->next = icb->next;
- _XCloseLC( icb->lcd );
- XFree( icb );
- }
- return( True );
- }
- }
- return( False );
-}
-
-
-Public void
-_XimResetIMInstantiateCallback(Xim xim)
-{
- char locale[XIM_MAXLCNAMELEN];
- XimInstCallback icb;
- XLCd lcd = xim->core.lcd;
-
- if( !callback_list && lock )
- return;
-
- MakeLocale( lcd, locale );
-
- for( icb = callback_list; icb; icb = icb->next )
- if( !strcmp( locale, icb->name ) &&
- (lcd->core->modifiers == icb->modifiers ||
- (lcd->core->modifiers && icb->modifiers &&
- !strcmp( lcd->core->modifiers, icb->modifiers ))) )
- icb->call = False;
-}
+/****************************************************************** + + Copyright 1993, 1994 by Sony Corporation + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of Sony Corporation + not be used in advertising or publicity pertaining to distribution + of the software without specific, written prior permission. +Sony Corporation makes no representations about the suitability of + this software for any purpose. It is provided "as is" without + express or implied warranty. + +SONY CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + Author: Makoto Wakamatsu Sony Corporation + makoto@sm.sony.co.jp + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <X11/Xatom.h> +#include "Xlibint.h" +#include "Xlcint.h" +#include "XlcPublic.h" +#include "Ximint.h" + + +typedef struct _XimInstCallback { + Bool call; + Bool destroy; + Display *display; + XLCd lcd; + char name[XIM_MAXLCNAMELEN]; + char *modifiers; + XrmDatabase rdb; + char *res_name; + char *res_class; + XIDProc callback; + XPointer client_data; + struct _XimInstCallback *next; +} XimInstCallbackRec, *XimInstCallback; + + +static XimInstCallback callback_list = NULL; +static Bool lock = False; + + +static void +MakeLocale( XLCd lcd, char locale[] ) +{ + char *language, *territory, *codeset; + + _XGetLCValues( lcd, XlcNLanguage, &language, XlcNTerritory, &territory, + XlcNCodeset, &codeset, NULL ); + + strcpy( locale, language ); + if( territory && *territory ) { + strcat( locale, "_" ); + strcat( locale, territory ); + } + if( codeset && *codeset ) { + strcat( locale, "." ); + strcat( locale, codeset ); + } +} + + +static Bool +_XimFilterPropertyNotify( + Display *display, + Window window, + XEvent *event, + XPointer client_data) +{ + Atom ims, actual_type, *atoms; + int actual_format; + unsigned long nitems, bytes_after; + int ii; + XIM xim; + Bool flag = False; + XimInstCallback icb, picb, tmp; + + if( (ims = XInternAtom( display, XIM_SERVERS, True )) == None || + event->xproperty.atom != ims || + event->xproperty.state == PropertyDelete ) + return( False ); + + if( XGetWindowProperty( display, RootWindow(display, 0), ims, 0L, 1000000L, + False, XA_ATOM, &actual_type, &actual_format, + &nitems, &bytes_after, (unsigned char **)&atoms ) + != Success ) { + return( False ); + } + if( actual_type != XA_ATOM || actual_format != 32 ) { + XFree( atoms ); + return( False ); + } + + lock = True; + for( ii = 0; ii < nitems; ii++, atoms ) { + if(XGetSelectionOwner (display, atoms[ii])) { + for( icb = callback_list; icb; icb = icb->next ) { + if( !icb->call && !icb->destroy ) { + xim = (*icb->lcd->methods->open_im)( icb->lcd, display, + icb->rdb, + icb->res_name, + icb->res_class ); + if( xim ) { + xim->methods->close( (XIM)xim ); + flag = True; + icb->call = True; + icb->callback( icb->display, icb->client_data, NULL ); + } + } + } + break; + } + } + XFree( atoms ); + + for( icb = callback_list, picb = NULL; icb; ) { + if( icb->destroy ) { + if( picb ) + picb->next = icb->next; + else + callback_list = icb->next; + tmp = icb; + icb = icb->next; + XFree( tmp ); + } + else { + picb = icb; + icb = icb->next; + } + } + lock = False; + + return( flag ); +} + + +Bool +_XimRegisterIMInstantiateCallback( + XLCd lcd, + Display *display, + XrmDatabase rdb, + char *res_name, + char *res_class, + XIDProc callback, + XPointer client_data) +{ + XimInstCallback icb, tmp; + XIM xim; + Window root; + XWindowAttributes attr; + + if( lock ) + return( False ); + + icb = (XimInstCallback)Xmalloc(sizeof(XimInstCallbackRec)); + if( !icb ) + return( False ); + icb->call = icb->destroy = False; + icb->display = display; + icb->lcd = lcd; + MakeLocale( lcd, icb->name ); + icb->modifiers = lcd->core->modifiers; /* XXXXX */ + icb->rdb = rdb; + icb->res_name = res_name; + icb->res_class = res_class; + icb->callback = callback; + icb->client_data = client_data; + icb->next = NULL; + + if( !callback_list ) + callback_list = icb; + else { + for( tmp = callback_list; tmp->next; tmp = tmp->next ); + tmp->next = icb; + } + + xim = (*lcd->methods->open_im)( lcd, display, rdb, res_name, res_class ); + + if( icb == callback_list ) { + root = RootWindow( display, 0 ); + XGetWindowAttributes( display, root, &attr ); + _XRegisterFilterByType( display, root, PropertyNotify, PropertyNotify, + _XimFilterPropertyNotify, (XPointer)NULL ); + XSelectInput( display, root, + attr.your_event_mask | PropertyChangeMask ); + } + + if( xim ) { + lock = True; + xim->methods->close( (XIM)xim ); + lock = False; + icb->call = True; + callback( display, client_data, NULL ); + } + + return( True ); +} + + +Bool +_XimUnRegisterIMInstantiateCallback( + XLCd lcd, + Display *display, + XrmDatabase rdb, + char *res_name, + char *res_class, + XIDProc callback, + XPointer client_data) +{ + char locale[XIM_MAXLCNAMELEN]; + XimInstCallback icb, picb; + + if( !callback_list ) + return( False ); + + MakeLocale( lcd, locale ); + + for( icb = callback_list, picb = NULL; icb; picb = icb, icb = icb->next ) { + if( !strcmp( locale, icb->name ) && + (lcd->core->modifiers == icb->modifiers || /* XXXXX */ + (lcd->core->modifiers && icb->modifiers && + !strcmp( lcd->core->modifiers, icb->modifiers ))) && + rdb == icb->rdb && /* XXXXX */ + ((res_name == NULL && icb->res_name == NULL) || + (res_name != NULL && icb->res_name != NULL && + !strcmp( res_name, icb->res_name ))) && + ((res_class == NULL && icb->res_class == NULL) || + (res_class != NULL && icb->res_class != NULL && + !strcmp( res_class, icb->res_class ))) && + (callback == icb->callback) && + (client_data == icb->client_data) && /* XXXXX */ + !icb->destroy ) { + if( lock ) + icb->destroy = True; + else { + if( !picb ) { + callback_list = icb->next; + _XUnregisterFilter( display, RootWindow(display, 0), + _XimFilterPropertyNotify, + (XPointer)NULL ); + } + else + picb->next = icb->next; + _XCloseLC( icb->lcd ); + XFree( icb ); + } + return( True ); + } + } + return( False ); +} + + +void +_XimResetIMInstantiateCallback(Xim xim) +{ + char locale[XIM_MAXLCNAMELEN]; + XimInstCallback icb; + XLCd lcd = xim->core.lcd; + + if( !callback_list && lock ) + return; + + MakeLocale( lcd, locale ); + + for( icb = callback_list; icb; icb = icb->next ) + if( !strcmp( locale, icb->name ) && + (lcd->core->modifiers == icb->modifiers || + (lcd->core->modifiers && icb->modifiers && + !strcmp( lcd->core->modifiers, icb->modifiers ))) ) + icb->call = False; +} diff --git a/libX11/modules/im/ximcp/imInt.c b/libX11/modules/im/ximcp/imInt.c index 9e8c426c3..9af41a46f 100644 --- a/libX11/modules/im/ximcp/imInt.c +++ b/libX11/modules/im/ximcp/imInt.c @@ -38,10 +38,10 @@ PERFORMANCE OF THIS SOFTWARE. #include "Ximint.h" #include "XimImSw.h" -Private Xim *_XimCurrentIMlist = (Xim *)NULL; -Private int _XimCurrentIMcount = 0; +static Xim *_XimCurrentIMlist = (Xim *)NULL; +static int _XimCurrentIMcount = 0; -Private Bool +static Bool _XimSetIMStructureList( Xim im) { @@ -73,7 +73,7 @@ _XimSetIMStructureList( return True; } -Public void +void _XimDestroyIMStructureList(Xim im) { register int i; @@ -87,7 +87,7 @@ _XimDestroyIMStructureList(Xim im) return; } -Public void +void _XimServerDestroy(Xim im_2_destroy) { register int i; @@ -121,7 +121,7 @@ _XimServerDestroy(Xim im_2_destroy) } #ifdef XIM_CONNECTABLE -Public void +void _XimServerReconectableDestroy(void) { register int i; @@ -148,7 +148,7 @@ _XimServerReconectableDestroy(void) } #endif /* XIM_CONNECTABLE */ -Private const char * +static const char * _XimStrstr( register const char *src, register const char *dest) @@ -164,7 +164,7 @@ _XimStrstr( return NULL; } -Private char * +static char * _XimMakeImName( XLCd lcd) { @@ -194,7 +194,7 @@ _XimMakeImName( return ret; } -Public XIM +XIM _XimOpenIM( XLCd lcd, Display *dpy, @@ -252,7 +252,7 @@ Error1: return NULL; } -Public Bool +Bool _XInitIM(XLCd lcd) { if(lcd == (XLCd)NULL) diff --git a/libX11/modules/im/ximcp/imLcGIc.c b/libX11/modules/im/ximcp/imLcGIc.c index 2ee5adbc2..003b3897a 100644 --- a/libX11/modules/im/ximcp/imLcGIc.c +++ b/libX11/modules/im/ximcp/imLcGIc.c @@ -1,47 +1,47 @@ -/******************************************************************
-
- Copyright 1992,1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
- Author: Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Public char *
-_XimLocalGetICValues(XIC xic, XIMArg *values)
-{
- Xic ic = (Xic)xic;
- XimDefICValues ic_values;
-
- _XimGetCurrentICValues(ic, &ic_values);
- return(_XimGetICValueData(ic, (XPointer)&ic_values,
- ic->private.local.ic_resources,
- ic->private.local.ic_num_resources,
- values, XIM_GETICVALUES));
-}
+/****************************************************************** + + Copyright 1992,1993, 1994 by FUJITSU LIMITED + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of FUJITSU LIMITED +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +FUJITSU LIMITED makes no representations about the suitability of +this software for any purpose. +It is provided "as is" without express or implied warranty. + +FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + Author: Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "Xlibint.h" +#include "Xlcint.h" +#include "Ximint.h" + +char * +_XimLocalGetICValues(XIC xic, XIMArg *values) +{ + Xic ic = (Xic)xic; + XimDefICValues ic_values; + + _XimGetCurrentICValues(ic, &ic_values); + return(_XimGetICValueData(ic, (XPointer)&ic_values, + ic->private.local.ic_resources, + ic->private.local.ic_num_resources, + values, XIM_GETICVALUES)); +} diff --git a/libX11/modules/im/ximcp/imLcIc.c b/libX11/modules/im/ximcp/imLcIc.c index 49338853c..ef18453ae 100644 --- a/libX11/modules/im/ximcp/imLcIc.c +++ b/libX11/modules/im/ximcp/imLcIc.c @@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "Xlcint.h" #include "Ximint.h" -Private void +static void _XimLocalUnSetFocus( XIC xic) { @@ -49,7 +49,7 @@ _XimLocalUnSetFocus( return; } -Private void +static void _XimLocalDestroyIC( XIC xic) { @@ -68,7 +68,7 @@ _XimLocalDestroyIC( return; } -Private void +static void _XimLocalSetFocus( XIC xic) { @@ -90,7 +90,7 @@ _XimLocalSetFocus( return; } -Private void +static void _XimLocalReset( XIC xic) { @@ -102,7 +102,7 @@ _XimLocalReset( ic->private.local.brl_committed = 0; } -Private char * +static char * _XimLocalMbReset( XIC xic) { @@ -110,7 +110,7 @@ _XimLocalMbReset( return (char *)NULL; } -Private wchar_t * +static wchar_t * _XimLocalWcReset( XIC xic) { @@ -118,7 +118,7 @@ _XimLocalWcReset( return (wchar_t *)NULL; } -Private XICMethodsRec Local_ic_methods = { +static XICMethodsRec Local_ic_methods = { _XimLocalDestroyIC, /* destroy */ _XimLocalSetFocus, /* set_focus */ _XimLocalUnSetFocus, /* unset_focus */ @@ -132,7 +132,7 @@ Private XICMethodsRec Local_ic_methods = { _XimLocalUtf8LookupString /* utf8_lookup_string */ }; -Public XIC +XIC _XimLocalCreateIC( XIM im, XIMArg *values) diff --git a/libX11/modules/im/ximcp/imLcIm.c b/libX11/modules/im/ximcp/imLcIm.c index 904169830..6456d7b31 100644 --- a/libX11/modules/im/ximcp/imLcIm.c +++ b/libX11/modules/im/ximcp/imLcIm.c @@ -86,14 +86,14 @@ struct _XimCacheStruct { /* char encoding[1] */ }; -Private struct _XimCacheStruct* _XimCache_mmap = NULL; -Private DefTreeBase _XimCachedDefaultTreeBase; -Private int _XimCachedDefaultTreeRefcount = 0; +static struct _XimCacheStruct* _XimCache_mmap = NULL; +static DefTreeBase _XimCachedDefaultTreeBase; +static int _XimCachedDefaultTreeRefcount = 0; #endif -Public Bool +Bool _XimCheckIfLocalProcessing(Xim im) { FILE *fp; @@ -117,7 +117,7 @@ _XimCheckIfLocalProcessing(Xim im) return(False); } -Private void +static void XimFreeDefaultTree( DefTreeBase *b) { @@ -144,7 +144,7 @@ XimFreeDefaultTree( b->utf8used = b->utf8size = 0; } -Public void +void _XimLocalIMFree( Xim im) { @@ -218,7 +218,7 @@ _XimLocalIMFree( return; } -Private Status +static Status _XimLocalCloseIM( XIM xim) { @@ -239,7 +239,7 @@ _XimLocalCloseIM( return(True); } -Public char * +char * _XimLocalGetIMValues( XIM xim, XIMArg *values) @@ -252,7 +252,7 @@ _XimLocalGetIMValues( im->core.im_resources, im->core.im_num_resources)); } -Public char * +char * _XimLocalSetIMValues( XIM xim, XIMArg *values) @@ -271,7 +271,7 @@ _XimLocalSetIMValues( #ifdef COMPOSECACHE -Private Bool +static Bool _XimReadCachedDefaultTree( int fd_cache, const char *name, @@ -322,7 +322,7 @@ _XimReadCachedDefaultTree( return True; } -Private unsigned int strToHash ( +static unsigned int strToHash ( const char *name) { unsigned int hash = 0; @@ -334,7 +334,7 @@ Private unsigned int strToHash ( /* Returns read-only fd of cache file, -1 if none. * Sets *res to cache filename if safe. Sets *size to file size of cache. */ -Private int _XimCachedFileName ( +static int _XimCachedFileName ( const char *dir, const char *name, const char *intname, const char *encoding, uid_t uid, int isglobal, char **res, off_t *size) @@ -419,7 +419,7 @@ Private int _XimCachedFileName ( } -Private Bool _XimLoadCache ( +static Bool _XimLoadCache ( int fd, const char *name, const char *encoding, @@ -439,7 +439,7 @@ Private Bool _XimLoadCache ( } -Private void +static void _XimWriteCachedDefaultTree( const char *name, const char *encoding, @@ -514,7 +514,7 @@ _XimWriteCachedDefaultTree( #endif -Private void +static void _XimCreateDefaultTree( Xim im) { @@ -644,7 +644,7 @@ _XimCreateDefaultTree( Xfree (cachename); } -Private XIMMethodsRec Xim_im_local_methods = { +static XIMMethodsRec Xim_im_local_methods = { _XimLocalCloseIM, /* close */ _XimLocalSetIMValues, /* set_values */ _XimLocalGetIMValues, /* get_values */ @@ -654,7 +654,7 @@ Private XIMMethodsRec Xim_im_local_methods = { _XimLcctstoutf8 /* ctstoutf8 */ }; -Public Bool +Bool _XimLocalOpenIM( Xim im) { diff --git a/libX11/modules/im/ximcp/imLcLkup.c b/libX11/modules/im/ximcp/imLcLkup.c index ad96ea25c..c15346746 100644 --- a/libX11/modules/im/ximcp/imLcLkup.c +++ b/libX11/modules/im/ximcp/imLcLkup.c @@ -43,7 +43,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "XlcPubI.h" #include "Ximint.h" -Public int +int _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, KeySym *keysym, Status *status) { @@ -126,7 +126,7 @@ _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, return (ret); } -Public int +int _XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen, KeySym *keysym, Status *status) { @@ -198,7 +198,7 @@ _XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen, return (ret); } -Public int +int _XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, KeySym *keysym, Status *status) { @@ -271,7 +271,7 @@ _XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, return (ret); } -Private int +static int _XimLcctsconvert( XlcConv conv, char *from, @@ -337,7 +337,7 @@ _XimLcctsconvert( return to_cnvlen; } -Public int +int _XimLcctstombs(XIM xim, char *from, int from_len, char *to, int to_len, Status *state) { @@ -345,7 +345,7 @@ _XimLcctstombs(XIM xim, char *from, int from_len, from, from_len, to, to_len, state); } -Public int +int _XimLcctstowcs(XIM xim, char *from, int from_len, wchar_t *to, int to_len, Status *state) { @@ -408,7 +408,7 @@ _XimLcctstowcs(XIM xim, char *from, int from_len, return to_cnvlen; } -Public int +int _XimLcctstoutf8(XIM xim, char *from, int from_len, char *to, int to_len, Status *state) { diff --git a/libX11/modules/im/ximcp/imLcSIc.c b/libX11/modules/im/ximcp/imLcSIc.c index 3fce5fdc7..40937b054 100644 --- a/libX11/modules/im/ximcp/imLcSIc.c +++ b/libX11/modules/im/ximcp/imLcSIc.c @@ -1,54 +1,54 @@ -/******************************************************************
-
- Copyright 1990, 1991, 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
- Author: Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xutil.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Public char *
-_XimLocalSetICValues(XIC xic, XIMArg *values)
-{
- XimDefICValues ic_values;
- Xic ic = (Xic)xic;
- char *name;
-
- _XimGetCurrentICValues(ic, &ic_values);
- name = _XimSetICValueData(ic, (XPointer)&ic_values,
- ic->private.local.ic_resources,
- ic->private.local.ic_num_resources,
- values, XIM_SETICVALUES, True);
- _XimSetCurrentICValues(ic, &ic_values);
- return(name);
-}
+/****************************************************************** + + Copyright 1990, 1991, 1992, 1993, 1994 by FUJITSU LIMITED + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of FUJITSU LIMITED +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +FUJITSU LIMITED makes no representations about the suitability of +this software for any purpose. +It is provided "as is" without express or implied warranty. + +FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + Author: Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <stdio.h> +#include <X11/Xlib.h> +#include <X11/Xmd.h> +#include <X11/Xutil.h> +#include "Xlibint.h" +#include "Xlcint.h" +#include "Ximint.h" + +char * +_XimLocalSetICValues(XIC xic, XIMArg *values) +{ + XimDefICValues ic_values; + Xic ic = (Xic)xic; + char *name; + + _XimGetCurrentICValues(ic, &ic_values); + name = _XimSetICValueData(ic, (XPointer)&ic_values, + ic->private.local.ic_resources, + ic->private.local.ic_num_resources, + values, XIM_SETICVALUES, True); + _XimSetCurrentICValues(ic, &ic_values); + return(name); +} diff --git a/libX11/modules/im/ximcp/imRm.c b/libX11/modules/im/ximcp/imRm.c index 56c470b9f..d1d80a22e 100644 --- a/libX11/modules/im/ximcp/imRm.c +++ b/libX11/modules/im/ximcp/imRm.c @@ -59,7 +59,7 @@ typedef struct _XimValueOffsetInfo { } XimValueOffsetInfoRec, *XimValueOffsetInfo; #ifdef XIM_CONNECTABLE -Private Bool +static Bool _XimCheckBool(str) char *str; { @@ -70,7 +70,7 @@ _XimCheckBool(str) return False; } -Public void +void _XimSetProtoResource(im) Xim im; { @@ -345,7 +345,7 @@ static XIMStyle const supported_local_styles[] = { 0 /* dummy */ }; -Private Bool +static Bool _XimDefaultStyles( XimValueOffsetInfo info, XPointer top, @@ -380,7 +380,7 @@ _XimDefaultStyles( return True; } -Private Bool +static Bool _XimDefaultIMValues( XimValueOffsetInfo info, XPointer top, @@ -416,7 +416,7 @@ _XimDefaultIMValues( return True; } -Private Bool +static Bool _XimDefaultICValues( XimValueOffsetInfo info, XPointer top, @@ -452,7 +452,7 @@ _XimDefaultICValues( return True; } -Private Bool +static Bool _XimDefaultVisiblePos( XimValueOffsetInfo info, XPointer top, @@ -466,7 +466,7 @@ _XimDefaultVisiblePos( return True; } -Private Bool +static Bool _XimDefaultFocusWindow( XimValueOffsetInfo info, XPointer top, @@ -485,7 +485,7 @@ _XimDefaultFocusWindow( return True; } -Private Bool +static Bool _XimDefaultResName( XimValueOffsetInfo info, XPointer top, @@ -505,7 +505,7 @@ _XimDefaultResName( return True; } -Private Bool +static Bool _XimDefaultResClass( XimValueOffsetInfo info, XPointer top, @@ -525,7 +525,7 @@ _XimDefaultResClass( return True; } -Private Bool +static Bool _XimDefaultDestroyCB( XimValueOffsetInfo info, XPointer top, @@ -541,7 +541,7 @@ _XimDefaultDestroyCB( return True; } -Private Bool +static Bool _XimDefaultResetState( XimValueOffsetInfo info, XPointer top, @@ -555,7 +555,7 @@ _XimDefaultResetState( return True; } -Private Bool +static Bool _XimDefaultHotKeyState( XimValueOffsetInfo info, XPointer top, @@ -569,7 +569,7 @@ _XimDefaultHotKeyState( return True; } -Private Bool +static Bool _XimDefaultArea( XimValueOffsetInfo info, XPointer top, @@ -605,7 +605,7 @@ _XimDefaultArea( return True; } -Private Bool +static Bool _XimDefaultColormap( XimValueOffsetInfo info, XPointer top, @@ -630,7 +630,7 @@ _XimDefaultColormap( return True; } -Private Bool +static Bool _XimDefaultStdColormap( XimValueOffsetInfo info, XPointer top, @@ -644,7 +644,7 @@ _XimDefaultStdColormap( return True; } -Private Bool +static Bool _XimDefaultFg( XimValueOffsetInfo info, XPointer top, @@ -662,7 +662,7 @@ _XimDefaultFg( return True; } -Private Bool +static Bool _XimDefaultBg( XimValueOffsetInfo info, XPointer top, @@ -680,7 +680,7 @@ _XimDefaultBg( return True; } -Private Bool +static Bool _XimDefaultBgPixmap( XimValueOffsetInfo info, XPointer top, @@ -694,7 +694,7 @@ _XimDefaultBgPixmap( return True; } -Private Bool +static Bool _XimDefaultFontSet( XimValueOffsetInfo info, XPointer top, @@ -708,7 +708,7 @@ _XimDefaultFontSet( return True; } -Private Bool +static Bool _XimDefaultLineSpace( XimValueOffsetInfo info, XPointer top, @@ -737,7 +737,7 @@ _XimDefaultLineSpace( return True; } -Private Bool +static Bool _XimDefaultCursor( XimValueOffsetInfo info, XPointer top, @@ -751,7 +751,7 @@ _XimDefaultCursor( return True; } -Private Bool +static Bool _XimDefaultPreeditState( XimValueOffsetInfo info, XPointer top, @@ -765,7 +765,7 @@ _XimDefaultPreeditState( return True; } -Private Bool +static Bool _XimDefaultNest( XimValueOffsetInfo info, XPointer top, @@ -775,7 +775,7 @@ _XimDefaultNest( return True; } -Private Bool +static Bool _XimEncodeCallback( XimValueOffsetInfo info, XPointer top, @@ -788,7 +788,7 @@ _XimEncodeCallback( return True; } -Private Bool +static Bool _XimEncodeString( XimValueOffsetInfo info, XPointer top, @@ -812,7 +812,7 @@ _XimEncodeString( return True; } -Private Bool +static Bool _XimEncodeStyle( XimValueOffsetInfo info, XPointer top, @@ -825,7 +825,7 @@ _XimEncodeStyle( return True; } -Private Bool +static Bool _XimEncodeWindow( XimValueOffsetInfo info, XPointer top, @@ -838,7 +838,7 @@ _XimEncodeWindow( return True; } -Private Bool +static Bool _XimEncodeStringConv( XimValueOffsetInfo info, XPointer top, @@ -850,7 +850,7 @@ _XimEncodeStringConv( return True; } -Private Bool +static Bool _XimEncodeResetState( XimValueOffsetInfo info, XPointer top, @@ -863,7 +863,7 @@ _XimEncodeResetState( return True; } -Private Bool +static Bool _XimEncodeHotKey( XimValueOffsetInfo info, XPointer top, @@ -906,7 +906,7 @@ _XimEncodeHotKey( return True; } -Private Bool +static Bool _XimEncodeHotKetState( XimValueOffsetInfo info, XPointer top, @@ -919,7 +919,7 @@ _XimEncodeHotKetState( return True; } -Private Bool +static Bool _XimEncodeRectangle( XimValueOffsetInfo info, XPointer top, @@ -932,7 +932,7 @@ _XimEncodeRectangle( return True; } -Private Bool +static Bool _XimEncodeSpot( XimValueOffsetInfo info, XPointer top, @@ -945,7 +945,7 @@ _XimEncodeSpot( return True; } -Private Bool +static Bool _XimEncodeColormap( XimValueOffsetInfo info, XPointer top, @@ -958,7 +958,7 @@ _XimEncodeColormap( return True; } -Private Bool +static Bool _XimEncodeStdColormap( XimValueOffsetInfo info, XPointer top, @@ -971,7 +971,7 @@ _XimEncodeStdColormap( return True; } -Private Bool +static Bool _XimEncodeLong( XimValueOffsetInfo info, XPointer top, @@ -984,7 +984,7 @@ _XimEncodeLong( return True; } -Private Bool +static Bool _XimEncodeBgPixmap( XimValueOffsetInfo info, XPointer top, @@ -997,7 +997,7 @@ _XimEncodeBgPixmap( return True; } -Private Bool +static Bool _XimEncodeFontSet( XimValueOffsetInfo info, XPointer top, @@ -1010,7 +1010,7 @@ _XimEncodeFontSet( return True; } -Private Bool +static Bool _XimEncodeLineSpace( XimValueOffsetInfo info, XPointer top, @@ -1023,7 +1023,7 @@ _XimEncodeLineSpace( return True; } -Private Bool +static Bool _XimEncodeCursor( XimValueOffsetInfo info, XPointer top, @@ -1036,7 +1036,7 @@ _XimEncodeCursor( return True; } -Private Bool +static Bool _XimEncodePreeditState( XimValueOffsetInfo info, XPointer top, @@ -1049,7 +1049,7 @@ _XimEncodePreeditState( return True; } -Private Bool +static Bool _XimEncodeNest( XimValueOffsetInfo info, XPointer top, @@ -1058,7 +1058,7 @@ _XimEncodeNest( return True; } -Private Bool +static Bool _XimDecodeStyles( XimValueOffsetInfo info, XPointer top, @@ -1096,7 +1096,7 @@ _XimDecodeStyles( return True; } -Private Bool +static Bool _XimDecodeValues( XimValueOffsetInfo info, XPointer top, @@ -1134,7 +1134,7 @@ _XimDecodeValues( return True; } -Private Bool +static Bool _XimDecodeCallback( XimValueOffsetInfo info, XPointer top, @@ -1154,7 +1154,7 @@ _XimDecodeCallback( return True; } -Private Bool +static Bool _XimDecodeString( XimValueOffsetInfo info, XPointer top, @@ -1176,7 +1176,7 @@ _XimDecodeString( return True; } -Private Bool +static Bool _XimDecodeBool( XimValueOffsetInfo info, XPointer top, @@ -1189,7 +1189,7 @@ _XimDecodeBool( return True; } -Private Bool +static Bool _XimDecodeStyle( XimValueOffsetInfo info, XPointer top, @@ -1202,7 +1202,7 @@ _XimDecodeStyle( return True; } -Private Bool +static Bool _XimDecodeWindow( XimValueOffsetInfo info, XPointer top, @@ -1215,7 +1215,7 @@ _XimDecodeWindow( return True; } -Private Bool +static Bool _XimDecodeStringConv( XimValueOffsetInfo info, XPointer top, @@ -1227,7 +1227,7 @@ _XimDecodeStringConv( return True; } -Private Bool +static Bool _XimDecodeResetState( XimValueOffsetInfo info, XPointer top, @@ -1240,7 +1240,7 @@ _XimDecodeResetState( return True; } -Private Bool +static Bool _XimDecodeHotKey( XimValueOffsetInfo info, XPointer top, @@ -1274,7 +1274,7 @@ _XimDecodeHotKey( return True; } -Private Bool +static Bool _XimDecodeHotKetState( XimValueOffsetInfo info, XPointer top, @@ -1287,7 +1287,7 @@ _XimDecodeHotKetState( return True; } -Private Bool +static Bool _XimDecodeRectangle( XimValueOffsetInfo info, XPointer top, @@ -1305,7 +1305,7 @@ _XimDecodeRectangle( return True; } -Private Bool +static Bool _XimDecodeSpot( XimValueOffsetInfo info, XPointer top, @@ -1323,7 +1323,7 @@ _XimDecodeSpot( return True; } -Private Bool +static Bool _XimDecodeColormap( XimValueOffsetInfo info, XPointer top, @@ -1336,7 +1336,7 @@ _XimDecodeColormap( return True; } -Private Bool +static Bool _XimDecodeStdColormap( XimValueOffsetInfo info, XPointer top, @@ -1349,7 +1349,7 @@ _XimDecodeStdColormap( return True; } -Private Bool +static Bool _XimDecodeLong( XimValueOffsetInfo info, XPointer top, @@ -1362,7 +1362,7 @@ _XimDecodeLong( return True; } -Private Bool +static Bool _XimDecodeBgPixmap( XimValueOffsetInfo info, XPointer top, @@ -1375,7 +1375,7 @@ _XimDecodeBgPixmap( return True; } -Private Bool +static Bool _XimDecodeFontSet( XimValueOffsetInfo info, XPointer top, @@ -1388,7 +1388,7 @@ _XimDecodeFontSet( return True; } -Private Bool +static Bool _XimDecodeLineSpace( XimValueOffsetInfo info, XPointer top, @@ -1401,7 +1401,7 @@ _XimDecodeLineSpace( return True; } -Private Bool +static Bool _XimDecodeCursor( XimValueOffsetInfo info, XPointer top, @@ -1414,7 +1414,7 @@ _XimDecodeCursor( return True; } -Private Bool +static Bool _XimDecodePreeditState( XimValueOffsetInfo info, XPointer top, @@ -1427,7 +1427,7 @@ _XimDecodePreeditState( return True; } -Private Bool +static Bool _XimDecodeNest( XimValueOffsetInfo info, XPointer top, @@ -2119,7 +2119,7 @@ static const XimICMode ic_mode[] = { static XrmQuark im_mode_quark[sizeof(im_mode) / sizeof(im_mode[0])]; static XrmQuark ic_mode_quark[sizeof(ic_mode) / sizeof(ic_mode[0])]; -Private Bool +static Bool _XimSetResourceList( XIMResourceList *res_list, unsigned int *list_num, @@ -2147,7 +2147,7 @@ _XimSetResourceList( return True; } -Public Bool +Bool _XimSetIMResourceList( XIMResourceList *res_list, unsigned int *list_num) @@ -2156,7 +2156,7 @@ _XimSetIMResourceList( im_resources, XIMNumber(im_resources), 100); } -Public Bool +Bool _XimSetICResourceList( XIMResourceList *res_list, unsigned int *list_num) @@ -2165,7 +2165,7 @@ _XimSetICResourceList( ic_resources, XIMNumber(ic_resources), 200); } -Public Bool +Bool _XimSetInnerIMResourceList( XIMResourceList *res_list, unsigned int *list_num) @@ -2174,7 +2174,7 @@ _XimSetInnerIMResourceList( im_inner_resources, XIMNumber(im_inner_resources), 100); } -Public Bool +Bool _XimSetInnerICResourceList( XIMResourceList *res_list, unsigned int *list_num) @@ -2183,7 +2183,7 @@ _XimSetInnerICResourceList( ic_inner_resources, XIMNumber(ic_inner_resources), 200); } -Private XIMResourceList +static XIMResourceList _XimGetResourceListRecByMode( XIMResourceList res_list, unsigned int list_num, @@ -2199,7 +2199,7 @@ _XimGetResourceListRecByMode( return (XIMResourceList)NULL; } -Public Bool +Bool _XimCheckCreateICValues( XIMResourceList res_list, unsigned int list_num) @@ -2210,7 +2210,7 @@ _XimCheckCreateICValues( return False; } -Public XIMResourceList +XIMResourceList _XimGetResourceListRecByQuark( XIMResourceList res_list, unsigned int list_num, @@ -2226,7 +2226,7 @@ _XimGetResourceListRecByQuark( return (XIMResourceList)NULL; } -Public XIMResourceList +XIMResourceList _XimGetResourceListRec( XIMResourceList res_list, unsigned int list_num, @@ -2237,7 +2237,7 @@ _XimGetResourceListRec( return _XimGetResourceListRecByQuark(res_list, list_num, quark); } -Public char * +char * _XimSetIMValueData( Xim im, XPointer top, @@ -2267,7 +2267,7 @@ _XimSetIMValueData( return NULL; } -Public char * +char * _XimGetIMValueData( Xim im, XPointer top, @@ -2297,7 +2297,7 @@ _XimGetIMValueData( return NULL; } -Public void +void _XimSetIMMode( XIMResourceList res_list, unsigned int list_num) @@ -2316,7 +2316,7 @@ _XimSetIMMode( return; } -Private int +static int _XimCheckSetIMDefaultsMode( XIMResourceList res) { @@ -2326,7 +2326,7 @@ _XimCheckSetIMDefaultsMode( return XIM_CHECK_INVALID; } -Private int +static int _XimCheckSetIMValuesMode( XIMResourceList res) { @@ -2336,7 +2336,7 @@ _XimCheckSetIMValuesMode( return XIM_CHECK_INVALID; } -Private int +static int _XimCheckGetIMValuesMode( XIMResourceList res) { @@ -2346,7 +2346,7 @@ Private int return XIM_CHECK_INVALID; } -Public int +int _XimCheckIMMode( XIMResourceList res, unsigned long mode) @@ -2365,7 +2365,7 @@ Public int } } -Public void +void _XimSetICMode(XIMResourceList res_list, unsigned int list_num, XIMStyle style) { XIMResourceList res; @@ -2407,7 +2407,7 @@ _XimSetICMode(XIMResourceList res_list, unsigned int list_num, XIMStyle style) return; } -Private int +static int _XimCheckSetICDefaultsMode( XIMResourceList res, unsigned long mode) @@ -2450,7 +2450,7 @@ _XimCheckSetICDefaultsMode( return XIM_CHECK_VALID; } -Private int +static int _XimCheckCreateICMode( XIMResourceList res, unsigned long mode) @@ -2503,7 +2503,7 @@ _XimCheckCreateICMode( return XIM_CHECK_VALID; } -Private int +static int _XimCheckSetICValuesMode( XIMResourceList res, unsigned long mode) @@ -2544,7 +2544,7 @@ _XimCheckSetICValuesMode( return XIM_CHECK_VALID; } -Private int +static int _XimCheckGetICValuesMode( XIMResourceList res, unsigned long mode) @@ -2579,7 +2579,7 @@ _XimCheckGetICValuesMode( return XIM_CHECK_VALID; } -Public int +int _XimCheckICMode( XIMResourceList res, unsigned long mode) @@ -2597,7 +2597,7 @@ Public int } } -Public Bool +Bool _XimSetLocalIMDefaults( Xim im, XPointer top, @@ -2636,7 +2636,7 @@ _XimSetLocalIMDefaults( return True; } -Public Bool +Bool _XimSetICDefaults( Xic ic, XPointer top, @@ -2701,7 +2701,7 @@ _XimSetICDefaults( return True; } -Private Bool +static Bool _XimEncodeAttr( XimValueOffsetInfo info, unsigned int num, @@ -2722,7 +2722,7 @@ _XimEncodeAttr( return False; } -Public Bool +Bool _XimEncodeLocalIMAttr( XIMResourceList res, XPointer top, @@ -2732,7 +2732,7 @@ _XimEncodeLocalIMAttr( res, top, val); } -Public Bool +Bool _XimEncodeLocalICAttr( Xic ic, XIMResourceList res, @@ -2757,7 +2757,7 @@ _XimEncodeLocalICAttr( return _XimEncodeAttr(info, num, res, top, arg->value); } -Private Bool +static Bool _XimEncodeLocalTopValue( Xic ic, XIMResourceList res, @@ -2793,7 +2793,7 @@ _XimEncodeLocalTopValue( return True; } -Private Bool +static Bool _XimEncodeLocalPreeditValue( Xic ic, XIMResourceList res, @@ -2815,7 +2815,7 @@ _XimEncodeLocalPreeditValue( return True; } -Private Bool +static Bool _XimEncodeLocalStatusValue( Xic ic, XIMResourceList res, @@ -2837,7 +2837,7 @@ _XimEncodeLocalStatusValue( return True; } -Public char * +char * _XimSetICValueData( Xic ic, XPointer top, @@ -2902,7 +2902,7 @@ _XimSetICValueData( return NULL; } -Private Bool +static Bool _XimCheckInputStyle( XIMStyles *styles, XIMStyle style) @@ -2918,7 +2918,7 @@ _XimCheckInputStyle( return False; } -Public Bool +Bool _XimCheckLocalInputStyle( Xic ic, XPointer top, @@ -2949,7 +2949,7 @@ _XimCheckLocalInputStyle( return False; } -Private Bool +static Bool _XimDecodeAttr( XimValueOffsetInfo info, unsigned int num, @@ -2970,7 +2970,7 @@ _XimDecodeAttr( return False; } -Public Bool +Bool _XimDecodeLocalIMAttr( XIMResourceList res, XPointer top, @@ -2980,7 +2980,7 @@ _XimDecodeLocalIMAttr( res, top, val); } -Public Bool +Bool _XimDecodeLocalICAttr( XIMResourceList res, XPointer top, @@ -3004,7 +3004,7 @@ _XimDecodeLocalICAttr( return _XimDecodeAttr(info, num, res, top, val); } -Public char * +char * _XimGetICValueData(Xic ic, XPointer top, XIMResourceList res_list, unsigned int list_num, XIMArg *values, unsigned long mode) { @@ -3053,7 +3053,7 @@ _XimGetICValueData(Xic ic, XPointer top, XIMResourceList res_list, return NULL; } -Public void +void _XimGetCurrentIMValues(Xim im, XimDefIMValues *im_values) { bzero((char *)im_values, sizeof(XimDefIMValues)); @@ -3067,7 +3067,7 @@ _XimGetCurrentIMValues(Xim im, XimDefIMValues *im_values) im_values->visible_position = im->core.visible_position; } -Public void +void _XimSetCurrentIMValues(Xim im, XimDefIMValues *im_values) { im->core.styles = im_values->styles; @@ -3079,7 +3079,7 @@ _XimSetCurrentIMValues(Xim im, XimDefIMValues *im_values) im->core.visible_position = im_values->visible_position; } -Public void +void _XimGetCurrentICValues(Xic ic, XimDefICValues *ic_values) { bzero((char *)ic_values, sizeof(XimDefICValues)); @@ -3102,7 +3102,7 @@ _XimGetCurrentICValues(Xic ic, XimDefICValues *ic_values) ic_values->status_attr = ic->core.status_attr; } -Public void +void _XimSetCurrentICValues( Xic ic, XimDefICValues *ic_values) @@ -3126,7 +3126,7 @@ _XimSetCurrentICValues( ic->core.status_attr = ic_values->status_attr; } -Private void +static void _XimInitialIMOffsetInfo(void) { unsigned int n = XIMNumber(im_attr_info); @@ -3137,7 +3137,7 @@ _XimInitialIMOffsetInfo(void) } } -Private void +static void _XimInitialICOffsetInfo(void) { unsigned int n; @@ -3159,7 +3159,7 @@ _XimInitialICOffsetInfo(void) } } -Private void +static void _XimInitialIMMode(void) { unsigned int n = XIMNumber(im_mode); @@ -3170,7 +3170,7 @@ _XimInitialIMMode(void) } } -Private void +static void _XimInitialICMode(void) { unsigned int n = XIMNumber(ic_mode); @@ -3181,7 +3181,7 @@ _XimInitialICMode(void) } } -Public void +void _XimInitialResourceInfo(void) { static Bool init_flag = False; diff --git a/libX11/modules/im/ximcp/imRmAttr.c b/libX11/modules/im/ximcp/imRmAttr.c index c047715f6..ef3ac2ca7 100644 --- a/libX11/modules/im/ximcp/imRmAttr.c +++ b/libX11/modules/im/ximcp/imRmAttr.c @@ -34,7 +34,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "Ximint.h" -Private XIMResourceList +static XIMResourceList _XimGetNestedListSeparator( XIMResourceList res_list, /* LISTofIMATTR or IMATTR */ unsigned int res_num) @@ -42,7 +42,7 @@ _XimGetNestedListSeparator( return _XimGetResourceListRec(res_list, res_num, XNSeparatorofNestedList); } -Private Bool +static Bool _XimCheckInnerIMAttributes( Xim im, XIMArg *arg, @@ -64,7 +64,7 @@ _XimCheckInnerIMAttributes( return True; } -Public char * +char * _XimMakeIMAttrIDList( Xim im, XIMResourceList res_list, @@ -102,7 +102,7 @@ _XimMakeIMAttrIDList( return (char *)NULL; } -Private Bool +static Bool _XimCheckInnerICAttributes( Xic ic, XIMArg *arg, @@ -124,7 +124,7 @@ _XimCheckInnerICAttributes( return True; } -Public char * +char * _XimMakeICAttrIDList( Xic ic, XIMResourceList res_list, @@ -209,7 +209,7 @@ _XimMakeICAttrIDList( return (char *)NULL; } -Private Bool +static Bool _XimAttributeToValue( Xic ic, XIMResourceList res, @@ -399,7 +399,7 @@ _XimAttributeToValue( return True; } -Private Bool +static Bool _XimDecodeInnerIMATTRIBUTE( Xim im, XIMArg *arg) @@ -415,7 +415,7 @@ _XimDecodeInnerIMATTRIBUTE( return _XimDecodeLocalIMAttr(res, (XPointer)&im_values, arg->value); } -Public char * +char * _XimDecodeIMATTRIBUTE( Xim im, XIMResourceList res_list, @@ -468,7 +468,7 @@ _XimDecodeIMATTRIBUTE( return (char *)NULL; } -Private Bool +static Bool _XimDecodeInnerICATTRIBUTE( Xic ic, XIMArg *arg, @@ -488,7 +488,7 @@ _XimDecodeInnerICATTRIBUTE( return True; } -Public char * +char * _XimDecodeICATTRIBUTE( Xic ic, XIMResourceList res_list, @@ -564,7 +564,7 @@ _XimDecodeICATTRIBUTE( return (char *)NULL; } -Private Bool +static Bool _XimValueToAttribute( XIMResourceList res, XPointer buf, @@ -772,7 +772,7 @@ _XimValueToAttribute( return True; } -Private Bool +static Bool _XimSetInnerIMAttributes( Xim im, XPointer top, @@ -795,7 +795,7 @@ _XimSetInnerIMAttributes( return _XimEncodeLocalIMAttr(res, top, arg->value); } -Public char * +char * _XimEncodeIMATTRIBUTE( Xim im, XIMResourceList res_list, @@ -859,7 +859,7 @@ _XimEncodeIMATTRIBUTE( } #ifdef XIM_CONNECTABLE -Public Bool +Bool _XimEncodeSavedIMATTRIBUTE( Xim im, XIMResourceList res_list, @@ -922,7 +922,7 @@ _XimEncodeSavedIMATTRIBUTE( } #endif /* XIM_CONNECTABLE */ -Private Bool +static Bool _XimEncodeTopValue( Xic ic, XIMResourceList res, @@ -945,7 +945,7 @@ _XimEncodeTopValue( return True; } -Private Bool +static Bool _XimEncodePreeditValue( Xic ic, XIMResourceList res, @@ -997,7 +997,7 @@ _XimEncodePreeditValue( return True; } -Private Bool +static Bool _XimEncodeStatusValue( Xic ic, XIMResourceList res, @@ -1049,7 +1049,7 @@ _XimEncodeStatusValue( return True; } -Private Bool +static Bool _XimSetInnerICAttributes( Xic ic, XPointer top, @@ -1072,7 +1072,7 @@ _XimSetInnerICAttributes( return _XimEncodeLocalICAttr(ic, res, top, arg, mode); } -Public char * +char * _XimEncodeICATTRIBUTE( Xic ic, XIMResourceList res_list, @@ -1184,7 +1184,7 @@ _XimEncodeICATTRIBUTE( } #ifdef XIM_CONNECTABLE -Private Bool +static Bool _XimEncodeSavedPreeditValue( Xic ic, XIMResourceList res, @@ -1226,7 +1226,7 @@ _XimEncodeSavedPreeditValue( return True; } -Private Bool +static Bool _XimEncodeSavedStatusValue( Xic ic, XIMResourceList res, @@ -1268,7 +1268,7 @@ _XimEncodeSavedStatusValue( return True; } -Public Bool +Bool _XimEncodeSavedICATTRIBUTE( Xic ic, XIMResourceList res_list, @@ -1379,7 +1379,7 @@ _XimEncodeSavedICATTRIBUTE( } #endif /* XIM_CONNECTABLE */ -Private unsigned int +static unsigned int _XimCountNumberOfAttr( INT16 total, CARD16 *attr, @@ -1404,7 +1404,7 @@ _XimCountNumberOfAttr( return n; } -Public Bool +Bool _XimGetAttributeID( Xim im, CARD16 *buf) diff --git a/libX11/modules/im/ximcp/imThaiFlt.c b/libX11/modules/im/ximcp/imThaiFlt.c index 12e3de265..f134e842e 100644 --- a/libX11/modules/im/ximcp/imThaiFlt.c +++ b/libX11/modules/im/ximcp/imThaiFlt.c @@ -81,7 +81,7 @@ SOFTWARE. /* character classification table */ #define TACTIS_CHARS 256 -Private +static char const tactis_chtype[TACTIS_CHARS] = { CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, /* 0 - 7 */ CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, /* 8 - 15 */ @@ -127,7 +127,7 @@ char const tactis_chtype[TACTIS_CHARS] = { #define CH_CLASSES 17 /* 17 classes of chars */ -Private +static char const write_rules_lookup[CH_CLASSES][CH_CLASSES] = { /* Table 0: writing/outputing rules */ /* row: leading char, column: following char */ @@ -151,7 +151,7 @@ char const write_rules_lookup[CH_CLASSES][CH_CLASSES] = { ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, NC, CP, NC, NC, NC, NC}/*AV3*/ }; -Private +static char const wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = { /* Table 1: WTT default input sequence check rules */ /* row: leading char, column: following char */ @@ -175,7 +175,7 @@ char const wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = { ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/ }; -Private +static char const wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = { /* Table 2: WTT strict input sequence check rules */ /* row: leading char, column: following char */ @@ -199,7 +199,7 @@ char const wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = { ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/ }; -Private +static char const thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = { /* Table 3: Thaicat input sequence check rules */ /* row: leading char, column: following char */ @@ -225,7 +225,7 @@ char const thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = { /* returns classification of a char */ -Private int +static int THAI_chtype (unsigned char ch) { return tactis_chtype[ch]; @@ -233,7 +233,7 @@ THAI_chtype (unsigned char ch) #ifdef UNUSED /* returns the display level */ -Private int +static int THAI_chlevel (unsigned char ch) { int chlevel; @@ -274,7 +274,7 @@ THAI_chlevel (unsigned char ch) /* return True if char is non-spacing */ -Private Bool +static Bool THAI_isdead (unsigned char ch) { return ((tactis_chtype[ch] == CTRL) || (tactis_chtype[ch] == BV1) || @@ -287,7 +287,7 @@ THAI_isdead (unsigned char ch) /* return True if char is consonant */ -Private Bool +static Bool THAI_iscons (unsigned char ch) { return (tactis_chtype[ch] == CONS); @@ -295,7 +295,7 @@ THAI_iscons (unsigned char ch) /* return True if char is vowel */ -Private Bool +static Bool THAI_isvowel (unsigned char ch) { return ((tactis_chtype[ch] == LV) || (tactis_chtype[ch] == FV1) || @@ -307,14 +307,14 @@ THAI_isvowel (unsigned char ch) /* return True if char is tonemark */ -Private Bool +static Bool THAI_istone (unsigned char ch) { return (tactis_chtype[ch] == TONE); } #endif -Private Bool +static Bool THAI_iscomposible ( unsigned char follow_ch, unsigned char lead_ch) @@ -324,7 +324,7 @@ THAI_iscomposible ( == CP); } -Private Bool +static Bool THAI_isaccepted ( unsigned char follow_ch, unsigned char lead_ch, @@ -355,7 +355,7 @@ THAI_isaccepted ( } #ifdef UNUSED -Private void +static void THAI_apply_write_rules( unsigned char *instr, unsigned char *outstr, @@ -401,7 +401,7 @@ Output parameters: } } -Private int +static int THAI_find_chtype ( unsigned char *instr, int chtype) @@ -430,7 +430,7 @@ Output parameters: } -Private int +static int THAI_apply_scm( unsigned char *instr, unsigned char *outstr, @@ -466,33 +466,33 @@ THAI_apply_scm( /* The following functions are copied from XKeyBind.c */ -Private void ComputeMaskFromKeytrans(); -Private int IsCancelComposeKey(KeySym *symbol, XKeyEvent *event); -Private void SetLed(Display *dpy, int num, int state); -Private CARD8 FindKeyCode(); +static void ComputeMaskFromKeytrans(); +static int IsCancelComposeKey(KeySym *symbol, XKeyEvent *event); +static void SetLed(Display *dpy, int num, int state); +static CARD8 FindKeyCode(); /* The following functions are specific to this module */ -Private int XThaiTranslateKey(); -Private int XThaiTranslateKeySym(); +static int XThaiTranslateKey(); +static int XThaiTranslateKeySym(); -Private KeySym HexIMNormalKey( +static KeySym HexIMNormalKey( XicThaiPart *thai_part, KeySym symbol, XKeyEvent *event); -Private KeySym HexIMFirstComposeKey( +static KeySym HexIMFirstComposeKey( XicThaiPart *thai_part, KeySym symbol, XKeyEvent *event); -Private KeySym HexIMSecondComposeKey( +static KeySym HexIMSecondComposeKey( XicThaiPart *thai_part, KeySym symbol XKeyEvent *event); -Private KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2); -Private void InitIscMode(Xic ic); -Private Bool ThaiComposeConvert( +static KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2); +static void InitIscMode(Xic ic); +static Bool ThaiComposeConvert( Display *dpy, KeySym insym, KeySym *outsym, KeySym *lower, KeySym *upper); @@ -530,7 +530,7 @@ Private Bool ThaiComposeConvert( #define IC_DeletePreviousChar(ic) \ (IC_RealDeletePreviousChar(ic)) -Private unsigned char +static unsigned char IC_RealGetPreviousChar(Xic ic, unsigned short pos) { XICCallback* cb = &ic->core.string_conversion_callback; @@ -597,7 +597,7 @@ IC_RealGetPreviousChar(Xic ic, unsigned short pos) } } -Private unsigned char +static unsigned char IC_RealDeletePreviousChar(Xic ic) { XICCallback* cb = &ic->core.string_conversion_callback; @@ -701,8 +701,8 @@ typedef KeySym (*StateProc)( * State handler to implement the Thai hex input method. */ -Private int const nstate_handlers = 3; -Private StateProc state_handler[] = { +static int const nstate_handlers = 3; +static StateProc state_handler[] = { HexIMNormalKey, HexIMFirstComposeKey, HexIMSecondComposeKey @@ -718,7 +718,7 @@ struct _XMapThaiKey { KeySym to; }; -Private struct _XMapThaiKey const ThaiComposeTable[] = { +static struct _XMapThaiKey const ThaiComposeTable[] = { { /* 0xa4 */ XK_currency, /* 0xa5 */ XK_yen }, { /* 0xa2 */ XK_cent, /* 0xa3 */ XK_sterling }, { /* 0xe6 */ XK_ae, /* 0xef */ XK_idiaeresis }, @@ -742,7 +742,7 @@ struct _XKeytrans { /* Convert keysym to 'Thai Compose' keysym */ /* The current implementation use latin-1 keysyms */ -Private Bool +static Bool ThaiComposeConvert( Display *dpy, KeySym insym, @@ -762,7 +762,7 @@ ThaiComposeConvert( return False; } -Private int +static int XThaiTranslateKey( register Display *dpy, KeyCode keycode, @@ -847,7 +847,7 @@ XThaiTranslateKey( * Should be changed to TACTIS keysyms when they are defined by the * standard. */ -Private int +static int XThaiTranslateKeySym( Display *dpy, register KeySym symbol, @@ -956,7 +956,7 @@ XThaiTranslateKeySym( /* * given a KeySym, returns the first keycode containing it, if any. */ -Private CARD8 +static CARD8 FindKeyCode( register Display *dpy, register KeySym code) @@ -980,7 +980,7 @@ FindKeyCode( * what modifier it is bound to, if any. Sets the AnyModifier bit if it * can't map some keysym to a modifier. */ -Private void +static void ComputeMaskFromKeytrans( Display *dpy, register struct _XKeytrans *p) @@ -1020,7 +1020,7 @@ ComputeMaskFromKeytrans( #define FIRST_COMPOSE_KEY_STATE 1 #define SECOND_COMPOSE_KEY_STATE 2 -Private +static KeySym HexIMNormalKey( XicThaiPart *thai_part, KeySym symbol, @@ -1036,7 +1036,7 @@ KeySym HexIMNormalKey( } -Private +static KeySym HexIMFirstComposeKey( XicThaiPart *thai_part, KeySym symbol, @@ -1059,7 +1059,7 @@ KeySym HexIMFirstComposeKey( return NoSymbol; } -Private +static KeySym HexIMSecondComposeKey( XicThaiPart *thai_part, KeySym symbol, @@ -1094,7 +1094,7 @@ KeySym HexIMSecondComposeKey( * The current implementation of this routine returns ISO Latin Keysyms. */ -Private +static KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2) { int hi_digit; @@ -1131,7 +1131,7 @@ int tactis_code; * 2) whether cancelling key event should be processed or ignored */ -Private +static int IsCancelComposeKey( KeySym *symbol, XKeyEvent *event) @@ -1163,7 +1163,7 @@ int IsCancelComposeKey( * set specified keyboard LED on or off */ -Private +static void SetLed( Display *dpy, int num, @@ -1180,7 +1180,7 @@ void SetLed( /* * Initialize ISC mode from im modifier */ -Private void InitIscMode(Xic ic) +static void InitIscMode(Xic ic) { Xim im; char *im_modifier_name; @@ -1213,7 +1213,7 @@ Private void InitIscMode(Xic ic) /* * Helper functions for _XimThaiFilter() */ -Private Bool +static Bool ThaiFltAcceptInput(Xic ic, unsigned char new_char, KeySym symbol) { DefTreeBase *b = &ic->private.local.base; @@ -1228,7 +1228,7 @@ ThaiFltAcceptInput(Xic ic, unsigned char new_char, KeySym symbol) return True; } -Private Bool +static Bool ThaiFltReorderInput(Xic ic, unsigned char previous_char, unsigned char new_char) { DefTreeBase *b = &ic->private.local.base; @@ -1242,7 +1242,7 @@ ThaiFltReorderInput(Xic ic, unsigned char previous_char, unsigned char new_char) return True; } -Private Bool +static Bool ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol) { DefTreeBase *b = &ic->private.local.base; @@ -1258,7 +1258,7 @@ ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol) return True; } -Private unsigned +static unsigned NumLockMask(Display *d) { int i; diff --git a/libX11/modules/im/ximcp/imThaiIc.c b/libX11/modules/im/ximcp/imThaiIc.c index 95433f3d7..a21fa2cb4 100644 --- a/libX11/modules/im/ximcp/imThaiIc.c +++ b/libX11/modules/im/ximcp/imThaiIc.c @@ -42,7 +42,7 @@ THIS SOFTWARE. #include "Xlcint.h" #include "Ximint.h" -Private void +static void _XimThaiUnSetFocus( XIC xic) { @@ -55,7 +55,7 @@ _XimThaiUnSetFocus( return; } -Private void +static void _XimThaiDestroyIC( XIC xic) { @@ -81,7 +81,7 @@ _XimThaiDestroyIC( return; } -Private void +static void _XimThaiSetFocus( XIC xic) { @@ -102,7 +102,7 @@ _XimThaiSetFocus( return; } -Private void +static void _XimThaiReset( XIC xic) { @@ -115,7 +115,7 @@ _XimThaiReset( b->utf8[b->tree[ic->private.local.composed].utf8] = '\0'; } -Private char * +static char * _XimThaiMbReset( XIC xic) { @@ -123,7 +123,7 @@ _XimThaiMbReset( return (char *)NULL; } -Private wchar_t * +static wchar_t * _XimThaiWcReset( XIC xic) { @@ -131,7 +131,7 @@ _XimThaiWcReset( return (wchar_t *)NULL; } -Private XICMethodsRec Thai_ic_methods = { +static XICMethodsRec Thai_ic_methods = { _XimThaiDestroyIC, /* destroy */ _XimThaiSetFocus, /* set_focus */ _XimThaiUnSetFocus, /* unset_focus */ diff --git a/libX11/modules/im/ximcp/imThaiIm.c b/libX11/modules/im/ximcp/imThaiIm.c index 45c690bbc..793ed36e0 100644 --- a/libX11/modules/im/ximcp/imThaiIm.c +++ b/libX11/modules/im/ximcp/imThaiIm.c @@ -1,235 +1,235 @@ -/******************************************************************
-
- Copyright 1992, 1993, 1994 by FUJITSU LIMITED
- Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission. FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose. It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
- Author: Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
- Modifier: Franky Ling Digital Equipment Corporation
- frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPublic.h"
-#include "XlcPubI.h"
-#include "Ximint.h"
-
-Private XIMMethodsRec Xim_im_thai_methods = {
- _XimThaiCloseIM, /* close */
- _XimLocalSetIMValues, /* set_values */
- _XimLocalGetIMValues, /* get_values */
- _XimThaiCreateIC, /* create_ic */
- _XimLcctstombs, /* ctstombs */
- _XimLcctstowcs, /* ctstowcs */
- _XimLcctstoutf8 /* ctstoutf8 */
-};
-
-#define THAI_LANGUAGE_NAME "th"
-
-Bool
-_XimCheckIfThaiProcessing(Xim im)
-{
- char *language;
-
- _XGetLCValues(im->core.lcd, XlcNLanguage, &language, NULL);
- if(strcmp(language, THAI_LANGUAGE_NAME) == 0 &&
- (strcmp(im->core.im_name, "") == 0 ||
- strcmp(im->core.im_name, "BasicCheck") == 0 ||
- strcmp(im->core.im_name, "Strict") == 0 ||
- strcmp(im->core.im_name, "Thaicat") == 0 ||
- strcmp(im->core.im_name, "Passthrough") == 0))
- {
- return(True);
- }
- return(False);
-}
-
-Public Bool
-_XimThaiOpenIM(Xim im)
-{
- XLCd lcd = im->core.lcd;
- XlcConv conv;
- XimDefIMValues im_values;
- XimLocalPrivateRec* private = &im->private.local;
-
- _XimInitialResourceInfo();
- if(_XimSetIMResourceList(&im->core.im_resources,
- &im->core.im_num_resources) == False) {
- goto Open_Error;
- }
- if(_XimSetICResourceList(&im->core.ic_resources,
- &im->core.ic_num_resources) == False) {
- goto Open_Error;
- }
-
- _XimSetIMMode(im->core.im_resources, im->core.im_num_resources);
-
- _XimGetCurrentIMValues(im, &im_values);
- if(_XimSetLocalIMDefaults(im, (XPointer)&im_values,
- im->core.im_resources, im->core.im_num_resources) == False) {
- goto Open_Error;
- }
- _XimSetCurrentIMValues(im, &im_values);
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte)))
- goto Open_Error;
- private->ctom_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar)))
- goto Open_Error;
- private->ctow_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNUtf8String)))
- goto Open_Error;
- private->ctoutf8_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte)))
- goto Open_Error;
- private->cstomb_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNWideChar)))
- goto Open_Error;
- private->cstowc_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String)))
- goto Open_Error;
- private->cstoutf8_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNChar)))
- goto Open_Error;
- private->ucstoc_conv = conv;
-
- if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String)))
- goto Open_Error;
- private->ucstoutf8_conv = conv;
-
- im->methods = &Xim_im_thai_methods;
- private->current_ic = (XIC)NULL;
-
- return(True);
-
-Open_Error :
- _XimThaiIMFree(im);
- return(False);
-}
-
-Public void
-_XimThaiIMFree(Xim im)
-{
- if(im->core.im_resources) {
- Xfree(im->core.im_resources);
- im->core.im_resources = NULL;
- }
- if(im->core.ic_resources) {
- Xfree(im->core.ic_resources);
- im->core.ic_resources = NULL;
- }
- if(im->core.im_values_list) {
- Xfree(im->core.im_values_list);
- im->core.im_values_list = NULL;
- }
- if(im->core.ic_values_list) {
- Xfree(im->core.ic_values_list);
- im->core.ic_values_list = NULL;
- }
- if(im->core.styles) {
- Xfree(im->core.styles);
- im->core.styles = NULL;
- }
- if(im->core.res_name) {
- Xfree(im->core.res_name);
- im->core.res_name = NULL;
- }
- if(im->core.res_class) {
- Xfree(im->core.res_class);
- im->core.res_class = NULL;
- }
- if(im->core.im_name) {
- Xfree(im->core.im_name);
- im->core.im_name = NULL;
- }
- if (im->private.local.ctom_conv) {
- _XlcCloseConverter(im->private.local.ctom_conv);
- im->private.local.ctom_conv = NULL;
- }
- if (im->private.local.ctow_conv) {
- _XlcCloseConverter(im->private.local.ctow_conv);
- im->private.local.ctow_conv = NULL;
- }
- if (im->private.local.ctoutf8_conv) {
- _XlcCloseConverter(im->private.local.ctoutf8_conv);
- im->private.local.ctoutf8_conv = NULL;
- }
- if (im->private.local.cstomb_conv) {
- _XlcCloseConverter(im->private.local.cstomb_conv);
- im->private.local.cstomb_conv = NULL;
- }
- if (im->private.local.cstowc_conv) {
- _XlcCloseConverter(im->private.local.cstowc_conv);
- im->private.local.cstowc_conv = NULL;
- }
- if (im->private.local.cstoutf8_conv) {
- _XlcCloseConverter(im->private.local.cstoutf8_conv);
- im->private.local.cstoutf8_conv = NULL;
- }
- if (im->private.local.ucstoc_conv) {
- _XlcCloseConverter(im->private.local.ucstoc_conv);
- im->private.local.ucstoc_conv = NULL;
- }
- if (im->private.local.ucstoutf8_conv) {
- _XlcCloseConverter(im->private.local.ucstoutf8_conv);
- im->private.local.ucstoutf8_conv = NULL;
- }
- return;
-}
-
-Public Status
-_XimThaiCloseIM(XIM xim)
-{
- Xim im = (Xim)xim;
- XIC ic;
- XIC next;
-
- ic = im->core.ic_chain;
- im->core.ic_chain = NULL;
- while (ic) {
- (*ic->methods->destroy) (ic);
- next = ic->core.next;
- Xfree ((char *) ic);
- ic = next;
- }
- _XimThaiIMFree(im);
- return(True);
-}
+/****************************************************************** + + Copyright 1992, 1993, 1994 by FUJITSU LIMITED + Copyright 1993 by Digital Equipment Corporation + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of FUJITSU LIMITED and +Digital Equipment Corporation not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. FUJITSU LIMITED and Digital Equipment Corporation +makes no representations about the suitability of this software for +any purpose. It is provided "as is" without express or implied +warranty. + +FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + Author: Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + Modifier: Franky Ling Digital Equipment Corporation + frankyling@hgrd01.enet.dec.com + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <stdio.h> +#include <X11/Xlib.h> +#include <X11/Xmd.h> +#include <X11/Xatom.h> +#include <X11/Xos.h> +#include "Xlibint.h" +#include "Xlcint.h" +#include "XlcPublic.h" +#include "XlcPubI.h" +#include "Ximint.h" + +static XIMMethodsRec Xim_im_thai_methods = { + _XimThaiCloseIM, /* close */ + _XimLocalSetIMValues, /* set_values */ + _XimLocalGetIMValues, /* get_values */ + _XimThaiCreateIC, /* create_ic */ + _XimLcctstombs, /* ctstombs */ + _XimLcctstowcs, /* ctstowcs */ + _XimLcctstoutf8 /* ctstoutf8 */ +}; + +#define THAI_LANGUAGE_NAME "th" + +Bool +_XimCheckIfThaiProcessing(Xim im) +{ + char *language; + + _XGetLCValues(im->core.lcd, XlcNLanguage, &language, NULL); + if(strcmp(language, THAI_LANGUAGE_NAME) == 0 && + (strcmp(im->core.im_name, "") == 0 || + strcmp(im->core.im_name, "BasicCheck") == 0 || + strcmp(im->core.im_name, "Strict") == 0 || + strcmp(im->core.im_name, "Thaicat") == 0 || + strcmp(im->core.im_name, "Passthrough") == 0)) + { + return(True); + } + return(False); +} + +Bool +_XimThaiOpenIM(Xim im) +{ + XLCd lcd = im->core.lcd; + XlcConv conv; + XimDefIMValues im_values; + XimLocalPrivateRec* private = &im->private.local; + + _XimInitialResourceInfo(); + if(_XimSetIMResourceList(&im->core.im_resources, + &im->core.im_num_resources) == False) { + goto Open_Error; + } + if(_XimSetICResourceList(&im->core.ic_resources, + &im->core.ic_num_resources) == False) { + goto Open_Error; + } + + _XimSetIMMode(im->core.im_resources, im->core.im_num_resources); + + _XimGetCurrentIMValues(im, &im_values); + if(_XimSetLocalIMDefaults(im, (XPointer)&im_values, + im->core.im_resources, im->core.im_num_resources) == False) { + goto Open_Error; + } + _XimSetCurrentIMValues(im, &im_values); + + if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte))) + goto Open_Error; + private->ctom_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar))) + goto Open_Error; + private->ctow_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNUtf8String))) + goto Open_Error; + private->ctoutf8_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte))) + goto Open_Error; + private->cstomb_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNWideChar))) + goto Open_Error; + private->cstowc_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String))) + goto Open_Error; + private->cstoutf8_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNChar))) + goto Open_Error; + private->ucstoc_conv = conv; + + if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String))) + goto Open_Error; + private->ucstoutf8_conv = conv; + + im->methods = &Xim_im_thai_methods; + private->current_ic = (XIC)NULL; + + return(True); + +Open_Error : + _XimThaiIMFree(im); + return(False); +} + +void +_XimThaiIMFree(Xim im) +{ + if(im->core.im_resources) { + Xfree(im->core.im_resources); + im->core.im_resources = NULL; + } + if(im->core.ic_resources) { + Xfree(im->core.ic_resources); + im->core.ic_resources = NULL; + } + if(im->core.im_values_list) { + Xfree(im->core.im_values_list); + im->core.im_values_list = NULL; + } + if(im->core.ic_values_list) { + Xfree(im->core.ic_values_list); + im->core.ic_values_list = NULL; + } + if(im->core.styles) { + Xfree(im->core.styles); + im->core.styles = NULL; + } + if(im->core.res_name) { + Xfree(im->core.res_name); + im->core.res_name = NULL; + } + if(im->core.res_class) { + Xfree(im->core.res_class); + im->core.res_class = NULL; + } + if(im->core.im_name) { + Xfree(im->core.im_name); + im->core.im_name = NULL; + } + if (im->private.local.ctom_conv) { + _XlcCloseConverter(im->private.local.ctom_conv); + im->private.local.ctom_conv = NULL; + } + if (im->private.local.ctow_conv) { + _XlcCloseConverter(im->private.local.ctow_conv); + im->private.local.ctow_conv = NULL; + } + if (im->private.local.ctoutf8_conv) { + _XlcCloseConverter(im->private.local.ctoutf8_conv); + im->private.local.ctoutf8_conv = NULL; + } + if (im->private.local.cstomb_conv) { + _XlcCloseConverter(im->private.local.cstomb_conv); + im->private.local.cstomb_conv = NULL; + } + if (im->private.local.cstowc_conv) { + _XlcCloseConverter(im->private.local.cstowc_conv); + im->private.local.cstowc_conv = NULL; + } + if (im->private.local.cstoutf8_conv) { + _XlcCloseConverter(im->private.local.cstoutf8_conv); + im->private.local.cstoutf8_conv = NULL; + } + if (im->private.local.ucstoc_conv) { + _XlcCloseConverter(im->private.local.ucstoc_conv); + im->private.local.ucstoc_conv = NULL; + } + if (im->private.local.ucstoutf8_conv) { + _XlcCloseConverter(im->private.local.ucstoutf8_conv); + im->private.local.ucstoutf8_conv = NULL; + } + return; +} + +Status +_XimThaiCloseIM(XIM xim) +{ + Xim im = (Xim)xim; + XIC ic; + XIC next; + + ic = im->core.ic_chain; + im->core.ic_chain = NULL; + while (ic) { + (*ic->methods->destroy) (ic); + next = ic->core.next; + Xfree ((char *) ic); + ic = next; + } + _XimThaiIMFree(im); + return(True); +} diff --git a/libX11/modules/im/ximcp/imTrX.c b/libX11/modules/im/ximcp/imTrX.c index d85d1d114..1412d7046 100644 --- a/libX11/modules/im/ximcp/imTrX.c +++ b/libX11/modules/im/ximcp/imTrX.c @@ -60,7 +60,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "XimTrInt.h" #include "XimTrX.h" -Private Bool +static Bool _XimXRegisterDispatcher( Xim im, Bool (*callback)( @@ -81,7 +81,7 @@ _XimXRegisterDispatcher( return True; } -Private void +static void _XimXFreeIntrCallback( Xim im) { @@ -96,7 +96,7 @@ _XimXFreeIntrCallback( return; } -Private Bool +static Bool _XimXCallDispatcher(Xim im, INT16 len, XPointer data) { register XIntrCallbackRec *rec; @@ -109,7 +109,7 @@ _XimXCallDispatcher(Xim im, INT16 len, XPointer data) return False; } -Private Bool +static Bool _XimXFilterWaitEvent( Display *d, Window w, @@ -137,7 +137,7 @@ _XimXFilterWaitEvent( return ret; } -Private Bool +static Bool _CheckConnect( Display *display, XEvent *event, @@ -153,7 +153,7 @@ _CheckConnect( return False; } -Private Bool +static Bool _XimXConnect(Xim im) { XEvent event; @@ -224,7 +224,7 @@ _XimXConnect(Xim im) return True; } -Private Bool +static Bool _XimXShutdown(Xim im) { XSpecRec *spec = (XSpecRec *)im->private.proto.spec; @@ -244,7 +244,7 @@ _XimXShutdown(Xim im) return True; } -Private char * +static char * _NewAtom( char *atomName) { @@ -255,7 +255,7 @@ _NewAtom( return atomName; } -Private Bool +static Bool _XimXWrite(Xim im, INT16 len, XPointer data) { Atom atom; @@ -316,7 +316,7 @@ _XimXWrite(Xim im, INT16 len, XPointer data) return True; } -Private Bool +static Bool _XimXGetReadData( Xim im, char *buf, @@ -440,7 +440,7 @@ _XimXGetReadData( return True; } -Private Bool +static Bool _CheckCMEvent( Display *display, XEvent *event, @@ -461,7 +461,7 @@ _CheckCMEvent( return False; } -Private Bool +static Bool _XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len) { XEvent *ev; @@ -484,14 +484,14 @@ _XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len) return True; } -Private void +static void _XimXFlush(Xim im) { XFlush(im->core.display); return; } -Public Bool +Bool _XimXConf(Xim im, char *address) { XSpecRec *spec; diff --git a/libX11/modules/im/ximcp/imTrans.c b/libX11/modules/im/ximcp/imTrans.c index 5c23211a5..75a05f2b1 100644 --- a/libX11/modules/im/ximcp/imTrans.c +++ b/libX11/modules/im/ximcp/imTrans.c @@ -74,7 +74,7 @@ PERFORMANCE OF THIS SOFTWARE. #endif -Private Bool +static Bool _XimTransConnect( Xim im) { @@ -124,7 +124,7 @@ _XimTransConnect( } -Private Bool +static Bool _XimTransShutdown( Xim im) { @@ -144,7 +144,7 @@ _XimTransShutdown( -Public Bool +Bool _XimTransRegisterDispatcher( Xim im, Bool (*callback)( @@ -166,7 +166,7 @@ _XimTransRegisterDispatcher( } -Public void +void _XimFreeTransIntrCallback( Xim im) { @@ -182,7 +182,7 @@ _XimFreeTransIntrCallback( } -Public Bool +Bool _XimTransCallDispatcher(Xim im, INT16 len, XPointer data) { TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec; @@ -196,7 +196,7 @@ _XimTransCallDispatcher(Xim im, INT16 len, XPointer data) } -Public Bool +Bool _XimTransFilterWaitEvent( Display *d, Window w, @@ -211,7 +211,7 @@ _XimTransFilterWaitEvent( } -Public void +void _XimTransInternalConnection( Display *d, int fd, @@ -237,7 +237,7 @@ _XimTransInternalConnection( } -Public Bool +Bool _XimTransWrite(Xim im, INT16 len, XPointer data) { TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec; @@ -254,7 +254,7 @@ _XimTransWrite(Xim im, INT16 len, XPointer data) } -Public Bool +Bool _XimTransRead( Xim im, XPointer recv_buf, @@ -275,7 +275,7 @@ _XimTransRead( } -Public void +void _XimTransFlush( Xim im) { @@ -284,7 +284,7 @@ _XimTransFlush( -Public Bool +Bool _XimTransConf( Xim im, char *address) diff --git a/libX11/modules/im/ximcp/imTransR.c b/libX11/modules/im/ximcp/imTransR.c index b8bad59a4..1fd008870 100644 --- a/libX11/modules/im/ximcp/imTransR.c +++ b/libX11/modules/im/ximcp/imTransR.c @@ -1,312 +1,312 @@ -/*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-/******************************************************************
-
- Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
- Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
- Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XimTrInt.h"
-#include "Ximint.h"
-
-Public TransportSW _XimTransportRec[] = {
- { "X", _XimXConf }, /* 1st entry must be X.
- This will be a fallback */
-#ifdef TCPCONN
- { "tcp", _XimTransConf }, /* use X transport lib */
-#endif /* TCPCONN */
-#if defined(UNIXCONN) || defined(LOCALCONN)
- { "local", _XimTransConf }, /* use X transport lib */
-#endif /* UNIXCONN */
-#ifdef DNETCONN
- { "dnet", _XimTransConf }, /* use X transport lib */
-#endif /* DNETCONN */
-#ifdef STREAMSCONN
- { "streams", _XimTransConf }, /* use X transport lib */
-#endif /* STREAMSCONN */
- { (char *)NULL, (Bool (*)(Xim, char *))NULL },
-};
-
-Public Bool
-_XimConnect(Xim im)
-{
- return im->private.proto.connect(im);
-}
-
-Public Bool
-_XimShutdown(Xim im)
-{
- return im->private.proto.shutdown(im);
-}
-
-Public Bool
-_XimWrite(Xim im, INT16 len, XPointer data)
-{
- return im->private.proto.write(im, len, data);
-}
-
-Private int
-_CheckProtocolData(
- Xim im,
- char *recv_buf)
-{
- int data_len;
-
- data_len = (int)(((*((CARD16 *)recv_buf + 1)) * 4) + XIM_HEADER_SIZE);
- return data_len;
-}
-
-Private int
-_XimReadData(
- Xim im,
- INT16 *len,
- XPointer buf,
- int buf_size)
-{
- char *hold_buf;
- char *tmp;
- int data_len;
- int packet_size;
- int ret_len;
- register int i;
-
- if (buf_size < XIM_HEADER_SIZE) {
- *len = (INT16)XIM_HEADER_SIZE;
- return XIM_OVERFLOW;
- }
-
- bzero(buf, buf_size);
- packet_size = 0;
- data_len = 0;
-
- if ((hold_buf = im->private.proto.hold_data)) {
- data_len = im->private.proto.hold_data_len;
- if (data_len >= XIM_HEADER_SIZE) {
- packet_size = _CheckProtocolData(im, hold_buf);
- if (packet_size > buf_size) {
- *len = (INT16)packet_size;
- return XIM_OVERFLOW;
- }
- if (packet_size <= data_len) {
- memcpy(buf, hold_buf, packet_size);
- for (i = packet_size; i < data_len; i++) {
- if (hold_buf[i])
- break;
- }
- data_len -= i;
-
- if (data_len) {
- if (!(tmp = (char *)Xmalloc(data_len))) {
- return XIM_FALSE;
- }
- memcpy(tmp, &hold_buf[i], data_len);
- im->private.proto.hold_data = tmp;
- im->private.proto.hold_data_len = data_len;
- } else {
- im->private.proto.hold_data = 0;
- im->private.proto.hold_data_len = 0;
- }
- Xfree(hold_buf);
- *len = (INT16)packet_size;
- return XIM_TRUE;
- }
- }
- memcpy(buf, hold_buf, data_len);
- buf_size -= data_len;
- Xfree(hold_buf);
- im->private.proto.hold_data = 0;
- im->private.proto.hold_data_len = 0;
- }
-
- if (!packet_size) {
- while (data_len < XIM_HEADER_SIZE) {
- if (!(im->private.proto.read(im,
- (XPointer)&buf[data_len], buf_size, &ret_len))) {
- return XIM_FALSE;
- }
- data_len += ret_len;
- buf_size -= ret_len;
- }
- packet_size = _CheckProtocolData(im, buf);
- }
-
- if (packet_size > buf_size) {
- if (!(tmp = (char *)Xmalloc(data_len))) {
- return XIM_FALSE;
- }
- memcpy(tmp, buf, data_len);
- bzero(buf, data_len);
- im->private.proto.hold_data = tmp;
- im->private.proto.hold_data_len = data_len;
- *len = (INT16)packet_size;
- return XIM_OVERFLOW;
- }
-
- while (data_len < packet_size) {
- if (!(im->private.proto.read(im,
- (XPointer)&buf[data_len], buf_size, &ret_len))) {
- return XIM_FALSE;
- }
- data_len += ret_len;
- buf_size -= ret_len;
- }
-
- for (i = packet_size; i < data_len; i++) {
- if (buf[i])
- break;
- }
- data_len -= i;
-
- if (data_len) {
- if (!(tmp = (char *)Xmalloc(data_len))) {
- return XIM_FALSE;
- }
- memcpy(tmp, &buf[i], data_len);
- bzero(&buf[i], data_len);
- im->private.proto.hold_data = tmp;
- im->private.proto.hold_data_len = data_len;
- } else {
- im->private.proto.hold_data = 0;
- im->private.proto.hold_data_len = 0;
- }
- *len = (INT16)packet_size;
- return XIM_TRUE;
-}
-
-Private Bool
-_XimCallDispatcher(
- Xim im,
- INT16 len,
- XPointer data)
-{
- return im->private.proto.call_dispatcher(im, len, data);
-}
-
-Public int
-_XimRead(Xim im, INT16 *len, XPointer buf, int buf_size,
- Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg)
-{
- INT16 read_len;
- int ret_code;
-
- for (;;) {
- ret_code = _XimReadData(im, &read_len, buf, buf_size);
- if(ret_code != XIM_TRUE) {
- return ret_code;
- }
- if ((*predicate)(im, read_len, buf, arg))
- break;
- if (_XimCallDispatcher(im, read_len, buf))
- continue;
- _XimError(im, 0, XIM_BadProtocol, (INT16)0, (CARD16)0, (char *)NULL);
- }
- *len = read_len;
- return True;
-}
-
-Public Bool
-_XimRegisterDispatcher(
- Xim im,
- Bool (*callback)(
- Xim, INT16, XPointer, XPointer
- ),
- XPointer call_data)
-{
- return im->private.proto.register_dispatcher(im, callback, call_data);
-}
-
-Public void
-_XimFlush(Xim im)
-{
- im->private.proto.flush(im);
- return;
-}
-
-Public Bool
-_XimFilterWaitEvent(Xim im)
-{
- INT16 read_len;
- CARD32 reply32[BUFSIZE/4];
- char *reply = (char *)reply32;
- XPointer preply;
- int buf_size;
- int ret_code;
-
- buf_size = BUFSIZE;
- ret_code = _XimReadData(im, &read_len, (XPointer)reply, buf_size);
- if(ret_code == XIM_TRUE) {
- preply = reply;
- } else if(ret_code == XIM_OVERFLOW) {
- if(read_len <= 0) {
- preply = reply;
- } else {
- buf_size = (int)read_len;
- preply = (XPointer)Xmalloc(buf_size);
- ret_code = _XimReadData(im, &read_len, preply, buf_size);
- if(ret_code != XIM_TRUE) {
- if (preply != reply)
- Xfree(preply);
- return False;
- }
- }
- } else {
- return False;
- }
- if (_XimCallDispatcher(im, read_len, preply)) {
- if(reply != preply)
- Xfree(preply);
- return True;
- }
- _XimError(im, 0, XIM_BadProtocol, (INT16)0, (CARD16)0, (char *)NULL);
- if(reply != preply)
- Xfree(preply);
- return True;
-}
+/* + * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +/****************************************************************** + + Copyright 1992, 1993, 1994 by FUJITSU LIMITED + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of FUJITSU LIMITED +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +FUJITSU LIMITED makes no representations about the suitability of +this software for any purpose. +It is provided "as is" without express or implied warranty. + +FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc. + Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + +******************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include "Xlibint.h" +#include "Xlcint.h" +#include "XimTrInt.h" +#include "Ximint.h" + +TransportSW _XimTransportRec[] = { + { "X", _XimXConf }, /* 1st entry must be X. + This will be a fallback */ +#ifdef TCPCONN + { "tcp", _XimTransConf }, /* use X transport lib */ +#endif /* TCPCONN */ +#if defined(UNIXCONN) || defined(LOCALCONN) + { "local", _XimTransConf }, /* use X transport lib */ +#endif /* UNIXCONN */ +#ifdef DNETCONN + { "dnet", _XimTransConf }, /* use X transport lib */ +#endif /* DNETCONN */ +#ifdef STREAMSCONN + { "streams", _XimTransConf }, /* use X transport lib */ +#endif /* STREAMSCONN */ + { (char *)NULL, (Bool (*)(Xim, char *))NULL }, +}; + +Bool +_XimConnect(Xim im) +{ + return im->private.proto.connect(im); +} + +Bool +_XimShutdown(Xim im) +{ + return im->private.proto.shutdown(im); +} + +Bool +_XimWrite(Xim im, INT16 len, XPointer data) +{ + return im->private.proto.write(im, len, data); +} + +static int +_CheckProtocolData( + Xim im, + char *recv_buf) +{ + int data_len; + + data_len = (int)(((*((CARD16 *)recv_buf + 1)) * 4) + XIM_HEADER_SIZE); + return data_len; +} + +static int +_XimReadData( + Xim im, + INT16 *len, + XPointer buf, + int buf_size) +{ + char *hold_buf; + char *tmp; + int data_len; + int packet_size; + int ret_len; + register int i; + + if (buf_size < XIM_HEADER_SIZE) { + *len = (INT16)XIM_HEADER_SIZE; + return XIM_OVERFLOW; + } + + bzero(buf, buf_size); + packet_size = 0; + data_len = 0; + + if ((hold_buf = im->private.proto.hold_data)) { + data_len = im->private.proto.hold_data_len; + if (data_len >= XIM_HEADER_SIZE) { + packet_size = _CheckProtocolData(im, hold_buf); + if (packet_size > buf_size) { + *len = (INT16)packet_size; + return XIM_OVERFLOW; + } + if (packet_size <= data_len) { + memcpy(buf, hold_buf, packet_size); + for (i = packet_size; i < data_len; i++) { + if (hold_buf[i]) + break; + } + data_len -= i; + + if (data_len) { + if (!(tmp = (char *)Xmalloc(data_len))) { + return XIM_FALSE; + } + memcpy(tmp, &hold_buf[i], data_len); + im->private.proto.hold_data = tmp; + im->private.proto.hold_data_len = data_len; + } else { + im->private.proto.hold_data = 0; + im->private.proto.hold_data_len = 0; + } + Xfree(hold_buf); + *len = (INT16)packet_size; + return XIM_TRUE; + } + } + memcpy(buf, hold_buf, data_len); + buf_size -= data_len; + Xfree(hold_buf); + im->private.proto.hold_data = 0; + im->private.proto.hold_data_len = 0; + } + + if (!packet_size) { + while (data_len < XIM_HEADER_SIZE) { + if (!(im->private.proto.read(im, + (XPointer)&buf[data_len], buf_size, &ret_len))) { + return XIM_FALSE; + } + data_len += ret_len; + buf_size -= ret_len; + } + packet_size = _CheckProtocolData(im, buf); + } + + if (packet_size > buf_size) { + if (!(tmp = (char *)Xmalloc(data_len))) { + return XIM_FALSE; + } + memcpy(tmp, buf, data_len); + bzero(buf, data_len); + im->private.proto.hold_data = tmp; + im->private.proto.hold_data_len = data_len; + *len = (INT16)packet_size; + return XIM_OVERFLOW; + } + + while (data_len < packet_size) { + if (!(im->private.proto.read(im, + (XPointer)&buf[data_len], buf_size, &ret_len))) { + return XIM_FALSE; + } + data_len += ret_len; + buf_size -= ret_len; + } + + for (i = packet_size; i < data_len; i++) { + if (buf[i]) + break; + } + data_len -= i; + + if (data_len) { + if (!(tmp = (char *)Xmalloc(data_len))) { + return XIM_FALSE; + } + memcpy(tmp, &buf[i], data_len); + bzero(&buf[i], data_len); + im->private.proto.hold_data = tmp; + im->private.proto.hold_data_len = data_len; + } else { + im->private.proto.hold_data = 0; + im->private.proto.hold_data_len = 0; + } + *len = (INT16)packet_size; + return XIM_TRUE; +} + +static Bool +_XimCallDispatcher( + Xim im, + INT16 len, + XPointer data) +{ + return im->private.proto.call_dispatcher(im, len, data); +} + +int +_XimRead(Xim im, INT16 *len, XPointer buf, int buf_size, + Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg) +{ + INT16 read_len; + int ret_code; + + for (;;) { + ret_code = _XimReadData(im, &read_len, buf, buf_size); + if(ret_code != XIM_TRUE) { + return ret_code; + } + if ((*predicate)(im, read_len, buf, arg)) + break; + if (_XimCallDispatcher(im, read_len, buf)) + continue; + _XimError(im, 0, XIM_BadProtocol, (INT16)0, (CARD16)0, (char *)NULL); + } + *len = read_len; + return True; +} + +Bool +_XimRegisterDispatcher( + Xim im, + Bool (*callback)( + Xim, INT16, XPointer, XPointer + ), + XPointer call_data) +{ + return im->private.proto.register_dispatcher(im, callback, call_data); +} + +void +_XimFlush(Xim im) +{ + im->private.proto.flush(im); + return; +} + +Bool +_XimFilterWaitEvent(Xim im) +{ + INT16 read_len; + CARD32 reply32[BUFSIZE/4]; + char *reply = (char *)reply32; + XPointer preply; + int buf_size; + int ret_code; + + buf_size = BUFSIZE; + ret_code = _XimReadData(im, &read_len, (XPointer)reply, buf_size); + if(ret_code == XIM_TRUE) { + preply = reply; + } else if(ret_code == XIM_OVERFLOW) { + if(read_len <= 0) { + preply = reply; + } else { + buf_size = (int)read_len; + preply = (XPointer)Xmalloc(buf_size); + ret_code = _XimReadData(im, &read_len, preply, buf_size); + if(ret_code != XIM_TRUE) { + if (preply != reply) + Xfree(preply); + return False; + } + } + } else { + return False; + } + if (_XimCallDispatcher(im, read_len, preply)) { + if(reply != preply) + Xfree(preply); + return True; + } + _XimError(im, 0, XIM_BadProtocol, (INT16)0, (CARD16)0, (char *)NULL); + if(reply != preply) + Xfree(preply); + return True; +} diff --git a/libX11/src/xlibi18n/Ximint.h b/libX11/src/xlibi18n/Ximint.h index 7d84e9396..def18cc6d 100644 --- a/libX11/src/xlibi18n/Ximint.h +++ b/libX11/src/xlibi18n/Ximint.h @@ -1,998 +1,995 @@ -/******************************************************************
-
- Copyright 1992, 1993, 1994 by FUJITSU LIMITED
- Copyright 1993, 1994 by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Sony Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission. FUJITSU LIMITED and Sony Corporation makes no
-representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED AND SONY CORPORATION DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJITSU LIMITED AND
-SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
- Author: Takashi Fujiwara FUJITSU LIMITED
- fujiwara@a80.tech.yk.fujitsu.co.jp
- Motifier: Makoto Wakamatsu Sony Corporation
- makoto@sm.sony.co.jp
-
-******************************************************************/
-
-#ifndef _XIMINT_H
-#define _XIMINT_H
-
-#include <stdio.h>
-#include <X11/Xutil.h>
-
-#define Public /**/
-#define Private static
-
-typedef struct _Xim *Xim;
-typedef struct _Xic *Xic;
-
-/*
- * Input Method data
- */
-#include "XimintP.h"
-#include "XimintL.h"
-
-/*
- * XIM dependent data
- */
-
-typedef struct _XimCommonPrivateRec {
- /* This struct is also inlined in XimLocalPrivateRec, XimProtoPrivateRec. */
- XlcConv ctom_conv;
- XlcConv ctow_conv;
- XlcConv ctoutf8_conv;
- XlcConv cstomb_conv;
- XlcConv cstowc_conv;
- XlcConv cstoutf8_conv;
- XlcConv ucstoc_conv;
- XlcConv ucstoutf8_conv;
-} XimCommonPrivateRec;
-
-typedef union _XIMPrivateRec {
- XimCommonPrivateRec common;
- XimLocalPrivateRec local;
- XimProtoPrivateRec proto;
-} XIMPrivateRec;
-
-/*
- * IM struct
- */
-typedef struct _Xim {
- XIMMethods methods;
- XIMCoreRec core;
- XIMPrivateRec private;
-} XimRec;
-
-/*
- * IC deprndent data
- */
-typedef union _XICPrivateRec {
- XicLocalPrivateRec local;
- XicProtoPrivateRec proto;
-} XICPrivateRec;
-
-/*
- * IC struct
- */
-typedef struct _Xic {
- XICMethods methods;
- XICCoreRec core;
- XICPrivateRec private;
-} XicRec;
-
-typedef struct _XimDefIMValues {
- XIMValuesList *im_values_list;
- XIMValuesList *ic_values_list;
- XIMStyles *styles;
- XIMCallback destroy_callback;
- char *res_name;
- char *res_class;
- Bool visible_position;
-} XimDefIMValues;
-
-typedef struct _XimDefICValues {
- XIMStyle input_style;
- Window client_window;
- Window focus_window;
- unsigned long filter_events;
- XICCallback geometry_callback;
- char *res_name;
- char *res_class;
- XICCallback destroy_callback;
- XICCallback preedit_state_notify_callback;
- XICCallback string_conversion_callback;
- XIMStringConversionText string_conversion;
- XIMResetState reset_state;
- XIMHotKeyTriggers *hotkey;
- XIMHotKeyState hotkey_state;
- ICPreeditAttributes preedit_attr;
- ICStatusAttributes status_attr;
-} XimDefICValues;
-
-#define XIM_MODE_IM_GET (1 << 0)
-#define XIM_MODE_IM_SET (1 << 1)
-#define XIM_MODE_IM_DEFAULT (1 << 2)
-
-#define XIM_MODE_PRE_GET (1 << 0)
-#define XIM_MODE_PRE_SET (1 << 1)
-#define XIM_MODE_PRE_CREATE (1 << 2)
-#define XIM_MODE_PRE_ONCE (1 << 3)
-#define XIM_MODE_PRE_DEFAULT (1 << 4)
-
-#define XIM_MODE_STS_GET (1 << 5)
-#define XIM_MODE_STS_SET (1 << 6)
-#define XIM_MODE_STS_CREATE (1 << 7)
-#define XIM_MODE_STS_ONCE (1 << 8)
-#define XIM_MODE_STS_DEFAULT (1 << 9)
-
-#define XIM_MODE_IC_GET (XIM_MODE_PRE_GET | XIM_MODE_STS_GET)
-#define XIM_MODE_IC_SET (XIM_MODE_PRE_SET | XIM_MODE_STS_SET)
-#define XIM_MODE_IC_CREATE (XIM_MODE_PRE_CREATE | XIM_MODE_STS_CREATE)
-#define XIM_MODE_IC_ONCE (XIM_MODE_PRE_ONCE | XIM_MODE_STS_ONCE)
-#define XIM_MODE_IC_DEFAULT (XIM_MODE_PRE_DEFAULT | XIM_MODE_STS_DEFAULT)
-
-#define XIM_MODE_PRE_MASK (XIM_MODE_PRE_GET | XIM_MODE_PRE_SET | \
- XIM_MODE_PRE_CREATE | XIM_MODE_PRE_ONCE | \
- XIM_MODE_PRE_DEFAULT)
-#define XIM_MODE_STS_MASK (XIM_MODE_STS_GET | XIM_MODE_STS_SET | \
- XIM_MODE_STS_CREATE | XIM_MODE_STS_ONCE | \
- XIM_MODE_STS_DEFAULT)
-
-#define XIM_SETIMDEFAULTS (1L << 0)
-#define XIM_SETIMVALUES (1L << 1)
-#define XIM_GETIMVALUES (1L << 2)
-
-#define XIM_SETICDEFAULTS (1L << 0)
-#define XIM_CREATEIC (1L << 1)
-#define XIM_SETICVALUES (1L << 2)
-#define XIM_GETICVALUES (1L << 3)
-#define XIM_PREEDIT_ATTR (1L << 4)
-#define XIM_STATUS_ATTR (1L << 5)
-
-#define XIM_CHECK_VALID 0
-#define XIM_CHECK_INVALID 1
-#define XIM_CHECK_ERROR 2
-
-#define FILTERD True
-#define NOTFILTERD False
-
-#define XIMMODIFIER "@im="
-
-#define XIM_TRUE True
-#define XIM_FALSE False
-#define XIM_OVERFLOW (-1)
-
-#define BRL_UC_ROW 0x2800
-
-/*
- * Global symbols
- */
-
-XPointer _XimGetLocaleCode (
- const char *encoding_name
-);
-
-int _XimGetCharCode (
- XPointer conv,
- KeySym keysym,
- unsigned char *buf,
- int nbytes
-);
-
-unsigned int KeySymToUcs4 (
- KeySym keysym
-);
-
-extern Bool _XimSetIMResourceList(
- XIMResourceList *res_list,
- unsigned int *list_num
-);
-
-extern Bool _XimSetICResourceList(
- XIMResourceList *res_list,
- unsigned int *list_num
-);
-
-extern Bool _XimSetInnerIMResourceList(
- XIMResourceList *res_list,
- unsigned int *list_num
-);
-
-extern Bool _XimSetInnerICResourceList(
- XIMResourceList *res_list,
- unsigned int *list_num
-);
-
-extern Bool _XimCheckCreateICValues(
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern XIMResourceList _XimGetResourceListRec(
- XIMResourceList res_list,
- unsigned int list_num,
- const char *name
-);
-
-extern void _XimSetIMMode(
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern void _XimSetICMode(
- XIMResourceList res_list,
- unsigned int list_num,
- XIMStyle style
-);
-
-extern int _XimCheckIMMode(
- XIMResourceList res_list,
- unsigned long mode
-);
-
-extern int _XimCheckICMode(
- XIMResourceList res_list,
- unsigned long mode
-);
-
-extern Bool _XimSetLocalIMDefaults(
- Xim im,
- XPointer top,
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern Bool _XimSetICDefaults(
- Xic ic,
- XPointer top,
- unsigned long mode,
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern Bool _XimEncodeLocalIMAttr(
- XIMResourceList res,
- XPointer top,
- XPointer val
-);
-
-extern Bool _XimEncodeLocalICAttr(
- Xic ic,
- XIMResourceList res,
- XPointer top,
- XIMArg *arg,
- unsigned long mode
-);
-
-extern Bool _XimCheckLocalInputStyle(
- Xic ic,
- XPointer top,
- XIMArg *values,
- XIMStyles *styles,
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern Bool _XimDecodeLocalIMAttr(
- XIMResourceList res,
- XPointer top,
- XPointer val
-);
-
-extern Bool _XimDecodeLocalICAttr(
- XIMResourceList res,
- XPointer top,
- XPointer val,
- unsigned long mode
-);
-
-extern void _XimGetCurrentIMValues(
- Xim im,
- XimDefIMValues *im_values
-);
-
-extern void _XimSetCurrentIMValues(
- Xim im,
- XimDefIMValues *im_values
-);
-
-extern void _XimGetCurrentICValues(
- Xic ic,
- XimDefICValues *ic_values
-);
-
-extern void _XimSetCurrentICValues(
- Xic ic,
- XimDefICValues *ic_values
-);
-
-extern void _XimInitialResourceInfo(
- void
-);
-
-extern void _XimParseStringFile(
- FILE *fp,
- Xim im
-);
-
-extern Bool _XimCheckIfLocalProcessing(
- Xim im
-);
-
-extern Bool _XimCheckIfThaiProcessing(
- Xim im
-);
-
-extern Bool _XimLocalOpenIM(
- Xim im
-);
-
-extern Bool _XimThaiOpenIM(
- Xim im
-);
-
-extern Bool _XimProtoOpenIM(
- Xim im
-);
-
-extern void _XimLocalIMFree(
- Xim im
-);
-
-extern void _XimThaiIMFree(
- Xim im
-);
-
-extern void _XimProtoIMFree(
- Xim im
-);
-
-extern char * _XimSetIMValueData(
- Xim im,
- XPointer top,
- XIMArg *arg,
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern char * _XimGetIMValueData(
- Xim im,
- XPointer top,
- XIMArg *arg,
- XIMResourceList res_list,
- unsigned int list_num
-);
-
-extern char * _XimSetICValueData(
- Xic ic,
- XPointer top,
- XIMResourceList res_list,
- unsigned int list_num,
- XIMArg *arg,
- unsigned long mode,
- Bool flag
-);
-
-extern char * _XimGetICValueData(
- Xic ic,
- XPointer top,
- XIMResourceList res_list,
- unsigned int list_num,
- XIMArg *arg,
- unsigned long mode
-);
-
-extern char * _XimLocalSetIMValues(
- XIM im,
- XIMArg *arg
-);
-
-extern char * _XimLocalGetIMValues(
- XIM im,
- XIMArg *arg
-);
-
-extern XIC _XimLocalCreateIC(
- XIM im,
- XIMArg *arg
-);
-
-extern Bool _XimDispatchInit(
- Xim im
-);
-
-extern Bool _XimGetAttributeID(
- Xim im,
- CARD16 *buf
-);
-
-extern Bool _XimExtension(
- Xim im
-);
-
-extern void _XimDestroyIMStructureList(
- Xim im
-);
-
-extern char * _XimMakeIMAttrIDList(
- Xim im,
- XIMResourceList res_list,
- unsigned int res_num,
- XIMArg *arg,
- CARD16 *buf,
- INT16 *len,
- unsigned long mode
-);
-
-extern char * _XimMakeICAttrIDList(
- Xic ic,
- XIMResourceList res_list,
- unsigned int res_num,
- XIMArg *arg,
- CARD16 *idList,
- INT16 *num,
- unsigned long mode
-);
-
-extern char * _XimDecodeIMATTRIBUTE(
- Xim im,
- XIMResourceList res_list,
- unsigned int res_num,
- CARD16 *buf,
- INT16 buf_len,
- XIMArg *arg,
- BITMASK32 mode
-);
-
-extern char * _XimDecodeICATTRIBUTE(
- Xic ic,
- XIMResourceList res_list,
- unsigned int res_num,
- CARD16 *buf,
- INT16 buf_len,
- XIMArg *arg,
- BITMASK32 mode
-);
-
-extern Bool _XimRegProtoIntrCallback(
- Xim im,
- CARD16 major_code,
- CARD16 minor_code,
- Bool (*proc)(
- Xim, INT16, XPointer, XPointer
- ),
- XPointer call_data
-);
-
-extern Bool _XimErrorCallback(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern Bool _XimError(
- Xim im,
- Xic ic,
- CARD16 error_code,
- INT16 detail_length,
- CARD16 type,
- char *detail
-);
-
-extern Bool _XimRegisterTriggerKeysCallback(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern Bool _XimSetEventMaskCallback(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern Bool _XimForwardEventCallback(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern Bool _XimCommitCallback(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern Bool _XimSyncCallback(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern void _XimFreeProtoIntrCallback(
- Xim im
-);
-
-extern XIC _XimProtoCreateIC(
- XIM im,
- XIMArg *arg
-);
-
-extern void _XimRegisterServerFilter(
- Xim im
-);
-
-extern void _XimUnregisterServerFilter(
- Xim im
-);
-
-extern Bool _XimTriggerNotify(
- Xim im,
- Xic ic,
- int mode,
- CARD32 idx
-);
-
-extern Bool _XimProcSyncReply(
- Xim im,
- Xic ic
-);
-
-extern void _XimSendSetFocus(
- Xim im,
- Xic ic
-);
-
-extern Bool _XimForwardEvent(
- Xic ic,
- XEvent *ev,
- Bool sync
-);
-
-extern void _XimFreeRemakeArg(
- XIMArg *arg
-);
-
-extern void _XimServerDestroy(
- Xim im
-);
-
-extern char * _XimEncodeIMATTRIBUTE(
- Xim im,
- XIMResourceList res_list,
- unsigned int res_num,
- XIMArg *arg,
- XIMArg **arg_ret,
- char *buf,
- int size,
- int *ret_len,
- XPointer top,
- unsigned long mode
-);
-
-extern char * _XimEncodeICATTRIBUTE(
- Xic ic,
- XIMResourceList res_list,
- unsigned int res_num,
- XIMArg *arg,
- XIMArg **arg_ret,
- char *buf,
- int size,
- int *ret_len,
- XPointer top,
- BITMASK32 *flag,
- unsigned long mode
-);
-
-#ifdef EXT_MOVE
-extern Bool _XimExtenMove(
- Xim im,
- Xic ic,
- CARD32 flag,
- CARD16 *buf,
- INT16 length
-);
-#endif
-
-extern int _Ximctstombs(
- XIM im,
- char *from,
- int from_len,
- char *to,
- int to_len,
- Status *state
-);
-
-extern int _Ximctstowcs(
- XIM im,
- char *from,
- int from_len,
- wchar_t *to,
- int to_len,
- Status *state
-);
-
-extern int _Ximctstoutf8(
- XIM im,
- char *from,
- int from_len,
- char *to,
- int to_len,
- Status *state
-);
-
-extern int _XimLcctstombs(
- XIM im,
- char *from,
- int from_len,
- char *to,
- int to_len,
- Status *state
-);
-
-extern int _XimLcctstowcs(
- XIM im,
- char *from,
- int from_len,
- wchar_t *to,
- int to_len,
- Status *state
-);
-
-extern int _XimLcctstoutf8(
- XIM im,
- char *from,
- int from_len,
- char *to,
- int to_len,
- Status *state
-);
-
-extern char _XimGetMyEndian(
- void
-);
-
-extern int _XimCheckDataSize(
- XPointer buf,
- int len
-);
-
-extern void _XimSetHeader(
- XPointer buf,
- CARD8 major_opcode,
- CARD8 minor_opcode,
- INT16 *len
-);
-
-extern Bool _XimSync(
- Xim im,
- Xic ic
-);
-
-extern int _XimProtoMbLookupString(
- XIC xic,
- XKeyEvent *ev,
- char *buffer,
- int bytes,
- KeySym *keysym,
- Status *state
-);
-
-extern int _XimProtoWcLookupString(
- XIC xic,
- XKeyEvent *ev,
- wchar_t *buffer,
- int bytes,
- KeySym *keysym,
- Status *state
-);
-
-extern int _XimProtoUtf8LookupString(
- XIC xic,
- XKeyEvent *ev,
- char *buffer,
- int bytes,
- KeySym *keysym,
- Status *state
-);
-
-extern void _XimRegisterFilter(
- Xic ic
-);
-
-extern void _XimUnregisterFilter(
- Xic ic
-);
-
-extern void _XimReregisterFilter(
- Xic ic
-);
-
-extern Status _XimProtoEventToWire(
- XEvent *re,
- xEvent *event,
- Bool sw
-);
-
-extern Bool _XimProtoWireToEvent(
- XEvent *re,
- xEvent *event,
- Bool sw
-);
-
-#ifdef EXT_FORWARD
-extern Bool _XimExtForwardKeyEvent(
- Xic ic,
- XKeyEvent *ev,
- Bool sync
-);
-#endif
-
-extern int _XimLookupMBText(
- Xic ic,
- XKeyEvent *event,
- char *buffer,
- int nbytes,
- KeySym *keysym,
- XComposeStatus *status
-);
-
-extern int _XimLookupWCText(
- Xic ic,
- XKeyEvent *event,
- wchar_t *buffer,
- int nbytes,
- KeySym *keysym,
- XComposeStatus *status
-);
-
-extern int _XimLookupUTF8Text(
- Xic ic,
- XKeyEvent *event,
- char *buffer,
- int nbytes,
- KeySym *keysym,
- XComposeStatus *status
-);
-
-extern EVENTMASK _XimGetWindowEventmask(
- Xic ic
-);
-
-extern Xic _XimICOfXICID(
- Xim im,
- XICID icid
-);
-
-extern void _XimResetIMInstantiateCallback(
- Xim xim
-);
-
-extern Bool _XimRegisterIMInstantiateCallback(
- XLCd lcd,
- Display *display,
- XrmDatabase rdb,
- char *res_name,
- char *res_class,
- XIDProc callback,
- XPointer client_data
-);
-
-extern Bool _XimUnRegisterIMInstantiateCallback(
- XLCd lcd,
- Display *display,
- XrmDatabase rdb,
- char *res_name,
- char *res_class,
- XIDProc callback,
- XPointer client_data
-);
-
-extern void _XimFreeCommitInfo(
- Xic ic
-);
-
-extern Bool _XimConnect(
- Xim im
-);
-
-extern Bool _XimShutdown(
- Xim im
-);
-
-extern Bool _XimWrite(
- Xim im,
- INT16 len,
- XPointer data
-);
-
-extern Bool _XimRead(
- Xim im,
- INT16 *len,
- XPointer data,
- int data_len,
- Bool (*predicate)(
- Xim, INT16, XPointer, XPointer
- ),
- XPointer arg
-);
-
-extern void _XimFlush(
- Xim im
-);
-
-extern Bool _XimFilterWaitEvent(
- Xim im
-);
-
-extern void _XimProcError(
- Xim im,
- Xic ic,
- XPointer data
-);
-
-#ifdef EXT_MOVE
-extern CARD32 _XimExtenArgCheck(
- XIMArg *arg
-);
-#endif
-
-extern Bool _XimCbDispatch(
- Xim im,
- INT16 len,
- XPointer data,
- XPointer call_data
-);
-
-extern Bool _XimLocalFilter(
- Display *d,
- Window w,
- XEvent *ev,
- XPointer client_data
-);
-
-extern XIMResourceList _XimGetResourceListRecByQuark(
- XIMResourceList res_list,
- unsigned int list_num,
- XrmQuark quark
-);
-
-extern Bool _XimReconnectModeCreateIC(
- Xic ic
-);
-
-extern char *_XimLocalSetICValues(
- XIC ic,
- XIMArg *values
-);
-
-extern char * _XimLocalGetICValues(
- XIC ic,
- XIMArg *values
-);
-
-extern int _XimLocalMbLookupString(
- XIC ic,
- XKeyEvent *ev,
- char *buffer,
- int bytes,
- KeySym *keysym,
- Status *status
-);
-
-extern int _XimLocalWcLookupString(
- XIC ic,
- XKeyEvent *ev,
- wchar_t *buffer,
- int bytes,
- KeySym *keysym,
- Status *status
-);
-
-extern int _XimLocalUtf8LookupString(
- XIC ic,
- XKeyEvent *ev,
- char *buffer,
- int bytes,
- KeySym *keysym,
- Status *status
-);
-
-extern Bool _XimThaiFilter(
- Display *d,
- Window w,
- XEvent *ev,
- XPointer client_data
-);
-
-extern XIC _XimThaiCreateIC(
- XIM im,
- XIMArg *values
-);
-
-extern Status _XimThaiCloseIM(
- XIM xim
-);
-
-#ifdef XIM_CONNECTABLE
-extern void _XimSetProtoResource(
- Xim im
-);
-
-extern Bool _XimConnectServer(
- Xim im
-);
-
-extern Bool _XimDelayModeSetAttr(
- Xim im
-);
-
-extern void _XimServerReconectableDestroy(
- void
-);
-
-extern Bool _XimReCreateIC(
- Xic ic
-);
-
-extern Bool _XimEncodeSavedIMATTRIBUTE(
- Xim im,
- XIMResourceList res_list,
- unsigned int res_num,
- int *idx,
- char *buf,
- int size,
- int *ret_len,
- XPointer top,
- unsigned long mode
-);
-
-extern Bool _XimEncodeSavedICATTRIBUTE(
- Xic ic,
- XIMResourceList res_list,
- unsigned int res_num,
- int *idx,
- char *buf,
- int size,
- int *ret_len,
- XPointer top,
- unsigned long mode
-);
-#endif
-
-extern Public Bool
-_XimRegisterDispatcher(
- Xim im,
- Bool (*callback)(
- Xim, INT16, XPointer, XPointer
- ),
- XPointer call_data);
-
-extern Public Bool
-_XimRespSyncReply(
- Xic ic,
- BITMASK16 mode);
-
-#endif /* _XIMINT_H */
+/****************************************************************** + + Copyright 1992, 1993, 1994 by FUJITSU LIMITED + Copyright 1993, 1994 by Sony Corporation + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of FUJITSU LIMITED and +Sony Corporation not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. FUJITSU LIMITED and Sony Corporation makes no +representations about the suitability of this software for any +purpose. It is provided "as is" without express or implied warranty. + +FUJITSU LIMITED AND SONY CORPORATION DISCLAIM ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJITSU LIMITED AND +SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + Author: Takashi Fujiwara FUJITSU LIMITED + fujiwara@a80.tech.yk.fujitsu.co.jp + Motifier: Makoto Wakamatsu Sony Corporation + makoto@sm.sony.co.jp + +******************************************************************/ + +#ifndef _XIMINT_H +#define _XIMINT_H + +#include <stdio.h> +#include <X11/Xutil.h> + +typedef struct _Xim *Xim; +typedef struct _Xic *Xic; + +/* + * Input Method data + */ +#include "XimintP.h" +#include "XimintL.h" + +/* + * XIM dependent data + */ + +typedef struct _XimCommonPrivateRec { + /* This struct is also inlined in XimLocalPrivateRec, XimProtoPrivateRec. */ + XlcConv ctom_conv; + XlcConv ctow_conv; + XlcConv ctoutf8_conv; + XlcConv cstomb_conv; + XlcConv cstowc_conv; + XlcConv cstoutf8_conv; + XlcConv ucstoc_conv; + XlcConv ucstoutf8_conv; +} XimCommonPrivateRec; + +typedef union _XIMPrivateRec { + XimCommonPrivateRec common; + XimLocalPrivateRec local; + XimProtoPrivateRec proto; +} XIMPrivateRec; + +/* + * IM struct + */ +typedef struct _Xim { + XIMMethods methods; + XIMCoreRec core; + XIMPrivateRec private; +} XimRec; + +/* + * IC deprndent data + */ +typedef union _XICPrivateRec { + XicLocalPrivateRec local; + XicProtoPrivateRec proto; +} XICPrivateRec; + +/* + * IC struct + */ +typedef struct _Xic { + XICMethods methods; + XICCoreRec core; + XICPrivateRec private; +} XicRec; + +typedef struct _XimDefIMValues { + XIMValuesList *im_values_list; + XIMValuesList *ic_values_list; + XIMStyles *styles; + XIMCallback destroy_callback; + char *res_name; + char *res_class; + Bool visible_position; +} XimDefIMValues; + +typedef struct _XimDefICValues { + XIMStyle input_style; + Window client_window; + Window focus_window; + unsigned long filter_events; + XICCallback geometry_callback; + char *res_name; + char *res_class; + XICCallback destroy_callback; + XICCallback preedit_state_notify_callback; + XICCallback string_conversion_callback; + XIMStringConversionText string_conversion; + XIMResetState reset_state; + XIMHotKeyTriggers *hotkey; + XIMHotKeyState hotkey_state; + ICPreeditAttributes preedit_attr; + ICStatusAttributes status_attr; +} XimDefICValues; + +#define XIM_MODE_IM_GET (1 << 0) +#define XIM_MODE_IM_SET (1 << 1) +#define XIM_MODE_IM_DEFAULT (1 << 2) + +#define XIM_MODE_PRE_GET (1 << 0) +#define XIM_MODE_PRE_SET (1 << 1) +#define XIM_MODE_PRE_CREATE (1 << 2) +#define XIM_MODE_PRE_ONCE (1 << 3) +#define XIM_MODE_PRE_DEFAULT (1 << 4) + +#define XIM_MODE_STS_GET (1 << 5) +#define XIM_MODE_STS_SET (1 << 6) +#define XIM_MODE_STS_CREATE (1 << 7) +#define XIM_MODE_STS_ONCE (1 << 8) +#define XIM_MODE_STS_DEFAULT (1 << 9) + +#define XIM_MODE_IC_GET (XIM_MODE_PRE_GET | XIM_MODE_STS_GET) +#define XIM_MODE_IC_SET (XIM_MODE_PRE_SET | XIM_MODE_STS_SET) +#define XIM_MODE_IC_CREATE (XIM_MODE_PRE_CREATE | XIM_MODE_STS_CREATE) +#define XIM_MODE_IC_ONCE (XIM_MODE_PRE_ONCE | XIM_MODE_STS_ONCE) +#define XIM_MODE_IC_DEFAULT (XIM_MODE_PRE_DEFAULT | XIM_MODE_STS_DEFAULT) + +#define XIM_MODE_PRE_MASK (XIM_MODE_PRE_GET | XIM_MODE_PRE_SET | \ + XIM_MODE_PRE_CREATE | XIM_MODE_PRE_ONCE | \ + XIM_MODE_PRE_DEFAULT) +#define XIM_MODE_STS_MASK (XIM_MODE_STS_GET | XIM_MODE_STS_SET | \ + XIM_MODE_STS_CREATE | XIM_MODE_STS_ONCE | \ + XIM_MODE_STS_DEFAULT) + +#define XIM_SETIMDEFAULTS (1L << 0) +#define XIM_SETIMVALUES (1L << 1) +#define XIM_GETIMVALUES (1L << 2) + +#define XIM_SETICDEFAULTS (1L << 0) +#define XIM_CREATEIC (1L << 1) +#define XIM_SETICVALUES (1L << 2) +#define XIM_GETICVALUES (1L << 3) +#define XIM_PREEDIT_ATTR (1L << 4) +#define XIM_STATUS_ATTR (1L << 5) + +#define XIM_CHECK_VALID 0 +#define XIM_CHECK_INVALID 1 +#define XIM_CHECK_ERROR 2 + +#define FILTERD True +#define NOTFILTERD False + +#define XIMMODIFIER "@im=" + +#define XIM_TRUE True +#define XIM_FALSE False +#define XIM_OVERFLOW (-1) + +#define BRL_UC_ROW 0x2800 + +/* + * Global symbols + */ + +XPointer _XimGetLocaleCode ( + const char *encoding_name +); + +int _XimGetCharCode ( + XPointer conv, + KeySym keysym, + unsigned char *buf, + int nbytes +); + +unsigned int KeySymToUcs4 ( + KeySym keysym +); + +extern Bool _XimSetIMResourceList( + XIMResourceList *res_list, + unsigned int *list_num +); + +extern Bool _XimSetICResourceList( + XIMResourceList *res_list, + unsigned int *list_num +); + +extern Bool _XimSetInnerIMResourceList( + XIMResourceList *res_list, + unsigned int *list_num +); + +extern Bool _XimSetInnerICResourceList( + XIMResourceList *res_list, + unsigned int *list_num +); + +extern Bool _XimCheckCreateICValues( + XIMResourceList res_list, + unsigned int list_num +); + +extern XIMResourceList _XimGetResourceListRec( + XIMResourceList res_list, + unsigned int list_num, + const char *name +); + +extern void _XimSetIMMode( + XIMResourceList res_list, + unsigned int list_num +); + +extern void _XimSetICMode( + XIMResourceList res_list, + unsigned int list_num, + XIMStyle style +); + +extern int _XimCheckIMMode( + XIMResourceList res_list, + unsigned long mode +); + +extern int _XimCheckICMode( + XIMResourceList res_list, + unsigned long mode +); + +extern Bool _XimSetLocalIMDefaults( + Xim im, + XPointer top, + XIMResourceList res_list, + unsigned int list_num +); + +extern Bool _XimSetICDefaults( + Xic ic, + XPointer top, + unsigned long mode, + XIMResourceList res_list, + unsigned int list_num +); + +extern Bool _XimEncodeLocalIMAttr( + XIMResourceList res, + XPointer top, + XPointer val +); + +extern Bool _XimEncodeLocalICAttr( + Xic ic, + XIMResourceList res, + XPointer top, + XIMArg *arg, + unsigned long mode +); + +extern Bool _XimCheckLocalInputStyle( + Xic ic, + XPointer top, + XIMArg *values, + XIMStyles *styles, + XIMResourceList res_list, + unsigned int list_num +); + +extern Bool _XimDecodeLocalIMAttr( + XIMResourceList res, + XPointer top, + XPointer val +); + +extern Bool _XimDecodeLocalICAttr( + XIMResourceList res, + XPointer top, + XPointer val, + unsigned long mode +); + +extern void _XimGetCurrentIMValues( + Xim im, + XimDefIMValues *im_values +); + +extern void _XimSetCurrentIMValues( + Xim im, + XimDefIMValues *im_values +); + +extern void _XimGetCurrentICValues( + Xic ic, + XimDefICValues *ic_values +); + +extern void _XimSetCurrentICValues( + Xic ic, + XimDefICValues *ic_values +); + +extern void _XimInitialResourceInfo( + void +); + +extern void _XimParseStringFile( + FILE *fp, + Xim im +); + +extern Bool _XimCheckIfLocalProcessing( + Xim im +); + +extern Bool _XimCheckIfThaiProcessing( + Xim im +); + +extern Bool _XimLocalOpenIM( + Xim im +); + +extern Bool _XimThaiOpenIM( + Xim im +); + +extern Bool _XimProtoOpenIM( + Xim im +); + +extern void _XimLocalIMFree( + Xim im +); + +extern void _XimThaiIMFree( + Xim im +); + +extern void _XimProtoIMFree( + Xim im +); + +extern char * _XimSetIMValueData( + Xim im, + XPointer top, + XIMArg *arg, + XIMResourceList res_list, + unsigned int list_num +); + +extern char * _XimGetIMValueData( + Xim im, + XPointer top, + XIMArg *arg, + XIMResourceList res_list, + unsigned int list_num +); + +extern char * _XimSetICValueData( + Xic ic, + XPointer top, + XIMResourceList res_list, + unsigned int list_num, + XIMArg *arg, + unsigned long mode, + Bool flag +); + +extern char * _XimGetICValueData( + Xic ic, + XPointer top, + XIMResourceList res_list, + unsigned int list_num, + XIMArg *arg, + unsigned long mode +); + +extern char * _XimLocalSetIMValues( + XIM im, + XIMArg *arg +); + +extern char * _XimLocalGetIMValues( + XIM im, + XIMArg *arg +); + +extern XIC _XimLocalCreateIC( + XIM im, + XIMArg *arg +); + +extern Bool _XimDispatchInit( + Xim im +); + +extern Bool _XimGetAttributeID( + Xim im, + CARD16 *buf +); + +extern Bool _XimExtension( + Xim im +); + +extern void _XimDestroyIMStructureList( + Xim im +); + +extern char * _XimMakeIMAttrIDList( + Xim im, + XIMResourceList res_list, + unsigned int res_num, + XIMArg *arg, + CARD16 *buf, + INT16 *len, + unsigned long mode +); + +extern char * _XimMakeICAttrIDList( + Xic ic, + XIMResourceList res_list, + unsigned int res_num, + XIMArg *arg, + CARD16 *idList, + INT16 *num, + unsigned long mode +); + +extern char * _XimDecodeIMATTRIBUTE( + Xim im, + XIMResourceList res_list, + unsigned int res_num, + CARD16 *buf, + INT16 buf_len, + XIMArg *arg, + BITMASK32 mode +); + +extern char * _XimDecodeICATTRIBUTE( + Xic ic, + XIMResourceList res_list, + unsigned int res_num, + CARD16 *buf, + INT16 buf_len, + XIMArg *arg, + BITMASK32 mode +); + +extern Bool _XimRegProtoIntrCallback( + Xim im, + CARD16 major_code, + CARD16 minor_code, + Bool (*proc)( + Xim, INT16, XPointer, XPointer + ), + XPointer call_data +); + +extern Bool _XimErrorCallback( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern Bool _XimError( + Xim im, + Xic ic, + CARD16 error_code, + INT16 detail_length, + CARD16 type, + char *detail +); + +extern Bool _XimRegisterTriggerKeysCallback( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern Bool _XimSetEventMaskCallback( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern Bool _XimForwardEventCallback( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern Bool _XimCommitCallback( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern Bool _XimSyncCallback( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern void _XimFreeProtoIntrCallback( + Xim im +); + +extern XIC _XimProtoCreateIC( + XIM im, + XIMArg *arg +); + +extern void _XimRegisterServerFilter( + Xim im +); + +extern void _XimUnregisterServerFilter( + Xim im +); + +extern Bool _XimTriggerNotify( + Xim im, + Xic ic, + int mode, + CARD32 idx +); + +extern Bool _XimProcSyncReply( + Xim im, + Xic ic +); + +extern void _XimSendSetFocus( + Xim im, + Xic ic +); + +extern Bool _XimForwardEvent( + Xic ic, + XEvent *ev, + Bool sync +); + +extern void _XimFreeRemakeArg( + XIMArg *arg +); + +extern void _XimServerDestroy( + Xim im +); + +extern char * _XimEncodeIMATTRIBUTE( + Xim im, + XIMResourceList res_list, + unsigned int res_num, + XIMArg *arg, + XIMArg **arg_ret, + char *buf, + int size, + int *ret_len, + XPointer top, + unsigned long mode +); + +extern char * _XimEncodeICATTRIBUTE( + Xic ic, + XIMResourceList res_list, + unsigned int res_num, + XIMArg *arg, + XIMArg **arg_ret, + char *buf, + int size, + int *ret_len, + XPointer top, + BITMASK32 *flag, + unsigned long mode +); + +#ifdef EXT_MOVE +extern Bool _XimExtenMove( + Xim im, + Xic ic, + CARD32 flag, + CARD16 *buf, + INT16 length +); +#endif + +extern int _Ximctstombs( + XIM im, + char *from, + int from_len, + char *to, + int to_len, + Status *state +); + +extern int _Ximctstowcs( + XIM im, + char *from, + int from_len, + wchar_t *to, + int to_len, + Status *state +); + +extern int _Ximctstoutf8( + XIM im, + char *from, + int from_len, + char *to, + int to_len, + Status *state +); + +extern int _XimLcctstombs( + XIM im, + char *from, + int from_len, + char *to, + int to_len, + Status *state +); + +extern int _XimLcctstowcs( + XIM im, + char *from, + int from_len, + wchar_t *to, + int to_len, + Status *state +); + +extern int _XimLcctstoutf8( + XIM im, + char *from, + int from_len, + char *to, + int to_len, + Status *state +); + +extern char _XimGetMyEndian( + void +); + +extern int _XimCheckDataSize( + XPointer buf, + int len +); + +extern void _XimSetHeader( + XPointer buf, + CARD8 major_opcode, + CARD8 minor_opcode, + INT16 *len +); + +extern Bool _XimSync( + Xim im, + Xic ic +); + +extern int _XimProtoMbLookupString( + XIC xic, + XKeyEvent *ev, + char *buffer, + int bytes, + KeySym *keysym, + Status *state +); + +extern int _XimProtoWcLookupString( + XIC xic, + XKeyEvent *ev, + wchar_t *buffer, + int bytes, + KeySym *keysym, + Status *state +); + +extern int _XimProtoUtf8LookupString( + XIC xic, + XKeyEvent *ev, + char *buffer, + int bytes, + KeySym *keysym, + Status *state +); + +extern void _XimRegisterFilter( + Xic ic +); + +extern void _XimUnregisterFilter( + Xic ic +); + +extern void _XimReregisterFilter( + Xic ic +); + +extern Status _XimProtoEventToWire( + XEvent *re, + xEvent *event, + Bool sw +); + +extern Bool _XimProtoWireToEvent( + XEvent *re, + xEvent *event, + Bool sw +); + +#ifdef EXT_FORWARD +extern Bool _XimExtForwardKeyEvent( + Xic ic, + XKeyEvent *ev, + Bool sync +); +#endif + +extern int _XimLookupMBText( + Xic ic, + XKeyEvent *event, + char *buffer, + int nbytes, + KeySym *keysym, + XComposeStatus *status +); + +extern int _XimLookupWCText( + Xic ic, + XKeyEvent *event, + wchar_t *buffer, + int nbytes, + KeySym *keysym, + XComposeStatus *status +); + +extern int _XimLookupUTF8Text( + Xic ic, + XKeyEvent *event, + char *buffer, + int nbytes, + KeySym *keysym, + XComposeStatus *status +); + +extern EVENTMASK _XimGetWindowEventmask( + Xic ic +); + +extern Xic _XimICOfXICID( + Xim im, + XICID icid +); + +extern void _XimResetIMInstantiateCallback( + Xim xim +); + +extern Bool _XimRegisterIMInstantiateCallback( + XLCd lcd, + Display *display, + XrmDatabase rdb, + char *res_name, + char *res_class, + XIDProc callback, + XPointer client_data +); + +extern Bool _XimUnRegisterIMInstantiateCallback( + XLCd lcd, + Display *display, + XrmDatabase rdb, + char *res_name, + char *res_class, + XIDProc callback, + XPointer client_data +); + +extern void _XimFreeCommitInfo( + Xic ic +); + +extern Bool _XimConnect( + Xim im +); + +extern Bool _XimShutdown( + Xim im +); + +extern Bool _XimWrite( + Xim im, + INT16 len, + XPointer data +); + +extern Bool _XimRead( + Xim im, + INT16 *len, + XPointer data, + int data_len, + Bool (*predicate)( + Xim, INT16, XPointer, XPointer + ), + XPointer arg +); + +extern void _XimFlush( + Xim im +); + +extern Bool _XimFilterWaitEvent( + Xim im +); + +extern void _XimProcError( + Xim im, + Xic ic, + XPointer data +); + +#ifdef EXT_MOVE +extern CARD32 _XimExtenArgCheck( + XIMArg *arg +); +#endif + +extern Bool _XimCbDispatch( + Xim im, + INT16 len, + XPointer data, + XPointer call_data +); + +extern Bool _XimLocalFilter( + Display *d, + Window w, + XEvent *ev, + XPointer client_data +); + +extern XIMResourceList _XimGetResourceListRecByQuark( + XIMResourceList res_list, + unsigned int list_num, + XrmQuark quark +); + +extern Bool _XimReconnectModeCreateIC( + Xic ic +); + +extern char *_XimLocalSetICValues( + XIC ic, + XIMArg *values +); + +extern char * _XimLocalGetICValues( + XIC ic, + XIMArg *values +); + +extern int _XimLocalMbLookupString( + XIC ic, + XKeyEvent *ev, + char *buffer, + int bytes, + KeySym *keysym, + Status *status +); + +extern int _XimLocalWcLookupString( + XIC ic, + XKeyEvent *ev, + wchar_t *buffer, + int bytes, + KeySym *keysym, + Status *status +); + +extern int _XimLocalUtf8LookupString( + XIC ic, + XKeyEvent *ev, + char *buffer, + int bytes, + KeySym *keysym, + Status *status +); + +extern Bool _XimThaiFilter( + Display *d, + Window w, + XEvent *ev, + XPointer client_data +); + +extern XIC _XimThaiCreateIC( + XIM im, + XIMArg *values +); + +extern Status _XimThaiCloseIM( + XIM xim +); + +#ifdef XIM_CONNECTABLE +extern void _XimSetProtoResource( + Xim im +); + +extern Bool _XimConnectServer( + Xim im +); + +extern Bool _XimDelayModeSetAttr( + Xim im +); + +extern void _XimServerReconectableDestroy( + void +); + +extern Bool _XimReCreateIC( + Xic ic +); + +extern Bool _XimEncodeSavedIMATTRIBUTE( + Xim im, + XIMResourceList res_list, + unsigned int res_num, + int *idx, + char *buf, + int size, + int *ret_len, + XPointer top, + unsigned long mode +); + +extern Bool _XimEncodeSavedICATTRIBUTE( + Xic ic, + XIMResourceList res_list, + unsigned int res_num, + int *idx, + char *buf, + int size, + int *ret_len, + XPointer top, + unsigned long mode +); +#endif + +extern Bool +_XimRegisterDispatcher( + Xim im, + Bool (*callback)( + Xim, INT16, XPointer, XPointer + ), + XPointer call_data); + +extern Bool +_XimRespSyncReply( + Xic ic, + BITMASK16 mode); + +#endif /* _XIMINT_H */ diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 55a9fa712..9a3fde185 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -30,7 +30,7 @@ AC_SUBST([OSMESA_VERSION]) dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24 -LIBDRM_RADEON_REQUIRED=2.4.39 +LIBDRM_RADEON_REQUIRED=2.4.40 LIBDRM_INTEL_REQUIRED=2.4.38 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED=2.4.33 diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 4f44764c2..28f6ae603 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -34,8 +34,7 @@ sRGB framebuffer format (GL_EXT_framebuffer_sRGB) DONE (i965, r600) glClearBuffer commands DONE glGetStringi command DONE glTexParameterI, glGetTexParameterI commands DONE -glVertexAttribI commands ~50% done (converts int - values to floats) +glVertexAttribI commands DONE Depth format cube textures DONE GLX_ARB_create_context (GLX 1.4 is required) DONE diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index bba3f0179..e9496a8d5 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -529,7 +529,7 @@ def generate(env): env.PkgCheckModules('XF86VIDMODE', ['xxf86vm']) env.PkgCheckModules('DRM', ['libdrm >= 2.4.24']) env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30']) - env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.31']) + env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.40']) env.PkgCheckModules('XORG', ['xorg-server >= 1.6.0']) env.PkgCheckModules('KMS', ['libkms >= 2.4.24']) env.PkgCheckModules('UDEV', ['libudev > 150']) diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index bb784d6b3..d10ce231c 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c @@ -1609,7 +1609,8 @@ void util_blitter_custom_depth_stencil(struct blitter_context *blitter, blitter_disable_render_cond(ctx); /* bind states */ - pipe->bind_blend_state(pipe, ctx->blend[PIPE_MASK_RGBA]); + pipe->bind_blend_state(pipe, cbsurf ? ctx->blend[PIPE_MASK_RGBA] : + ctx->blend[0]); pipe->bind_depth_stencil_alpha_state(pipe, dsa_stage); ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 0, FALSE)); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); diff --git a/mesalib/src/gallium/auxiliary/util/u_framebuffer.h b/mesalib/src/gallium/auxiliary/util/u_framebuffer.h index e7dc1e9e4..a89066230 100644 --- a/mesalib/src/gallium/auxiliary/util/u_framebuffer.h +++ b/mesalib/src/gallium/auxiliary/util/u_framebuffer.h @@ -33,6 +33,10 @@ #include "pipe/p_state.h" +#ifdef __cplusplus +extern "C" { +#endif + extern boolean util_framebuffer_state_equal(const struct pipe_framebuffer_state *dst, const struct pipe_framebuffer_state *src); @@ -51,4 +55,8 @@ util_framebuffer_min_size(const struct pipe_framebuffer_state *fb, unsigned *width, unsigned *height); +#ifdef __cplusplus +} +#endif + #endif /* U_FRAMEBUFFER_H */ diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 5157661b3..d450aa1e4 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -4058,7 +4058,7 @@ ast_uniform_block::hir(exec_list *instructions, decl_list->hir(&declared_variables, state); foreach_list_const(node, &declared_variables) { - struct ir_variable *var = (ir_variable *)node; + ir_variable *var = (ir_variable *)node; struct gl_uniform_buffer_variable *ubo_var = &ubo->Uniforms[ubo->NumUniforms++]; diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index 1c7aadaca..7b0a487b6 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -780,7 +780,7 @@ ir_constant::get_float_component(unsigned i) const case GLSL_TYPE_UINT: return (float) this->value.u[i]; case GLSL_TYPE_INT: return (float) this->value.i[i]; case GLSL_TYPE_FLOAT: return this->value.f[i]; - case GLSL_TYPE_BOOL: return this->value.b[i] ? 1.0 : 0.0; + case GLSL_TYPE_BOOL: return this->value.b[i] ? 1.0f : 0.0f; default: assert(!"Should not get here."); break; } diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp index d96e25c18..c62f0b115 100644 --- a/mesalib/src/glsl/ir_builder.cpp +++ b/mesalib/src/glsl/ir_builder.cpp @@ -77,7 +77,7 @@ swizzle(operand a, int swizzle, int components) } ir_swizzle * -swizzle_for_size(operand a, int components) +swizzle_for_size(operand a, unsigned components) { void *mem_ctx = ralloc_parent(a.val); diff --git a/mesalib/src/glsl/ir_builder.h b/mesalib/src/glsl/ir_builder.h index 7a0a196ee..067858df4 100644 --- a/mesalib/src/glsl/ir_builder.h +++ b/mesalib/src/glsl/ir_builder.h @@ -94,7 +94,7 @@ ir_expression *saturate(operand a); /** * Swizzle away later components, but preserve the ordering. */ -ir_swizzle *swizzle_for_size(operand a, int components); +ir_swizzle *swizzle_for_size(operand a, unsigned components); ir_swizzle *swizzle_xxxx(operand a); ir_swizzle *swizzle_yyyy(operand a); diff --git a/mesalib/src/glsl/lower_mat_op_to_vec.cpp b/mesalib/src/glsl/lower_mat_op_to_vec.cpp index a371afc14..08cae29fa 100644 --- a/mesalib/src/glsl/lower_mat_op_to_vec.cpp +++ b/mesalib/src/glsl/lower_mat_op_to_vec.cpp @@ -122,7 +122,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int b_col, i; + unsigned b_col, i; ir_assignment *assign; ir_expression *expr; @@ -154,7 +154,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int i; + unsigned i; ir_assignment *assign; ir_expression *expr; @@ -183,7 +183,7 @@ ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int i; + unsigned i; for (i = 0; i < b->type->matrix_columns; i++) { ir_rvalue *column_result; @@ -208,7 +208,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_dereference *result, ir_dereference *a, ir_dereference *b) { - int i; + unsigned i; for (i = 0; i < a->type->matrix_columns; i++) { ir_expression *column_expr; diff --git a/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp b/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp index fce9c3424..789f62afe 100644 --- a/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp +++ b/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp @@ -71,7 +71,7 @@ ir_vec_index_to_cond_assign_visitor::convert_vec_index_to_cond_assign(ir_rvalue ir_assignment *assign; ir_variable *index, *var; ir_dereference *deref; - int i; + unsigned i; if (!orig_deref) return ir; @@ -164,7 +164,7 @@ ir_vec_index_to_cond_assign_visitor::visit_leave(ir_assignment *ir) ir_variable *index, *var; ir_dereference_variable *deref; ir_assignment *assign; - int i; + unsigned i; ir->rhs = convert_vec_index_to_cond_assign(ir->rhs); if (ir->condition) diff --git a/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp b/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp index 46fd6ace1..264d6dc07 100644 --- a/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp +++ b/mesalib/src/glsl/lower_vec_index_to_swizzle.cpp @@ -93,7 +93,7 @@ ir_vec_index_to_swizzle_visitor::convert_vec_index_to_swizzle(ir_rvalue *ir) * large. For simplicity sake, just clamp the index to [0, size-1]. */ const int i = MIN2(MAX2(ir_constant->value.i[0], 0), - (deref->array->type->vector_elements - 1)); + ((int) deref->array->type->vector_elements - 1)); return new(ctx) ir_swizzle(deref->array, i, 0, 0, 0, 1); } diff --git a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index bd8427eaf..2bffc4e08 100644 --- a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -5,7 +5,8 @@ <category name="GL_APPLE_vertex_array_object" number="273"> <enum name="VERTEX_ARRAY_BINDING_APPLE" value="0x85B5"/> - <function name="BindVertexArrayAPPLE" offset="assign" static_dispatch="false"> + <function name="BindVertexArrayAPPLE" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="array" type="GLuint"/> </function> @@ -14,7 +15,8 @@ <param name="arrays" type="const GLuint *" count="n"/> </function> - <function name="GenVertexArraysAPPLE" offset="assign" static_dispatch="false"> + <function name="GenVertexArraysAPPLE" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *" count="n" output="true"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml b/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml index 8e81553f6..1478e3970 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml @@ -8,7 +8,8 @@ <category name="GL_ARB_base_instance" number="107"> - <function name="DrawArraysInstancedBaseInstance" offset="assign"> + <function name="DrawArraysInstancedBaseInstance" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> @@ -16,7 +17,8 @@ <param name="baseinstance" type="GLuint"/> </function> - <function name="DrawElementsInstancedBaseInstance" offset="assign"> + <function name="DrawElementsInstancedBaseInstance" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -25,7 +27,8 @@ <param name="baseinstance" type="GLuint"/> </function> - <function name="DrawElementsInstancedBaseVertexBaseInstance" offset="assign"> + <function name="DrawElementsInstancedBaseVertexBaseInstance" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index 0b6947cc5..c08017aa5 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -8,24 +8,25 @@ <category name="GL_ARB_draw_buffers_blend" number="69"> - <function name="BlendEquationiARB" offset="assign"> + <function name="BlendEquationiARB" offset="assign" mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="BlendEquationSeparateiARB" offset="assign"> + <function name="BlendEquationSeparateiARB" offset="assign" + mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> - <function name="BlendFunciARB" offset="assign"> + <function name="BlendFunciARB" offset="assign" mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="src" type="GLenum"/> <param name="dst" type="GLenum"/> </function> - <function name="BlendFuncSeparateiARB" offset="assign"> + <function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB"> <param name="buf" type="GLuint"/> <param name="srcRGB" type="GLenum"/> <param name="dstRGB" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index 851f1faec..986654848 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -8,7 +8,7 @@ <category name="GL_ARB_draw_elements_base_vertex" number="62"> - <function name="DrawElementsBaseVertex" offset="assign"> + <function name="DrawElementsBaseVertex" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -16,7 +16,8 @@ <param name="basevertex" type="GLint"/> </function> - <function name="DrawRangeElementsBaseVertex" offset="assign"> + <function name="DrawRangeElementsBaseVertex" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -26,7 +27,8 @@ <param name="basevertex" type="GLint"/> </function> - <function name="MultiDrawElementsBaseVertex" offset="assign"> + <function name="MultiDrawElementsBaseVertex" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -35,7 +37,8 @@ <param name="basevertex" type="const GLint *"/> </function> - <function name="DrawElementsInstancedBaseVertex" offset="assign"> + <function name="DrawElementsInstancedBaseVertex" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml index 57bb776ac..7ee7629c7 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml @@ -8,14 +8,14 @@ <category name="GL_ARB_draw_instanced" number="44"> - <function name="DrawArraysInstancedARB" offset="assign"> + <function name="DrawArraysInstancedARB" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawElementsInstancedARB" offset="assign"> + <function name="DrawElementsInstancedARB" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml index 97a4e2e8f..73f0a9c3d 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml @@ -45,7 +45,7 @@ <param name="level" type="GLint"/> <param name="layer" type="GLint"/> </function> - <function name="FramebufferTextureFaceARB" offset="assign"> + <function name="FramebufferTextureFaceARB" exec="skip" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml index 8da5c41e8..7db166564 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml @@ -11,7 +11,8 @@ <enum name="NUM_PROGRAM_BINARY_FORMATS" value="0x87FE"/> <enum name="PROGRAM_BINARY_FORMATS" value="0x87FF"/> - <function name="GetProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> + <function name="GetProgramBinary" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -19,14 +20,16 @@ <param name="binary" type="GLvoid *"/> </function> - <function name="ProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> + <function name="ProgramBinary" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="binaryFormat" type="GLenum"/> <param name="binary" type="const GLvoid *"/> <param name="length" type="GLsizei"/> </function> - <function name="ProgramParameteri" offset="assign" static_dispatch="false" es2="3.0"> + <function name="ProgramParameteri" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="value" type="GLint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml index 822f54374..9a30b0c9e 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml @@ -10,7 +10,7 @@ <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/> - <function name="VertexAttribDivisorARB" offset="assign"> + <function name="VertexAttribDivisorARB" offset="assign" mesa_name="-ARB"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml index b347ef35c..14048bf49 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml @@ -25,21 +25,21 @@ </function> <!-- OpenGL 1.0 sized buffer queries --> - <function name="GetnMapdvARB" offset="assign"> + <function name="GetnMapdvARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="v" type="GLdouble *" output="true"/> </function> - <function name="GetnMapfvARB" offset="assign"> + <function name="GetnMapfvARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="v" type="GLfloat *" output="true"/> </function> - <function name="GetnMapivARB" offset="assign"> + <function name="GetnMapivARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="bufSize" type="GLsizei"/> @@ -48,19 +48,19 @@ - <function name="GetnPixelMapfvARB" offset="assign"> + <function name="GetnPixelMapfvARB" offset="assign" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="values" type="GLfloat *" output="true"/> </function> - <function name="GetnPixelMapuivARB" offset="assign"> + <function name="GetnPixelMapuivARB" offset="assign" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="values" type="GLuint *" output="true"/> </function> - <function name="GetnPixelMapusvARB" offset="assign"> + <function name="GetnPixelMapusvARB" offset="assign" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="bufSize" type="GLsizei"/> <param name="values" type="GLushort *" output="true"/> @@ -95,7 +95,7 @@ <!-- ARB_imaging sized buffer queries --> - <function name="GetnColorTableARB" offset="assign"> + <function name="GetnColorTableARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -103,7 +103,7 @@ <param name="table" type="GLvoid *" output="true"/> </function> - <function name="GetnConvolutionFilterARB" offset="assign"> + <function name="GetnConvolutionFilterARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -111,7 +111,7 @@ <param name="image" type="GLvoid *" output="true"/> </function> - <function name="GetnSeparableFilterARB" offset="assign"> + <function name="GetnSeparableFilterARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -122,7 +122,7 @@ <param name="span" type="GLvoid *" output="true"/> </function> - <function name="GetnHistogramARB" offset="assign"> + <function name="GetnHistogramARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> @@ -131,7 +131,7 @@ <param name="values" type="GLvoid *" output="true"/> </function> - <function name="GetnMinmaxARB" offset="assign"> + <function name="GetnMinmaxARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml index 57680f553..8884591ca 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml @@ -11,7 +11,7 @@ <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB" value="0x8C2D"/> <enum name="TEXTURE_BUFFER_FORMAT_ARB" value="0x8C2E"/> - <function name="TexBufferARB" offset="assign"> + <function name="TexBufferARB" offset="assign" mesa_name="-ARB"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml index 7d12d9774..6c6090c1c 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml @@ -7,214 +7,244 @@ <enum name="INT_2_10_10_10_REV" value = "0x8D9F"/> - <function name="VertexP2ui" offset="assign"> + <function name="VertexP2ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="GLuint"/> </function> - <function name="VertexP3ui" offset="assign"> + <function name="VertexP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="GLuint"/> </function> - <function name="VertexP4ui" offset="assign"> + <function name="VertexP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="GLuint"/> </function> - <function name="VertexP2uiv" offset="assign"> + <function name="VertexP2uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexP3uiv" offset="assign"> + <function name="VertexP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexP4uiv" offset="assign"> + <function name="VertexP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="value" type="const GLuint *"/> </function> - <function name="TexCoordP1ui" offset="assign"> + <function name="TexCoordP1ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP2ui" offset="assign"> + <function name="TexCoordP2ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP3ui" offset="assign"> + <function name="TexCoordP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP4ui" offset="assign"> + <function name="TexCoordP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="TexCoordP1uiv" offset="assign"> + <function name="TexCoordP1uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="TexCoordP2uiv" offset="assign"> + <function name="TexCoordP2uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="TexCoordP3uiv" offset="assign"> + <function name="TexCoordP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="TexCoordP4uiv" offset="assign"> + <function name="TexCoordP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP1ui" offset="assign"> + <function name="MultiTexCoordP1ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP2ui" offset="assign"> + <function name="MultiTexCoordP2ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP3ui" offset="assign"> + <function name="MultiTexCoordP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP4ui" offset="assign"> + <function name="MultiTexCoordP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="MultiTexCoordP1uiv" offset="assign"> + <function name="MultiTexCoordP1uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP2uiv" offset="assign"> + <function name="MultiTexCoordP2uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP3uiv" offset="assign"> + <function name="MultiTexCoordP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="MultiTexCoordP4uiv" offset="assign"> + <function name="MultiTexCoordP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="texture" type="GLenum"/> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="NormalP3ui" offset="assign"> + <function name="NormalP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="GLuint"/> </function> - <function name="NormalP3uiv" offset="assign"> + <function name="NormalP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="coords" type="const GLuint *"/> </function> - <function name="ColorP3ui" offset="assign"> + <function name="ColorP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="GLuint"/> </function> - <function name="ColorP4ui" offset="assign"> + <function name="ColorP4ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="GLuint"/> </function> - <function name="ColorP3uiv" offset="assign"> + <function name="ColorP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="const GLuint *"/> </function> - <function name="ColorP4uiv" offset="assign"> + <function name="ColorP4uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="const GLuint *"/> </function> - <function name="SecondaryColorP3ui" offset="assign"> + <function name="SecondaryColorP3ui" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="GLuint"/> </function> - <function name="SecondaryColorP3uiv" offset="assign"> + <function name="SecondaryColorP3uiv" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="type" type="GLenum"/> <param name="color" type="const GLuint *"/> </function> - <function name="VertexAttribP1ui" offset="assign"> + <function name="VertexAttribP1ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP2ui" offset="assign"> + <function name="VertexAttribP2ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP3ui" offset="assign"> + <function name="VertexAttribP3ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP4ui" offset="assign"> + <function name="VertexAttribP4ui" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="GLuint"/> </function> - <function name="VertexAttribP1uiv" offset="assign"> + <function name="VertexAttribP1uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexAttribP2uiv" offset="assign"> + <function name="VertexAttribP2uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexAttribP3uiv" offset="assign"> + <function name="VertexAttribP3uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="value" type="const GLuint *"/> </function> - <function name="VertexAttribP4uiv" offset="assign"> + <function name="VertexAttribP4uiv" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml index efbe61f74..affd55a5f 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml @@ -8,7 +8,7 @@ <category name="GL_EXT_draw_buffers2" number="340"> - <function name="ColorMaskIndexedEXT" offset="assign"> + <function name="ColorMaskIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -16,29 +16,29 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleanIndexedvEXT" offset="assign"> + <function name="GetBooleanIndexedvEXT" offset="assign" mesa_name="-EXT"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegerIndexedvEXT" offset="assign"> + <function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> </function> - <function name="EnableIndexedEXT" offset="assign"> + <function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="DisableIndexedEXT" offset="assign"> + <function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name ="IsEnabledIndexedEXT" offset="assign"> + <function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml index bf2f6a3ed..b008f2e65 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -44,25 +44,25 @@ </enum> - <function name="VertexAttribI1iEXT" offset="assign"> + <function name="VertexAttribI1iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> </function> - <function name="VertexAttribI2iEXT" offset="assign"> + <function name="VertexAttribI2iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="VertexAttribI3iEXT" offset="assign"> + <function name="VertexAttribI3iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="VertexAttribI4iEXT" offset="assign"> + <function name="VertexAttribI4iEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> @@ -70,25 +70,25 @@ <param name="w" type="GLint"/> </function> - <function name="VertexAttribI1uiEXT" offset="assign"> + <function name="VertexAttribI1uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> </function> - <function name="VertexAttribI2uiEXT" offset="assign"> + <function name="VertexAttribI2uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="VertexAttribI3uiEXT" offset="assign"> + <function name="VertexAttribI3uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="VertexAttribI4uiEXT" offset="assign"> + <function name="VertexAttribI4uiEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -96,67 +96,73 @@ <param name="w" type="GLuint"/> </function> - <function name="VertexAttribI1ivEXT" offset="assign"> + <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI2ivEXT" offset="assign"> + <function name="VertexAttribI2ivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI3ivEXT" offset="assign"> + <function name="VertexAttribI3ivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI4ivEXT" offset="assign"> + <function name="VertexAttribI4ivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI1uivEXT" offset="assign"> + <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI2uivEXT" offset="assign"> + <function name="VertexAttribI2uivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI3uivEXT" offset="assign"> + <function name="VertexAttribI3uivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4uivEXT" offset="assign"> + <function name="VertexAttribI4uivEXT" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4bvEXT" offset="assign"> + <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttribI4svEXT" offset="assign"> + <function name="VertexAttribI4svEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttribI4ubvEXT" offset="assign"> + <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttribI4usvEXT" offset="assign"> + <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback" + mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttribIPointerEXT" offset="assign"> + <function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -164,37 +170,37 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIivEXT" offset="assign"> + <function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuivEXT" offset="assign"> + <function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1uiEXT" offset="assign"> + <function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2uiEXT" offset="assign"> + <function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3uiEXT" offset="assign"> + <function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4uiEXT" offset="assign"> + <function name="Uniform4uiEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -202,43 +208,43 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uivEXT" offset="assign"> + <function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uivEXT" offset="assign"> + <function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uivEXT" offset="assign"> + <function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uivEXT" offset="assign"> + <function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="GetUniformuivEXT" offset="assign"> + <function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="BindFragDataLocationEXT" offset="assign"> + <function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> </function> - <function name="GetFragDataLocationEXT" offset="assign"> + <function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT"> <return type="GLint"/> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml b/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml index 6ec56157c..03f90a1b1 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_separate_shader_objects.xml @@ -8,16 +8,16 @@ <!-- Alias of CURRENT_PROGRAM --> <enum name="ACTIVE_PROGRAM_EXT" value="0x8B8D"/> - <function name="UseShaderProgramEXT" offset="assign"> + <function name="UseShaderProgramEXT" deprecated="3.1" offset="assign"> <param name="type" type="GLenum"/> <param name="program" type="GLuint"/> </function> - <function name="ActiveProgramEXT" offset="assign"> + <function name="ActiveProgramEXT" deprecated="3.1" offset="assign"> <param name="program" type="GLuint"/> </function> - <function name="CreateShaderProgramEXT" offset="assign"> + <function name="CreateShaderProgramEXT" deprecated="3.1" offset="assign"> <param name="type" type="GLenum"/> <param name="string" type="const GLchar *"/> <return type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml index 7e5a8cbeb..dac399964 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml @@ -69,25 +69,25 @@ <param name="a" type="GLuint"/> </function> - <function name="TexParameterIivEXT" offset="assign"> + <function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuivEXT" offset="assign"> + <function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIivEXT" offset="assign"> + <function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuivEXT" offset="assign"> + <function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index dbd7513c7..e9b27582a 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -24,7 +24,7 @@ <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT" value="0x8C7F"/> <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT" value="0x8C76"/> - <function name="BindBufferRangeEXT" offset="assign"> + <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -39,27 +39,29 @@ <param name="offset" type="GLintptr"/> </function> - <function name="BindBufferBaseEXT" offset="assign"> + <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="BeginTransformFeedbackEXT" offset="assign"> + <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedbackEXT" offset="assign"> + <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> </function> - <function name="TransformFeedbackVaryingsEXT" offset="assign"> + <function name="TransformFeedbackVaryingsEXT" offset="assign" + mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const char **"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVaryingEXT" offset="assign"> + <function name="GetTransformFeedbackVaryingEXT" offset="assign" + mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -108,7 +110,7 @@ <function name="ResumeTransformFeedback" offset="assign" es2="3.0"> </function> - <function name="DrawTransformFeedback" offset="assign"> + <function name="DrawTransformFeedback" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index 808d3cdc7..82566d8a3 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -598,19 +598,20 @@ <enum name="MAX_FRAGMENT_INPUT_COMPONENTS" value="0x9125"/> <enum name="CONTEXT_PROFILE_MASK" value="0x9126"/> - <function name="GetInteger64i_v" offset="assign" es2="3.0"> + <function name="GetInteger64i_v" offset="assign" es2="3.0" exec="skip"> <param name="cap" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint64 *"/> </function> - <function name="GetBufferParameteri64v" offset="assign" es2="3.0"> + <function name="GetBufferParameteri64v" offset="assign" es2="3.0" + exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *"/> </function> - <function name="FramebufferTexture" offset="assign"> + <function name="FramebufferTexture" offset="assign" exec="skip"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 14bb2dfe6..13943e839 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -55,6 +55,7 @@ MESA_OUTPUTS = \ $(MESA_GLAPI_OUTPUTS) \ $(MESA_GLAPI_ASM_OUTPUTS) \ $(MESA_DIR)/main/enums.c \ + $(MESA_DIR)/main/api_exec.c \ $(MESA_DIR)/main/dispatch.h \ $(MESA_DIR)/main/remap_helper.h \ $(MESA_GLX_DIR)/indirect.c \ @@ -215,6 +216,9 @@ $(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON) $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ +$(MESA_DIR)/main/api_exec.c: gl_genexec.py $(COMMON) + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ + $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@ diff --git a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml index 8bb31dd1f..8bb5c22ca 100644 --- a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml +++ b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml @@ -13,12 +13,12 @@ <enum name="QUERY_BY_REGION_WAIT_NV" value="0x8E15"/> <enum name="QUERY_BY_REGION_NO_WAIT_NV" value="0x8E16"/> - <function name="BeginConditionalRenderNV" offset="assign"> + <function name="BeginConditionalRenderNV" offset="assign" mesa_name="-NV"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRenderNV" offset="assign"> + <function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV"> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml index abe7dda00..d19fc8cf1 100644 --- a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -11,10 +11,11 @@ <enum name="PRIMITIVE_RESTART_NV" value="0x8558"/> <enum name="PRIMITIVE_RESTART_INDEX_NV" value="0x8559"/> - <function name="PrimitiveRestartNV" offset="assign"> + <function name="PrimitiveRestartNV" offset="assign" deprecated="3.1" + exec="dynamic"> </function> - <function name="PrimitiveRestartIndexNV" offset="assign"> + <function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV"> <param name="index" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml index 974240c49..ad775728f 100644 --- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml +++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml @@ -14,13 +14,13 @@ <!-- OpenGL ES 1.0 --> <function name="AlphaFuncxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> <function name="ClearColorxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> @@ -28,12 +28,12 @@ </function> <function name="ClearDepthxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="depth" type="GLclampx"/> </function> <function name="Color4xOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> @@ -41,24 +41,25 @@ </function> <function name="DepthRangexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"> + <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0" + exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="FogxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="FrustumxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -68,62 +69,62 @@ </function> <function name="LightModelxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="LightModelxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="LightxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="LightxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="LineWidthxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="width" type="GLfixed"/> </function> <function name="LoadMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="MaterialxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="MaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="MultMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -132,14 +133,14 @@ </function> <function name="Normal3xOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> <function name="OrthoxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -149,18 +150,18 @@ </function> <function name="PointSizexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="size" type="GLfixed"/> </function> <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> <function name="RotatexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> @@ -168,41 +169,41 @@ </function> <function name="SampleCoveragexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> <function name="ScalexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <function name="TexEnvxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="TexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="TexParameterxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="TranslatexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -210,65 +211,65 @@ <!-- OpenGL ES 1.1 --> <function name="ClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> <function name="GetClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfixed *" output="true" count="4"/> </function> <function name="GetFixedvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetLightxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetMaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="PointParameterxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="PointParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> <function name="TexParameterxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> @@ -276,21 +277,21 @@ <!-- texgen --> <function name="GetTexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="check" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="TexGenxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="check" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> <function name="TexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="check" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index 7d4744159..8a6c27194 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -12,7 +12,7 @@ </function> <function name="ClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> @@ -24,13 +24,13 @@ </function> <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> <function name="FrustumfOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -40,7 +40,7 @@ </function> <function name="OrthofOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index 1fdb4d591..c0bbbfae1 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -73,7 +73,7 @@ <enum name="TEXTURE_CROP_RECT_OES" value="0x8B9D"/> <function name="DrawTexiOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -82,12 +82,12 @@ </function> <function name="DrawTexivOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="coords" type="const GLint *" count="5"/> </function> <function name="DrawTexfOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -96,12 +96,12 @@ </function> <function name="DrawTexfvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="coords" type="const GLfloat *" count="5"/> </function> <function name="DrawTexsOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -110,12 +110,12 @@ </function> <function name="DrawTexsvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false" mesa_name="-OES"> <param name="coords" type="const GLshort *" count="5"/> </function> <function name="DrawTexxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -124,7 +124,7 @@ </function> <function name="DrawTexxvOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false"> <param name="coords" type="const GLfixed *" count="5"/> </function> @@ -307,22 +307,26 @@ <enum name="WEIGHT_ARRAY_BUFFER_BINDING_OES" value="0x889E"/> <enum name="MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES" value="0x8B9E"/> - <function name="CurrentPaletteMatrixOES" alias="CurrentPaletteMatrixARB" static_dispatch="false"> + <function name="CurrentPaletteMatrixOES" alias="CurrentPaletteMatrixARB" + static_dispatch="false" exec="skip"> <param name="matrixpaletteindex" type="GLuint"/> </function> <!-- no offset --> - <function name="LoadPaletteFromModelViewMatrixOES" static_dispatch="false"> + <function name="LoadPaletteFromModelViewMatrixOES" static_dispatch="false" + exec="skip"> </function> - <function name="MatrixIndexPointerOES" alias="MatrixIndexPointerARB" static_dispatch="false"> + <function name="MatrixIndexPointerOES" alias="MatrixIndexPointerARB" + static_dispatch="false" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> </function> - <function name="WeightPointerOES" alias="WeightPointerARB" static_dispatch="false"> + <function name="WeightPointerOES" alias="WeightPointerARB" + static_dispatch="false" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -339,7 +343,8 @@ <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/> <function name="PointSizePointerOES" offset="assign" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false" + mesa_name="-OES"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -355,7 +360,7 @@ <!-- optional for es1.0 --> <category name="GL_OES_query_matrix" number="16"> <function name="QueryMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false"> <param name="mantissa" type="GLfixed *" count="16" /> <param name="exponent" type="GLint *" count="16" /> <return type="GLbitfield"/> @@ -768,7 +773,7 @@ </category> <!-- 93. GL_NV_read_buffer --> -<category name="NV_read_buffer"> +<category name="GL_NV_read_buffer"> <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0"> <param name="mode" type="GLenum"/> </function> @@ -783,7 +788,7 @@ </category> <!-- 111. GL_ANGLE_texture_compression_dxt --> -<category name="ANGLE_texture_compression_dxt" number="111"> +<category name="GL_ANGLE_texture_compression_dxt" number="111"> <enum name="COMPRESSED_RGBA_S3TC_DXT3_ANGLE" value="0x83F2"/> <enum name="COMPRESSED_RGBA_S3TC_DXT5_ANGLE" value="0x83F3"/> </category> diff --git a/mesalib/src/mapi/glapi/gen/gen.bat b/mesalib/src/mapi/glapi/gen/gen.bat index 3baeee0e2..5759bacf3 100644 --- a/mesalib/src/mapi/glapi/gen/gen.bat +++ b/mesalib/src/mapi/glapi/gen/gen.bat @@ -9,18 +9,18 @@ glx_proto_size.py -m reqsize_h --only-get -h _INDIRECT_SIZE_GET_H_ > indirect_re glx_proto_recv.py -m dispatch_c > indirect_dispatch.c glx_proto_recv.py -m dispatch_c -s > indirect_dispatch_swap.c glx_proto_recv.py -m dispatch_h -f gl_and_glX_API.xml -s > indirect_dispatch.h -gl_table.py > glapitable.h -gl_gentable.py > glapi_gentable.c -gl_table.py -m remap_table > dispatch.h +gl_table.py -f gl_and_es_API.xml > glapitable.h +gl_gentable.py -f gl_and_es_API.xml > glapi_gentable.c +gl_table.py -f gl_and_es_API.xml -m remap_table > dispatch.h rem gl_offsets.py > glapioffsets.h -gl_apitemp.py > glapitemp.h -gl_procs.py > glprocs.h +gl_apitemp.py -f gl_and_es_API.xml > glapitemp.h +gl_procs.py -f gl_and_es_API.xml > glprocs.h glX_proto_send.py -m proto > indirect.c glX_proto_send.py -m init_h > indirect.h glX_proto_send.py -m init_c > indirect_init.c gl_enums.py -f gl_and_es_API.xml > enums.c -remap_helper.py > remap_helper.h +remap_helper.py -f gl_and_es_API.xml > remap_helper.h copy ..\..\mapi\mapi_abi.py -mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h
\ No newline at end of file +mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h diff --git a/mesalib/src/mapi/glapi/gen/glX_API.xml b/mesalib/src/mapi/glapi/gen/glX_API.xml index 9e02aa498..62ad9ebbd 100644 --- a/mesalib/src/mapi/glapi/gen/glX_API.xml +++ b/mesalib/src/mapi/glapi/gen/glX_API.xml @@ -201,13 +201,13 @@ </function> </category> -<category name="GLX_MESA_copy_sub_buffer" number="215"> +<category name="GLX_MESA_copy_sub_buffer" number="215" window_system="glX"> <function name="CopySubBufferMESA"> <glx vendorpriv="5154"/> </function> </category> -<category name="GLX_EXT_texture_from_pixmap"> +<category name="GLX_EXT_texture_from_pixmap" window_system="glX"> <function name="BindTexImageEXT"> <glx vendorpriv="1330"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py index b5f2c5482..84526581a 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py @@ -80,11 +80,8 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): def printRealHeader(self): print '#ifdef HAVE_DIX_CONFIG_H' print '#include <dix-config.h>' - print '#else' - print '' - print '#include "glheader.h"' - print '' print '#endif' + print '#include "glheader.h"' print '' print '#include <X11/Xmd.h>' print '#include <GL/gl.h>' diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd index db33500c0..066d5da52 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.dtd +++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd @@ -37,7 +37,11 @@ static_dispatch (true | false) "true" vectorequiv NMTOKEN #IMPLIED es1 CDATA "none" - es2 CDATA "none"> + es2 CDATA "none" + deprecated CDATA "none" + exec NMTOKEN #IMPLIED + desktop (true | false) "true" + mesa_name CDATA #IMPLIED> <!ATTLIST size name NMTOKEN #REQUIRED count NMTOKEN #IMPLIED mode (get | set) "set"> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index af564726a..bc85534cc 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -1108,51 +1108,51 @@ <type name="DEBUGPROCARB" size="4" pointer="true"/> - <function name="NewList" offset="0"> + <function name="NewList" offset="0" deprecated="3.1"> <param name="list" type="GLuint"/> <param name="mode" type="GLenum"/> <glx sop="101"/> </function> - <function name="EndList" offset="1"> + <function name="EndList" offset="1" deprecated="3.1"> <glx sop="102"/> </function> - <function name="CallList" offset="2"> + <function name="CallList" offset="2" deprecated="3.1"> <param name="list" type="GLuint"/> <glx rop="1"/> </function> - <function name="CallLists" offset="3"> + <function name="CallLists" offset="3" deprecated="3.1"> <param name="n" type="GLsizei" counter="true"/> <param name="type" type="GLenum"/> <param name="lists" type="const GLvoid *" variable_param="type" count="n"/> <glx rop="2" large="true"/> </function> - <function name="DeleteLists" offset="4"> + <function name="DeleteLists" offset="4" deprecated="3.1"> <param name="list" type="GLuint"/> <param name="range" type="GLsizei"/> <glx sop="103"/> </function> - <function name="GenLists" offset="5"> + <function name="GenLists" offset="5" deprecated="3.1"> <param name="range" type="GLsizei"/> <return type="GLuint"/> <glx sop="104"/> </function> - <function name="ListBase" offset="6"> + <function name="ListBase" offset="6" deprecated="3.1"> <param name="base" type="GLuint"/> <glx rop="3"/> </function> - <function name="Begin" offset="7"> + <function name="Begin" offset="7" deprecated="3.1" exec="dynamic"> <param name="mode" type="GLenum"/> <glx rop="4"/> </function> - <function name="Bitmap" offset="8"> + <function name="Bitmap" offset="8" deprecated="3.1"> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="xorig" type="GLfloat"/> @@ -1163,785 +1163,876 @@ <glx rop="5" large="true"/> </function> - <function name="Color3b" offset="9" vectorequiv="Color3bv"> + <function name="Color3b" offset="9" vectorequiv="Color3bv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="Color3bv" offset="10"> + <function name="Color3bv" offset="10" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="6"/> </function> - <function name="Color3d" offset="11" vectorequiv="Color3dv"> + <function name="Color3d" offset="11" vectorequiv="Color3dv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="Color3dv" offset="12"> + <function name="Color3dv" offset="12" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="7"/> </function> - <function name="Color3f" offset="13" vectorequiv="Color3fv"> + <function name="Color3f" offset="13" vectorequiv="Color3fv" + deprecated="3.1" exec="dynamic"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> </function> - <function name="Color3fv" offset="14"> + <function name="Color3fv" offset="14" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="8"/> </function> - <function name="Color3i" offset="15" vectorequiv="Color3iv"> + <function name="Color3i" offset="15" vectorequiv="Color3iv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="Color3iv" offset="16"> + <function name="Color3iv" offset="16" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLint *" count="3"/> <glx rop="9"/> </function> - <function name="Color3s" offset="17" vectorequiv="Color3sv"> + <function name="Color3s" offset="17" vectorequiv="Color3sv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="Color3sv" offset="18"> + <function name="Color3sv" offset="18" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLshort *" count="3"/> <glx rop="10"/> </function> - <function name="Color3ub" offset="19" vectorequiv="Color3ubv"> + <function name="Color3ub" offset="19" vectorequiv="Color3ubv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="Color3ubv" offset="20"> + <function name="Color3ubv" offset="20" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="11"/> </function> - <function name="Color3ui" offset="21" vectorequiv="Color3uiv"> + <function name="Color3ui" offset="21" vectorequiv="Color3uiv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="Color3uiv" offset="22"> + <function name="Color3uiv" offset="22" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLuint *" count="3"/> <glx rop="12"/> </function> - <function name="Color3us" offset="23" vectorequiv="Color3usv"> + <function name="Color3us" offset="23" vectorequiv="Color3usv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="Color3usv" offset="24"> + <function name="Color3usv" offset="24" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLushort *" count="3"/> <glx rop="13"/> </function> - <function name="Color4b" offset="25" vectorequiv="Color4bv"> + <function name="Color4b" offset="25" vectorequiv="Color4bv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> <param name="alpha" type="GLbyte"/> </function> - <function name="Color4bv" offset="26"> + <function name="Color4bv" offset="26" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLbyte *" count="4"/> <glx rop="14"/> </function> - <function name="Color4d" offset="27" vectorequiv="Color4dv"> + <function name="Color4d" offset="27" vectorequiv="Color4dv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> <param name="alpha" type="GLdouble"/> </function> - <function name="Color4dv" offset="28"> + <function name="Color4dv" offset="28" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="15"/> </function> - <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0"> + <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0" + deprecated="3.1" exec="dynamic"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> <param name="alpha" type="GLfloat"/> </function> - <function name="Color4fv" offset="30"> + <function name="Color4fv" offset="30" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="16"/> </function> - <function name="Color4i" offset="31" vectorequiv="Color4iv"> + <function name="Color4i" offset="31" vectorequiv="Color4iv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> <param name="alpha" type="GLint"/> </function> - <function name="Color4iv" offset="32"> + <function name="Color4iv" offset="32" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLint *" count="4"/> <glx rop="17"/> </function> - <function name="Color4s" offset="33" vectorequiv="Color4sv"> + <function name="Color4s" offset="33" vectorequiv="Color4sv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> <param name="alpha" type="GLshort"/> </function> - <function name="Color4sv" offset="34"> + <function name="Color4sv" offset="34" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLshort *" count="4"/> <glx rop="18"/> </function> - <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1"> + <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> <param name="alpha" type="GLubyte"/> </function> - <function name="Color4ubv" offset="36"> + <function name="Color4ubv" offset="36" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLubyte *" count="4"/> <glx rop="19"/> </function> - <function name="Color4ui" offset="37" vectorequiv="Color4uiv"> + <function name="Color4ui" offset="37" vectorequiv="Color4uiv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> <param name="alpha" type="GLuint"/> </function> - <function name="Color4uiv" offset="38"> + <function name="Color4uiv" offset="38" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLuint *" count="4"/> <glx rop="20"/> </function> - <function name="Color4us" offset="39" vectorequiv="Color4usv"> + <function name="Color4us" offset="39" vectorequiv="Color4usv" + deprecated="3.1" exec="loopback" mesa_name="+_f"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> <param name="alpha" type="GLushort"/> </function> - <function name="Color4usv" offset="40"> + <function name="Color4usv" offset="40" deprecated="3.1" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLushort *" count="4"/> <glx rop="21"/> </function> - <function name="EdgeFlag" offset="41" vectorequiv="EdgeFlagv"> + <function name="EdgeFlag" offset="41" vectorequiv="EdgeFlagv" + deprecated="3.1" exec="dynamic"> <param name="flag" type="GLboolean"/> </function> - <function name="EdgeFlagv" offset="42"> + <function name="EdgeFlagv" offset="42" deprecated="3.1" exec="loopback"> <param name="flag" type="const GLboolean *" count="1"/> <glx rop="22"/> </function> - <function name="End" offset="43"> + <function name="End" offset="43" deprecated="3.1" exec="dynamic"> <glx rop="23"/> </function> - <function name="Indexd" offset="44" vectorequiv="Indexdv"> + <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1" + exec="loopback"> <param name="c" type="GLdouble"/> </function> - <function name="Indexdv" offset="45"> + <function name="Indexdv" offset="45" deprecated="3.1" exec="loopback"> <param name="c" type="const GLdouble *" count="1"/> <glx rop="24"/> </function> - <function name="Indexf" offset="46" vectorequiv="Indexfv"> + <function name="Indexf" offset="46" vectorequiv="Indexfv" deprecated="3.1" + exec="dynamic"> <param name="c" type="GLfloat"/> </function> - <function name="Indexfv" offset="47"> + <function name="Indexfv" offset="47" deprecated="3.1" exec="dynamic"> <param name="c" type="const GLfloat *" count="1"/> <glx rop="25"/> </function> - <function name="Indexi" offset="48" vectorequiv="Indexiv"> + <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1" + exec="loopback"> <param name="c" type="GLint"/> </function> - <function name="Indexiv" offset="49"> + <function name="Indexiv" offset="49" deprecated="3.1" exec="loopback"> <param name="c" type="const GLint *" count="1"/> <glx rop="26"/> </function> - <function name="Indexs" offset="50" vectorequiv="Indexsv"> + <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1" + exec="loopback"> <param name="c" type="GLshort"/> </function> - <function name="Indexsv" offset="51"> + <function name="Indexsv" offset="51" deprecated="3.1" exec="loopback"> <param name="c" type="const GLshort *" count="1"/> <glx rop="27"/> </function> - <function name="Normal3b" offset="52" vectorequiv="Normal3bv"> + <function name="Normal3b" offset="52" vectorequiv="Normal3bv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLbyte"/> <param name="ny" type="GLbyte"/> <param name="nz" type="GLbyte"/> </function> - <function name="Normal3bv" offset="53"> + <function name="Normal3bv" offset="53" deprecated="3.1" exec="loopback"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="28"/> </function> - <function name="Normal3d" offset="54" vectorequiv="Normal3dv"> + <function name="Normal3d" offset="54" vectorequiv="Normal3dv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLdouble"/> <param name="ny" type="GLdouble"/> <param name="nz" type="GLdouble"/> </function> - <function name="Normal3dv" offset="55"> + <function name="Normal3dv" offset="55" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="29"/> </function> - <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0"> + <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0" + deprecated="3.1" exec="dynamic"> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> <param name="nz" type="GLfloat"/> </function> - <function name="Normal3fv" offset="57"> + <function name="Normal3fv" offset="57" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="30"/> </function> - <function name="Normal3i" offset="58" vectorequiv="Normal3iv"> + <function name="Normal3i" offset="58" vectorequiv="Normal3iv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLint"/> <param name="ny" type="GLint"/> <param name="nz" type="GLint"/> </function> - <function name="Normal3iv" offset="59"> + <function name="Normal3iv" offset="59" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="3"/> <glx rop="31"/> </function> - <function name="Normal3s" offset="60" vectorequiv="Normal3sv"> + <function name="Normal3s" offset="60" vectorequiv="Normal3sv" + deprecated="3.1" exec="loopback"> <param name="nx" type="GLshort"/> <param name="ny" type="GLshort"/> <param name="nz" type="GLshort"/> </function> - <function name="Normal3sv" offset="61"> + <function name="Normal3sv" offset="61" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="3"/> <glx rop="32"/> </function> - <function name="RasterPos2d" offset="62" vectorequiv="RasterPos2dv"> + <function name="RasterPos2d" offset="62" vectorequiv="RasterPos2dv" + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="RasterPos2dv" offset="63"> + <function name="RasterPos2dv" offset="63" deprecated="3.1"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="33"/> </function> - <function name="RasterPos2f" offset="64" vectorequiv="RasterPos2fv"> + <function name="RasterPos2f" offset="64" vectorequiv="RasterPos2fv" + deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="RasterPos2fv" offset="65"> + <function name="RasterPos2fv" offset="65" deprecated="3.1"> <param name="v" type="const GLfloat *" count="2"/> <glx rop="34"/> </function> - <function name="RasterPos2i" offset="66" vectorequiv="RasterPos2iv"> + <function name="RasterPos2i" offset="66" vectorequiv="RasterPos2iv" + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="RasterPos2iv" offset="67"> + <function name="RasterPos2iv" offset="67" deprecated="3.1"> <param name="v" type="const GLint *" count="2"/> <glx rop="35"/> </function> - <function name="RasterPos2s" offset="68" vectorequiv="RasterPos2sv"> + <function name="RasterPos2s" offset="68" vectorequiv="RasterPos2sv" + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="RasterPos2sv" offset="69"> + <function name="RasterPos2sv" offset="69" deprecated="3.1"> <param name="v" type="const GLshort *" count="2"/> <glx rop="36"/> </function> - <function name="RasterPos3d" offset="70" vectorequiv="RasterPos3dv"> + <function name="RasterPos3d" offset="70" vectorequiv="RasterPos3dv" + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="RasterPos3dv" offset="71"> + <function name="RasterPos3dv" offset="71" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="37"/> </function> - <function name="RasterPos3f" offset="72" vectorequiv="RasterPos3fv"> + <function name="RasterPos3f" offset="72" vectorequiv="RasterPos3fv" + deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="RasterPos3fv" offset="73"> + <function name="RasterPos3fv" offset="73" deprecated="3.1"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="38"/> </function> - <function name="RasterPos3i" offset="74" vectorequiv="RasterPos3iv"> + <function name="RasterPos3i" offset="74" vectorequiv="RasterPos3iv" + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="RasterPos3iv" offset="75"> + <function name="RasterPos3iv" offset="75" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="39"/> </function> - <function name="RasterPos3s" offset="76" vectorequiv="RasterPos3sv"> + <function name="RasterPos3s" offset="76" vectorequiv="RasterPos3sv" + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="RasterPos3sv" offset="77"> + <function name="RasterPos3sv" offset="77" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="40"/> </function> - <function name="RasterPos4d" offset="78" vectorequiv="RasterPos4dv"> + <function name="RasterPos4d" offset="78" vectorequiv="RasterPos4dv" + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="RasterPos4dv" offset="79"> + <function name="RasterPos4dv" offset="79" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="41"/> </function> - <function name="RasterPos4f" offset="80" vectorequiv="RasterPos4fv"> + <function name="RasterPos4f" offset="80" vectorequiv="RasterPos4fv" + deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <param name="w" type="GLfloat"/> </function> - <function name="RasterPos4fv" offset="81"> + <function name="RasterPos4fv" offset="81" deprecated="3.1"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="42"/> </function> - <function name="RasterPos4i" offset="82" vectorequiv="RasterPos4iv"> + <function name="RasterPos4i" offset="82" vectorequiv="RasterPos4iv" + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="RasterPos4iv" offset="83"> + <function name="RasterPos4iv" offset="83" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="43"/> </function> - <function name="RasterPos4s" offset="84" vectorequiv="RasterPos4sv"> + <function name="RasterPos4s" offset="84" vectorequiv="RasterPos4sv" + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="RasterPos4sv" offset="85"> + <function name="RasterPos4sv" offset="85" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="44"/> </function> - <function name="Rectd" offset="86" vectorequiv="Rectdv"> + <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1" + exec="loopback"> <param name="x1" type="GLdouble"/> <param name="y1" type="GLdouble"/> <param name="x2" type="GLdouble"/> <param name="y2" type="GLdouble"/> </function> - <function name="Rectdv" offset="87"> + <function name="Rectdv" offset="87" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLdouble *" count="2"/> <param name="v2" type="const GLdouble *" count="2"/> <glx rop="45"/> </function> - <function name="Rectf" offset="88" vectorequiv="Rectfv"> + <function name="Rectf" offset="88" vectorequiv="Rectfv" deprecated="3.1" + exec="dynamic"> <param name="x1" type="GLfloat"/> <param name="y1" type="GLfloat"/> <param name="x2" type="GLfloat"/> <param name="y2" type="GLfloat"/> </function> - <function name="Rectfv" offset="89"> + <function name="Rectfv" offset="89" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLfloat *" count="2"/> <param name="v2" type="const GLfloat *" count="2"/> <glx rop="46"/> </function> - <function name="Recti" offset="90" vectorequiv="Rectiv"> + <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1" + exec="loopback"> <param name="x1" type="GLint"/> <param name="y1" type="GLint"/> <param name="x2" type="GLint"/> <param name="y2" type="GLint"/> </function> - <function name="Rectiv" offset="91"> + <function name="Rectiv" offset="91" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLint *" count="2"/> <param name="v2" type="const GLint *" count="2"/> <glx rop="47"/> </function> - <function name="Rects" offset="92" vectorequiv="Rectsv"> + <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1" + exec="loopback"> <param name="x1" type="GLshort"/> <param name="y1" type="GLshort"/> <param name="x2" type="GLshort"/> <param name="y2" type="GLshort"/> </function> - <function name="Rectsv" offset="93"> + <function name="Rectsv" offset="93" deprecated="3.1" exec="loopback"> <param name="v1" type="const GLshort *" count="2"/> <param name="v2" type="const GLshort *" count="2"/> <glx rop="48"/> </function> - <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv"> + <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> </function> - <function name="TexCoord1dv" offset="95"> + <function name="TexCoord1dv" offset="95" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="1"/> <glx rop="49"/> </function> - <function name="TexCoord1f" offset="96" vectorequiv="TexCoord1fv"> + <function name="TexCoord1f" offset="96" vectorequiv="TexCoord1fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> </function> - <function name="TexCoord1fv" offset="97"> + <function name="TexCoord1fv" offset="97" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="1"/> <glx rop="50"/> </function> - <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv"> + <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> </function> - <function name="TexCoord1iv" offset="99"> + <function name="TexCoord1iv" offset="99" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="1"/> <glx rop="51"/> </function> - <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv"> + <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> </function> - <function name="TexCoord1sv" offset="101"> + <function name="TexCoord1sv" offset="101" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="1"/> <glx rop="52"/> </function> - <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv"> + <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="TexCoord2dv" offset="103"> + <function name="TexCoord2dv" offset="103" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="53"/> </function> - <function name="TexCoord2f" offset="104" vectorequiv="TexCoord2fv"> + <function name="TexCoord2f" offset="104" vectorequiv="TexCoord2fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> </function> - <function name="TexCoord2fv" offset="105"> + <function name="TexCoord2fv" offset="105" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="2"/> <glx rop="54"/> </function> - <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv"> + <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="TexCoord2iv" offset="107"> + <function name="TexCoord2iv" offset="107" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="2"/> <glx rop="55"/> </function> - <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv"> + <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="TexCoord2sv" offset="109"> + <function name="TexCoord2sv" offset="109" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="2"/> <glx rop="56"/> </function> - <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv"> + <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="TexCoord3dv" offset="111"> + <function name="TexCoord3dv" offset="111" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="57"/> </function> - <function name="TexCoord3f" offset="112" vectorequiv="TexCoord3fv"> + <function name="TexCoord3f" offset="112" vectorequiv="TexCoord3fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> </function> - <function name="TexCoord3fv" offset="113"> + <function name="TexCoord3fv" offset="113" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="58"/> </function> - <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv"> + <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="TexCoord3iv" offset="115"> + <function name="TexCoord3iv" offset="115" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="3"/> <glx rop="59"/> </function> - <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv"> + <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="TexCoord3sv" offset="117"> + <function name="TexCoord3sv" offset="117" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="3"/> <glx rop="60"/> </function> - <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv"> + <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> <param name="q" type="GLdouble"/> </function> - <function name="TexCoord4dv" offset="119"> + <function name="TexCoord4dv" offset="119" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="61"/> </function> - <function name="TexCoord4f" offset="120" vectorequiv="TexCoord4fv"> + <function name="TexCoord4f" offset="120" vectorequiv="TexCoord4fv" + deprecated="3.1" exec="dynamic"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> <param name="q" type="GLfloat"/> </function> - <function name="TexCoord4fv" offset="121"> + <function name="TexCoord4fv" offset="121" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="62"/> </function> - <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv"> + <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> <param name="q" type="GLint"/> </function> - <function name="TexCoord4iv" offset="123"> + <function name="TexCoord4iv" offset="123" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="4"/> <glx rop="63"/> </function> - <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv"> + <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv" + deprecated="3.1" exec="loopback"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> <param name="q" type="GLshort"/> </function> - <function name="TexCoord4sv" offset="125"> + <function name="TexCoord4sv" offset="125" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="4"/> <glx rop="64"/> </function> - <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv"> + <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="Vertex2dv" offset="127"> + <function name="Vertex2dv" offset="127" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="65"/> </function> - <function name="Vertex2f" offset="128" vectorequiv="Vertex2fv"> + <function name="Vertex2f" offset="128" vectorequiv="Vertex2fv" + deprecated="3.1" exec="dynamic"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="Vertex2fv" offset="129"> + <function name="Vertex2fv" offset="129" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="2"/> <glx rop="66"/> </function> - <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv"> + <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="Vertex2iv" offset="131"> + <function name="Vertex2iv" offset="131" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="2"/> <glx rop="67"/> </function> - <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv"> + <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="Vertex2sv" offset="133"> + <function name="Vertex2sv" offset="133" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="2"/> <glx rop="68"/> </function> - <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv"> + <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="Vertex3dv" offset="135"> + <function name="Vertex3dv" offset="135" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="69"/> </function> - <function name="Vertex3f" offset="136" vectorequiv="Vertex3fv"> + <function name="Vertex3f" offset="136" vectorequiv="Vertex3fv" + deprecated="3.1" exec="dynamic"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="Vertex3fv" offset="137"> + <function name="Vertex3fv" offset="137" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="3"/> <glx rop="70"/> </function> - <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv"> + <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="Vertex3iv" offset="139"> + <function name="Vertex3iv" offset="139" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="3"/> <glx rop="71"/> </function> - <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv"> + <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="Vertex3sv" offset="141"> + <function name="Vertex3sv" offset="141" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="3"/> <glx rop="72"/> </function> - <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv"> + <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="Vertex4dv" offset="143"> + <function name="Vertex4dv" offset="143" deprecated="3.1" exec="loopback"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="73"/> </function> - <function name="Vertex4f" offset="144" vectorequiv="Vertex4fv"> + <function name="Vertex4f" offset="144" vectorequiv="Vertex4fv" + deprecated="3.1" exec="dynamic"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <param name="w" type="GLfloat"/> </function> - <function name="Vertex4fv" offset="145"> + <function name="Vertex4fv" offset="145" deprecated="3.1" + exec="dynamic"> <param name="v" type="const GLfloat *" count="4"/> <glx rop="74"/> </function> - <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv"> + <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="Vertex4iv" offset="147"> + <function name="Vertex4iv" offset="147" deprecated="3.1" exec="loopback"> <param name="v" type="const GLint *" count="4"/> <glx rop="75"/> </function> - <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv"> + <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv" + deprecated="3.1" exec="loopback"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="Vertex4sv" offset="149"> + <function name="Vertex4sv" offset="149" deprecated="3.1" exec="loopback"> <param name="v" type="const GLshort *" count="4"/> <glx rop="76"/> </function> - <function name="ClipPlane" offset="150"> + <function name="ClipPlane" offset="150" deprecated="3.1"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLdouble *" count="4"/> <glx rop="77"/> </function> - <function name="ColorMaterial" offset="151"> + <function name="ColorMaterial" offset="151" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> <glx rop="78"/> @@ -1952,25 +2043,25 @@ <glx rop="79"/> </function> - <function name="Fogf" offset="153" es1="1.0"> + <function name="Fogf" offset="153" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="80"/> </function> - <function name="Fogfv" offset="154" es1="1.0"> + <function name="Fogfv" offset="154" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="81"/> </function> - <function name="Fogi" offset="155"> + <function name="Fogi" offset="155" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="82"/> </function> - <function name="Fogiv" offset="156"> + <function name="Fogiv" offset="156" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="83"/> @@ -1987,59 +2078,59 @@ <glx rop="85"/> </function> - <function name="Lightf" offset="159" es1="1.0"> + <function name="Lightf" offset="159" es1="1.0" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="86"/> </function> - <function name="Lightfv" offset="160" es1="1.0"> + <function name="Lightfv" offset="160" es1="1.0" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="87"/> </function> - <function name="Lighti" offset="161"> + <function name="Lighti" offset="161" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="88"/> </function> - <function name="Lightiv" offset="162"> + <function name="Lightiv" offset="162" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="89"/> </function> - <function name="LightModelf" offset="163" es1="1.0"> + <function name="LightModelf" offset="163" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="90"/> </function> - <function name="LightModelfv" offset="164" es1="1.0"> + <function name="LightModelfv" offset="164" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="91"/> </function> - <function name="LightModeli" offset="165"> + <function name="LightModeli" offset="165" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="92"/> </function> - <function name="LightModeliv" offset="166"> + <function name="LightModeliv" offset="166" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="93"/> </function> - <function name="LineStipple" offset="167"> + <function name="LineStipple" offset="167" deprecated="3.1"> <param name="factor" type="GLint"/> <param name="pattern" type="GLushort"/> <glx rop="94"/> @@ -2050,28 +2141,30 @@ <glx rop="95"/> </function> - <function name="Materialf" offset="169" es1="1.0"> + <function name="Materialf" offset="169" es1="1.0" deprecated="3.1" + exec="loopback"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="96"/> </function> - <function name="Materialfv" offset="170" es1="1.0"> + <function name="Materialfv" offset="170" es1="1.0" deprecated="3.1" + exec="dynamic"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="97"/> </function> - <function name="Materiali" offset="171"> + <function name="Materiali" offset="171" deprecated="3.1" exec="loopback"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="98"/> </function> - <function name="Materialiv" offset="172"> + <function name="Materialiv" offset="172" deprecated="3.1" exec="loopback"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -2089,7 +2182,7 @@ <glx rop="101"/> </function> - <function name="PolygonStipple" offset="175"> + <function name="PolygonStipple" offset="175" deprecated="3.1"> <param name="mask" type="const GLubyte *" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP" img_target="0" img_pad_dimensions="false"/> <glx rop="102"/> </function> @@ -2102,7 +2195,7 @@ <glx rop="103"/> </function> - <function name="ShadeModel" offset="177" es1="1.0"> + <function name="ShadeModel" offset="177" es1="1.0" deprecated="3.1"> <param name="mode" type="GLenum"/> <glx rop="104"/> </function> @@ -2160,114 +2253,114 @@ <glx rop="110" large="true"/> </function> - <function name="TexEnvf" offset="184" es1="1.0"> + <function name="TexEnvf" offset="184" es1="1.0" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="111"/> </function> - <function name="TexEnvfv" offset="185" es1="1.0"> + <function name="TexEnvfv" offset="185" es1="1.0" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="112"/> </function> - <function name="TexEnvi" offset="186" es1="1.1"> + <function name="TexEnvi" offset="186" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="113"/> </function> - <function name="TexEnviv" offset="187" es1="1.1"> + <function name="TexEnviv" offset="187" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="114"/> </function> - <function name="TexGend" offset="188"> + <function name="TexGend" offset="188" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLdouble"/> <glx rop="115"/> </function> - <function name="TexGendv" offset="189"> + <function name="TexGendv" offset="189" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLdouble *" variable_param="pname"/> <glx rop="116"/> </function> - <function name="TexGenf" offset="190"> + <function name="TexGenf" offset="190" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="117"/> </function> - <function name="TexGenfv" offset="191"> + <function name="TexGenfv" offset="191" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="118"/> </function> - <function name="TexGeni" offset="192"> + <function name="TexGeni" offset="192" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="119"/> </function> - <function name="TexGeniv" offset="193"> + <function name="TexGeniv" offset="193" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="120"/> </function> - <function name="FeedbackBuffer" offset="194"> + <function name="FeedbackBuffer" offset="194" deprecated="3.1"> <param name="size" type="GLsizei"/> <param name="type" type="GLenum"/> <param name="buffer" type="GLfloat *" output="true"/> <glx sop="105" handcode="true"/> </function> - <function name="SelectBuffer" offset="195"> + <function name="SelectBuffer" offset="195" deprecated="3.1"> <param name="size" type="GLsizei"/> <param name="buffer" type="GLuint *" output="true"/> <glx sop="106" handcode="true"/> </function> - <function name="RenderMode" offset="196"> + <function name="RenderMode" offset="196" deprecated="3.1"> <param name="mode" type="GLenum"/> <return type="GLint"/> <glx sop="107" handcode="true"/> </function> - <function name="InitNames" offset="197"> + <function name="InitNames" offset="197" deprecated="3.1"> <glx rop="121"/> </function> - <function name="LoadName" offset="198"> + <function name="LoadName" offset="198" deprecated="3.1"> <param name="name" type="GLuint"/> <glx rop="122"/> </function> - <function name="PassThrough" offset="199"> + <function name="PassThrough" offset="199" deprecated="3.1"> <param name="token" type="GLfloat"/> <glx rop="123"/> </function> - <function name="PopName" offset="200"> + <function name="PopName" offset="200" deprecated="3.1"> <glx rop="124"/> </function> - <function name="PushName" offset="201"> + <function name="PushName" offset="201" deprecated="3.1"> <param name="name" type="GLuint"/> <glx rop="125"/> </function> @@ -2282,7 +2375,7 @@ <glx rop="127"/> </function> - <function name="ClearAccum" offset="204"> + <function name="ClearAccum" offset="204" deprecated="3.1"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> @@ -2290,7 +2383,7 @@ <glx rop="128"/> </function> - <function name="ClearIndex" offset="205"> + <function name="ClearIndex" offset="205" deprecated="3.1"> <param name="c" type="GLfloat"/> <glx rop="129"/> </function> @@ -2331,12 +2424,12 @@ <glx rop="135"/> </function> - <function name="IndexMask" offset="212"> + <function name="IndexMask" offset="212" deprecated="3.1"> <param name="mask" type="GLuint"/> <glx rop="136"/> </function> - <function name="Accum" offset="213"> + <function name="Accum" offset="213" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="value" type="GLfloat"/> <glx rop="137"/> @@ -2360,16 +2453,16 @@ <glx sop="142" handcode="true"/> </function> - <function name="PopAttrib" offset="218"> + <function name="PopAttrib" offset="218" deprecated="3.1"> <glx rop="141"/> </function> - <function name="PushAttrib" offset="219"> + <function name="PushAttrib" offset="219" deprecated="3.1"> <param name="mask" type="GLbitfield"/> <glx rop="142"/> </function> - <function name="Map1d" offset="220"> + <function name="Map1d" offset="220" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -2379,7 +2472,7 @@ <glx rop="143" handcode="true"/> </function> - <function name="Map1f" offset="221"> + <function name="Map1f" offset="221" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -2389,7 +2482,7 @@ <glx rop="144" handcode="true"/> </function> - <function name="Map2d" offset="222"> + <function name="Map2d" offset="222" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -2403,7 +2496,7 @@ <glx rop="145" handcode="true"/> </function> - <function name="Map2f" offset="223"> + <function name="Map2f" offset="223" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -2417,21 +2510,21 @@ <glx rop="146" handcode="true"/> </function> - <function name="MapGrid1d" offset="224"> + <function name="MapGrid1d" offset="224" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> <glx rop="147"/> </function> - <function name="MapGrid1f" offset="225"> + <function name="MapGrid1f" offset="225" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> <glx rop="148"/> </function> - <function name="MapGrid2d" offset="226"> + <function name="MapGrid2d" offset="226" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -2441,7 +2534,7 @@ <glx rop="149"/> </function> - <function name="MapGrid2f" offset="227"> + <function name="MapGrid2f" offset="227" deprecated="3.1"> <param name="un" type="GLint"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -2451,57 +2544,68 @@ <glx rop="150"/> </function> - <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv"> + <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv" + deprecated="3.1" exec="loopback"> <param name="u" type="GLdouble"/> </function> - <function name="EvalCoord1dv" offset="229"> + <function name="EvalCoord1dv" offset="229" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLdouble *" count="1"/> <glx rop="151"/> </function> - <function name="EvalCoord1f" offset="230" vectorequiv="EvalCoord1fv"> + <function name="EvalCoord1f" offset="230" vectorequiv="EvalCoord1fv" + deprecated="3.1" exec="dynamic"> <param name="u" type="GLfloat"/> </function> - <function name="EvalCoord1fv" offset="231"> + <function name="EvalCoord1fv" offset="231" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLfloat *" count="1"/> <glx rop="152"/> </function> - <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv"> + <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv" + deprecated="3.1" exec="loopback"> <param name="u" type="GLdouble"/> <param name="v" type="GLdouble"/> </function> - <function name="EvalCoord2dv" offset="233"> + <function name="EvalCoord2dv" offset="233" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLdouble *" count="2"/> <glx rop="153"/> </function> - <function name="EvalCoord2f" offset="234" vectorequiv="EvalCoord2fv"> + <function name="EvalCoord2f" offset="234" vectorequiv="EvalCoord2fv" + deprecated="3.1" exec="dynamic"> <param name="u" type="GLfloat"/> <param name="v" type="GLfloat"/> </function> - <function name="EvalCoord2fv" offset="235"> + <function name="EvalCoord2fv" offset="235" deprecated="3.1" + exec="loopback"> <param name="u" type="const GLfloat *" count="2"/> <glx rop="154"/> </function> - <function name="EvalMesh1" offset="236"> + <function name="EvalMesh1" offset="236" deprecated="3.1" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="i1" type="GLint"/> <param name="i2" type="GLint"/> <glx rop="155"/> </function> - <function name="EvalPoint1" offset="237"> + <function name="EvalPoint1" offset="237" deprecated="3.1" + exec="dynamic"> <param name="i" type="GLint"/> <glx rop="156"/> </function> - <function name="EvalMesh2" offset="238"> + <function name="EvalMesh2" offset="238" deprecated="3.1" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="i1" type="GLint"/> <param name="i2" type="GLint"/> @@ -2510,13 +2614,14 @@ <glx rop="157"/> </function> - <function name="EvalPoint2" offset="239"> + <function name="EvalPoint2" offset="239" deprecated="3.1" + exec="dynamic"> <param name="i" type="GLint"/> <param name="j" type="GLint"/> <glx rop="158"/> </function> - <function name="AlphaFunc" offset="240" es1="1.0"> + <function name="AlphaFunc" offset="240" es1="1.0" deprecated="3.1"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampf"/> <glx rop="159"/> @@ -2552,19 +2657,19 @@ <glx rop="164"/> </function> - <function name="PixelZoom" offset="246"> + <function name="PixelZoom" offset="246" deprecated="3.1"> <param name="xfactor" type="GLfloat"/> <param name="yfactor" type="GLfloat"/> <glx rop="165"/> </function> - <function name="PixelTransferf" offset="247"> + <function name="PixelTransferf" offset="247" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="166"/> </function> - <function name="PixelTransferi" offset="248"> + <function name="PixelTransferi" offset="248" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="167"/> @@ -2582,21 +2687,21 @@ <glx sop="110" handcode="client"/> </function> - <function name="PixelMapfv" offset="251"> + <function name="PixelMapfv" offset="251" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLfloat *" count="mapsize"/> <glx rop="168" large="true"/> </function> - <function name="PixelMapuiv" offset="252"> + <function name="PixelMapuiv" offset="252" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLuint *" count="mapsize"/> <glx rop="169" large="true"/> </function> - <function name="PixelMapusv" offset="253"> + <function name="PixelMapusv" offset="253" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLushort *" count="mapsize"/> @@ -2608,7 +2713,7 @@ <glx rop="171"/> </function> - <function name="CopyPixels" offset="255"> + <function name="CopyPixels" offset="255" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -2628,7 +2733,7 @@ <glx sop="111"/> </function> - <function name="DrawPixels" offset="257"> + <function name="DrawPixels" offset="257" deprecated="3.1"> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> @@ -2643,7 +2748,7 @@ <glx sop="112" handcode="client"/> </function> - <function name="GetClipPlane" offset="259"> + <function name="GetClipPlane" offset="259" deprecated="3.1"> <param name="plane" type="GLenum"/> <param name="equation" type="GLdouble *" output="true" count="4"/> <glx sop="113" always_array="true"/> @@ -2672,74 +2777,74 @@ <glx sop="117" handcode="client"/> </function> - <function name="GetLightfv" offset="264" es1="1.1"> + <function name="GetLightfv" offset="264" es1="1.1" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="118"/> </function> - <function name="GetLightiv" offset="265"> + <function name="GetLightiv" offset="265" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="119"/> </function> - <function name="GetMapdv" offset="266"> + <function name="GetMapdv" offset="266" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="v" type="GLdouble *" output="true" variable_param="target query"/> <glx sop="120"/> </function> - <function name="GetMapfv" offset="267"> + <function name="GetMapfv" offset="267" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="v" type="GLfloat *" output="true" variable_param="target query"/> <glx sop="121"/> </function> - <function name="GetMapiv" offset="268"> + <function name="GetMapiv" offset="268" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="query" type="GLenum"/> <param name="v" type="GLint *" output="true" variable_param="target query"/> <glx sop="122"/> </function> - <function name="GetMaterialfv" offset="269" es1="1.1"> + <function name="GetMaterialfv" offset="269" es1="1.1" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="123"/> </function> - <function name="GetMaterialiv" offset="270"> + <function name="GetMaterialiv" offset="270" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="124"/> </function> - <function name="GetPixelMapfv" offset="271"> + <function name="GetPixelMapfv" offset="271" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="values" type="GLfloat *" output="true" variable_param="map"/> <glx sop="125"/> </function> - <function name="GetPixelMapuiv" offset="272"> + <function name="GetPixelMapuiv" offset="272" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="values" type="GLuint *" output="true" variable_param="map"/> <glx sop="126"/> </function> - <function name="GetPixelMapusv" offset="273"> + <function name="GetPixelMapusv" offset="273" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="values" type="GLushort *" output="true" variable_param="map"/> <glx sop="127"/> </function> - <function name="GetPolygonStipple" offset="274"> + <function name="GetPolygonStipple" offset="274" deprecated="3.1"> <param name="mask" type="GLubyte *" output="true" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP"/> <glx sop="128"/> </function> @@ -2750,35 +2855,35 @@ <glx sop="129" handcode="true"/> </function> - <function name="GetTexEnvfv" offset="276" es1="1.1"> + <function name="GetTexEnvfv" offset="276" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="130"/> </function> - <function name="GetTexEnviv" offset="277" es1="1.1"> + <function name="GetTexEnviv" offset="277" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="131"/> </function> - <function name="GetTexGendv" offset="278"> + <function name="GetTexGendv" offset="278" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *" output="true" variable_param="pname"/> <glx sop="132"/> </function> - <function name="GetTexGenfv" offset="279"> + <function name="GetTexGenfv" offset="279" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="133"/> </function> - <function name="GetTexGeniv" offset="280"> + <function name="GetTexGeniv" offset="280" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> @@ -2830,7 +2935,7 @@ <glx sop="140" handcode="client"/> </function> - <function name="IsList" offset="287"> + <function name="IsList" offset="287" deprecated="3.1"> <param name="list" type="GLuint"/> <return type="GLboolean"/> <glx sop="141"/> @@ -2842,7 +2947,7 @@ <glx rop="174"/> </function> - <function name="Frustum" offset="289"> + <function name="Frustum" offset="289" deprecated="3.1"> <param name="left" type="GLdouble"/> <param name="right" type="GLdouble"/> <param name="bottom" type="GLdouble"/> @@ -2852,36 +2957,36 @@ <glx rop="175"/> </function> - <function name="LoadIdentity" offset="290" es1="1.0"> + <function name="LoadIdentity" offset="290" es1="1.0" deprecated="3.1"> <glx rop="176"/> </function> - <function name="LoadMatrixf" offset="291" es1="1.0"> + <function name="LoadMatrixf" offset="291" es1="1.0" deprecated="3.1"> <param name="m" type="const GLfloat *" count="16"/> <glx rop="177"/> </function> - <function name="LoadMatrixd" offset="292"> + <function name="LoadMatrixd" offset="292" deprecated="3.1"> <param name="m" type="const GLdouble *" count="16"/> <glx rop="178"/> </function> - <function name="MatrixMode" offset="293" es1="1.0"> + <function name="MatrixMode" offset="293" es1="1.0" deprecated="3.1"> <param name="mode" type="GLenum"/> <glx rop="179"/> </function> - <function name="MultMatrixf" offset="294" es1="1.0"> + <function name="MultMatrixf" offset="294" es1="1.0" deprecated="3.1"> <param name="m" type="const GLfloat *" count="16"/> <glx rop="180"/> </function> - <function name="MultMatrixd" offset="295"> + <function name="MultMatrixd" offset="295" deprecated="3.1"> <param name="m" type="const GLdouble *" count="16"/> <glx rop="181"/> </function> - <function name="Ortho" offset="296"> + <function name="Ortho" offset="296" deprecated="3.1"> <param name="left" type="GLdouble"/> <param name="right" type="GLdouble"/> <param name="bottom" type="GLdouble"/> @@ -2891,15 +2996,15 @@ <glx rop="182"/> </function> - <function name="PopMatrix" offset="297" es1="1.0"> + <function name="PopMatrix" offset="297" es1="1.0" deprecated="3.1"> <glx rop="183"/> </function> - <function name="PushMatrix" offset="298" es1="1.0"> + <function name="PushMatrix" offset="298" es1="1.0" deprecated="3.1"> <glx rop="184"/> </function> - <function name="Rotated" offset="299"> + <function name="Rotated" offset="299" deprecated="3.1"> <param name="angle" type="GLdouble"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -2907,7 +3012,7 @@ <glx rop="185"/> </function> - <function name="Rotatef" offset="300" es1="1.0"> + <function name="Rotatef" offset="300" es1="1.0" deprecated="3.1"> <param name="angle" type="GLfloat"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -2915,28 +3020,28 @@ <glx rop="186"/> </function> - <function name="Scaled" offset="301"> + <function name="Scaled" offset="301" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <glx rop="187"/> </function> - <function name="Scalef" offset="302" es1="1.0"> + <function name="Scalef" offset="302" es1="1.0" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <glx rop="188"/> </function> - <function name="Translated" offset="303"> + <function name="Translated" offset="303" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <glx rop="189"/> </function> - <function name="Translatef" offset="304" es1="1.0"> + <function name="Translatef" offset="304" es1="1.0" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -3126,12 +3231,13 @@ <enum name="ALL_CLIENT_ATTRIB_BITS" value="0xFFFFFFFF"/> <enum name="CLIENT_ALL_ATTRIB_BITS" value="0xFFFFFFFF"/> - <function name="ArrayElement" offset="306"> + <function name="ArrayElement" offset="306" deprecated="3.1" + exec="dynamic"> <param name="i" type="GLint"/> <glx handcode="true"/> </function> - <function name="ColorPointer" offset="308" es1="1.0"> + <function name="ColorPointer" offset="308" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3139,19 +3245,22 @@ <glx handcode="true"/> </function> - <function name="DisableClientState" offset="309" es1="1.0"> + <function name="DisableClientState" offset="309" es1="1.0" + deprecated="3.1"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> - <function name="DrawArrays" offset="310" es1="1.0" es2="2.0"> + <function name="DrawArrays" offset="310" es1="1.0" es2="2.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx rop="193" handcode="true"/> </function> - <function name="DrawElements" offset="311" es1="1.0" es2="2.0"> + <function name="DrawElements" offset="311" es1="1.0" es2="2.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -3159,13 +3268,13 @@ <glx handcode="true"/> </function> - <function name="EdgeFlagPointer" offset="312"> + <function name="EdgeFlagPointer" offset="312" deprecated="3.1"> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="EnableClientState" offset="313" es1="1.0"> + <function name="EnableClientState" offset="313" es1="1.0" deprecated="3.1"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> @@ -3176,28 +3285,28 @@ <glx handcode="true"/> </function> - <function name="IndexPointer" offset="314"> + <function name="IndexPointer" offset="314" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="InterleavedArrays" offset="317"> + <function name="InterleavedArrays" offset="317" deprecated="3.1"> <param name="format" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="NormalPointer" offset="318" es1="1.0"> + <function name="NormalPointer" offset="318" es1="1.0" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="TexCoordPointer" offset="320" es1="1.0"> + <function name="TexCoordPointer" offset="320" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3205,7 +3314,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointer" offset="321" es1="1.0"> + <function name="VertexPointer" offset="321" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3290,7 +3399,7 @@ <glx rop="4100" large="true"/> </function> - <function name="AreTexturesResident" offset="322"> + <function name="AreTexturesResident" offset="322" deprecated="3.1"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="const GLuint *" count="n"/> <param name="residences" type="GLboolean *" output="true" count="n"/> @@ -3322,27 +3431,28 @@ <glx sop="146"/> </function> - <function name="PrioritizeTextures" offset="331"> + <function name="PrioritizeTextures" offset="331" deprecated="3.1"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="const GLuint *" count="n"/> <param name="priorities" type="const GLclampf *" count="n"/> <glx rop="4118"/> </function> - <function name="Indexub" offset="315" vectorequiv="Indexubv"> + <function name="Indexub" offset="315" vectorequiv="Indexubv" + deprecated="3.1" exec="loopback"> <param name="c" type="GLubyte"/> </function> - <function name="Indexubv" offset="316"> + <function name="Indexubv" offset="316" deprecated="3.1" exec="loopback"> <param name="c" type="const GLubyte *" count="1"/> <glx rop="194"/> </function> - <function name="PopClientAttrib" offset="334"> + <function name="PopClientAttrib" offset="334" deprecated="3.1"> <glx handcode="true"/> </function> - <function name="PushClientAttrib" offset="335"> + <function name="PushClientAttrib" offset="335" deprecated="3.1"> <param name="mask" type="GLbitfield"/> <glx handcode="true"/> </function> @@ -3708,7 +3818,8 @@ <glx rop="4097"/> </function> - <function name="DrawRangeElements" offset="338" es2="3.0"> + <function name="DrawRangeElements" offset="338" es2="3.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -3718,7 +3829,7 @@ <glx handcode="true"/> </function> - <function name="ColorTable" offset="339"> + <function name="ColorTable" offset="339" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3728,21 +3839,21 @@ <glx rop="2053" large="true"/> </function> - <function name="ColorTableParameterfv" offset="340"> + <function name="ColorTableParameterfv" offset="340" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="2054"/> </function> - <function name="ColorTableParameteriv" offset="341"> + <function name="ColorTableParameteriv" offset="341" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="2055"/> </function> - <function name="CopyColorTable" offset="342"> + <function name="CopyColorTable" offset="342" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="x" type="GLint"/> @@ -3751,7 +3862,7 @@ <glx rop="2056"/> </function> - <function name="GetColorTable" offset="343"> + <function name="GetColorTable" offset="343" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -3759,21 +3870,21 @@ <glx sop="147" dimensions_in_reply="true"/> </function> - <function name="GetColorTableParameterfv" offset="344"> + <function name="GetColorTableParameterfv" offset="344" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="148"/> </function> - <function name="GetColorTableParameteriv" offset="345"> + <function name="GetColorTableParameteriv" offset="345" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="149"/> </function> - <function name="ColorSubTable" offset="346"> + <function name="ColorSubTable" offset="346" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="start" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -3783,7 +3894,7 @@ <glx rop="195" large="true"/> </function> - <function name="CopyColorSubTable" offset="347"> + <function name="CopyColorSubTable" offset="347" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="start" type="GLsizei"/> <param name="x" type="GLint"/> @@ -3792,7 +3903,7 @@ <glx rop="196"/> </function> - <function name="ConvolutionFilter1D" offset="348"> + <function name="ConvolutionFilter1D" offset="348" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3802,7 +3913,7 @@ <glx rop="4101" large="true"/> </function> - <function name="ConvolutionFilter2D" offset="349"> + <function name="ConvolutionFilter2D" offset="349" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3813,35 +3924,35 @@ <glx rop="4102" large="true"/> </function> - <function name="ConvolutionParameterf" offset="350"> + <function name="ConvolutionParameterf" offset="350" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat"/> <glx rop="4103"/> </function> - <function name="ConvolutionParameterfv" offset="351"> + <function name="ConvolutionParameterfv" offset="351" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="4104"/> </function> - <function name="ConvolutionParameteri" offset="352"> + <function name="ConvolutionParameteri" offset="352" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint"/> <glx rop="4105"/> </function> - <function name="ConvolutionParameteriv" offset="353"> + <function name="ConvolutionParameteriv" offset="353" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4106"/> </function> - <function name="CopyConvolutionFilter1D" offset="354"> + <function name="CopyConvolutionFilter1D" offset="354" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="x" type="GLint"/> @@ -3850,7 +3961,7 @@ <glx rop="4107"/> </function> - <function name="CopyConvolutionFilter2D" offset="355"> + <function name="CopyConvolutionFilter2D" offset="355" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="x" type="GLint"/> @@ -3860,7 +3971,7 @@ <glx rop="4108"/> </function> - <function name="GetConvolutionFilter" offset="356"> + <function name="GetConvolutionFilter" offset="356" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -3868,21 +3979,21 @@ <glx sop="150" dimensions_in_reply="true"/> </function> - <function name="GetConvolutionParameterfv" offset="357"> + <function name="GetConvolutionParameterfv" offset="357" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="151"/> </function> - <function name="GetConvolutionParameteriv" offset="358"> + <function name="GetConvolutionParameteriv" offset="358" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="152"/> </function> - <function name="GetSeparableFilter" offset="359"> + <function name="GetSeparableFilter" offset="359" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="type" type="GLenum"/> @@ -3892,7 +4003,7 @@ <glx sop="153" handcode="true"/> </function> - <function name="SeparableFilter2D" offset="360"> + <function name="SeparableFilter2D" offset="360" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -3904,7 +4015,7 @@ <glx rop="4109" handcode="true"/> </function> - <function name="GetHistogram" offset="361"> + <function name="GetHistogram" offset="361" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> @@ -3913,21 +4024,21 @@ <glx sop="154" dimensions_in_reply="true" img_reset="reset"/> </function> - <function name="GetHistogramParameterfv" offset="362"> + <function name="GetHistogramParameterfv" offset="362" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="155"/> </function> - <function name="GetHistogramParameteriv" offset="363"> + <function name="GetHistogramParameteriv" offset="363" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="156"/> </function> - <function name="GetMinmax" offset="364"> + <function name="GetMinmax" offset="364" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="reset" type="GLboolean"/> <param name="format" type="GLenum"/> @@ -3936,21 +4047,21 @@ <glx sop="157" img_reset="reset"/> </function> - <function name="GetMinmaxParameterfv" offset="365"> + <function name="GetMinmaxParameterfv" offset="365" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="158"/> </function> - <function name="GetMinmaxParameteriv" offset="366"> + <function name="GetMinmaxParameteriv" offset="366" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="159"/> </function> - <function name="Histogram" offset="367"> + <function name="Histogram" offset="367" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="internalformat" type="GLenum"/> @@ -3958,19 +4069,19 @@ <glx rop="4110"/> </function> - <function name="Minmax" offset="368"> + <function name="Minmax" offset="368" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="sink" type="GLboolean"/> <glx rop="4111"/> </function> - <function name="ResetHistogram" offset="369"> + <function name="ResetHistogram" offset="369" deprecated="3.1"> <param name="target" type="GLenum"/> <glx rop="4112"/> </function> - <function name="ResetMinmax" offset="370"> + <function name="ResetMinmax" offset="370" deprecated="3.1"> <param name="target" type="GLenum"/> <glx rop="4113"/> </function> @@ -4238,143 +4349,168 @@ </function> <function name="ClientActiveTexture" alias="ClientActiveTextureARB" - es1="1.0"> + es1="1.0" deprecated="3.1"> <param name="texture" type="GLenum"/> </function> - <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB"> + <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB"> + <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB"> + <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> </function> - <function name="MultiTexCoord1fv" alias="MultiTexCoord1fvARB"> + <function name="MultiTexCoord1fv" alias="MultiTexCoord1fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB"> + <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB"> + <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB"> + <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB"> + <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB"> + <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB"> + <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB"> + <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> </function> - <function name="MultiTexCoord2fv" alias="MultiTexCoord2fvARB"> + <function name="MultiTexCoord2fv" alias="MultiTexCoord2fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB"> + <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB"> + <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB"> + <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB"> + <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB"> + <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB"> + <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB"> + <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> </function> - <function name="MultiTexCoord3fv" alias="MultiTexCoord3fvARB"> + <function name="MultiTexCoord3fv" alias="MultiTexCoord3fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB"> + <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB"> + <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB"> + <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB"> + <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB"> + <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -4382,12 +4518,14 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB"> + <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0"> + <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -4395,12 +4533,14 @@ <param name="q" type="GLfloat"/> </function> - <function name="MultiTexCoord4fv" alias="MultiTexCoord4fvARB"> + <function name="MultiTexCoord4fv" alias="MultiTexCoord4fvARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB"> + <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -4408,12 +4548,14 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB"> + <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB"> + <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -4421,24 +4563,29 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB"> + <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *"/> </function> - <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB"> + <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB" + deprecated="3.1"> <param name="m" type="const GLfloat *"/> </function> - <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB"> + <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB" + deprecated="3.1"> <param name="m" type="const GLdouble *"/> </function> - <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB"> + <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB" + deprecated="3.1"> <param name="m" type="const GLfloat *"/> </function> - <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB"> + <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB" + deprecated="3.1"> <param name="m" type="const GLdouble *"/> </function> @@ -4648,23 +4795,24 @@ <param name="dfactorAlpha" type="GLenum"/> </function> - <function name="FogCoordf" alias="FogCoordfEXT"> + <function name="FogCoordf" alias="FogCoordfEXT" deprecated="3.1"> <param name="coord" type="GLfloat"/> </function> - <function name="FogCoordfv" alias="FogCoordfvEXT"> + <function name="FogCoordfv" alias="FogCoordfvEXT" deprecated="3.1"> <param name="coord" type="const GLfloat *"/> </function> - <function name="FogCoordd" alias="FogCoorddEXT"> + <function name="FogCoordd" alias="FogCoorddEXT" deprecated="3.1"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddv" alias="FogCoorddvEXT"> + <function name="FogCoorddv" alias="FogCoorddvEXT" deprecated="3.1"> <param name="coord" type="const GLdouble *"/> </function> - <function name="FogCoordPointer" alias="FogCoordPointerEXT"> + <function name="FogCoordPointer" alias="FogCoordPointerEXT" + deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -4705,166 +4853,183 @@ <param name="params" type="const GLint *"/> </function> - <function name="SecondaryColor3b" alias="SecondaryColor3bEXT"> + <function name="SecondaryColor3b" alias="SecondaryColor3bEXT" + deprecated="3.1"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT"> + <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT" + deprecated="3.1"> <param name="v" type="const GLbyte *"/> </function> - <function name="SecondaryColor3d" alias="SecondaryColor3dEXT"> + <function name="SecondaryColor3d" alias="SecondaryColor3dEXT" + deprecated="3.1"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT"> + <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT" + deprecated="3.1"> <param name="v" type="const GLdouble *"/> </function> - <function name="SecondaryColor3f" alias="SecondaryColor3fEXT"> + <function name="SecondaryColor3f" alias="SecondaryColor3fEXT" + deprecated="3.1" exec="dynamic"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> </function> - <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT"> + <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT" + deprecated="3.1" exec="dynamic"> <param name="v" type="const GLfloat *"/> </function> - <function name="SecondaryColor3i" alias="SecondaryColor3iEXT"> + <function name="SecondaryColor3i" alias="SecondaryColor3iEXT" + deprecated="3.1"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT"> + <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT" + deprecated="3.1"> <param name="v" type="const GLint *"/> </function> - <function name="SecondaryColor3s" alias="SecondaryColor3sEXT"> + <function name="SecondaryColor3s" alias="SecondaryColor3sEXT" + deprecated="3.1"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT"> + <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT" + deprecated="3.1"> <param name="v" type="const GLshort *"/> </function> - <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT"> + <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT" + deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT"> + <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT" + deprecated="3.1"> <param name="v" type="const GLubyte *"/> </function> - <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT"> + <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT" + deprecated="3.1"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT"> + <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT" + deprecated="3.1"> <param name="v" type="const GLuint *"/> </function> - <function name="SecondaryColor3us" alias="SecondaryColor3usEXT"> + <function name="SecondaryColor3us" alias="SecondaryColor3usEXT" + deprecated="3.1"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT"> + <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT" + deprecated="3.1"> <param name="v" type="const GLushort *"/> </function> - <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT"> + <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT" + deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> </function> - <function name="WindowPos2d" alias="WindowPos2dMESA"> + <function name="WindowPos2d" alias="WindowPos2dMESA" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="WindowPos2dv" alias="WindowPos2dvMESA"> + <function name="WindowPos2dv" alias="WindowPos2dvMESA" deprecated="3.1"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos2f" alias="WindowPos2fMESA"> + <function name="WindowPos2f" alias="WindowPos2fMESA" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="WindowPos2fv" alias="WindowPos2fvMESA"> + <function name="WindowPos2fv" alias="WindowPos2fvMESA" deprecated="3.1"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos2i" alias="WindowPos2iMESA"> + <function name="WindowPos2i" alias="WindowPos2iMESA" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="WindowPos2iv" alias="WindowPos2ivMESA"> + <function name="WindowPos2iv" alias="WindowPos2ivMESA" deprecated="3.1"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos2s" alias="WindowPos2sMESA"> + <function name="WindowPos2s" alias="WindowPos2sMESA" deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="WindowPos2sv" alias="WindowPos2svMESA"> + <function name="WindowPos2sv" alias="WindowPos2svMESA" deprecated="3.1"> <param name="v" type="const GLshort *"/> </function> - <function name="WindowPos3d" alias="WindowPos3dMESA"> + <function name="WindowPos3d" alias="WindowPos3dMESA" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="WindowPos3dv" alias="WindowPos3dvMESA"> + <function name="WindowPos3dv" alias="WindowPos3dvMESA" deprecated="3.1"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos3f" alias="WindowPos3fMESA"> + <function name="WindowPos3f" alias="WindowPos3fMESA" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3fv" alias="WindowPos3fvMESA"> + <function name="WindowPos3fv" alias="WindowPos3fvMESA" deprecated="3.1"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos3i" alias="WindowPos3iMESA"> + <function name="WindowPos3i" alias="WindowPos3iMESA" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="WindowPos3iv" alias="WindowPos3ivMESA"> + <function name="WindowPos3iv" alias="WindowPos3ivMESA" deprecated="3.1"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos3s" alias="WindowPos3sMESA"> + <function name="WindowPos3s" alias="WindowPos3sMESA" deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="WindowPos3sv" alias="WindowPos3svMESA"> + <function name="WindowPos3sv" alias="WindowPos3svMESA" deprecated="3.1"> <param name="v" type="const GLshort *"/> </function> </category> @@ -5828,151 +5993,164 @@ <glx handcode="true"/> </function> - <function name="MultiTexCoord1dARB" offset="376" vectorequiv="MultiTexCoord1dvARB"> + <function name="MultiTexCoord1dARB" offset="376" + vectorequiv="MultiTexCoord1dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dvARB" offset="377"> + <function name="MultiTexCoord1dvARB" offset="377" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="198"/> </function> - <function name="MultiTexCoord1fARB" offset="378" vectorequiv="MultiTexCoord1fvARB"> + <function name="MultiTexCoord1fARB" offset="378" + vectorequiv="MultiTexCoord1fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> </function> - <function name="MultiTexCoord1fvARB" offset="379"> + <function name="MultiTexCoord1fvARB" offset="379" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="1"/> <glx rop="199"/> </function> - <function name="MultiTexCoord1iARB" offset="380" vectorequiv="MultiTexCoord1ivARB"> + <function name="MultiTexCoord1iARB" offset="380" + vectorequiv="MultiTexCoord1ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1ivARB" offset="381"> + <function name="MultiTexCoord1ivARB" offset="381" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="1"/> <glx rop="200"/> </function> - <function name="MultiTexCoord1sARB" offset="382" vectorequiv="MultiTexCoord1svARB"> + <function name="MultiTexCoord1sARB" offset="382" + vectorequiv="MultiTexCoord1svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1svARB" offset="383"> + <function name="MultiTexCoord1svARB" offset="383" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="201"/> </function> - <function name="MultiTexCoord2dARB" offset="384" vectorequiv="MultiTexCoord2dvARB"> + <function name="MultiTexCoord2dARB" offset="384" + vectorequiv="MultiTexCoord2dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dvARB" offset="385"> + <function name="MultiTexCoord2dvARB" offset="385" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="202"/> </function> - <function name="MultiTexCoord2fARB" offset="386" vectorequiv="MultiTexCoord2fvARB"> + <function name="MultiTexCoord2fARB" offset="386" + vectorequiv="MultiTexCoord2fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> </function> - <function name="MultiTexCoord2fvARB" offset="387"> + <function name="MultiTexCoord2fvARB" offset="387" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="2"/> <glx rop="203"/> </function> - <function name="MultiTexCoord2iARB" offset="388" vectorequiv="MultiTexCoord2ivARB"> + <function name="MultiTexCoord2iARB" offset="388" + vectorequiv="MultiTexCoord2ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2ivARB" offset="389"> + <function name="MultiTexCoord2ivARB" offset="389" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="2"/> <glx rop="204"/> </function> - <function name="MultiTexCoord2sARB" offset="390" vectorequiv="MultiTexCoord2svARB"> + <function name="MultiTexCoord2sARB" offset="390" + vectorequiv="MultiTexCoord2svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2svARB" offset="391"> + <function name="MultiTexCoord2svARB" offset="391" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="205"/> </function> - <function name="MultiTexCoord3dARB" offset="392" vectorequiv="MultiTexCoord3dvARB"> + <function name="MultiTexCoord3dARB" offset="392" + vectorequiv="MultiTexCoord3dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dvARB" offset="393"> + <function name="MultiTexCoord3dvARB" offset="393" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="206"/> </function> - <function name="MultiTexCoord3fARB" offset="394" vectorequiv="MultiTexCoord3fvARB"> + <function name="MultiTexCoord3fARB" offset="394" + vectorequiv="MultiTexCoord3fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> </function> - <function name="MultiTexCoord3fvARB" offset="395"> + <function name="MultiTexCoord3fvARB" offset="395" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="3"/> <glx rop="207"/> </function> - <function name="MultiTexCoord3iARB" offset="396" vectorequiv="MultiTexCoord3ivARB"> + <function name="MultiTexCoord3iARB" offset="396" + vectorequiv="MultiTexCoord3ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3ivARB" offset="397"> + <function name="MultiTexCoord3ivARB" offset="397" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="3"/> <glx rop="208"/> </function> - <function name="MultiTexCoord3sARB" offset="398" vectorequiv="MultiTexCoord3svARB"> + <function name="MultiTexCoord3sARB" offset="398" + vectorequiv="MultiTexCoord3svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3svARB" offset="399"> + <function name="MultiTexCoord3svARB" offset="399" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="209"/> </function> - <function name="MultiTexCoord4dARB" offset="400" vectorequiv="MultiTexCoord4dvARB"> + <function name="MultiTexCoord4dARB" offset="400" + vectorequiv="MultiTexCoord4dvARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -5980,13 +6158,14 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dvARB" offset="401"> + <function name="MultiTexCoord4dvARB" offset="401" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="210"/> </function> - <function name="MultiTexCoord4fARB" offset="402" vectorequiv="MultiTexCoord4fvARB"> + <function name="MultiTexCoord4fARB" offset="402" + vectorequiv="MultiTexCoord4fvARB" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -5994,13 +6173,14 @@ <param name="q" type="GLfloat"/> </function> - <function name="MultiTexCoord4fvARB" offset="403"> + <function name="MultiTexCoord4fvARB" offset="403" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLfloat *" count="4"/> <glx rop="211"/> </function> - <function name="MultiTexCoord4iARB" offset="404" vectorequiv="MultiTexCoord4ivARB"> + <function name="MultiTexCoord4iARB" offset="404" + vectorequiv="MultiTexCoord4ivARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -6008,13 +6188,14 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4ivARB" offset="405"> + <function name="MultiTexCoord4ivARB" offset="405" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="4"/> <glx rop="212"/> </function> - <function name="MultiTexCoord4sARB" offset="406" vectorequiv="MultiTexCoord4svARB"> + <function name="MultiTexCoord4sARB" offset="406" + vectorequiv="MultiTexCoord4svARB" exec="loopback"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -6022,7 +6203,7 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4svARB" offset="407"> + <function name="MultiTexCoord4svARB" offset="407" exec="loopback"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="213"/> @@ -6393,47 +6574,47 @@ <size name="Get" mode="get"/> </enum> - <function name="WeightbvARB"> + <function name="WeightbvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLbyte *"/> </function> - <function name="WeightsvARB"> + <function name="WeightsvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLshort *"/> </function> - <function name="WeightivARB"> + <function name="WeightivARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLint *"/> </function> - <function name="WeightfvARB"> + <function name="WeightfvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLfloat *"/> </function> - <function name="WeightdvARB"> + <function name="WeightdvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLdouble *"/> </function> - <function name="WeightubvARB"> + <function name="WeightubvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLubyte *"/> </function> - <function name="WeightusvARB"> + <function name="WeightusvARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLushort *"/> </function> - <function name="WeightuivARB"> + <function name="WeightuivARB" exec="skip"> <param name="size" type="GLint"/> <param name="weights" type="const GLuint *"/> </function> - <function name="WeightPointerARB"> + <function name="WeightPointerARB" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -6441,7 +6622,7 @@ <glx handcode="true"/> </function> - <function name="VertexBlendARB"> + <function name="VertexBlendARB" exec="skip"> <param name="count" type="GLint"/> </function> </category> @@ -6476,30 +6657,30 @@ </enum> <enum name="MATRIX_INDEX_ARRAY_POINTER_ARB" value="0x8849"/> - <function name="CurrentPaletteMatrixARB"> + <function name="CurrentPaletteMatrixARB" exec="skip"> <param name="index" type="GLint"/> <glx ignore="true" rop="4329"/> </function> - <function name="MatrixIndexubvARB"> + <function name="MatrixIndexubvARB" exec="skip"> <param name="size" type="GLint" counter="true"/> <param name="indices" type="const GLubyte *" count="size"/> <glx ignore="true" rop="4326"/> </function> - <function name="MatrixIndexusvARB"> + <function name="MatrixIndexusvARB" exec="skip"> <param name="size" type="GLint" counter="true"/> <param name="indices" type="const GLushort *" count="size"/> <glx ignore="true" rop="4327"/> </function> - <function name="MatrixIndexuivARB"> + <function name="MatrixIndexuivARB" exec="skip"> <param name="size" type="GLint" counter="true"/> <param name="indices" type="const GLuint *" count="size"/> <glx ignore="true" rop="4328"/> </function> - <function name="MatrixIndexPointerARB"> + <function name="MatrixIndexPointerARB" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -6866,115 +7047,125 @@ <glx handcode="client" vendorpriv="1303"/> </function> - <function name="VertexAttrib1dARB" offset="assign" vectorequiv="VertexAttrib1dvARB"> + <function name="VertexAttrib1dARB" offset="assign" + vectorequiv="VertexAttrib1dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvARB" offset="assign"> + <function name="VertexAttrib1dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4197" doubles_in_order="true"/> </function> - <function name="VertexAttrib1fARB" offset="assign" vectorequiv="VertexAttrib1fvARB"> + <function name="VertexAttrib1fARB" offset="assign" + vectorequiv="VertexAttrib1fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> </function> - <function name="VertexAttrib1fvARB" offset="assign"> + <function name="VertexAttrib1fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="1"/> <glx rop="4193"/> </function> - <function name="VertexAttrib1sARB" offset="assign" vectorequiv="VertexAttrib1svARB"> + <function name="VertexAttrib1sARB" offset="assign" + vectorequiv="VertexAttrib1svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svARB" offset="assign"> + <function name="VertexAttrib1svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4189"/> </function> - <function name="VertexAttrib2dARB" offset="assign" vectorequiv="VertexAttrib2dvARB"> + <function name="VertexAttrib2dARB" offset="assign" + vectorequiv="VertexAttrib2dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvARB" offset="assign"> + <function name="VertexAttrib2dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4198" doubles_in_order="true"/> </function> - <function name="VertexAttrib2fARB" offset="assign" vectorequiv="VertexAttrib2fvARB"> + <function name="VertexAttrib2fARB" offset="assign" + vectorequiv="VertexAttrib2fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="VertexAttrib2fvARB" offset="assign"> + <function name="VertexAttrib2fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="2"/> <glx rop="4194"/> </function> - <function name="VertexAttrib2sARB" offset="assign" vectorequiv="VertexAttrib2svARB"> + <function name="VertexAttrib2sARB" offset="assign" + vectorequiv="VertexAttrib2svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svARB" offset="assign"> + <function name="VertexAttrib2svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4190"/> </function> - <function name="VertexAttrib3dARB" offset="assign" vectorequiv="VertexAttrib3dvARB"> + <function name="VertexAttrib3dARB" offset="assign" + vectorequiv="VertexAttrib3dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvARB" offset="assign"> + <function name="VertexAttrib3dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4199" doubles_in_order="true"/> </function> - <function name="VertexAttrib3fARB" offset="assign" vectorequiv="VertexAttrib3fvARB"> + <function name="VertexAttrib3fARB" offset="assign" + vectorequiv="VertexAttrib3fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="VertexAttrib3fvARB" offset="assign"> + <function name="VertexAttrib3fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="3"/> <glx rop="4195"/> </function> - <function name="VertexAttrib3sARB" offset="assign" vectorequiv="VertexAttrib3svARB"> + <function name="VertexAttrib3sARB" offset="assign" + vectorequiv="VertexAttrib3svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svARB" offset="assign"> + <function name="VertexAttrib3svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4191"/> </function> - <function name="VertexAttrib4dARB" offset="assign" vectorequiv="VertexAttrib4dvARB"> + <function name="VertexAttrib4dARB" offset="assign" + vectorequiv="VertexAttrib4dvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -6982,13 +7173,14 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvARB" offset="assign"> + <function name="VertexAttrib4dvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4200" doubles_in_order="true"/> </function> - <function name="VertexAttrib4fARB" offset="assign" vectorequiv="VertexAttrib4fvARB"> + <function name="VertexAttrib4fARB" offset="assign" + vectorequiv="VertexAttrib4fvARB" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -6996,13 +7188,14 @@ <param name="w" type="GLfloat"/> </function> - <function name="VertexAttrib4fvARB" offset="assign"> + <function name="VertexAttrib4fvARB" offset="assign" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="4"/> <glx rop="4196"/> </function> - <function name="VertexAttrib4sARB" offset="assign" vectorequiv="VertexAttrib4svARB"> + <function name="VertexAttrib4sARB" offset="assign" + vectorequiv="VertexAttrib4svARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -7010,13 +7203,14 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svARB" offset="assign"> + <function name="VertexAttrib4svARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4192"/> </function> - <function name="VertexAttrib4NubARB" offset="assign" vectorequiv="VertexAttrib4NubvARB"> + <function name="VertexAttrib4NubARB" offset="assign" + vectorequiv="VertexAttrib4NubvARB" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -7024,67 +7218,67 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4NubvARB" offset="assign"> + <function name="VertexAttrib4NubvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4201"/> </function> - <function name="VertexAttrib4bvARB" offset="assign"> + <function name="VertexAttrib4bvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> <glx rop="4230"/> </function> - <function name="VertexAttrib4ivARB" offset="assign"> + <function name="VertexAttrib4ivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> <glx rop="4231"/> </function> - <function name="VertexAttrib4ubvARB" offset="assign"> + <function name="VertexAttrib4ubvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4232"/> </function> - <function name="VertexAttrib4usvARB" offset="assign"> + <function name="VertexAttrib4usvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> <glx rop="4233"/> </function> - <function name="VertexAttrib4uivARB" offset="assign"> + <function name="VertexAttrib4uivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> <glx rop="4234"/> </function> - <function name="VertexAttrib4NbvARB" offset="assign"> + <function name="VertexAttrib4NbvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> <glx rop="4235"/> </function> - <function name="VertexAttrib4NsvARB" offset="assign"> + <function name="VertexAttrib4NsvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4236"/> </function> - <function name="VertexAttrib4NivARB" offset="assign"> + <function name="VertexAttrib4NivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> <glx rop="4237"/> </function> - <function name="VertexAttrib4NusvARB" offset="assign"> + <function name="VertexAttrib4NusvARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> <glx rop="4238"/> </function> - <function name="VertexAttrib4NuivARB" offset="assign"> + <function name="VertexAttrib4NuivARB" offset="assign" exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> <glx rop="4239"/> @@ -7110,7 +7304,7 @@ <glx handcode="true"/> </function> - <function name="ProgramStringARB" offset="assign"> + <function name="ProgramStringARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="format" type="GLenum"/> <param name="len" type="GLsizei" counter="true"/> @@ -7138,7 +7332,8 @@ <return type="GLboolean"/> </function> - <function name="ProgramEnvParameter4dARB" offset="assign" vectorequiv="ProgramEnvParameter4dvARB"> + <function name="ProgramEnvParameter4dARB" offset="assign" + vectorequiv="ProgramEnvParameter4dvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> @@ -7147,14 +7342,16 @@ <param name="w" type="GLdouble"/> </function> - <function name="ProgramEnvParameter4dvARB" offset="assign"> + <function name="ProgramEnvParameter4dvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLdouble *" count="4"/> <glx rop="4185" doubles_in_order="true"/> </function> - <function name="ProgramEnvParameter4fARB" offset="assign" vectorequiv="ProgramEnvParameter4fvARB"> + <function name="ProgramEnvParameter4fARB" offset="assign" + vectorequiv="ProgramEnvParameter4fvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> @@ -7163,14 +7360,16 @@ <param name="w" type="GLfloat"/> </function> - <function name="ProgramEnvParameter4fvARB" offset="assign"> + <function name="ProgramEnvParameter4fvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLfloat *" count="4"/> <glx rop="4184"/> </function> - <function name="ProgramLocalParameter4dARB" offset="assign" vectorequiv="ProgramLocalParameter4dvARB"> + <function name="ProgramLocalParameter4dARB" offset="assign" + vectorequiv="ProgramLocalParameter4dvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> @@ -7179,14 +7378,16 @@ <param name="w" type="GLdouble"/> </function> - <function name="ProgramLocalParameter4dvARB" offset="assign"> + <function name="ProgramLocalParameter4dvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLdouble *" count="4"/> <glx rop="4216" doubles_in_order="true"/> </function> - <function name="ProgramLocalParameter4fARB" offset="assign" vectorequiv="ProgramLocalParameter4fvARB"> + <function name="ProgramLocalParameter4fARB" offset="assign" + vectorequiv="ProgramLocalParameter4fvARB" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> @@ -7195,7 +7396,8 @@ <param name="w" type="GLfloat"/> </function> - <function name="ProgramLocalParameter4fvARB" offset="assign"> + <function name="ProgramLocalParameter4fvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="const GLfloat *" count="4"/> @@ -7214,28 +7416,32 @@ the ARB_vertex_program protocol to unused padding. --> - <function name="GetProgramEnvParameterdvARB" offset="assign"> + <function name="GetProgramEnvParameterdvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLdouble *" output="true" count="4"/> <glx vendorpriv="1297" handcode="client" doubles_in_order="true"/> </function> - <function name="GetProgramEnvParameterfvARB" offset="assign"> + <function name="GetProgramEnvParameterfvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLfloat *" output="true" count="4"/> <glx vendorpriv="1296" handcode="client"/> </function> - <function name="GetProgramLocalParameterdvARB" offset="assign"> + <function name="GetProgramLocalParameterdvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLdouble *" output="true" count="4"/> <glx vendorpriv="1306" handcode="client" doubles_in_order="true"/> </function> - <function name="GetProgramLocalParameterfvARB" offset="assign"> + <function name="GetProgramLocalParameterfvARB" offset="assign" + deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="params" type="GLfloat *" output="true" count="4"/> @@ -7243,14 +7449,14 @@ </function> - <function name="GetProgramivARB" offset="assign"> + <function name="GetProgramivARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx vendorpriv="1307"/> </function> - <function name="GetProgramStringARB" offset="assign"> + <function name="GetProgramStringARB" offset="assign" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="string" type="GLvoid *" output="true"/> @@ -8025,7 +8231,8 @@ <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/> <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/> - <function name="DrawTransformFeedbackStream" offset="assign"> + <function name="DrawTransformFeedbackStream" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8061,13 +8268,15 @@ <!-- ARB extensions #106...#108 --> <category name="GL_ARB_transform_feedback_instanced" number="109"> - <function name="DrawTransformFeedbackInstanced" offset="assign"> + <function name="DrawTransformFeedbackInstanced" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawTransformFeedbackStreamInstanced" offset="assign"> + <function name="DrawTransformFeedbackStreamInstanced" offset="assign" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8111,7 +8320,7 @@ <category name="GL_EXT_polygon_offset" number="3"> <enum name="POLYGON_OFFSET_BIAS_EXT" value="0x8039"/> - <function name="PolygonOffsetEXT" offset="assign"> + <function name="PolygonOffsetEXT" offset="assign" deprecated="3.1"> <param name="factor" type="GLfloat"/> <param name="bias" type="GLfloat"/> <glx rop="4098" ignore="true"/> @@ -8215,14 +8424,14 @@ </category> <category name="GL_SGIS_texture_filter4" number="7"> - <function name="GetTexFilterFuncSGIS"> + <function name="GetTexFilterFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="filter" type="GLenum"/> <param name="weights" type="GLfloat *" output="true"/> <glx vendorpriv="4101" ignore="true"/> </function> - <function name="TexFilterFuncSGIS"> + <function name="TexFilterFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="filter" type="GLenum"/> <param name="n" type="GLsizei" counter="true"/> @@ -8712,37 +8921,37 @@ </category> <category name="GL_SGIS_pixel_texture" number="15"> - <function name="PixelTexGenParameteriSGIS"> + <function name="PixelTexGenParameteriSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="PixelTexGenParameterivSGIS"> + <function name="PixelTexGenParameterivSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="PixelTexGenParameterfSGIS"> + <function name="PixelTexGenParameterfSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="PixelTexGenParameterfvSGIS"> + <function name="PixelTexGenParameterfvSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="GetPixelTexGenParameterivSGIS"> + <function name="GetPixelTexGenParameterivSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetPixelTexGenParameterfvSGIS"> + <function name="GetPixelTexGenParameterfvSGIS" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> @@ -8750,7 +8959,7 @@ </category> <category name="GL_SGIS_texture4D" number="16"> - <function name="TexImage4DSGIS"> + <function name="TexImage4DSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -8765,7 +8974,7 @@ <glx rop="2057" ignore="true"/> </function> - <function name="TexSubImage4DSGIS"> + <function name="TexSubImage4DSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -8831,14 +9040,14 @@ </category> <category name="GL_SGIS_detail_texture" number="21"> - <function name="DetailTexFuncSGIS"> + <function name="DetailTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="n" type="GLsizei" counter="true"/> <param name="points" type="const GLfloat *" count="n"/> <glx rop="2051" ignore="true"/> </function> - <function name="GetDetailTexFuncSGIS"> + <function name="GetDetailTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="points" type="GLfloat *" output="true"/> <glx vendorpriv="4096" ignore="true"/> @@ -8846,14 +9055,14 @@ </category> <category name="GL_SGIS_sharpen_texture" number="22"> - <function name="SharpenTexFuncSGIS"> + <function name="SharpenTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="n" type="GLsizei" counter="true"/> <param name="points" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="2052" ignore="true"/> </function> - <function name="GetSharpenTexFuncSGIS"> + <function name="GetSharpenTexFuncSGIS" exec="skip"> <param name="target" type="GLenum"/> <param name="points" type="GLfloat *" output="true"/> <glx vendorpriv="4097" ignore="true"/> @@ -8861,13 +9070,15 @@ </category> <category name="GL_SGIS_multisample" number="25"> - <function name="SampleMaskSGIS" offset="assign" static_dispatch="false"> + <function name="SampleMaskSGIS" offset="assign" static_dispatch="false" + exec="skip"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> <glx rop="2048"/> </function> - <function name="SamplePatternSGIS" offset="assign" static_dispatch="false"> + <function name="SamplePatternSGIS" offset="assign" static_dispatch="false" + exec="skip"> <param name="pattern" type="GLenum"/> <glx rop="2049"/> </function> @@ -8898,7 +9109,7 @@ <param name="i" type="GLint"/> </function> - <function name="ColorPointerEXT" offset="assign"> + <function name="ColorPointerEXT" offset="assign" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -8913,7 +9124,7 @@ <param name="count" type="GLsizei"/> </function> - <function name="EdgeFlagPointerEXT" offset="assign"> + <function name="EdgeFlagPointerEXT" offset="assign" deprecated="3.1"> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> <param name="pointer" type="const GLboolean *"/> @@ -8925,7 +9136,7 @@ <param name="params" type="GLvoid **" output="true"/> </function> - <function name="IndexPointerEXT" offset="assign"> + <function name="IndexPointerEXT" offset="assign" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -8933,7 +9144,7 @@ <glx handcode="true"/> </function> - <function name="NormalPointerEXT" offset="assign"> + <function name="NormalPointerEXT" offset="assign" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -8941,7 +9152,7 @@ <glx handcode="true"/> </function> - <function name="TexCoordPointerEXT" offset="assign"> + <function name="TexCoordPointerEXT" offset="assign" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -8950,7 +9161,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointerEXT" offset="assign"> + <function name="VertexPointerEXT" offset="assign" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -9064,25 +9275,25 @@ <!-- Extension number 50 is a GLX extension. --> <category name="GL_SGIX_sprite" number="52"> - <function name="SpriteParameterfSGIX"> + <function name="SpriteParameterfSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="SpriteParameterfvSGIX"> + <function name="SpriteParameterfvSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="SpriteParameteriSGIX"> + <function name="SpriteParameteriSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="SpriteParameterivSGIX"> + <function name="SpriteParameterivSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> @@ -9103,13 +9314,13 @@ <size name="PointParameterfvEXT" mode="get"/> </enum> - <function name="PointParameterfEXT" offset="assign"> + <function name="PointParameterfEXT" offset="assign" mesa_name="-EXT"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="2065"/> </function> - <function name="PointParameterfvEXT" offset="assign"> + <function name="PointParameterfvEXT" offset="assign" mesa_name="-EXT"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="2066"/> @@ -9117,33 +9328,33 @@ </category> <category name="GL_SGIX_instruments" number="55"> - <function name="GetInstrumentsSGIX"> + <function name="GetInstrumentsSGIX" exec="skip"> <return type="GLint"/> <glx ignore="true"/> </function> - <function name="InstrumentsBufferSGIX"> + <function name="InstrumentsBufferSGIX" exec="skip"> <param name="size" type="GLsizei"/> <param name="buffer" type="GLint *" output="true"/> <glx ignore="true"/> </function> - <function name="PollInstrumentsSGIX"> + <function name="PollInstrumentsSGIX" exec="skip"> <param name="marker_p" type="GLint *" output="true"/> <return type="GLint"/> <glx ignore="true"/> </function> - <function name="ReadInstrumentsSGIX"> + <function name="ReadInstrumentsSGIX" exec="skip"> <param name="marker" type="GLint"/> <glx ignore="true"/> </function> - <function name="StartInstrumentsSGIX"> + <function name="StartInstrumentsSGIX" exec="skip"> <glx ignore="true"/> </function> - <function name="StopInstrumentsSGIX"> + <function name="StopInstrumentsSGIX" exec="skip"> <param name="marker" type="GLint"/> <glx ignore="true"/> </function> @@ -9167,14 +9378,14 @@ </category> <category name="GL_SGIX_framezoom" number="57"> - <function name="FrameZoomSGIX"> + <function name="FrameZoomSGIX" exec="skip"> <param name="factor" type="GLint"/> <glx rop="2072" ignore="true"/> </function> </category> <category name="GL_SGIX_tag_sample_buffer" number="58"> - <function name="TagSampleBufferSGIX"> + <function name="TagSampleBufferSGIX" exec="skip"> <glx rop="2050" ignore="true"/> </function> </category> @@ -9182,14 +9393,14 @@ <!-- Extension number 59 is not listed in the extension registry. --> <category name="GL_SGIX_reference_plane" number="60"> - <function name="ReferencePlaneSGIX"> + <function name="ReferencePlaneSGIX" exec="skip"> <param name="equation" type="const GLdouble *" count="4"/> <glx rop="2071" ignore="true"/> </function> </category> <category name="GL_SGIX_flush_raster" number="61"> - <function name="FlushRasterSGIX"> + <function name="FlushRasterSGIX" exec="skip"> <glx vendorpriv="4105" ignore="true"/> </function> </category> @@ -9203,13 +9414,13 @@ </category> <category name="GL_SGIS_fog_function" number="64"> - <function name="FogFuncSGIS"> + <function name="FogFuncSGIS" exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="points" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="2067" ignore="true"/> </function> - <function name="GetFogFuncSGIS"> + <function name="GetFogFuncSGIS" exec="skip"> <param name="points" type="GLfloat *" output="true"/> <!-- GLX protocol for this function is unknown. --> </function> @@ -9224,37 +9435,37 @@ </category> <category name="GL_HP_image_transform" number="66"> - <function name="ImageTransformParameteriHP"> + <function name="ImageTransformParameteriHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="ImageTransformParameterfHP"> + <function name="ImageTransformParameterfHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="ImageTransformParameterivHP"> + <function name="ImageTransformParameterivHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="ImageTransformParameterfvHP"> + <function name="ImageTransformParameterfvHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> - <function name="GetImageTransformParameterivHP"> + <function name="GetImageTransformParameterivHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> </function> - <function name="GetImageTransformParameterfvHP"> + <function name="GetImageTransformParameterfvHP" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> @@ -9301,7 +9512,7 @@ <!-- Extension number 75 is a GLU extension. --> <category name="GL_PGI_misc_hints" number="77"> - <function name="HintPGI"> + <function name="HintPGI" exec="skip"> <param name="target" type="GLenum"/> <param name="mode" type="GLint"/> <glx ignore="true"/> @@ -9385,42 +9596,42 @@ </category> <category name="GL_SGIX_list_priority" number="80"> - <function name="GetListParameterfvSGIX"> + <function name="GetListParameterfvSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetListParameterivSGIX"> + <function name="GetListParameterivSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="ListParameterfSGIX"> + <function name="ListParameterfSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="ListParameterfvSGIX"> + <function name="ListParameterfvSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="ListParameteriSGIX"> + <function name="ListParameteriSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="ListParameterivSGIX"> + <function name="ListParameterivSGIX" exec="skip"> <param name="list" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> @@ -9472,7 +9683,7 @@ <!-- Extension number 92 is a GLX extension. --> <category name="GL_EXT_index_material" number="94"> - <function name="IndexMaterialEXT"> + <function name="IndexMaterialEXT" exec="skip"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> <glx ignore="true"/> @@ -9480,7 +9691,7 @@ </category> <category name="GL_EXT_index_func" number="95"> - <function name="IndexFuncEXT"> + <function name="IndexFuncEXT" exec="skip"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampf"/> <glx ignore="true"/> @@ -9491,13 +9702,13 @@ <enum name="ARRAY_ELEMENT_LOCK_FIRST_EXT" value="0x81A8"/> <enum name="ARRAY_ELEMENT_LOCK_COUNT_EXT" value="0x81A9"/> - <function name="LockArraysEXT" offset="assign"> + <function name="LockArraysEXT" offset="assign" deprecated="3.1"> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx handcode="true" ignore="true"/> </function> - <function name="UnlockArraysEXT" offset="assign"> + <function name="UnlockArraysEXT" offset="assign" deprecated="3.1"> <glx handcode="true" ignore="true"/> </function> </category> @@ -9513,13 +9724,13 @@ <size name="CullParameterdv"/> </enum> - <function name="CullParameterdvEXT"> + <function name="CullParameterdvEXT" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *"/> <!-- Spec bug. Should be const. --> <glx ignore="true"/> </function> - <function name="CullParameterfvEXT"> + <function name="CullParameterfvEXT" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *"/> <!-- Spec bug. Should be const. --> <glx ignore="true"/> @@ -9531,121 +9742,121 @@ <!-- Shouldn't this be EXT_fragment_lighting? --> <category name="GL_SGIX_fragment_lighting" number="102"> - <function name="FragmentColorMaterialSGIX"> + <function name="FragmentColorMaterialSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> <glx ignore="true"/> </function> - <function name="FragmentLightfSGIX"> + <function name="FragmentLightfSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="FragmentLightfvSGIX"> + <function name="FragmentLightfvSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="FragmentLightiSGIX"> + <function name="FragmentLightiSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="FragmentLightivSGIX"> + <function name="FragmentLightivSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="FragmentLightModelfSGIX"> + <function name="FragmentLightModelfSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="FragmentLightModelfvSGIX"> + <function name="FragmentLightModelfvSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="FragmentLightModeliSGIX"> + <function name="FragmentLightModeliSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="FragmentLightModelivSGIX"> + <function name="FragmentLightModelivSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialfSGIX"> + <function name="FragmentMaterialfSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialfvSGIX"> + <function name="FragmentMaterialfvSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialiSGIX"> + <function name="FragmentMaterialiSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> </function> - <function name="FragmentMaterialivSGIX"> + <function name="FragmentMaterialivSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="GetFragmentLightfvSGIX"> + <function name="GetFragmentLightfvSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetFragmentLightivSGIX"> + <function name="GetFragmentLightivSGIX" exec="skip"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetFragmentMaterialfvSGIX"> + <function name="GetFragmentMaterialfvSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetFragmentMaterialivSGIX"> + <function name="GetFragmentMaterialivSGIX" exec="skip"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="LightEnviSGIX"> + <function name="LightEnviSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx ignore="true"/> @@ -9682,15 +9893,15 @@ <!-- Extension number 116 is not listed in the extension registry. --> <category name="GL_EXT_light_texture" number="117"> - <function name="ApplyTextureEXT"> + <function name="ApplyTextureEXT" exec="skip"> <param name="mode" type="GLenum"/> </function> - <function name="TextureLightEXT"> + <function name="TextureLightEXT" exec="skip"> <param name="pname" type="GLenum"/> </function> - <function name="TextureMaterialEXT"> + <function name="TextureMaterialEXT" exec="skip"> <param name="face" type="GLenum"/> <param name="mode" type="GLenum"/> </function> @@ -9708,55 +9919,55 @@ <!-- Extension number 131 is not listed in the extension registry. --> <category name="GL_SGIX_async" number="132"> - <function name="AsyncMarkerSGIX"> + <function name="AsyncMarkerSGIX" exec="skip"> <param name="marker" type="GLuint"/> </function> - <function name="FinishAsyncSGIX"> + <function name="FinishAsyncSGIX" exec="skip"> <param name="markerp" type="GLuint *"/> <!-- Spec bug. Should be const. --> <return type="GLint"/> </function> - <function name="PollAsyncSGIX"> + <function name="PollAsyncSGIX" exec="skip"> <param name="markerp" type="GLuint *"/> <!-- Spec bug. Should be const. --> <return type="GLint"/> </function> - <function name="GenAsyncMarkersSGIX"> + <function name="GenAsyncMarkersSGIX" exec="skip"> <param name="range" type="GLsizei"/> <return type="GLuint"/> </function> - <function name="DeleteAsyncMarkersSGIX"> + <function name="DeleteAsyncMarkersSGIX" exec="skip"> <param name="marker" type="GLuint"/> <param name="range" type="GLsizei"/> </function> - <function name="IsAsyncMarkerSGIX"> + <function name="IsAsyncMarkerSGIX" exec="skip"> <param name="marker" type="GLuint"/> <return type="GLboolean"/> </function> </category> <category name="GL_INTEL_parallel_arrays" number="136"> - <function name="VertexPointervINTEL"> + <function name="VertexPointervINTEL" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> </function> - <function name="NormalPointervINTEL"> + <function name="NormalPointervINTEL" exec="skip"> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> </function> - <function name="ColorPointervINTEL"> + <function name="ColorPointervINTEL" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> </function> - <function name="TexCoordPointervINTEL"> + <function name="TexCoordPointervINTEL" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="pointer" type="const GLvoid **"/> @@ -9773,25 +9984,25 @@ </category> <category name="GL_EXT_pixel_transform" number="138"> - <function name="PixelTransformParameteriEXT"> + <function name="PixelTransformParameteriEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="PixelTransformParameterfEXT"> + <function name="PixelTransformParameterfEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="PixelTransformParameterivEXT"> + <function name="PixelTransformParameterivEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="PixelTransformParameterfvEXT"> + <function name="PixelTransformParameterfvEXT" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> @@ -9817,24 +10028,30 @@ </category> <category name="GL_EXT_secondary_color" number="145"> - <function name="SecondaryColor3bEXT" offset="assign" vectorequiv="SecondaryColor3bvEXT"> + <function name="SecondaryColor3bEXT" offset="assign" + vectorequiv="SecondaryColor3bvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bvEXT" offset="assign"> + <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="4126"/> </function> - <function name="SecondaryColor3dEXT" offset="assign" vectorequiv="SecondaryColor3dvEXT"> + <function name="SecondaryColor3dEXT" offset="assign" + vectorequiv="SecondaryColor3dvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dvEXT" offset="assign"> + <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4130"/> </function> @@ -9850,57 +10067,72 @@ <glx rop="4129"/> </function> - <function name="SecondaryColor3iEXT" offset="assign" vectorequiv="SecondaryColor3ivEXT"> + <function name="SecondaryColor3iEXT" offset="assign" + vectorequiv="SecondaryColor3ivEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3ivEXT" offset="assign"> + <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLint *" count="3"/> <glx rop="4128"/> </function> - <function name="SecondaryColor3sEXT" offset="assign" vectorequiv="SecondaryColor3svEXT"> + <function name="SecondaryColor3sEXT" offset="assign" + vectorequiv="SecondaryColor3svEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3svEXT" offset="assign"> + <function name="SecondaryColor3svEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLshort *" count="3"/> <glx rop="4127"/> </function> - <function name="SecondaryColor3ubEXT" offset="assign" vectorequiv="SecondaryColor3ubvEXT"> + <function name="SecondaryColor3ubEXT" offset="assign" + vectorequiv="SecondaryColor3ubvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubvEXT" offset="assign"> + <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="4131"/> </function> - <function name="SecondaryColor3uiEXT" offset="assign" vectorequiv="SecondaryColor3uivEXT"> + <function name="SecondaryColor3uiEXT" offset="assign" + vectorequiv="SecondaryColor3uivEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uivEXT" offset="assign"> + <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLuint *" count="3"/> <glx rop="4133"/> </function> - <function name="SecondaryColor3usEXT" offset="assign" vectorequiv="SecondaryColor3usvEXT"> + <function name="SecondaryColor3usEXT" offset="assign" + vectorequiv="SecondaryColor3usvEXT" exec="loopback" + mesa_name="+_f"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usvEXT" offset="assign"> + <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback" + mesa_name="+_f"> <param name="v" type="const GLushort *" count="3"/> <glx rop="4132"/> </function> @@ -9915,7 +10147,7 @@ </category> <category name="GL_EXT_texture_perturb_normal" number="147"> - <function name="TextureNormalEXT"> + <function name="TextureNormalEXT" exec="skip"> <param name="mode" type="GLenum"/> </function> </category> @@ -9929,7 +10161,8 @@ <glx handcode="true"/> </function> - <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0"> + <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0" + exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -9940,20 +10173,22 @@ </category> <category name="GL_EXT_fog_coord" number="149"> - <function name="FogCoordfEXT" offset="assign" vectorequiv="FogCoordfvEXT"> + <function name="FogCoordfEXT" offset="assign" vectorequiv="FogCoordfvEXT" + exec="dynamic"> <param name="coord" type="GLfloat"/> </function> - <function name="FogCoordfvEXT" offset="assign"> + <function name="FogCoordfvEXT" offset="assign" exec="dynamic"> <param name="coord" type="const GLfloat *" count="1"/> <glx rop="4124"/> </function> - <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT"> + <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT" + exec="loopback"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddvEXT" offset="assign"> + <function name="FogCoorddvEXT" offset="assign" exec="loopback"> <param name="coord" type="const GLdouble *" count="1"/> <glx rop="4125"/> </function> @@ -9973,113 +10208,113 @@ <!-- Extension number 154 is not listed in the extension registry. --> <category name="GL_EXT_coordinate_frame" number="156"> - <function name="Tangent3bEXT"> + <function name="Tangent3bEXT" exec="skip"> <param name="tx" type="GLbyte"/> <param name="ty" type="GLbyte"/> <param name="tz" type="GLbyte"/> </function> - <function name="Tangent3bvEXT"> + <function name="Tangent3bvEXT" exec="skip"> <param name="v" type="const GLbyte *"/> </function> - <function name="Tangent3dEXT"> + <function name="Tangent3dEXT" exec="skip"> <param name="tx" type="GLdouble"/> <param name="ty" type="GLdouble"/> <param name="tz" type="GLdouble"/> </function> - <function name="Tangent3dvEXT"> + <function name="Tangent3dvEXT" exec="skip"> <param name="v" type="const GLdouble *"/> </function> - <function name="Tangent3fEXT"> + <function name="Tangent3fEXT" exec="skip"> <param name="tx" type="GLfloat"/> <param name="ty" type="GLfloat"/> <param name="tz" type="GLfloat"/> </function> - <function name="Tangent3fvEXT"> + <function name="Tangent3fvEXT" exec="skip"> <param name="v" type="const GLfloat *"/> </function> - <function name="Tangent3iEXT"> + <function name="Tangent3iEXT" exec="skip"> <param name="tx" type="GLint"/> <param name="ty" type="GLint"/> <param name="tz" type="GLint"/> </function> - <function name="Tangent3ivEXT"> + <function name="Tangent3ivEXT" exec="skip"> <param name="v" type="const GLint *"/> </function> - <function name="Tangent3sEXT"> + <function name="Tangent3sEXT" exec="skip"> <param name="tx" type="GLshort"/> <param name="ty" type="GLshort"/> <param name="tz" type="GLshort"/> </function> - <function name="Tangent3svEXT"> + <function name="Tangent3svEXT" exec="skip"> <param name="v" type="const GLshort *"/> </function> - <function name="Binormal3bEXT"> + <function name="Binormal3bEXT" exec="skip"> <param name="bx" type="GLbyte"/> <param name="by" type="GLbyte"/> <param name="bz" type="GLbyte"/> </function> - <function name="Binormal3bvEXT"> + <function name="Binormal3bvEXT" exec="skip"> <param name="v" type="const GLbyte *"/> </function> - <function name="Binormal3dEXT"> + <function name="Binormal3dEXT" exec="skip"> <param name="bx" type="GLdouble"/> <param name="by" type="GLdouble"/> <param name="bz" type="GLdouble"/> </function> - <function name="Binormal3dvEXT"> + <function name="Binormal3dvEXT" exec="skip"> <param name="v" type="const GLdouble *"/> </function> - <function name="Binormal3fEXT"> + <function name="Binormal3fEXT" exec="skip"> <param name="bx" type="GLfloat"/> <param name="by" type="GLfloat"/> <param name="bz" type="GLfloat"/> </function> - <function name="Binormal3fvEXT"> + <function name="Binormal3fvEXT" exec="skip"> <param name="v" type="const GLfloat *"/> </function> - <function name="Binormal3iEXT"> + <function name="Binormal3iEXT" exec="skip"> <param name="bx" type="GLint"/> <param name="by" type="GLint"/> <param name="bz" type="GLint"/> </function> - <function name="Binormal3ivEXT"> + <function name="Binormal3ivEXT" exec="skip"> <param name="v" type="const GLint *"/> </function> - <function name="Binormal3sEXT"> + <function name="Binormal3sEXT" exec="skip"> <param name="bx" type="GLshort"/> <param name="by" type="GLshort"/> <param name="bz" type="GLshort"/> </function> - <function name="Binormal3svEXT"> + <function name="Binormal3svEXT" exec="skip"> <param name="v" type="const GLshort *"/> </function> - <function name="TangentPointerEXT"> + <function name="TangentPointerEXT" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> </function> - <function name="BinormalPointerEXT"> + <function name="BinormalPointerEXT" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -10113,7 +10348,7 @@ </category> <category name="GL_SGIX_pixel_texture" number="160"> - <function name="PixelTexGenSGIX"> + <function name="PixelTexGenSGIX" exec="skip"> <param name="mode" type="GLenum"/> <glx rop="2059" ignore="true"/> </function> @@ -10123,70 +10358,70 @@ <!-- Extension number 162 is not listed in the extension registry. --> <category name="GL_SUNX_constant_data" number="163"> - <function name="FinishTextureSUNX"> + <function name="FinishTextureSUNX" exec="skip"> </function> </category> <category name="GL_SUN_global_alpha" number="164"> - <function name="GlobalAlphaFactorbSUN"> + <function name="GlobalAlphaFactorbSUN" exec="skip"> <param name="factor" type="GLbyte"/> </function> - <function name="GlobalAlphaFactorsSUN"> + <function name="GlobalAlphaFactorsSUN" exec="skip"> <param name="factor" type="GLshort"/> </function> - <function name="GlobalAlphaFactoriSUN"> + <function name="GlobalAlphaFactoriSUN" exec="skip"> <param name="factor" type="GLint"/> </function> - <function name="GlobalAlphaFactorfSUN"> + <function name="GlobalAlphaFactorfSUN" exec="skip"> <param name="factor" type="GLfloat"/> </function> - <function name="GlobalAlphaFactordSUN"> + <function name="GlobalAlphaFactordSUN" exec="skip"> <param name="factor" type="GLdouble"/> </function> - <function name="GlobalAlphaFactorubSUN"> + <function name="GlobalAlphaFactorubSUN" exec="skip"> <param name="factor" type="GLubyte"/> </function> - <function name="GlobalAlphaFactorusSUN"> + <function name="GlobalAlphaFactorusSUN" exec="skip"> <param name="factor" type="GLushort"/> </function> - <function name="GlobalAlphaFactoruiSUN"> + <function name="GlobalAlphaFactoruiSUN" exec="skip"> <param name="factor" type="GLuint"/> </function> </category> <category name="GL_SUN_triangle_list" number="165"> - <function name="ReplacementCodeuiSUN"> + <function name="ReplacementCodeuiSUN" exec="skip"> <param name="code" type="GLuint"/> </function> - <function name="ReplacementCodeusSUN"> + <function name="ReplacementCodeusSUN" exec="skip"> <param name="code" type="GLushort"/> </function> - <function name="ReplacementCodeubSUN"> + <function name="ReplacementCodeubSUN" exec="skip"> <param name="code" type="GLubyte"/> </function> - <function name="ReplacementCodeuivSUN"> + <function name="ReplacementCodeuivSUN" exec="skip"> <param name="code" type="const GLuint *"/> </function> - <function name="ReplacementCodeusvSUN"> + <function name="ReplacementCodeusvSUN" exec="skip"> <param name="code" type="const GLushort *"/> </function> - <function name="ReplacementCodeubvSUN"> + <function name="ReplacementCodeubvSUN" exec="skip"> <param name="code" type="const GLubyte *"/> </function> - <function name="ReplacementCodePointerSUN"> + <function name="ReplacementCodePointerSUN" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -10194,7 +10429,7 @@ </category> <category name="GL_SUN_vertex" number="166"> - <function name="Color4ubVertex2fSUN"> + <function name="Color4ubVertex2fSUN" exec="skip"> <param name="r" type="GLubyte"/> <param name="g" type="GLubyte"/> <param name="b" type="GLubyte"/> @@ -10203,12 +10438,12 @@ <param name="y" type="GLfloat"/> </function> - <function name="Color4ubVertex2fvSUN"> + <function name="Color4ubVertex2fvSUN" exec="skip"> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Color4ubVertex3fSUN"> + <function name="Color4ubVertex3fSUN" exec="skip"> <param name="r" type="GLubyte"/> <param name="g" type="GLubyte"/> <param name="b" type="GLubyte"/> @@ -10218,12 +10453,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="Color4ubVertex3fvSUN"> + <function name="Color4ubVertex3fvSUN" exec="skip"> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Color3fVertex3fSUN"> + <function name="Color3fVertex3fSUN" exec="skip"> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> <param name="b" type="GLfloat"/> @@ -10232,12 +10467,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="Color3fVertex3fvSUN"> + <function name="Color3fVertex3fvSUN" exec="skip"> <param name="c" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Normal3fVertex3fSUN"> + <function name="Normal3fVertex3fSUN" exec="skip"> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> <param name="nz" type="GLfloat"/> @@ -10246,12 +10481,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="Normal3fVertex3fvSUN"> + <function name="Normal3fVertex3fvSUN" exec="skip"> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="Color4fNormal3fVertex3fSUN"> + <function name="Color4fNormal3fVertex3fSUN" exec="skip"> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> <param name="b" type="GLfloat"/> @@ -10264,13 +10499,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="Color4fNormal3fVertex3fvSUN"> + <function name="Color4fNormal3fVertex3fvSUN" exec="skip"> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fVertex3fSUN"> + <function name="TexCoord2fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="x" type="GLfloat"/> @@ -10278,12 +10513,12 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fVertex3fvSUN"> + <function name="TexCoord2fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord4fVertex4fSUN"> + <function name="TexCoord4fVertex4fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="p" type="GLfloat"/> @@ -10294,12 +10529,12 @@ <param name="w" type="GLfloat"/> </function> - <function name="TexCoord4fVertex4fvSUN"> + <function name="TexCoord4fVertex4fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fColor4ubVertex3fSUN"> + <function name="TexCoord2fColor4ubVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLubyte"/> @@ -10311,13 +10546,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fColor4ubVertex3fvSUN"> + <function name="TexCoord2fColor4ubVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fColor3fVertex3fSUN"> + <function name="TexCoord2fColor3fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> @@ -10328,13 +10563,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fColor3fVertex3fvSUN"> + <function name="TexCoord2fColor3fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fNormal3fVertex3fSUN"> + <function name="TexCoord2fNormal3fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="nx" type="GLfloat"/> @@ -10345,13 +10580,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fNormal3fVertex3fvSUN"> + <function name="TexCoord2fNormal3fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord2fColor4fNormal3fVertex3fSUN"> + <function name="TexCoord2fColor4fNormal3fVertex3fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="r" type="GLfloat"/> @@ -10366,14 +10601,14 @@ <param name="z" type="GLfloat"/> </function> - <function name="TexCoord2fColor4fNormal3fVertex3fvSUN"> + <function name="TexCoord2fColor4fNormal3fVertex3fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="TexCoord4fColor4fNormal3fVertex4fSUN"> + <function name="TexCoord4fColor4fNormal3fVertex4fSUN" exec="skip"> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> <param name="p" type="GLfloat"/> @@ -10391,26 +10626,26 @@ <param name="w" type="GLfloat"/> </function> - <function name="TexCoord4fColor4fNormal3fVertex4fvSUN"> + <function name="TexCoord4fColor4fNormal3fVertex4fvSUN" exec="skip"> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiVertex3fSUN"> + <function name="ReplacementCodeuiVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiVertex3fvSUN"> + <function name="ReplacementCodeuiVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiColor4ubVertex3fSUN"> + <function name="ReplacementCodeuiColor4ubVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="r" type="GLubyte"/> <param name="g" type="GLubyte"/> @@ -10421,13 +10656,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiColor4ubVertex3fvSUN"> + <function name="ReplacementCodeuiColor4ubVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="c" type="const GLubyte *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiColor3fVertex3fSUN"> + <function name="ReplacementCodeuiColor3fVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> @@ -10437,13 +10672,13 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiColor3fVertex3fvSUN"> + <function name="ReplacementCodeuiColor3fVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="c" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiNormal3fVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> @@ -10453,13 +10688,14 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiNormal3fVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiColor4fNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiColor4fNormal3fVertex3fSUN" + exec="skip"> <param name="rc" type="GLuint"/> <param name="r" type="GLfloat"/> <param name="g" type="GLfloat"/> @@ -10473,14 +10709,15 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiColor4fNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiColor4fNormal3fVertex3fvSUN" + exec="skip"> <param name="rc" type="const GLuint *"/> <param name="c" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiTexCoord2fVertex3fSUN"> + <function name="ReplacementCodeuiTexCoord2fVertex3fSUN" exec="skip"> <param name="rc" type="GLuint"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -10489,13 +10726,14 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiTexCoord2fVertex3fvSUN"> + <function name="ReplacementCodeuiTexCoord2fVertex3fvSUN" exec="skip"> <param name="rc" type="const GLuint *"/> <param name="tc" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN" + exec="skip"> <param name="rc" type="GLuint"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -10507,14 +10745,16 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN" + exec="skip"> <param name="rc" type="const GLuint *"/> <param name="tc" type="const GLfloat *"/> <param name="n" type="const GLfloat *"/> <param name="v" type="const GLfloat *"/> </function> - <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN"> + <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN" + exec="skip"> <param name="rc" type="GLuint"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -10530,7 +10770,8 @@ <param name="z" type="GLfloat"/> </function> - <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN"> + <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN" + exec="skip"> <param name="rc" type="const GLuint *"/> <param name="tc" type="const GLfloat *"/> <param name="c" type="const GLfloat *"/> @@ -10603,17 +10844,18 @@ </category> <category name="GL_EXT_vertex_weighting" number="188"> - <function name="VertexWeightfEXT" vectorequiv="VertexWeightfvEXT"> + <function name="VertexWeightfEXT" vectorequiv="VertexWeightfvEXT" + exec="skip"> <param name="weight" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="VertexWeightfvEXT"> + <function name="VertexWeightfvEXT" exec="skip"> <param name="weight" type="const GLfloat *" count="1"/> <glx rop="4135" ignore="true"/> </function> - <function name="VertexWeightPointerEXT"> + <function name="VertexWeightPointerEXT" exec="skip"> <param name="size" type="GLsizei"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -10632,11 +10874,11 @@ </category> <category name="GL_NV_vertex_array_range" number="190"> - <function name="FlushVertexArrayRangeNV"> + <function name="FlushVertexArrayRangeNV" exec="skip"> <glx ignore="true"/> </function> - <function name="VertexArrayRangeNV"> + <function name="VertexArrayRangeNV" exec="skip"> <param name="length" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx ignore="true"/> @@ -10644,31 +10886,31 @@ </category> <category name="GL_NV_register_combiners" number="191"> - <function name="CombinerParameterfvNV"> + <function name="CombinerParameterfvNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="4137" ignore="true"/> </function> - <function name="CombinerParameterfNV"> + <function name="CombinerParameterfNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="4136" ignore="true"/> </function> - <function name="CombinerParameterivNV"> + <function name="CombinerParameterivNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4139" ignore="true"/> </function> - <function name="CombinerParameteriNV"> + <function name="CombinerParameteriNV" exec="skip"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="4138" ignore="true"/> </function> - <function name="CombinerInputNV"> + <function name="CombinerInputNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10678,7 +10920,7 @@ <glx rop="4140" ignore="true"/> </function> - <function name="CombinerOutputNV"> + <function name="CombinerOutputNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="abOutput" type="GLenum"/> @@ -10692,7 +10934,7 @@ <glx rop="4141" ignore="true"/> </function> - <function name="FinalCombinerInputNV"> + <function name="FinalCombinerInputNV" exec="skip"> <param name="variable" type="GLenum"/> <param name="input" type="GLenum"/> <param name="mapping" type="GLenum"/> @@ -10700,7 +10942,7 @@ <glx rop="4142" ignore="true"/> </function> - <function name="GetCombinerInputParameterfvNV"> + <function name="GetCombinerInputParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10709,7 +10951,7 @@ <glx vendorpriv="1270" ignore="true"/> </function> - <function name="GetCombinerInputParameterivNV"> + <function name="GetCombinerInputParameterivNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10718,7 +10960,7 @@ <glx vendorpriv="1271" ignore="true"/> </function> - <function name="GetCombinerOutputParameterfvNV"> + <function name="GetCombinerOutputParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="pname" type="GLenum"/> @@ -10726,7 +10968,7 @@ <glx vendorpriv="1272" ignore="true"/> </function> - <function name="GetCombinerOutputParameterivNV"> + <function name="GetCombinerOutputParameterivNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="pname" type="GLenum"/> @@ -10734,14 +10976,14 @@ <glx vendorpriv="1273" ignore="true"/> </function> - <function name="GetFinalCombinerInputParameterfvNV"> + <function name="GetFinalCombinerInputParameterfvNV" exec="skip"> <param name="variable" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> <glx vendorpriv="1274" ignore="true"/> </function> - <function name="GetFinalCombinerInputParameterivNV"> + <function name="GetFinalCombinerInputParameterivNV" exec="skip"> <param name="variable" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> @@ -10889,7 +11131,7 @@ <glx handcode="true"/> </function> - <function name="WindowPos4dMESA" offset="assign"> + <function name="WindowPos4dMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> @@ -10897,12 +11139,12 @@ <glx ignore="true"/> </function> - <function name="WindowPos4dvMESA" offset="assign"> + <function name="WindowPos4dvMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLdouble *"/> <glx ignore="true"/> </function> - <function name="WindowPos4fMESA" offset="assign"> + <function name="WindowPos4fMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -10910,12 +11152,12 @@ <glx ignore="true"/> </function> - <function name="WindowPos4fvMESA" offset="assign"> + <function name="WindowPos4fvMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="WindowPos4iMESA" offset="assign"> + <function name="WindowPos4iMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -10923,12 +11165,12 @@ <glx ignore="true"/> </function> - <function name="WindowPos4ivMESA" offset="assign"> + <function name="WindowPos4ivMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="WindowPos4sMESA" offset="assign"> + <function name="WindowPos4sMESA" offset="assign" deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -10936,7 +11178,7 @@ <glx ignore="true"/> </function> - <function name="WindowPos4svMESA" offset="assign"> + <function name="WindowPos4svMESA" offset="assign" deprecated="3.1"> <param name="v" type="const GLshort *"/> <glx ignore="true"/> </function> @@ -10971,7 +11213,7 @@ </category> <category name="GL_IBM_vertex_array_lists" number="201"> - <function name="ColorPointerListIBM"> + <function name="ColorPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -10979,7 +11221,7 @@ <param name="ptrstride" type="GLint"/> </function> - <function name="SecondaryColorPointerListIBM"> + <function name="SecondaryColorPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -10987,34 +11229,34 @@ <param name="ptrstride" type="GLint"/> </function> - <function name="EdgeFlagPointerListIBM"> + <function name="EdgeFlagPointerListIBM" exec="skip"> <param name="stride" type="GLint"/> <param name="pointer" type="const GLboolean **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="FogCoordPointerListIBM"> + <function name="FogCoordPointerListIBM" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> <param name="pointer" type="const GLvoid **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="IndexPointerListIBM"> + <function name="IndexPointerListIBM" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> <param name="pointer" type="const GLvoid **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="NormalPointerListIBM"> + <function name="NormalPointerListIBM" exec="skip"> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> <param name="pointer" type="const GLvoid **"/> <param name="ptrstride" type="GLint"/> </function> - <function name="TexCoordPointerListIBM"> + <function name="TexCoordPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -11022,7 +11264,7 @@ <param name="ptrstride" type="GLint"/> </function> - <function name="VertexPointerListIBM"> + <function name="VertexPointerListIBM" exec="skip"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLint"/> @@ -11049,7 +11291,7 @@ </category> <category name="GL_3DFX_tbuffer" number="208"> - <function name="TbufferMask3DFX"> + <function name="TbufferMask3DFX" exec="skip"> <param name="mask" type="GLuint"/> <glx ignore="true"/> </function> @@ -11072,7 +11314,7 @@ <category name="GL_SGIS_texture_color_mask" number="214"> <enum name="TEXTURE_COLOR_WRITEMASK_SGIS" value="0x81EF"/> - <function name="TextureColorMaskSGIS"> + <function name="TextureColorMaskSGIS" exec="skip"> <param name="red" type="GLboolean"/> <param name="green" type="GLboolean"/> <param name="blue" type="GLboolean"/> @@ -11098,43 +11340,43 @@ </category> <category name="GL_NV_fence" number="222"> - <function name="DeleteFencesNV"> + <function name="DeleteFencesNV" exec="skip"> <param name="n" type="GLsizei"/> <param name="fences" type="const GLuint *"/> <glx ignore="true"/> </function> - <function name="GenFencesNV"> + <function name="GenFencesNV" exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="fences" type="GLuint *" output="true" count="n"/> <glx ignore="true"/> </function> - <function name="IsFenceNV"> + <function name="IsFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <return type="GLboolean"/> <glx ignore="true"/> </function> - <function name="TestFenceNV"> + <function name="TestFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <return type="GLboolean"/> <glx ignore="true"/> </function> - <function name="GetFenceivNV"> + <function name="GetFenceivNV" exec="skip"> <param name="fence" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> <glx ignore="true"/> </function> - <function name="FinishFenceNV"> + <function name="FinishFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <glx ignore="true"/> </function> - <function name="SetFenceNV"> + <function name="SetFenceNV" exec="skip"> <param name="fence" type="GLuint"/> <param name="condition" type="GLenum"/> <glx ignore="true"/> @@ -11146,7 +11388,7 @@ </category> <category name="GL_NV_evaluators" number="225"> - <function name="MapControlPointsNV"> + <function name="MapControlPointsNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> @@ -11158,19 +11400,19 @@ <param name="points" type="const GLvoid *"/> </function> - <function name="MapParameterivNV"> + <function name="MapParameterivNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="MapParameterfvNV"> + <function name="MapParameterfvNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> - <function name="GetMapControlPointsNV"> + <function name="GetMapControlPointsNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="type" type="GLenum"/> @@ -11180,33 +11422,33 @@ <param name="points" type="GLvoid *" output="true"/> </function> - <function name="GetMapParameterivNV"> + <function name="GetMapParameterivNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetMapParameterfvNV"> + <function name="GetMapParameterfvNV" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> </function> - <function name="GetMapAttribParameterivNV"> + <function name="GetMapAttribParameterivNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetMapAttribParameterfvNV"> + <function name="GetMapAttribParameterfvNV" exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> </function> - <function name="EvalMapsNV"> + <function name="EvalMapsNV" exec="skip"> <param name="target" type="GLenum"/> <param name="mode" type="GLenum"/> </function> @@ -11218,13 +11460,13 @@ </category> <category name="GL_NV_register_combiners2" number="227"> - <function name="CombinerStageParameterfvNV"> + <function name="CombinerStageParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> - <function name="GetCombinerStageParameterfvNV"> + <function name="GetCombinerStageParameterfvNV" exec="skip"> <param name="stage" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> @@ -11358,7 +11600,8 @@ <enum name="MAP2_VERTEX_ATTRIB14_4_NV" value="0x867E"/> <enum name="MAP2_VERTEX_ATTRIB15_4_NV" value="0x867F"/> - <function name="AreProgramsResidentNV" offset="assign"> + <function name="AreProgramsResidentNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="const GLuint *" count="n"/> <param name="residences" type="GLboolean *" output="true" count="n"/> @@ -11366,26 +11609,30 @@ <glx vendorpriv="1293"/> </function> - <function name="BindProgramNV" offset="assign"> + <function name="BindProgramNV" offset="assign" deprecated="3.1" + mesa_name="-NV"> <param name="target" type="GLenum"/> <param name="program" type="GLuint"/> <glx rop="4180"/> </function> - <function name="DeleteProgramsNV" offset="assign"> + <function name="DeleteProgramsNV" offset="assign" deprecated="3.1" + mesa_name="-NV"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="const GLuint *" count="n"/> <glx vendorpriv="1294"/> </function> - <function name="ExecuteProgramNV" offset="assign"> + <function name="ExecuteProgramNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> <param name="params" type="const GLfloat *" count="4"/> <glx rop="4181"/> </function> - <function name="GenProgramsNV" offset="assign"> + <function name="GenProgramsNV" offset="assign" deprecated="3.1" + mesa_name="-NV"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="GLuint *" output="true" count="n"/> <glx vendorpriv="1295" always_array="true"/> @@ -11397,7 +11644,8 @@ of these functions. --> - <function name="GetProgramParameterdvNV" offset="assign"> + <function name="GetProgramParameterdvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> @@ -11405,7 +11653,8 @@ <glx vendorpriv="1297"/> </function> - <function name="GetProgramParameterfvNV" offset="assign"> + <function name="GetProgramParameterfvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> @@ -11413,21 +11662,24 @@ <glx vendorpriv="1296"/> </function> - <function name="GetProgramivNV" offset="assign"> + <function name="GetProgramivNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx vendorpriv="1298"/> </function> - <function name="GetProgramStringNV" offset="assign"> + <function name="GetProgramStringNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="program" type="GLubyte *" output="true"/> <glx vendorpriv="1299" handcode="server" always_array="true"/> </function> - <function name="GetTrackMatrixivNV" offset="assign"> + <function name="GetTrackMatrixivNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="address" type="GLuint"/> <param name="pname" type="GLenum"/> @@ -11435,41 +11687,47 @@ <glx vendorpriv="1300"/> </function> - <function name="GetVertexAttribdvNV" offset="assign"> + <function name="GetVertexAttribdvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *" output="true" variable_param="pname"/> <glx vendorpriv="1301"/> </function> - <function name="GetVertexAttribfvNV" offset="assign"> + <function name="GetVertexAttribfvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx vendorpriv="1302"/> </function> - <function name="GetVertexAttribivNV" offset="assign"> + <function name="GetVertexAttribivNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx vendorpriv="1303"/> </function> - <function name="GetVertexAttribPointervNV" offset="assign"> + <function name="GetVertexAttribPointervNV" offset="assign" + mesa_name="-NV+ARB"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> <glx handcode="true"/> </function> - <function name="IsProgramNV" offset="assign"> + <function name="IsProgramNV" offset="assign" deprecated="3.1" + mesa_name="-NV+ARB"> <param name="program" type="GLuint"/> <return type="GLboolean"/> <glx vendorpriv="1304"/> </function> - <function name="LoadProgramNV" offset="assign"> + <function name="LoadProgramNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> @@ -11507,7 +11765,8 @@ <param name="params" type="const GLfloat *"/> </function> - <function name="ProgramParameters4dvNV" offset="assign"> + <function name="ProgramParameters4dvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="num" type="GLsizei" counter="true"/> @@ -11515,7 +11774,8 @@ <glx rop="4187"/> </function> - <function name="ProgramParameters4fvNV" offset="assign"> + <function name="ProgramParameters4fvNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="num" type="GLsizei" counter="true"/> @@ -11523,13 +11783,15 @@ <glx rop="4186"/> </function> - <function name="RequestResidentProgramsNV" offset="assign"> + <function name="RequestResidentProgramsNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="const GLuint *" count="n"/> <glx rop="4182"/> </function> - <function name="TrackMatrixNV" offset="assign"> + <function name="TrackMatrixNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="target" type="GLenum"/> <param name="address" type="GLuint"/> <param name="matrix" type="GLenum"/> @@ -11537,7 +11799,8 @@ <glx rop="4188"/> </function> - <function name="VertexAttribPointerNV" offset="assign"> + <function name="VertexAttribPointerNV" offset="assign" deprecated="3.1" + exec="skip"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -11546,43 +11809,50 @@ <glx handcode="true"/> </function> - <function name="VertexAttrib1sNV" offset="assign" vectorequiv="VertexAttrib1svNV"> + <function name="VertexAttrib1sNV" offset="assign" + vectorequiv="VertexAttrib1svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svNV" offset="assign"> + <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4265"/> </function> - <function name="VertexAttrib2sNV" offset="assign" vectorequiv="VertexAttrib2svNV"> + <function name="VertexAttrib2sNV" offset="assign" + vectorequiv="VertexAttrib2svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svNV" offset="assign"> + <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4266"/> </function> - <function name="VertexAttrib3sNV" offset="assign" vectorequiv="VertexAttrib3svNV"> + <function name="VertexAttrib3sNV" offset="assign" + vectorequiv="VertexAttrib3svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svNV" offset="assign"> + <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4267"/> </function> - <function name="VertexAttrib4sNV" offset="assign" vectorequiv="VertexAttrib4svNV"> + <function name="VertexAttrib4sNV" offset="assign" + vectorequiv="VertexAttrib4svNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -11590,49 +11860,61 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svNV" offset="assign"> + <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4268"/> </function> - <function name="VertexAttrib1fNV" offset="assign" vectorequiv="VertexAttrib1fvNV"> + <function name="VertexAttrib1fNV" offset="assign" + vectorequiv="VertexAttrib1fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> </function> - <function name="VertexAttrib1fvNV" offset="assign"> + <function name="VertexAttrib1fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="1"/> <glx rop="4269"/> </function> - <function name="VertexAttrib2fNV" offset="assign" vectorequiv="VertexAttrib2fvNV"> + <function name="VertexAttrib2fNV" offset="assign" + vectorequiv="VertexAttrib2fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="VertexAttrib2fvNV" offset="assign"> + <function name="VertexAttrib2fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="2"/> <glx rop="4270"/> </function> - <function name="VertexAttrib3fNV" offset="assign" vectorequiv="VertexAttrib3fvNV"> + <function name="VertexAttrib3fNV" offset="assign" + vectorequiv="VertexAttrib3fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="VertexAttrib3fvNV" offset="assign"> + <function name="VertexAttrib3fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="3"/> <glx rop="4271"/> </function> - <function name="VertexAttrib4fNV" offset="assign" vectorequiv="VertexAttrib4fvNV"> + <function name="VertexAttrib4fNV" offset="assign" + vectorequiv="VertexAttrib4fvNV" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -11640,49 +11922,57 @@ <param name="w" type="GLfloat"/> </function> - <function name="VertexAttrib4fvNV" offset="assign"> + <function name="VertexAttrib4fvNV" offset="assign" deprecated="3.1" + exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *" count="4"/> <glx rop="4272"/> </function> - <function name="VertexAttrib1dNV" offset="assign" vectorequiv="VertexAttrib1dvNV"> + <function name="VertexAttrib1dNV" offset="assign" + vectorequiv="VertexAttrib1dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvNV" offset="assign"> + <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4273" doubles_in_order="true"/> </function> - <function name="VertexAttrib2dNV" offset="assign" vectorequiv="VertexAttrib2dvNV"> + <function name="VertexAttrib2dNV" offset="assign" + vectorequiv="VertexAttrib2dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvNV" offset="assign"> + <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4274" doubles_in_order="true"/> </function> - <function name="VertexAttrib3dNV" offset="assign" vectorequiv="VertexAttrib3dvNV"> + <function name="VertexAttrib3dNV" offset="assign" + vectorequiv="VertexAttrib3dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvNV" offset="assign"> + <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4275" doubles_in_order="true"/> </function> - <function name="VertexAttrib4dNV" offset="assign" vectorequiv="VertexAttrib4dvNV"> + <function name="VertexAttrib4dNV" offset="assign" + vectorequiv="VertexAttrib4dvNV" deprecated="3.1" exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -11690,13 +11980,16 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvNV" offset="assign"> + <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4276" doubles_in_order="true"/> </function> - <function name="VertexAttrib4ubNV" offset="assign" vectorequiv="VertexAttrib4ubvNV"> + <function name="VertexAttrib4ubNV" offset="assign" + vectorequiv="VertexAttrib4ubvNV" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -11704,97 +11997,111 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4ubvNV" offset="assign"> + <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4277"/> </function> - <function name="VertexAttribs1svNV" offset="assign"> + <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n"/> <glx rop="4202"/> </function> - <function name="VertexAttribs2svNV" offset="assign"> + <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="2"/> <glx rop="4203"/> </function> - <function name="VertexAttribs3svNV" offset="assign"> + <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="3"/> <glx rop="4204"/> </function> - <function name="VertexAttribs4svNV" offset="assign"> + <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="4"/> <glx rop="4205"/> </function> - <function name="VertexAttribs1fvNV" offset="assign"> + <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n"/> <glx rop="4206"/> </function> - <function name="VertexAttribs2fvNV" offset="assign"> + <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="4207"/> </function> - <function name="VertexAttribs3fvNV" offset="assign"> + <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="3"/> <glx rop="4208"/> </function> - <function name="VertexAttribs4fvNV" offset="assign"> + <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="4"/> <glx rop="4209"/> </function> - <function name="VertexAttribs1dvNV" offset="assign"> + <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n"/> <glx rop="4210" doubles_in_order="true"/> </function> - <function name="VertexAttribs2dvNV" offset="assign"> + <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="2"/> <glx rop="4211" doubles_in_order="true"/> </function> - <function name="VertexAttribs3dvNV" offset="assign"> + <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="3"/> <glx rop="4212" doubles_in_order="true"/> </function> - <function name="VertexAttribs4dvNV" offset="assign"> + <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="4"/> <glx rop="4213" doubles_in_order="true"/> </function> - <function name="VertexAttribs4ubvNV" offset="assign"> + <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1" + exec="loopback"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLubyte *" count="n" count_scale="4"/> @@ -11863,22 +12170,22 @@ <size name="GetTexEnviv" mode="get"/> <size name="GetTexEnvfv" mode="get"/> </enum> - <function name="TexBumpParameterfvATI" offset="assign"> + <function name="TexBumpParameterfvATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="const GLfloat *" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="TexBumpParameterivATI" offset="assign"> + <function name="TexBumpParameterivATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="const GLint *" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetTexBumpParameterfvATI" offset="assign"> + <function name="GetTexBumpParameterfvATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat *" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetTexBumpParameterivATI" offset="assign"> + <function name="GetTexBumpParameterivATI" offset="assign" deprecated="3.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLint *" variable_param="pname"/> <glx ignore="true"/> @@ -11997,45 +12304,45 @@ redudndant garbage. There are a lot of enums with the value 0x00000001. --> - <function name="GenFragmentShadersATI" offset="assign"> + <function name="GenFragmentShadersATI" offset="assign" deprecated="3.1"> <return type="GLuint"/> <param name="range" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BindFragmentShaderATI" offset="assign"> + <function name="BindFragmentShaderATI" offset="assign" deprecated="3.1"> <param name="id" type="GLuint"/> <glx ignore="true"/> </function> - <function name="DeleteFragmentShaderATI" offset="assign"> + <function name="DeleteFragmentShaderATI" offset="assign" deprecated="3.1"> <param name="id" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BeginFragmentShaderATI" offset="assign"> + <function name="BeginFragmentShaderATI" offset="assign" deprecated="3.1"> <glx ignore="true"/> </function> - <function name="EndFragmentShaderATI" offset="assign"> + <function name="EndFragmentShaderATI" offset="assign" deprecated="3.1"> <glx ignore="true"/> </function> - <function name="PassTexCoordATI" offset="assign"> + <function name="PassTexCoordATI" offset="assign" deprecated="3.1"> <param name="dst" type="GLuint"/> <param name="coord" type="GLuint"/> <param name="swizzle" type="GLenum"/> <glx ignore="true"/> </function> - <function name="SampleMapATI" offset="assign"> + <function name="SampleMapATI" offset="assign" deprecated="3.1"> <param name="dst" type="GLuint"/> <param name="interp" type="GLuint"/> <param name="swizzle" type="GLenum"/> <glx ignore="true"/> </function> - <function name="ColorFragmentOp1ATI" offset="assign"> + <function name="ColorFragmentOp1ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMask" type="GLuint"/> @@ -12046,7 +12353,7 @@ <glx ignore="true"/> </function> - <function name="ColorFragmentOp2ATI" offset="assign"> + <function name="ColorFragmentOp2ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMask" type="GLuint"/> @@ -12060,7 +12367,7 @@ <glx ignore="true"/> </function> - <function name="ColorFragmentOp3ATI" offset="assign"> + <function name="ColorFragmentOp3ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMask" type="GLuint"/> @@ -12077,7 +12384,7 @@ <glx ignore="true"/> </function> - <function name="AlphaFragmentOp1ATI" offset="assign"> + <function name="AlphaFragmentOp1ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMod" type="GLuint"/> @@ -12087,7 +12394,7 @@ <glx ignore="true"/> </function> - <function name="AlphaFragmentOp2ATI" offset="assign"> + <function name="AlphaFragmentOp2ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMod" type="GLuint"/> @@ -12100,7 +12407,7 @@ <glx ignore="true"/> </function> - <function name="AlphaFragmentOp3ATI" offset="assign"> + <function name="AlphaFragmentOp3ATI" offset="assign" deprecated="3.1"> <param name="op" type="GLenum"/> <param name="dst" type="GLuint"/> <param name="dstMod" type="GLuint"/> @@ -12116,7 +12423,8 @@ <glx ignore="true"/> </function> - <function name="SetFragmentShaderConstantATI" offset="assign"> + <function name="SetFragmentShaderConstantATI" offset="assign" + deprecated="3.1"> <param name="dst" type="GLuint"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> @@ -12134,7 +12442,7 @@ <enum name="QUAD_MESH_SUN" value="0x8614"/> <enum name="TRIANGLE_MESH_SUN" value="0x8615"/> - <function name="DrawMeshArraysSUN"> + <function name="DrawMeshArraysSUN" exec="skip"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> @@ -12190,13 +12498,13 @@ <size name="Get" mode="get"/> </enum> - <function name="PointParameteriNV" offset="assign"> + <function name="PointParameteriNV" offset="assign" mesa_name="-NV"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="4221"/> </function> - <function name="PointParameterivNV" offset="assign"> + <function name="PointParameterivNV" offset="assign" mesa_name="-NV"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4222"/> @@ -12218,7 +12526,8 @@ <size name="Get" mode="get"/> </enum> - <function name="ActiveStencilFaceEXT" offset="assign" static_dispatch="false"> + <function name="ActiveStencilFaceEXT" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="face" type="GLenum"/> <glx rop="4220"/> </function> @@ -12258,7 +12567,9 @@ <enum name="MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV" value="0x8868"/> <enum name="PROGRAM_ERROR_STRING_NV" value="0x8874"/> - <function name="ProgramNamedParameter4fNV" offset="assign" vectorequiv="ProgramNamedParameter4fvNV"> + <function name="ProgramNamedParameter4fNV" offset="assign" + vectorequiv="ProgramNamedParameter4fvNV" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12268,7 +12579,9 @@ <param name="w" type="GLfloat"/> </function> - <function name="ProgramNamedParameter4dNV" offset="assign" vectorequiv="ProgramNamedParameter4dvNV"> + <function name="ProgramNamedParameter4dNV" offset="assign" + vectorequiv="ProgramNamedParameter4dvNV" deprecated="3.1" + exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12278,7 +12591,8 @@ <param name="w" type="GLdouble"/> </function> - <function name="ProgramNamedParameter4fvNV" offset="assign"> + <function name="ProgramNamedParameter4fvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12286,7 +12600,8 @@ <glx rop="4218"/> </function> - <function name="ProgramNamedParameter4dvNV" offset="assign"> + <function name="ProgramNamedParameter4dvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12294,7 +12609,8 @@ <glx rop="4219"/> </function> - <function name="GetProgramNamedParameterfvNV" offset="assign"> + <function name="GetProgramNamedParameterfvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12302,7 +12618,8 @@ <glx vendorpriv="1310" always_array="true"/> </function> - <function name="GetProgramNamedParameterdvNV" offset="assign"> + <function name="GetProgramNamedParameterdvNV" offset="assign" + deprecated="3.1" exec="skip"> <param name="id" type="GLuint"/> <param name="len" type="GLsizei" counter="true"/> <param name="name" type="const GLubyte *" count="len"/> @@ -12452,12 +12769,14 @@ <enum name="BUFFER_FLUSHING_UNMAP_APPLE" count="1" value="0x8A13"> <size name="GetBufferParameteriv" mode="get"/> </enum> - <function name="BufferParameteriAPPLE" offset="assign" static_dispatch="false"> + <function name="BufferParameteriAPPLE" offset="assign" + static_dispatch="false" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="FlushMappedBufferRangeAPPLE" offset="assign" static_dispatch="false"> + <function name="FlushMappedBufferRangeAPPLE" offset="assign" + static_dispatch="false" exec="skip"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="size" type="GLsizeiptr"/> @@ -12503,12 +12822,12 @@ <enum name="TEXTURE_RANGE_POINTER_APPLE" count="1" value="0x85B8"> <size name="GetTexParameterPointervAPPLE" mode="get"/> </enum> - <function name="TextureRangeAPPLE"> + <function name="TextureRangeAPPLE" exec="skip"> <param name="target" type="GLenum"/> <param name="length" type="GLsizei"/> <param name="pointer" type="GLvoid *"/> </function> - <function name="GetTexParameterPointervAPPLE"> + <function name="GetTexParameterPointervAPPLE" exec="skip"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **"/> @@ -12553,7 +12872,8 @@ <param name="zfail" type="GLenum"/> <param name="zpass" type="GLenum"/> </function> - <function name="StencilFuncSeparateATI" offset="assign" static_dispatch="false"> + <function name="StencilFuncSeparateATI" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="frontfunc" type="GLenum"/> <param name="backfunc" type="GLenum"/> <param name="ref" type="GLint"/> @@ -12563,14 +12883,16 @@ </category> <category name="GL_EXT_gpu_program_parameters"> - <function name="ProgramEnvParameters4fvEXT" offset="assign" static_dispatch="false"> + <function name="ProgramEnvParameters4fvEXT" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="params" type="const GLfloat *"/> </function> - <function name="ProgramLocalParameters4fvEXT" offset="assign" static_dispatch="false"> + <function name="ProgramLocalParameters4fvEXT" offset="assign" + static_dispatch="false" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="count" type="GLsizei"/> @@ -12613,17 +12935,17 @@ <enum name="DEBUG_OBJECT_MESA" value="0x8759"/> <enum name="DEBUG_PRINT_MESA" value="0x875A"/> <enum name="DEBUG_ASSERT_MESA" value="0x875B"/> - <function name="CreateDebugObjectMESA"> + <function name="CreateDebugObjectMESA" exec="skip"> <return type="GLhandleARB"/> <glx ignore="true"/> </function> - <function name="ClearDebugLogMESA"> + <function name="ClearDebugLogMESA" exec="skip"> <param name="obj" type="GLhandleARB"/> <param name="logType" type="GLenum"/> <param name="shaderType" type="GLenum"/> <glx ignore="true"/> </function> - <function name="GetDebugLogMESA"> + <function name="GetDebugLogMESA" exec="skip"> <param name="obj" type="GLhandleARB"/> <param name="logType" type="GLenum"/> <param name="shaderType" type="GLenum"/> @@ -12632,7 +12954,7 @@ <param name="debugLog" type="GLcharARB *" output="true"/> <glx ignore="true"/> </function> - <function name="GetDebugLogLengthMESA"> + <function name="GetDebugLogLengthMESA" exec="skip"> <return type="GLsizei"/> <param name="obj" type="GLhandleARB"/> <param name="logType" type="GLenum"/> @@ -12667,14 +12989,14 @@ </category> <category name="GL_SGIX_igloo_interface"> - <function name="IglooInterfaceSGIX"> + <function name="IglooInterfaceSGIX" exec="skip"> <param name="pname" type="GLenum"/> <param name="params" type="const GLvoid *"/> </function> </category> <category name="GL_SGIX_polynomial_ffd"> - <function name="DeformationMap3dSGIX"> + <function name="DeformationMap3dSGIX" exec="skip"> <param name="target" type="GLenum"/> <param name="u1" type="GLdouble"/> <param name="u2" type="GLdouble"/> @@ -12691,7 +13013,7 @@ <param name="points" type="const GLdouble *"/> </function> - <function name="DeformationMap3fSGIX"> + <function name="DeformationMap3fSGIX" exec="skip"> <param name="target" type="GLenum"/> <param name="u1" type="GLfloat"/> <param name="u2" type="GLfloat"/> @@ -12708,11 +13030,11 @@ <param name="points" type="const GLfloat *"/> </function> - <function name="DeformSGIX"> + <function name="DeformSGIX" exec="skip"> <param name="mask" type="GLenum"/> </function> - <function name="LoadIdentityDeformationMapSGIX"> + <function name="LoadIdentityDeformationMapSGIX" exec="skip"> <param name="mask" type="GLenum"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py index 019687912..47f8dd5b9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_XML.py +++ b/mesalib/src/mapi/glapi/gen/gl_XML.py @@ -594,6 +594,46 @@ class gl_parameter(object): return self.type_expr.format_string() +# Regular expression used to parse "mesa_name" attributes. A +# mesa_name attribute describes how to adjust a GL function name +# suffix to obtain the name of the function in Mesa that implements +# the functionality. The attribute string consists of a part preceded +# by a "-", indicating the suffix to remove, and a part preceded by a +# "+" indicating the suffix to add. Either part is optional. +# +# For example: +# +# <function name="EnableIndexedEXT" mesa_name="-EXT">...</function> +# <function name="IsProgramNV" mesa_name="-NV+ARB">...</function> +# +# means that EnableIndexedEXT is implemented by a Mesa function called +# _mesa_EnableIndexed, and IsProgramNV is implemented by a Mesa function +# called _mesa_IsProgramARB. +# +# Note: the prefix "_mesa_" is handled separately, by the "exec" +# attribute. +name_modification_regexp = re.compile( + r'^(-(?P<minus>[a-zA-Z0-9_]+))?(\+(?P<plus>[a-zA-Z0-9_]+))?$') + + +# Interpret a "mesa_name" attribute (see above) to determine the +# appropriate suffix for the Mesa function implementing a piece of GL +# functionality, and return the properly suffixed name. +def interpret_name_modification(name, mod): + m = name_modification_regexp.match(mod) + if m is None: + raise Exception('Unintelligible mesa_name property: {0!r}'.format(mod)) + new_name = name + if m.group('minus'): + if not new_name.endswith(m.group('minus')): + raise Exception( + 'Cannot subtract suffix {0!r} from function {1}'.format( + m.group('minus'), name)) + new_name = new_name[:-len(m.group('minus'))] + if m.group('plus'): + new_name += m.group('plus') + return new_name + class gl_function( gl_item ): def __init__(self, element, context): @@ -606,6 +646,10 @@ class gl_function( gl_item ): self.offset = -1 self.initialized = 0 self.images = [] + self.exec_flavor = 'mesa' + self.desktop = True + self.deprecated = None + self.mesa_name = None # self.entry_point_api_map[name][api] is a decimal value # indicating the earliest version of the given API in which @@ -613,10 +657,18 @@ class gl_function( gl_item ): # the first level of the map; the second level of the map only # lists APIs which contain the entry point in at least one # version. For example, - # self.entry_point_gles_map['ClipPlanex'] == { 'es1': + # self.entry_point_api_map['ClipPlanex'] == { 'es1': # Decimal('1.1') }. self.entry_point_api_map = {} + # self.api_map[api] is a decimal value indicating the earliest + # version of the given API in which ANY alias for the function + # exists. The map only lists APIs which contain the function + # in at least one version. For example, for the ClipPlanex + # function, self.entry_point_api_map == { 'es1': + # Decimal('1.1') }. + self.api_map = {} + self.assign_offset = 0 self.static_entry_points = [] @@ -651,15 +703,30 @@ class gl_function( gl_item ): version_str = element.nsProp(api, None) assert version_str is not None if version_str != 'none': - self.entry_point_api_map[name][api] = Decimal(version_str) + version_decimal = Decimal(version_str) + self.entry_point_api_map[name][api] = version_decimal + if api not in self.api_map or \ + version_decimal < self.api_map[api]: + self.api_map[api] = version_decimal + + exec_flavor = element.nsProp('exec', None) + if exec_flavor: + self.exec_flavor = exec_flavor + + deprecated = element.nsProp('deprecated', None) + if deprecated != 'none': + self.deprecated = Decimal(deprecated) + + if not is_attr_true(element, 'desktop'): + self.desktop = False if alias: true_name = alias else: true_name = name - # Only try to set the offset when a non-alias - # entry-point is being processes. + # Only try to set the offset and mesa_name when a + # non-alias entry-point is being processed. offset = element.nsProp( "offset", None ) if offset: @@ -671,6 +738,12 @@ class gl_function( gl_item ): if offset == "assign": self.assign_offset = 1 + mesa_name = element.nsProp('mesa_name', None) + if mesa_name is None: + self.mesa_name = name + else: + self.mesa_name = interpret_name_modification(name, mesa_name) + if not self.name: self.name = true_name diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml index 7495a2e56..205f74fa9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml @@ -19,13 +19,13 @@ <type name="clampx" size="4" /> <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> @@ -33,12 +33,12 @@ </function> <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="depth" type="GLclampx"/> </function> <function name="Color4x" alias="Color4xOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> @@ -46,23 +46,25 @@ </function> <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0"> + <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0" + desktop="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0"> + <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0" + desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="Frustumx" alias="FrustumxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -72,62 +74,62 @@ </function> <function name="LightModelx" alias="LightModelxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="LightModelxv" alias="LightModelxvOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="Lightx" alias="LightxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="Lightxv" alias="LightxvOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="width" type="GLfixed"/> </function> <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="Materialx" alias="MaterialxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="m" type="const GLfixed *" count="16"/> </function> <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -136,14 +138,14 @@ </function> <function name="Normal3x" alias="Normal3xOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> <function name="Orthox" alias="OrthoxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -153,18 +155,18 @@ </function> <function name="PointSizex" alias="PointSizexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="size" type="GLfixed"/> </function> <function name="PolygonOffsetx" alias="PolygonOffsetxOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> <function name="Rotatex" alias="RotatexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> @@ -172,41 +174,41 @@ </function> <function name="SampleCoveragex" alias="SampleCoveragexOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> <function name="Scalex" alias="ScalexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <function name="TexParameterx" alias="TexParameterxOES" - static_dispatch="false" es1="1.0"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="Translatex" alias="TranslatexOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -214,7 +216,7 @@ <!-- from GL_OES_single_precision --> <function name="Frustumf" alias="FrustumfOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -224,7 +226,7 @@ </function> <function name="Orthof" alias="OrthofOES" static_dispatch="false" - es1="1.0"> + es1="1.0" desktop="false"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -237,7 +239,7 @@ <category name="es1.1"> <!-- from GL_OES_fixed_point --> <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> @@ -249,53 +251,53 @@ </function> <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetMaterialxv" alias="GetMaterialxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="GetTexParameterxv" alias="GetTexParameterxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="PointParameterx" alias="PointParameterxOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> <function name="PointParameterxv" alias="PointParameterxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> <function name="TexParameterxv" alias="TexParameterxvOES" - static_dispatch="false" es1="1.1"> + static_dispatch="false" es1="1.1" desktop="false"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> @@ -303,7 +305,7 @@ <!-- from GL_OES_single_precision --> <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false" - es1="1.1"> + es1="1.1" desktop="false"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py new file mode 100644 index 000000000..adfa5957e --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py @@ -0,0 +1,222 @@ +#!/usr/bin/env python + +# Copyright (C) 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# This script generates the file api_exec.c, which contains +# _mesa_create_exec_table(). It is responsible for populating all +# entries in the "exec" dispatch table that aren't dynamic. + +import collections +import license +import gl_XML +import sys, getopt + + +exec_flavor_map = { + 'check': '_check_', + 'dynamic': None, + 'es': '_es_', + 'loopback': 'loopback_', + 'mesa': '_mesa_', + 'skip': None, + } + + +header = """/** + * \\file api_exec.c + * Initialize dispatch table. + */ + + +#include "main/mfeatures.h" +#include "main/accum.h" +#include "main/api_loopback.h" +#include "main/api_exec.h" +#include "main/arbprogram.h" +#include "main/atifragshader.h" +#include "main/attrib.h" +#include "main/blend.h" +#include "main/bufferobj.h" +#include "main/arrayobj.h" +#include "main/buffers.h" +#include "main/clear.h" +#include "main/clip.h" +#include "main/colortab.h" +#include "main/condrender.h" +#include "main/context.h" +#include "main/convolve.h" +#include "main/depth.h" +#include "main/dlist.h" +#include "main/drawpix.h" +#include "main/drawtex.h" +#include "main/rastpos.h" +#include "main/enable.h" +#include "main/errors.h" +#include "main/es1_conversion.h" +#include "main/eval.h" +#include "main/get.h" +#include "main/feedback.h" +#include "main/fog.h" +#include "main/fbobject.h" +#include "main/framebuffer.h" +#include "main/hint.h" +#include "main/histogram.h" +#include "main/imports.h" +#include "main/light.h" +#include "main/lines.h" +#include "main/matrix.h" +#include "main/multisample.h" +#include "main/pixel.h" +#include "main/pixelstore.h" +#include "main/points.h" +#include "main/polygon.h" +#include "main/querymatrix.h" +#include "main/queryobj.h" +#include "main/readpix.h" +#include "main/samplerobj.h" +#include "main/scissor.h" +#include "main/stencil.h" +#include "main/texenv.h" +#include "main/texgetimage.h" +#include "main/teximage.h" +#include "main/texgen.h" +#include "main/texobj.h" +#include "main/texparam.h" +#include "main/texstate.h" +#include "main/texstorage.h" +#include "main/texturebarrier.h" +#include "main/transformfeedback.h" +#include "main/mtypes.h" +#include "main/varray.h" +#include "main/viewport.h" +#include "main/shaderapi.h" +#include "main/uniforms.h" +#include "main/syncobj.h" +#include "main/dispatch.h" + + +/** + * Initialize a dispatch table with pointers to Mesa's immediate-mode + * commands. + * + * Pointers to glBegin()/glEnd() object commands and a few others + * are provided via the GLvertexformat interface. + * + * \param ctx GL context to which \c exec belongs. + * \param exec dispatch table. + */ +struct _glapi_table * +_mesa_create_exec_table(struct gl_context *ctx) +{ + struct _glapi_table *exec; + + exec = _mesa_alloc_dispatch_table(_gloffset_COUNT); + if (exec == NULL) + return NULL; + +""" + + +footer = """ + return exec; +} +""" + + +class PrintCode(gl_XML.gl_print_base): + + def __init__(self): + gl_XML.gl_print_base.__init__(self) + + self.name = 'gl_genexec.py' + self.license = license.bsd_license_template % ( + 'Copyright (C) 2012 Intel Corporation', + 'Intel Corporation') + + def printRealHeader(self): + print header + + def printRealFooter(self): + print footer + + def printBody(self, api): + # Collect SET_* calls by the condition under which they should + # be called. + settings_by_condition = collections.defaultdict(lambda: []) + for f in api.functionIterateAll(): + if f.exec_flavor not in exec_flavor_map: + raise Exception( + 'Unrecognized exec flavor {0!r}'.format(f.exec_flavor)) + condition_parts = [] + if f.desktop: + if f.deprecated: + condition_parts.append('ctx->API == API_OPENGL') + else: + condition_parts.append('_mesa_is_desktop_gl(ctx)') + if 'es1' in f.api_map: + condition_parts.append('ctx->API == API_OPENGLES') + if 'es2' in f.api_map: + if f.api_map['es2'] == 3: + condition_parts.append('_mesa_is_gles3(ctx)') + else: + condition_parts.append('ctx->API == API_OPENGLES2') + if not condition_parts: + # This function does not exist in any API. + continue + condition = ' || '.join(condition_parts) + prefix = exec_flavor_map[f.exec_flavor] + if prefix is None: + # This function is not implemented, or is dispatched + # dynamically. + continue + settings_by_condition[condition].append( + 'SET_{0}(exec, {1}{2});'.format(f.name, prefix, f.mesa_name)) + # Print out an if statement for each unique condition, with + # the SET_* calls nested inside it. + for condition in sorted(settings_by_condition.keys()): + print ' if ({0}) {{'.format(condition) + for setting in sorted(settings_by_condition[condition]): + print ' {0}'.format(setting) + print ' }' + + +def show_usage(): + print "Usage: %s [-f input_file_name]" % sys.argv[0] + sys.exit(1) + + +if __name__ == '__main__': + file_name = "gl_and_es_API.xml" + + try: + (args, trail) = getopt.getopt(sys.argv[1:], "m:f:") + except Exception,e: + show_usage() + + for (arg,val) in args: + if arg == "-f": + file_name = val + + printer = PrintCode() + + api = gl_XML.parse_GL_API(file_name) + printer.Print(api) diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk index ffa36db4d..ce6d65bbd 100644 --- a/mesalib/src/mesa/Android.gen.mk +++ b/mesalib/src/mesa/Android.gen.mk @@ -32,6 +32,7 @@ intermediates := $(call local-intermediates-dir) # This is the list of auto-generated files: sources and headers sources := \ main/enums.c \ + main/api_exec.c \ program/program_parse.tab.c \ program/lex.yy.c \ main/dispatch.h \ @@ -123,6 +124,12 @@ $(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(intermediates)/main/enums.c: $(dispatch_deps) $(call es-gen) +$(intermediates)/main/api_exec.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_genexec.py +$(intermediates)/main/api_exec.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml + +$(intermediates)/main/api_exec.c: $(dispatch_deps) + $(call es-gen) + GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py GET_HASH_GEN_FLAGS := $(patsubst %,-a %,$(MESA_ENABLED_APIS)) diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 53e5ee8c2..11e034f84 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -441,6 +441,14 @@ env.CodeGenerate( command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) +# The api_exec.c file is generated from the GL/ES API.xml file +env.CodeGenerate( + target = 'main/api_exec.c', + script = GLAPI + 'gen/gl_genexec.py', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' + ) + # We also depend on the auto-generated GL API headers env.Depends(mesa_sources, glapi_headers) diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 24d8d485a..1f2a8a696 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -292,7 +292,6 @@ struct gen_mipmap_state GLuint FBO; GLuint Sampler; GLuint ShaderProg; - GLuint IntegerShaderProg; struct glsl_sampler sampler_1d; struct glsl_sampler sampler_2d; struct glsl_sampler sampler_3d; @@ -3047,27 +3046,6 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, }; struct glsl_sampler *sampler; const char *vs_source; - - static const char *vs_int_source = - "#version 130\n" - "in vec2 position;\n" - "in vec3 textureCoords;\n" - "out vec3 texCoords;\n" - "void main()\n" - "{\n" - " texCoords = textureCoords;\n" - " gl_Position = gl_Vertex;\n" - "}\n"; - static const char *fs_int_source = - "#version 130\n" - "uniform isampler2D tex2d;\n" - "in vec3 texCoords;\n" - "out ivec4 out_color;\n" - "\n" - "void main()\n" - "{\n" - " out_color = texture(tex2d, texCoords.xy);\n" - "}\n"; char *fs_source; GLuint vs, fs; void *mem_ctx; @@ -3162,26 +3140,6 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, link_program_with_debug(ctx, mipmap->ShaderProg); sampler->shader_prog = mipmap->ShaderProg; ralloc_free(mem_ctx); - - if ((_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) || - _mesa_is_gles3(ctx)){ - vs = compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_int_source); - fs = compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_int_source); - - mipmap->IntegerShaderProg = _mesa_CreateProgramObjectARB(); - _mesa_AttachShader(mipmap->IntegerShaderProg, fs); - _mesa_DeleteObjectARB(fs); - _mesa_AttachShader(mipmap->IntegerShaderProg, vs); - _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(mipmap->IntegerShaderProg, 0, "position"); - _mesa_BindAttribLocationARB(mipmap->IntegerShaderProg, 1, "texcoords"); - - /* Note that user-defined out attributes get automatically assigned - * locations starting from 0, so we don't need to explicitly - * BindFragDataLocation to 0. - */ - link_program_with_debug(ctx, mipmap->IntegerShaderProg); - } } @@ -3209,11 +3167,6 @@ meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx, mipmap->sampler_cubemap.shader_prog = 0; mipmap->sampler_1d_array.shader_prog = 0; mipmap->sampler_2d_array.shader_prog = 0; - - if (mipmap->IntegerShaderProg) { - _mesa_DeleteObjectARB(mipmap->IntegerShaderProg); - mipmap->IntegerShaderProg = 0; - } } @@ -3266,11 +3219,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, */ if (use_glsl_version) { setup_glsl_generate_mipmap(ctx, mipmap, target); - - if (texObj->_IsIntegerFormat) - _mesa_UseProgramObjectARB(mipmap->IntegerShaderProg); - else - _mesa_UseProgramObjectARB(mipmap->ShaderProg); + _mesa_UseProgramObjectARB(mipmap->ShaderProg); } else { setup_ff_generate_mipmap(ctx, mipmap); @@ -3294,15 +3243,9 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_GenSamplers(1, &mipmap->Sampler); _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler); - if (use_glsl_version && texObj->_IsIntegerFormat) - _mesa_SamplerParameteri(mipmap->Sampler, - GL_TEXTURE_MIN_FILTER, - GL_NEAREST_MIPMAP_NEAREST); - else - _mesa_SamplerParameteri(mipmap->Sampler, - GL_TEXTURE_MIN_FILTER, - GL_LINEAR_MIPMAP_LINEAR); - + _mesa_SamplerParameteri(mipmap->Sampler, + GL_TEXTURE_MIN_FILTER, + GL_LINEAR_MIPMAP_LINEAR); _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); diff --git a/mesalib/src/mesa/main/.gitignore b/mesalib/src/mesa/main/.gitignore index 12c88372a..b1b83f102 100644 --- a/mesalib/src/mesa/main/.gitignore +++ b/mesalib/src/mesa/main/.gitignore @@ -1,3 +1,4 @@ +api_exec.c
dispatch.h
enums.c
get_es1.c
diff --git a/mesalib/src/mesa/main/accum.c b/mesalib/src/mesa/main/accum.c index e2d7726b5..6416ee860 100644 --- a/mesalib/src/mesa/main/accum.c +++ b/mesalib/src/mesa/main/accum.c @@ -55,7 +55,7 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Accum( GLenum op, GLfloat value ) { GET_CURRENT_CONTEXT(ctx); @@ -106,14 +106,6 @@ _mesa_Accum( GLenum op, GLfloat value ) } -void -_mesa_init_accum_dispatch(struct _glapi_table *disp) -{ - SET_Accum(disp, _mesa_Accum); - SET_ClearAccum(disp, _mesa_ClearAccum); -} - - /** * Clear the accumulation buffer by mapping the renderbuffer and * writing the clear color to it. Called by the driver's implementation diff --git a/mesalib/src/mesa/main/accum.h b/mesalib/src/mesa/main/accum.h index 594a7687d..00c24b2db 100644 --- a/mesalib/src/mesa/main/accum.h +++ b/mesalib/src/mesa/main/accum.h @@ -46,9 +46,8 @@ struct gl_renderbuffer; extern void GLAPIENTRY _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ); - -extern void -_mesa_init_accum_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_Accum( GLenum op, GLfloat value ); extern void _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value); diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c deleted file mode 100644 index bc5f71f0d..000000000 --- a/mesalib/src/mesa/main/api_exec.c +++ /dev/null @@ -1,935 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 7.1 - * - * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -/** - * \file api_exec.c - * Initialize dispatch table with the immidiate mode functions. - */ - - -#include "mfeatures.h" -#include "accum.h" -#include "api_loopback.h" -#include "api_exec.h" -#include "arbprogram.h" -#include "atifragshader.h" -#include "attrib.h" -#include "blend.h" -#include "bufferobj.h" -#include "arrayobj.h" -#include "buffers.h" -#include "clear.h" -#include "clip.h" -#include "colortab.h" -#include "condrender.h" -#include "context.h" -#include "convolve.h" -#include "depth.h" -#include "dlist.h" -#include "drawpix.h" -#include "drawtex.h" -#include "rastpos.h" -#include "enable.h" -#include "errors.h" -#include "es1_conversion.h" -#include "eval.h" -#include "get.h" -#include "feedback.h" -#include "fog.h" -#include "fbobject.h" -#include "framebuffer.h" -#include "hint.h" -#include "histogram.h" -#include "imports.h" -#include "light.h" -#include "lines.h" -#include "matrix.h" -#include "multisample.h" -#include "pixel.h" -#include "pixelstore.h" -#include "points.h" -#include "polygon.h" -#include "querymatrix.h" -#include "queryobj.h" -#include "readpix.h" -#include "samplerobj.h" -#include "scissor.h" -#include "stencil.h" -#include "texenv.h" -#include "texgetimage.h" -#include "teximage.h" -#include "texgen.h" -#include "texobj.h" -#include "texparam.h" -#include "texstate.h" -#include "texstorage.h" -#include "texturebarrier.h" -#include "transformfeedback.h" -#include "mtypes.h" -#include "varray.h" -#include "viewport.h" -#include "shaderapi.h" -#include "uniforms.h" -#include "syncobj.h" -#include "main/dispatch.h" - - -/** - * Initialize a dispatch table with pointers to Mesa's immediate-mode - * commands. - * - * Pointers to glBegin()/glEnd() object commands and a few others - * are provided via the GLvertexformat interface. - * - * \param ctx GL context to which \c exec belongs. - * \param exec dispatch table. - */ -struct _glapi_table * -_mesa_create_exec_table(struct gl_context *ctx) -{ - struct _glapi_table *exec; - - exec = _mesa_alloc_dispatch_table(_gloffset_COUNT); - if (exec == NULL) - return NULL; - - _mesa_loopback_init_api_table(ctx, exec); - - /* load the dispatch slots we understand */ - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_AlphaFunc(exec, _mesa_AlphaFunc); - } - - SET_BlendFunc(exec, _mesa_BlendFunc); - SET_Clear(exec, _mesa_Clear); - SET_ClearColor(exec, _mesa_ClearColor); - SET_ClearStencil(exec, _mesa_ClearStencil); - SET_ColorMask(exec, _mesa_ColorMask); - SET_CullFace(exec, _mesa_CullFace); - SET_Disable(exec, _mesa_Disable); - if (ctx->API == API_OPENGL || ctx->API == API_OPENGL_CORE) - SET_DrawBuffer(exec, _mesa_DrawBuffer); - if (ctx->API != API_OPENGLES) { - SET_ReadBuffer(exec, _mesa_ReadBuffer); - } - SET_Enable(exec, _mesa_Enable); - SET_Finish(exec, _mesa_Finish); - SET_Flush(exec, _mesa_Flush); - SET_FrontFace(exec, _mesa_FrontFace); - if (ctx->API == API_OPENGL) { - SET_Frustum(exec, _mesa_Frustum); - } - SET_GetError(exec, _mesa_GetError); - SET_GetFloatv(exec, _mesa_GetFloatv); - SET_GetString(exec, _mesa_GetString); - if (ctx->API == API_OPENGL) { - SET_LineStipple(exec, _mesa_LineStipple); - } - SET_LineWidth(exec, _mesa_LineWidth); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_LoadIdentity(exec, _mesa_LoadIdentity); - SET_LoadMatrixf(exec, _mesa_LoadMatrixf); - } - if (ctx->API != API_OPENGLES2) { - SET_LogicOp(exec, _mesa_LogicOp); - } - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_MatrixMode(exec, _mesa_MatrixMode); - SET_MultMatrixf(exec, _mesa_MultMatrixf); - } - if (ctx->API == API_OPENGL) { - SET_Ortho(exec, _mesa_Ortho); - } - SET_PixelStorei(exec, _mesa_PixelStorei); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_PopMatrix(exec, _mesa_PopMatrix); - SET_PushMatrix(exec, _mesa_PushMatrix); - SET_Rotatef(exec, _mesa_Rotatef); - SET_Scalef(exec, _mesa_Scalef); - } - SET_Scissor(exec, _mesa_Scissor); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_ShadeModel(exec, _mesa_ShadeModel); - } - SET_StencilFunc(exec, _mesa_StencilFunc); - SET_StencilMask(exec, _mesa_StencilMask); - SET_StencilOp(exec, _mesa_StencilOp); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_TexEnvfv(exec, _mesa_TexEnvfv); - SET_TexEnvi(exec, _mesa_TexEnvi); - } - SET_TexImage2D(exec, _mesa_TexImage2D); - SET_TexParameteri(exec, _mesa_TexParameteri); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_Translatef(exec, _mesa_Translatef); - } - SET_Viewport(exec, _mesa_Viewport); - - if (ctx->API == API_OPENGL) { - _mesa_init_accum_dispatch(exec); - _mesa_init_dlist_dispatch(exec); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_ClearDepth(exec, _mesa_ClearDepth); - } - - if (ctx->API == API_OPENGL) { - SET_ClearIndex(exec, _mesa_ClearIndex); - SET_ClipPlane(exec, _mesa_ClipPlane); - SET_ColorMaterial(exec, _mesa_ColorMaterial); - } - SET_DepthFunc(exec, _mesa_DepthFunc); - SET_DepthMask(exec, _mesa_DepthMask); - - if (_mesa_is_desktop_gl(ctx)) { - SET_DepthRange(exec, _mesa_DepthRange); - } - - if (ctx->API == API_OPENGL) { - _mesa_init_drawpix_dispatch(exec); - } - if (ctx->API == API_OPENGL) { - _mesa_init_feedback_dispatch(exec); - } - - if (ctx->API == API_OPENGL) { - SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT); - SET_Fogi(exec, _mesa_Fogi); - SET_Fogiv(exec, _mesa_Fogiv); - SET_GetClipPlane(exec, _mesa_GetClipPlane); - } - if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) { - SET_Fogf(exec, _mesa_Fogf); - SET_Fogfv(exec, _mesa_Fogfv); - } - SET_GetBooleanv(exec, _mesa_GetBooleanv); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetDoublev(exec, _mesa_GetDoublev); - } - SET_GetIntegerv(exec, _mesa_GetIntegerv); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_GetLightfv(exec, _mesa_GetLightfv); - SET_GetMaterialfv(exec, _mesa_GetMaterialfv); - SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv); - SET_GetTexEnviv(exec, _mesa_GetTexEnviv); - } - if (ctx->API == API_OPENGL) { - SET_GetLightiv(exec, _mesa_GetLightiv); - SET_GetMaterialiv(exec, _mesa_GetMaterialiv); - SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv); - SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv); - } - SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv); - SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetTexImage(exec, _mesa_GetTexImage); - } - SET_Hint(exec, _mesa_Hint); - if (ctx->API == API_OPENGL) { - SET_IndexMask(exec, _mesa_IndexMask); - } - SET_IsEnabled(exec, _mesa_IsEnabled); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_LightModelf(exec, _mesa_LightModelf); - SET_LightModelfv(exec, _mesa_LightModelfv); - SET_Lightf(exec, _mesa_Lightf); - SET_Lightfv(exec, _mesa_Lightfv); - } - if (ctx->API == API_OPENGL) { - SET_LightModeli(exec, _mesa_LightModeli); - SET_LightModeliv(exec, _mesa_LightModeliv); - SET_Lighti(exec, _mesa_Lighti); - SET_Lightiv(exec, _mesa_Lightiv); - SET_LoadMatrixd(exec, _mesa_LoadMatrixd); - } - - if (ctx->API == API_OPENGL) { - _mesa_init_eval_dispatch(exec); - SET_MultMatrixd(exec, _mesa_MultMatrixd); - _mesa_init_pixel_dispatch(exec); - } - - if (ctx->API != API_OPENGLES2) { - SET_PointSize(exec, _mesa_PointSize); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_PixelStoref(exec, _mesa_PixelStoref); - SET_PolygonMode(exec, _mesa_PolygonMode); - } - - SET_PolygonOffset(exec, _mesa_PolygonOffset); - if (ctx->API == API_OPENGL) { - SET_PolygonStipple(exec, _mesa_PolygonStipple); - _mesa_init_attrib_dispatch(exec); - _mesa_init_rastpos_dispatch(exec); - } - - SET_ReadPixels(exec, _mesa_ReadPixels); - if (ctx->API == API_OPENGL) { - SET_Rotated(exec, _mesa_Rotated); - SET_Scaled(exec, _mesa_Scaled); - SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT); - } - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_TexEnvf(exec, _mesa_TexEnvf); - SET_TexEnviv(exec, _mesa_TexEnviv); - } - - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - _mesa_init_texgen_dispatch(ctx, exec); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_TexImage1D(exec, _mesa_TexImage1D); - } - SET_TexParameterf(exec, _mesa_TexParameterf); - SET_TexParameterfv(exec, _mesa_TexParameterfv); - SET_TexParameteriv(exec, _mesa_TexParameteriv); - if (ctx->API == API_OPENGL) { - SET_Translated(exec, _mesa_Translated); - } - - /* 1.1 */ - SET_BindTexture(exec, _mesa_BindTexture); - SET_DeleteTextures(exec, _mesa_DeleteTextures); - SET_GenTextures(exec, _mesa_GenTextures); - if (ctx->API == API_OPENGL) { - SET_AreTexturesResident(exec, _mesa_AreTexturesResident); - } - if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) { - SET_ColorPointer(exec, _mesa_ColorPointer); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D); - SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D); - SET_TexSubImage1D(exec, _mesa_TexSubImage1D); - } - - SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D); - SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D); - SET_TexSubImage2D(exec, _mesa_TexSubImage2D); - - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_DisableClientState(exec, _mesa_DisableClientState); - SET_EnableClientState(exec, _mesa_EnableClientState); - } - if (ctx->API == API_OPENGL) { - SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer); - SET_IndexPointer(exec, _mesa_IndexPointer); - SET_InterleavedArrays(exec, _mesa_InterleavedArrays); - } - if (ctx->API != API_OPENGLES2) { - /* Note glGetPointerv is deprecated in GL CORE 3.1 through 4.2, but - * was re-added in GL CORE 4.3. We will just keep the function - * around in all GL CORE contexts. - */ - SET_GetPointerv(exec, _mesa_GetPointerv); - } - SET_IsTexture(exec, _mesa_IsTexture); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_NormalPointer(exec, _mesa_NormalPointer); - SET_TexCoordPointer(exec, _mesa_TexCoordPointer); - SET_VertexPointer(exec, _mesa_VertexPointer); - } - if (ctx->API == API_OPENGL) { - SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures); - } - - /* 1.2 */ - if (ctx->API != API_OPENGLES) { - SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D); - SET_TexImage3D(exec, _mesa_TexImage3D); - SET_TexSubImage3D(exec, _mesa_TexSubImage3D); - } - - /* OpenGL 1.2 GL_ARB_imaging */ - if (ctx->API != API_OPENGLES) { - SET_BlendColor(exec, _mesa_BlendColor); - } - SET_BlendEquation(exec, _mesa_BlendEquation); - SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT); - - if (ctx->API == API_OPENGL) { - _mesa_init_colortable_dispatch(exec); - _mesa_init_convolve_dispatch(exec); - _mesa_init_histogram_dispatch(exec); - } - - /* OpenGL 2.0 */ - if (ctx->API != API_OPENGLES) { - SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate); - SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate); - SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate); - } - - _mesa_init_shader_dispatch(ctx, exec); - _mesa_init_shader_uniform_dispatch(ctx, exec); - - /* 2. GL_EXT_blend_color */ -#if 0 -/* SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */ -#endif - - /* 3. GL_EXT_polygon_offset */ - if (ctx->API == API_OPENGL) { - SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT); - } - - /* 6. GL_EXT_texture3d */ -#if 0 -/* SET_CopyTexSubImage3DEXT(exec, _mesa_CopyTexSubImage3D); */ -/* SET_TexImage3DEXT(exec, _mesa_TexImage3DEXT); */ -/* SET_TexSubImage3DEXT(exec, _mesa_TexSubImage3D); */ -#endif - - /* 11. GL_EXT_histogram */ -#if 0 - if (ctx->API == API_OPENGL) { - SET_GetHistogramEXT(exec, _mesa_GetHistogram); - SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv); - SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv); - SET_GetMinmaxEXT(exec, _mesa_GetMinmax); - SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv); - SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv); - } -#endif - - /* 14. SGI_color_table */ -#if 0 - if (ctx->API == API_OPENGL) { - SET_ColorTableSGI(exec, _mesa_ColorTable); - SET_ColorSubTableSGI(exec, _mesa_ColorSubTable); - SET_GetColorTableSGI(exec, _mesa_GetColorTable); - SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv); - } -#endif - - /* 30. GL_EXT_vertex_array */ - if (ctx->API == API_OPENGL) { - SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT); - SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT); - SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT); - SET_NormalPointerEXT(exec, _mesa_NormalPointerEXT); - SET_TexCoordPointerEXT(exec, _mesa_TexCoordPointerEXT); - SET_VertexPointerEXT(exec, _mesa_VertexPointerEXT); - } - - /* 37. GL_EXT_blend_minmax */ -#if 0 - SET_BlendEquationEXT(exec, _mesa_BlendEquationEXT); -#endif - - /* 54. GL_EXT_point_parameters */ - if (ctx->API != API_OPENGLES2) { - SET_PointParameterfEXT(exec, _mesa_PointParameterf); - SET_PointParameterfvEXT(exec, _mesa_PointParameterfv); - } - - /* 95. GL_ARB_ES2_compatibility */ - SET_ClearDepthf(exec, _mesa_ClearDepthf); - SET_DepthRangef(exec, _mesa_DepthRangef); - - /* 97. GL_EXT_compiled_vertex_array */ - if (ctx->API == API_OPENGL) { - SET_LockArraysEXT(exec, _mesa_LockArraysEXT); - SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT); - } - - /* 148. GL_EXT_multi_draw_arrays */ - SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT); - - /* 173. GL_INGR_blend_func_separate */ - SET_BlendFuncSeparateEXT(exec, _mesa_BlendFuncSeparateEXT); - - /* 196. GL_MESA_resize_buffers */ - if (_mesa_is_desktop_gl(ctx)) { - SET_ResizeBuffersMESA(exec, _mesa_ResizeBuffersMESA); - } - - /* 197. GL_MESA_window_pos */ - /* part of _mesa_init_rastpos_dispatch(exec); */ - - /* 200. GL_IBM_multimode_draw_arrays */ - if (_mesa_is_desktop_gl(ctx)) { - SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM); - SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM); - } - - /* 233. GL_NV_vertex_program */ - if (ctx->API == API_OPENGL) { - SET_BindProgramNV(exec, _mesa_BindProgram); - SET_DeleteProgramsNV(exec, _mesa_DeletePrograms); - SET_GenProgramsNV(exec, _mesa_GenPrograms); - SET_IsProgramNV(exec, _mesa_IsProgramARB); - /* glVertexAttrib*NV functions handled in api_loopback.c */ - } - - /* 273. GL_APPLE_vertex_array_object */ - if (ctx->API == API_OPENGL) { - SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE); - SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE); - } - /* Reused by ARB_vertex_array_object / OES_vertex_array_object */ - if (ctx->API != API_OPENGLES) { - SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE); - SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE); - } - - /* 262. GL_NV_point_sprite */ - if (_mesa_is_desktop_gl(ctx)) { - SET_PointParameteriNV(exec, _mesa_PointParameteri); - SET_PointParameterivNV(exec, _mesa_PointParameteriv); - } - - /* 268. GL_EXT_stencil_two_side */ - if (ctx->API == API_OPENGL) { - SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT); - } - - /* 285. GL_NV_primitive_restart */ - if (_mesa_is_desktop_gl(ctx)) { - SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex); - } - - /* ???. GL_EXT_depth_bounds_test */ - if (_mesa_is_desktop_gl(ctx)) { - SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT); - } - - /* 352. GL_EXT_transform_feedback */ - /* ARB 93. GL_ARB_transform_feedback2 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_transform_feedback_dispatch(ctx, exec); - } - - /* 364. GL_EXT_provoking_vertex */ - if (_mesa_is_desktop_gl(ctx)) { - SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT); - } - - /* ARB 1. GL_ARB_multitexture */ - SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB); - if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB); - } - - /* ARB 3. GL_ARB_transpose_matrix */ - if (ctx->API == API_OPENGL) { - SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB); - SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB); - SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB); - SET_MultTransposeMatrixfARB(exec, _mesa_MultTransposeMatrixfARB); - } - - /* ARB 5. GL_ARB_multisample */ - SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB); - - /* ARB 12. GL_ARB_texture_compression */ - if (_mesa_is_desktop_gl(ctx)) { - SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB); - SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB); - SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB); - } - - if (ctx->API != API_OPENGLES) { - SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB); - } - SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB); - if (ctx->API != API_OPENGLES) { - SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB); - } - SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB); - - /* ARB 104. GL_ARB_robustness */ - if (_mesa_is_desktop_gl(ctx)) { - SET_GetnCompressedTexImageARB(exec, _mesa_GetnCompressedTexImageARB); - } - - /* ARB 14. GL_ARB_point_parameters */ - /* reuse EXT_point_parameters functions */ - - /* ARB 26. GL_ARB_vertex_program */ - /* ARB 27. GL_ARB_fragment_program */ - /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */ - /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */ - /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */ - /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */ - /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */ - /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */ - /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */ - /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */ - /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */ - /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */ - /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */ - /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */ - /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */ - /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */ - /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */ - /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */ - /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */ - /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */ - /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */ - /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */ - /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */ - /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */ - /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */ - /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */ - /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */ - /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */ - /* glVertexAttrib4bvARB handled in api_loopback.c */ - /* glVertexAttrib4ivARB handled in api_loopback.c */ - /* glVertexAttrib4ubvARB handled in api_loopback.c */ - /* glVertexAttrib4usvARB handled in api_loopback.c */ - /* glVertexAttrib4uivARB handled in api_loopback.c */ - /* glVertexAttrib4NbvARB handled in api_loopback.c */ - /* glVertexAttrib4NsvARB handled in api_loopback.c */ - /* glVertexAttrib4NivARB handled in api_loopback.c */ - /* glVertexAttrib4NusvARB handled in api_loopback.c */ - /* glVertexAttrib4NuivARB handled in api_loopback.c */ - if (ctx->API != API_OPENGLES) { - SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB); - SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB); - SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB); - } - if (_mesa_is_desktop_gl(ctx)) { - /* glBindProgramARB aliases glBindProgramNV */ - /* glDeleteProgramsARB aliases glDeleteProgramsNV */ - /* glGenProgramsARB aliases glGenProgramsNV */ - /* glIsProgramARB aliases glIsProgramNV */ - SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB); - } - if (ctx->API == API_OPENGL) { - SET_ProgramStringARB(exec, _mesa_ProgramStringARB); - } - - if (ctx->API != API_OPENGLES) { - SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB); - SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB); - SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervARB); - } - if (ctx->API == API_OPENGL) { - SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); - SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB); - SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB); - SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB); - SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB); - SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB); - SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB); - SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB); - SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB); - SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB); - SET_GetProgramivARB(exec, _mesa_GetProgramivARB); - SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB); - SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB); - SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB); - } - - /* ARB 28. GL_ARB_vertex_buffer_object */ - _mesa_init_bufferobj_dispatch(ctx, exec); - - /* ARB 29. GL_ARB_occlusion_query */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_queryobj_dispatch(ctx, exec); - } - - /* ARB 37. GL_ARB_draw_buffers */ - if (ctx->API != API_OPENGLES) { - SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB); - } - - /* ARB 66. GL_ARB_sync */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_sync_dispatch(exec); - } - - /* ARB 104. GL_ARB_debug_output */ - if (_mesa_is_desktop_gl(ctx)) { - _mesa_init_errors_dispatch(exec); - } - - /* ARB 105. GL_ARB_robustness */ - if (_mesa_is_desktop_gl(ctx)) { - SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB); - SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB); - SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB); - SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB); - } - - /* GL_ATI_fragment_shader */ - if (ctx->API == API_OPENGL) { - _mesa_init_ati_fragment_shader_dispatch(exec); - } - - /* GL_ATI_envmap_bumpmap */ - if (ctx->API == API_OPENGL) { - SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI); - SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI); - SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI); - SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI); - } - - SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT); - SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT); - SET_DeleteRenderbuffersEXT(exec, _mesa_DeleteRenderbuffersEXT); - SET_GenRenderbuffersEXT(exec, _mesa_GenRenderbuffersEXT); - SET_RenderbufferStorageEXT(exec, _mesa_RenderbufferStorageEXT); - SET_GetRenderbufferParameterivEXT(exec, _mesa_GetRenderbufferParameterivEXT); - SET_IsFramebufferEXT(exec, _mesa_IsFramebufferEXT); - SET_BindFramebufferEXT(exec, _mesa_BindFramebufferEXT); - SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT); - SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT); - SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT); - if (_mesa_is_desktop_gl(ctx)) { - SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT); - } - SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT); - if (ctx->API != API_OPENGLES) { - SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT); - } - SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT); - SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT); - SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT); - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT); - } - - /* GL_EXT_gpu_program_parameters */ - if (ctx->API == API_OPENGL) { - SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT); - SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT); - } - - /* GL_MESA_texture_array / GL_EXT_texture_array */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT); - } - - /* GL_ATI_separate_stencil */ - if (ctx->API == API_OPENGL) { - SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI); - } - - /* The ARB_fbo functions are the union of - * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array - */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample); - } - - /* GL_ARB_map_buffer_range / GL_EXT_map_buffer_range */ - SET_MapBufferRange(exec, _mesa_MapBufferRange); - SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange); - - /* GL_ARB_copy_buffer */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData); - } - - /* GL_ARB_vertex_array_object / GL_OES_vertex_array_object */ - if (ctx->API != API_OPENGLES) { - SET_BindVertexArray(exec, _mesa_BindVertexArray); - SET_GenVertexArrays(exec, _mesa_GenVertexArrays); - } - - /* GL_EXT_draw_buffers2 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed); - SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv); - SET_EnableIndexedEXT(exec, _mesa_EnableIndexed); - SET_DisableIndexedEXT(exec, _mesa_DisableIndexed); - SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed); - } - - /* GL_NV_conditional_render */ - if (_mesa_is_desktop_gl(ctx)) { - SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender); - SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender); - } - - SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES); - SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES); - - if (_mesa_is_desktop_gl(ctx)) { - SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE); - SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE); - SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_ClampColorARB(exec, _mesa_ClampColorARB); - } - - /* GL_EXT_texture_integer */ - if (_mesa_is_desktop_gl(ctx)) { - SET_ClearColorIiEXT(exec, _mesa_ClearColorIiEXT); - SET_ClearColorIuiEXT(exec, _mesa_ClearColorIuiEXT); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_GetTexParameterIivEXT(exec, _mesa_GetTexParameterIiv); - SET_GetTexParameterIuivEXT(exec, _mesa_GetTexParameterIuiv); - SET_TexParameterIivEXT(exec, _mesa_TexParameterIiv); - SET_TexParameterIuivEXT(exec, _mesa_TexParameterIuiv); - } - - /* GL_EXT_gpu_shader4 / OpenGL 3.0 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_GetVertexAttribIivEXT(exec, _mesa_GetVertexAttribIiv); - SET_GetVertexAttribIuivEXT(exec, _mesa_GetVertexAttribIuiv); - SET_VertexAttribIPointerEXT(exec, _mesa_VertexAttribIPointer); - } - - /* GL 3.0 (functions not covered by other extensions) */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_ClearBufferiv(exec, _mesa_ClearBufferiv); - SET_ClearBufferuiv(exec, _mesa_ClearBufferuiv); - SET_ClearBufferfv(exec, _mesa_ClearBufferfv); - SET_ClearBufferfi(exec, _mesa_ClearBufferfi); - SET_GetStringi(exec, _mesa_GetStringi); - } - - /* GL_ARB_instanced_arrays */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor); - } - - /* GL_ARB_draw_buffer_blend */ - if (_mesa_is_desktop_gl(ctx)) { - SET_BlendFunciARB(exec, _mesa_BlendFunci); - SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei); - SET_BlendEquationiARB(exec, _mesa_BlendEquationi); - SET_BlendEquationSeparateiARB(exec, _mesa_BlendEquationSeparatei); - } - - /* GL_NV_texture_barrier */ - if (_mesa_is_desktop_gl(ctx)) { - SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV); - } - - /* GL_ARB_texture_buffer_object */ - if (_mesa_is_desktop_gl(ctx)) { - SET_TexBufferARB(exec, _mesa_TexBuffer); - } - - /* GL_ARB_texture_storage */ - if (_mesa_is_desktop_gl(ctx)) { - SET_TexStorage1D(exec, _mesa_TexStorage1D); - SET_TextureStorage1DEXT(exec, _mesa_TextureStorage1DEXT); - } - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_TexStorage2D(exec, _mesa_TexStorage2D); - SET_TexStorage3D(exec, _mesa_TexStorage3D); - } - if (_mesa_is_desktop_gl(ctx)) { - SET_TextureStorage2DEXT(exec, _mesa_TextureStorage2DEXT); - SET_TextureStorage3DEXT(exec, _mesa_TextureStorage3DEXT); - } - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - _mesa_init_sampler_object_dispatch(ctx, exec); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_InvalidateTexSubImage(exec, _mesa_InvalidateTexSubImage); - SET_InvalidateTexImage(exec, _mesa_InvalidateTexImage); - } - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_InvalidateSubFramebuffer(exec, _mesa_InvalidateSubFramebuffer); - SET_InvalidateFramebuffer(exec, _mesa_InvalidateFramebuffer); - } - -#if FEATURE_ES1 - if (ctx->API == API_OPENGLES) { - SET_AlphaFuncxOES(exec, _es_AlphaFuncx); - SET_ClearColorxOES(exec, _es_ClearColorx); - SET_ClearDepthxOES(exec, _es_ClearDepthx); - SET_ClipPlanefOES(exec, _es_ClipPlanef); - SET_ClipPlanexOES(exec, _es_ClipPlanex); - SET_Color4xOES(exec, _es_Color4x); - SET_DepthRangexOES(exec, _es_DepthRangex); - SET_DrawTexfOES(exec, _mesa_DrawTexf); - SET_DrawTexfvOES(exec, _mesa_DrawTexfv); - SET_DrawTexiOES(exec, _mesa_DrawTexi); - SET_DrawTexivOES(exec, _mesa_DrawTexiv); - SET_DrawTexsOES(exec, _mesa_DrawTexs); - SET_DrawTexsvOES(exec, _mesa_DrawTexsv); - SET_DrawTexxOES(exec, _es_DrawTexxOES); - SET_DrawTexxvOES(exec, _es_DrawTexxvOES); - SET_FogxOES(exec, _es_Fogx); - SET_FogxvOES(exec, _es_Fogxv); - SET_FrustumfOES(exec, _es_Frustumf); - SET_FrustumxOES(exec, _es_Frustumx); - SET_GetClipPlanefOES(exec, _es_GetClipPlanef); - SET_GetClipPlanexOES(exec, _es_GetClipPlanex); - SET_GetFixedvOES(exec, _mesa_GetFixedv); - SET_GetLightxvOES(exec, _es_GetLightxv); - SET_GetMaterialxvOES(exec, _es_GetMaterialxv); - SET_GetTexEnvxvOES(exec, _es_GetTexEnvxv); - SET_GetTexGenxvOES(exec, _check_GetTexGenxvOES); - SET_GetTexParameterxvOES(exec, _es_GetTexParameterxv); - SET_LightModelxOES(exec, _es_LightModelx); - SET_LightModelxvOES(exec, _es_LightModelxv); - SET_LightxOES(exec, _es_Lightx); - SET_LightxvOES(exec, _es_Lightxv); - SET_LineWidthxOES(exec, _es_LineWidthx); - SET_LoadMatrixxOES(exec, _es_LoadMatrixx); - SET_MaterialxOES(exec, _es_Materialx); - SET_MaterialxvOES(exec, _es_Materialxv); - SET_MultMatrixxOES(exec, _es_MultMatrixx); - SET_MultiTexCoord4xOES(exec, _es_MultiTexCoord4x); - SET_Normal3xOES(exec, _es_Normal3x); - SET_OrthofOES(exec, _es_Orthof); - SET_OrthoxOES(exec, _es_Orthox); - SET_PointParameterxOES(exec, _es_PointParameterx); - SET_PointParameterxvOES(exec, _es_PointParameterxv); - SET_PointSizePointerOES(exec, _mesa_PointSizePointer); - SET_PointSizexOES(exec, _es_PointSizex); - SET_PolygonOffsetxOES(exec, _es_PolygonOffsetx); - SET_QueryMatrixxOES(exec, _es_QueryMatrixxOES); - SET_RotatexOES(exec, _es_Rotatex); - SET_SampleCoveragexOES(exec, _es_SampleCoveragex); - SET_ScalexOES(exec, _es_Scalex); - SET_TexEnvxOES(exec, _es_TexEnvx); - SET_TexEnvxvOES(exec, _es_TexEnvxv); - SET_TexGenxOES(exec, _check_TexGenxOES); - SET_TexGenxvOES(exec, _check_TexGenxvOES); - SET_TexParameterxOES(exec, _es_TexParameterx); - SET_TexParameterxvOES(exec, _es_TexParameterxv); - SET_TranslatexOES(exec, _es_Translatex); - } -#endif - - return exec; -} diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c index 2d35f17ad..331553086 100644 --- a/mesalib/src/mesa/main/api_loopback.c +++ b/mesalib/src/mesa/main/api_loopback.c @@ -87,7 +87,7 @@ #define ATTRIBI_4UI(index,x,y,z,w) CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w)) -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) { COLORF( BYTE_TO_FLOAT(red), @@ -96,41 +96,41 @@ loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3i_f( GLint red, GLint green, GLint blue ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), 1.0); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), SHORT_TO_FLOAT(blue), 1.0); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), @@ -138,48 +138,48 @@ loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3bv_f( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3dv_f( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3iv_f( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3sv_f( const GLshort *v ) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3uiv_f( const GLuint *v ) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3usv_f( const GLushort *v ) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), 1.0 ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color3ubv_f( const GLubyte *v ) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -187,7 +187,7 @@ loopback_Color3ubv_f( const GLubyte *v ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ) { @@ -195,21 +195,21 @@ loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, BYTE_TO_FLOAT(blue), BYTE_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, GLshort alpha ) { @@ -217,21 +217,21 @@ loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, SHORT_TO_FLOAT(blue), SHORT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), @@ -239,7 +239,7 @@ loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4iv_f( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), @@ -247,21 +247,21 @@ loopback_Color4iv_f( const GLint *v ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4bv_f( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4dv_f( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4sv_f( const GLshort *v) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), @@ -269,21 +269,21 @@ loopback_Color4sv_f( const GLshort *v) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4uiv_f( const GLuint *v) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4usv_f( const GLushort *v) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Color4ubv_f( const GLubyte *v) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -291,565 +291,565 @@ loopback_Color4ubv_f( const GLubyte *v) } -static void GLAPIENTRY +void GLAPIENTRY loopback_FogCoorddEXT( GLdouble d ) { FOGCOORDF( (GLfloat) d ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_FogCoorddvEXT( const GLdouble *v ) { FOGCOORDF( (GLfloat) *v ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexd( GLdouble c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexi( GLint c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexs( GLshort c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexub( GLubyte c ) { INDEX( (GLfloat) c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexdv( const GLdouble *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexiv( const GLint *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexsv( const GLshort *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Indexubv( const GLubyte *c ) { INDEX( (GLfloat) *c ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EdgeFlagv(const GLboolean *flag) { CALL_EdgeFlag(GET_DISPATCH(), (*flag)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ) { NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ) { NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3i( GLint nx, GLint ny, GLint nz ) { NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ) { NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3bv( const GLbyte *v ) { NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3dv( const GLdouble *v ) { NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3iv( const GLint *v ) { NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Normal3sv( const GLshort *v ) { NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1d( GLdouble s ) { TEXCOORD1((GLfloat) s); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1i( GLint s ) { TEXCOORD1((GLfloat) s); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1s( GLshort s ) { TEXCOORD1((GLfloat) s); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2d( GLdouble s, GLdouble t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2s( GLshort s, GLshort t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2i( GLint s, GLint t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3i( GLint s, GLint t, GLint r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1dv( const GLdouble *v ) { TEXCOORD1((GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1iv( const GLint *v ) { TEXCOORD1((GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord1sv( const GLshort *v ) { TEXCOORD1((GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2dv( const GLdouble *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2iv( const GLint *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord2sv( const GLshort *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3dv( const GLdouble *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3iv( const GLint *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord3sv( const GLshort *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4dv( const GLdouble *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4iv( const GLint *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_TexCoord4sv( const GLshort *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2d( GLdouble x, GLdouble y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2i( GLint x, GLint y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2s( GLshort x, GLshort y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3i( GLint x, GLint y, GLint z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3s( GLshort x, GLshort y, GLshort z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2dv( const GLdouble *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2iv( const GLint *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex2sv( const GLshort *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3dv( const GLdouble *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3iv( const GLint *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex3sv( const GLshort *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4dv( const GLdouble *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4iv( const GLint *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Vertex4sv( const GLshort *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1dARB(GLenum target, GLdouble s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1iARB(GLenum target, GLint s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1sARB(GLenum target, GLshort s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord2dv( const GLdouble *u ) { EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord2fv( const GLfloat *u ) { EVALCOORD2( u[0], u[1] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord2d( GLdouble u, GLdouble v ) { EVALCOORD2( (GLfloat) u, (GLfloat) v ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord1dv( const GLdouble *u ) { EVALCOORD1( (GLfloat) *u ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord1fv( const GLfloat *u ) { EVALCOORD1( (GLfloat) *u ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_EvalCoord1d( GLdouble u ) { EVALCOORD1( (GLfloat) u ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) { GLfloat fparam[4]; @@ -857,14 +857,14 @@ loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) MATERIALFV( face, pname, fparam ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Materiali(GLenum face, GLenum pname, GLint param ) { GLfloat p = (GLfloat) param; MATERIALFV(face, pname, &p); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) { GLfloat fparam[4]; @@ -894,49 +894,49 @@ loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectdv(const GLdouble *v1, const GLdouble *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectfv(const GLfloat *v1, const GLfloat *v2) { RECTF(v1[0], v1[1], v2[0], v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectiv(const GLint *v1, const GLint *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } -static void GLAPIENTRY +void GLAPIENTRY loopback_Rectsv(const GLshort *v1, const GLshort *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) { SECONDARYCOLORF( BYTE_TO_FLOAT(red), @@ -944,13 +944,13 @@ loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) BYTE_TO_FLOAT(blue) ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ) { SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) { SECONDARYCOLORF( INT_TO_FLOAT(red), @@ -958,7 +958,7 @@ loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) INT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) { SECONDARYCOLORF(SHORT_TO_FLOAT(red), @@ -966,7 +966,7 @@ loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) SHORT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) { SECONDARYCOLORF(UINT_TO_FLOAT(red), @@ -974,7 +974,7 @@ loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) UINT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) { SECONDARYCOLORF(USHORT_TO_FLOAT(red), @@ -982,7 +982,7 @@ loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) USHORT_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(red), @@ -990,7 +990,7 @@ loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) UBYTE_TO_FLOAT(blue)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) { SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]), @@ -998,12 +998,12 @@ loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) BYTE_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3dvEXT_f( const GLdouble *v ) { SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3ivEXT_f( const GLint *v ) { SECONDARYCOLORF(INT_TO_FLOAT(v[0]), @@ -1011,7 +1011,7 @@ loopback_SecondaryColor3ivEXT_f( const GLint *v ) INT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3svEXT_f( const GLshort *v ) { SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]), @@ -1019,7 +1019,7 @@ loopback_SecondaryColor3svEXT_f( const GLshort *v ) SHORT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3uivEXT_f( const GLuint *v ) { SECONDARYCOLORF(UINT_TO_FLOAT(v[0]), @@ -1027,7 +1027,7 @@ loopback_SecondaryColor3uivEXT_f( const GLuint *v ) UINT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3usvEXT_f( const GLushort *v ) { SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]), @@ -1035,7 +1035,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v ) USHORT_TO_FLOAT(v[2])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]), @@ -1050,111 +1050,111 @@ loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) * Note that attribute indexes DO alias conventional vertex attributes. */ -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1sNV(GLuint index, GLshort x) { ATTRIB1NV(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dNV(GLuint index, GLdouble x) { ATTRIB1NV(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y) { ATTRIB2NV(index, (GLfloat) x, y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y) { ATTRIB2NV(index, (GLfloat) x, (GLfloat) y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1svNV(GLuint index, const GLshort *v) { ATTRIB1NV(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v) { ATTRIB1NV(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2svNV(GLuint index, const GLshort *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3svNV(GLuint index, const GLshort *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4svNV(GLuint index, const GLshort *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) { ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -1162,7 +1162,7 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1170,7 +1170,7 @@ loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib1svNV(index + i, v + i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1178,7 +1178,7 @@ loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB1NV(index + i, v[i]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1186,7 +1186,7 @@ loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib1dvNV(index + i, v + i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1194,7 +1194,7 @@ loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib2svNV(index + i, v + 2 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1202,7 +1202,7 @@ loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB2NV(index + i, v[2 * i], v[2 * i + 1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1210,7 +1210,7 @@ loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib2dvNV(index + i, v + 2 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1218,7 +1218,7 @@ loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib3svNV(index + i, v + 3 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1226,7 +1226,7 @@ loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB3NV(index + i, v[3 * i], v[3 * i + 1], v[3 * i + 2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1234,7 +1234,7 @@ loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib3dvNV(index + i, v + 3 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; @@ -1242,7 +1242,7 @@ loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) loopback_VertexAttrib4svNV(index + i, v + 4 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; @@ -1250,7 +1250,7 @@ loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) ATTRIB4NV(index + i, v[4 * i], v[4 * i + 1], v[4 * i + 2], v[4 * i + 3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; @@ -1258,7 +1258,7 @@ loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) loopback_VertexAttrib4dvNV(index + i, v + 4 * i); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) { GLint i; @@ -1273,176 +1273,176 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) * Note that attribute indexes do NOT alias conventional attributes. */ -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1sARB(GLuint index, GLshort x) { ATTRIB1ARB(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dARB(GLuint index, GLdouble x) { ATTRIB1ARB(index, (GLfloat) x); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y) { ATTRIB2ARB(index, (GLfloat) x, y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y) { ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1svARB(GLuint index, const GLshort *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2svARB(GLuint index, const GLshort *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3svARB(GLuint index, const GLshort *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4svARB(GLuint index, const GLshort *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ivARB(GLuint index, const GLint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v) { ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NivARB(GLuint index, const GLint * v) { ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v) { ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3])); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) { ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), @@ -1456,37 +1456,37 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) * Note that attribute indexes do NOT alias conventional attributes. */ -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI1iv(GLuint index, const GLint *v) { ATTRIBI_1I(index, v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI1uiv(GLuint index, const GLuint *v) { ATTRIBI_1UI(index, v[0]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4bv(GLuint index, const GLbyte *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4sv(GLuint index, const GLshort *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY loopback_VertexAttribI4usv(GLuint index, const GLushort *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); diff --git a/mesalib/src/mesa/main/api_loopback.h b/mesalib/src/mesa/main/api_loopback.h index 628d4f89e..879ad8995 100644 --- a/mesalib/src/mesa/main/api_loopback.h +++ b/mesalib/src/mesa/main/api_loopback.h @@ -29,6 +29,14 @@ #include "main/compiler.h" #include "main/mfeatures.h" +#include "main/glheader.h" // ? +#include "main/macros.h" // ? +#include "main/mtypes.h" // ? +#include "glapi/glapi.h" // ? +#include "glapi/glthread.h" // ? +#include "main/dispatch.h" // ? +#include "main/mfeatures.h" // ? +#include "main/context.h" // ? struct _glapi_table; struct gl_context; @@ -36,5 +44,434 @@ struct gl_context; extern void _mesa_loopback_init_api_table(const struct gl_context *ctx, struct _glapi_table *dest); +void GLAPIENTRY +loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ); +void GLAPIENTRY +loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ); +void GLAPIENTRY +loopback_Color3i_f( GLint red, GLint green, GLint blue ); +void GLAPIENTRY +loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ); +void GLAPIENTRY +loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ); +void GLAPIENTRY +loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ); +void GLAPIENTRY +loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ); +void GLAPIENTRY +loopback_Color3bv_f( const GLbyte *v ); +void GLAPIENTRY +loopback_Color3dv_f( const GLdouble *v ); +void GLAPIENTRY +loopback_Color3iv_f( const GLint *v ); +void GLAPIENTRY +loopback_Color3sv_f( const GLshort *v ); +void GLAPIENTRY +loopback_Color3uiv_f( const GLuint *v ); +void GLAPIENTRY +loopback_Color3usv_f( const GLushort *v ); +void GLAPIENTRY +loopback_Color3ubv_f( const GLubyte *v ); +void GLAPIENTRY +loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, + GLbyte alpha ); +void GLAPIENTRY +loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, + GLdouble alpha ); +void GLAPIENTRY +loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ); +void GLAPIENTRY +loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, + GLshort alpha ); +void GLAPIENTRY +loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ); +void GLAPIENTRY +loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, + GLushort alpha ); +void GLAPIENTRY +loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ); +void GLAPIENTRY +loopback_Color4iv_f( const GLint *v ); +void GLAPIENTRY +loopback_Color4bv_f( const GLbyte *v ); +void GLAPIENTRY +loopback_Color4dv_f( const GLdouble *v ); +void GLAPIENTRY +loopback_Color4sv_f( const GLshort *v); +void GLAPIENTRY +loopback_Color4uiv_f( const GLuint *v); +void GLAPIENTRY +loopback_Color4usv_f( const GLushort *v); +void GLAPIENTRY +loopback_Color4ubv_f( const GLubyte *v); +void GLAPIENTRY +loopback_FogCoorddEXT( GLdouble d ); +void GLAPIENTRY +loopback_FogCoorddvEXT( const GLdouble *v ); +void GLAPIENTRY +loopback_Indexd( GLdouble c ); +void GLAPIENTRY +loopback_Indexi( GLint c ); +void GLAPIENTRY +loopback_Indexs( GLshort c ); +void GLAPIENTRY +loopback_Indexub( GLubyte c ); +void GLAPIENTRY +loopback_Indexdv( const GLdouble *c ); +void GLAPIENTRY +loopback_Indexiv( const GLint *c ); +void GLAPIENTRY +loopback_Indexsv( const GLshort *c ); +void GLAPIENTRY +loopback_Indexubv( const GLubyte *c ); +void GLAPIENTRY +loopback_EdgeFlagv(const GLboolean *flag); +void GLAPIENTRY +loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ); +void GLAPIENTRY +loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ); +void GLAPIENTRY +loopback_Normal3i( GLint nx, GLint ny, GLint nz ); +void GLAPIENTRY +loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ); +void GLAPIENTRY +loopback_Normal3bv( const GLbyte *v ); +void GLAPIENTRY +loopback_Normal3dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Normal3iv( const GLint *v ); +void GLAPIENTRY +loopback_Normal3sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord1d( GLdouble s ); +void GLAPIENTRY +loopback_TexCoord1i( GLint s ); +void GLAPIENTRY +loopback_TexCoord1s( GLshort s ); +void GLAPIENTRY +loopback_TexCoord2d( GLdouble s, GLdouble t ); +void GLAPIENTRY +loopback_TexCoord2s( GLshort s, GLshort t ); +void GLAPIENTRY +loopback_TexCoord2i( GLint s, GLint t ); +void GLAPIENTRY +loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ); +void GLAPIENTRY +loopback_TexCoord3i( GLint s, GLint t, GLint r ); +void GLAPIENTRY +loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ); +void GLAPIENTRY +loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); +void GLAPIENTRY +loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ); +void GLAPIENTRY +loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); +void GLAPIENTRY +loopback_TexCoord1dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord1iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord1sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord2dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord2iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord2sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord3dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord3iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord3sv( const GLshort *v ); +void GLAPIENTRY +loopback_TexCoord4dv( const GLdouble *v ); +void GLAPIENTRY +loopback_TexCoord4iv( const GLint *v ); +void GLAPIENTRY +loopback_TexCoord4sv( const GLshort *v ); +void GLAPIENTRY +loopback_Vertex2d( GLdouble x, GLdouble y ); +void GLAPIENTRY +loopback_Vertex2i( GLint x, GLint y ); +void GLAPIENTRY +loopback_Vertex2s( GLshort x, GLshort y ); +void GLAPIENTRY +loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ); +void GLAPIENTRY +loopback_Vertex3i( GLint x, GLint y, GLint z ); +void GLAPIENTRY +loopback_Vertex3s( GLshort x, GLshort y, GLshort z ); +void GLAPIENTRY +loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +void GLAPIENTRY +loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ); +void GLAPIENTRY +loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); +void GLAPIENTRY +loopback_Vertex2dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Vertex2iv( const GLint *v ); +void GLAPIENTRY +loopback_Vertex2sv( const GLshort *v ); +void GLAPIENTRY +loopback_Vertex3dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Vertex3iv( const GLint *v ); +void GLAPIENTRY +loopback_Vertex3sv( const GLshort *v ); +void GLAPIENTRY +loopback_Vertex4dv( const GLdouble *v ); +void GLAPIENTRY +loopback_Vertex4iv( const GLint *v ); +void GLAPIENTRY +loopback_Vertex4sv( const GLshort *v ); +void GLAPIENTRY +loopback_MultiTexCoord1dARB(GLenum target, GLdouble s); +void GLAPIENTRY +loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord1iARB(GLenum target, GLint s); +void GLAPIENTRY +loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord1sARB(GLenum target, GLshort s); +void GLAPIENTRY +loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t); +void GLAPIENTRY +loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t); +void GLAPIENTRY +loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t); +void GLAPIENTRY +loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r); +void GLAPIENTRY +loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r); +void GLAPIENTRY +loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r); +void GLAPIENTRY +loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, + GLdouble q); +void GLAPIENTRY +loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v); +void GLAPIENTRY +loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q); +void GLAPIENTRY +loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v); +void GLAPIENTRY +loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, + GLshort q); +void GLAPIENTRY +loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v); +void GLAPIENTRY +loopback_EvalCoord2dv( const GLdouble *u ); +void GLAPIENTRY +loopback_EvalCoord2fv( const GLfloat *u ); +void GLAPIENTRY +loopback_EvalCoord2d( GLdouble u, GLdouble v ); +void GLAPIENTRY +loopback_EvalCoord1dv( const GLdouble *u ); +void GLAPIENTRY +loopback_EvalCoord1fv( const GLfloat *u ); +void GLAPIENTRY +loopback_EvalCoord1d( GLdouble u ); +void GLAPIENTRY +loopback_Materialf( GLenum face, GLenum pname, GLfloat param ); +void GLAPIENTRY +loopback_Materiali(GLenum face, GLenum pname, GLint param ); +void GLAPIENTRY +loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ); +void GLAPIENTRY +loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); +void GLAPIENTRY +loopback_Rectdv(const GLdouble *v1, const GLdouble *v2); +void GLAPIENTRY +loopback_Rectfv(const GLfloat *v1, const GLfloat *v2); +void GLAPIENTRY +loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2); +void GLAPIENTRY +loopback_Rectiv(const GLint *v1, const GLint *v2); +void GLAPIENTRY +loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2); +void GLAPIENTRY +loopback_Rectsv(const GLshort *v1, const GLshort *v2); +void GLAPIENTRY +loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ); +void GLAPIENTRY +loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ); +void GLAPIENTRY +loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ); +void GLAPIENTRY +loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ); +void GLAPIENTRY +loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ); +void GLAPIENTRY +loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ); +void GLAPIENTRY +loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ); +void GLAPIENTRY +loopback_SecondaryColor3bvEXT_f( const GLbyte *v ); +void GLAPIENTRY +loopback_SecondaryColor3dvEXT_f( const GLdouble *v ); +void GLAPIENTRY +loopback_SecondaryColor3ivEXT_f( const GLint *v ); +void GLAPIENTRY +loopback_SecondaryColor3svEXT_f( const GLshort *v ); +void GLAPIENTRY +loopback_SecondaryColor3uivEXT_f( const GLuint *v ); +void GLAPIENTRY +loopback_SecondaryColor3usvEXT_f( const GLushort *v ); +void GLAPIENTRY +loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ); +void GLAPIENTRY +loopback_VertexAttrib1sNV(GLuint index, GLshort x); +void GLAPIENTRY +loopback_VertexAttrib1dNV(GLuint index, GLdouble x); +void GLAPIENTRY +loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y); +void GLAPIENTRY +loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y); +void GLAPIENTRY +loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, + GLshort w); +void GLAPIENTRY +loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, + GLdouble w); +void GLAPIENTRY +loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, + GLubyte w); +void GLAPIENTRY +loopback_VertexAttrib1svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib2svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib3svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4svNV(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v); +void GLAPIENTRY +loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v); +void GLAPIENTRY +loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v); +void GLAPIENTRY +loopback_VertexAttrib1sARB(GLuint index, GLshort x); +void GLAPIENTRY +loopback_VertexAttrib1dARB(GLuint index, GLdouble x); +void GLAPIENTRY +loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y); +void GLAPIENTRY +loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y); +void GLAPIENTRY +loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, + GLshort w); +void GLAPIENTRY +loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, + GLdouble w); +void GLAPIENTRY +loopback_VertexAttrib1svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib2svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib3svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4svARB(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v); +void GLAPIENTRY +loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v); +void GLAPIENTRY +loopback_VertexAttrib4ivARB(GLuint index, const GLint * v); +void GLAPIENTRY +loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v); +void GLAPIENTRY +loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v); +void GLAPIENTRY +loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v); +void GLAPIENTRY +loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v); +void GLAPIENTRY +loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v); +void GLAPIENTRY +loopback_VertexAttrib4NivARB(GLuint index, const GLint * v); +void GLAPIENTRY +loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, + GLubyte w); +void GLAPIENTRY +loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v); +void GLAPIENTRY +loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v); +void GLAPIENTRY +loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v); +void GLAPIENTRY +loopback_VertexAttribI1iv(GLuint index, const GLint *v); +void GLAPIENTRY +loopback_VertexAttribI1uiv(GLuint index, const GLuint *v); +void GLAPIENTRY +loopback_VertexAttribI4bv(GLuint index, const GLbyte *v); +void GLAPIENTRY +loopback_VertexAttribI4sv(GLuint index, const GLshort *v); +void GLAPIENTRY +loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v); +void GLAPIENTRY +loopback_VertexAttribI4usv(GLuint index, const GLushort *v); + #endif /* API_LOOPBACK_H */ diff --git a/mesalib/src/mesa/main/atifragshader.c b/mesalib/src/mesa/main/atifragshader.c index 32ddfb8bb..2a0790862 100644 --- a/mesalib/src/mesa/main/atifragshader.c +++ b/mesalib/src/mesa/main/atifragshader.c @@ -37,26 +37,6 @@ static struct ati_fragment_shader DummyShader; -void -_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp) -{ - SET_GenFragmentShadersATI(disp, _mesa_GenFragmentShadersATI); - SET_BindFragmentShaderATI(disp, _mesa_BindFragmentShaderATI); - SET_DeleteFragmentShaderATI(disp, _mesa_DeleteFragmentShaderATI); - SET_BeginFragmentShaderATI(disp, _mesa_BeginFragmentShaderATI); - SET_EndFragmentShaderATI(disp, _mesa_EndFragmentShaderATI); - SET_PassTexCoordATI(disp, _mesa_PassTexCoordATI); - SET_SampleMapATI(disp, _mesa_SampleMapATI); - SET_ColorFragmentOp1ATI(disp, _mesa_ColorFragmentOp1ATI); - SET_ColorFragmentOp2ATI(disp, _mesa_ColorFragmentOp2ATI); - SET_ColorFragmentOp3ATI(disp, _mesa_ColorFragmentOp3ATI); - SET_AlphaFragmentOp1ATI(disp, _mesa_AlphaFragmentOp1ATI); - SET_AlphaFragmentOp2ATI(disp, _mesa_AlphaFragmentOp2ATI); - SET_AlphaFragmentOp3ATI(disp, _mesa_AlphaFragmentOp3ATI); - SET_SetFragmentShaderConstantATI(disp, _mesa_SetFragmentShaderConstantATI); -} - - /** * Allocate and initialize a new ATI fragment shader object. */ diff --git a/mesalib/src/mesa/main/atifragshader.h b/mesalib/src/mesa/main/atifragshader.h index f5af5f15f..c47a7d56e 100644 --- a/mesalib/src/mesa/main/atifragshader.h +++ b/mesalib/src/mesa/main/atifragshader.h @@ -63,9 +63,6 @@ struct atifs_setupinst }; -extern void -_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp); - extern struct ati_fragment_shader * _mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id); diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 48df7f16b..05db35b8e 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1584,16 +1584,6 @@ _mesa_PopClientAttrib(void) } -void -_mesa_init_attrib_dispatch(struct _glapi_table *disp) -{ - SET_PopAttrib(disp, _mesa_PopAttrib); - SET_PushAttrib(disp, _mesa_PushAttrib); - SET_PopClientAttrib(disp, _mesa_PopClientAttrib); - SET_PushClientAttrib(disp, _mesa_PushClientAttrib); -} - - /** * Free any attribute state data that might be attached to the context. */ diff --git a/mesalib/src/mesa/main/attrib.h b/mesalib/src/mesa/main/attrib.h index f75c3c5ce..1ecf3a591 100644 --- a/mesalib/src/mesa/main/attrib.h +++ b/mesalib/src/mesa/main/attrib.h @@ -45,9 +45,6 @@ _mesa_PushClientAttrib( GLbitfield mask ); extern void GLAPIENTRY _mesa_PopClientAttrib( void ); -extern void -_mesa_init_attrib_dispatch(struct _glapi_table *disp); - extern void _mesa_init_attrib( struct gl_context *ctx ); diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index 9697919fa..9dba99daf 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -2246,7 +2246,7 @@ _mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length) { @@ -2305,7 +2305,7 @@ _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset, return; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_InvalidateBufferData(GLuint buffer) { GET_CURRENT_CONTEXT(ctx); @@ -2337,34 +2337,3 @@ _mesa_InvalidateBufferData(GLuint buffer) */ return; } - -void -_mesa_init_bufferobj_dispatch(struct gl_context *ctx, struct _glapi_table *disp) -{ - SET_BindBufferARB(disp, _mesa_BindBufferARB); - SET_BufferDataARB(disp, _mesa_BufferDataARB); - SET_BufferSubDataARB(disp, _mesa_BufferSubDataARB); - SET_DeleteBuffersARB(disp, _mesa_DeleteBuffersARB); - SET_GenBuffersARB(disp, _mesa_GenBuffersARB); - SET_GetBufferParameterivARB(disp, _mesa_GetBufferParameterivARB); - /* TODO: add GetBufferParameteri64v for desktop GL and GLES3 once tests - * exist for it. - */ - SET_GetBufferPointervARB(disp, _mesa_GetBufferPointervARB); - if (_mesa_is_desktop_gl(ctx)) { - SET_GetBufferSubDataARB(disp, _mesa_GetBufferSubDataARB); - } - SET_IsBufferARB(disp, _mesa_IsBufferARB); - SET_MapBufferARB(disp, _mesa_MapBufferARB); - SET_UnmapBufferARB(disp, _mesa_UnmapBufferARB); - - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange); - SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase); - } - - if (_mesa_is_desktop_gl(ctx)) { - SET_InvalidateBufferData(disp, _mesa_InvalidateBufferData); - SET_InvalidateBufferSubData(disp, _mesa_InvalidateBufferSubData); - } -} diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h index 4f1e61b63..4d5446ac0 100644 --- a/mesalib/src/mesa/main/bufferobj.h +++ b/mesalib/src/mesa/main/bufferobj.h @@ -100,72 +100,56 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver); * API functions */ -extern void GLAPIENTRY +void GLAPIENTRY _mesa_BindBufferARB(GLenum target, GLuint buffer); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GenBuffersARB(GLsizei n, GLuint * buffer); - -extern GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsBufferARB(GLuint buffer); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); - -extern void * GLAPIENTRY +void * GLAPIENTRY _mesa_MapBufferARB(GLenum target, GLenum access); - -extern GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_UnmapBufferARB(GLenum target); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); - -extern void * GLAPIENTRY +void * GLAPIENTRY _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length); - -extern GLenum GLAPIENTRY +GLenum GLAPIENTRY _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option); - -extern GLenum GLAPIENTRY +GLenum GLAPIENTRY _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option); - -extern void GLAPIENTRY -_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params); - void GLAPIENTRY -_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer); - +_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, + GLint* params); void GLAPIENTRY _mesa_BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); +void GLAPIENTRY +_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer); +void GLAPIENTRY +_mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset, + GLsizeiptr length); +void GLAPIENTRY +_mesa_InvalidateBufferData(GLuint buffer); -extern void -_mesa_init_bufferobj_dispatch(struct gl_context *ctx, - struct _glapi_table *disp); #endif diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c index 5799c01f6..f1b3e585a 100644 --- a/mesalib/src/mesa/main/colortab.c +++ b/mesalib/src/mesa/main/colortab.c @@ -63,7 +63,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start, -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) { @@ -74,7 +74,7 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat, -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width) { @@ -85,7 +85,7 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start, -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data ) { @@ -95,7 +95,7 @@ _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTable( GLenum target, GLenum format, GLenum type, GLvoid *data ) { @@ -105,7 +105,7 @@ _mesa_GetColorTable( GLenum target, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) { /* no extensions use this function */ @@ -116,7 +116,7 @@ _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) -static void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) { /* no extensions use this function */ @@ -127,7 +127,7 @@ _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); @@ -137,28 +137,10 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)"); } - - -void -_mesa_init_colortable_dispatch(struct _glapi_table *disp) -{ - SET_ColorSubTable(disp, _mesa_ColorSubTable); - SET_ColorTable(disp, _mesa_ColorTable); - SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv); - SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv); - SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable); - SET_CopyColorTable(disp, _mesa_CopyColorTable); - SET_GetColorTable(disp, _mesa_GetColorTable); - SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv); - - /* GL_ARB_robustness */ - SET_GetnColorTableARB(disp, _mesa_GetnColorTableARB); -} diff --git a/mesalib/src/mesa/main/colortab.h b/mesalib/src/mesa/main/colortab.h index 7b8df38a1..f25fbe8a5 100644 --- a/mesalib/src/mesa/main/colortab.h +++ b/mesalib/src/mesa/main/colortab.h @@ -33,18 +33,35 @@ struct _glapi_table; -extern void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table ); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_ColorSubTable( GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *table ); - -extern void -_mesa_init_colortable_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_CopyColorTable(GLenum target, GLenum internalformat, + GLint x, GLint y, GLsizei width); +void GLAPIENTRY +_mesa_CopyColorSubTable(GLenum target, GLsizei start, + GLint x, GLint y, GLsizei width); +void GLAPIENTRY +_mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, + GLsizei bufSize, GLvoid *data ); +void GLAPIENTRY +_mesa_GetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *data ); +void GLAPIENTRY +_mesa_ColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params); +void GLAPIENTRY +_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ); +void GLAPIENTRY +_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ); #endif /* COLORTAB_H */ diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index a4dedeea2..0508378b7 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -706,9 +706,9 @@ check_context_limits(struct gl_context *ctx) assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS); /* Max texture size should be <= max viewport size (render to texture) */ - assert((1 << (ctx->Const.MaxTextureLevels - 1)) + assert((1U << (ctx->Const.MaxTextureLevels - 1)) <= ctx->Const.MaxViewportWidth); - assert((1 << (ctx->Const.MaxTextureLevels - 1)) + assert((1U << (ctx->Const.MaxTextureLevels - 1)) <= ctx->Const.MaxViewportHeight); assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS); diff --git a/mesalib/src/mesa/main/convolve.c b/mesalib/src/mesa/main/convolve.c index cac8a9979..dfc1b9465 100644 --- a/mesalib/src/mesa/main/convolve.c +++ b/mesalib/src/mesa/main/convolve.c @@ -41,7 +41,7 @@ #include "main/dispatch.h" -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image) { GET_CURRENT_CONTEXT(ctx); @@ -49,7 +49,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D"); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image) { GET_CURRENT_CONTEXT(ctx); @@ -58,7 +58,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param) { GET_CURRENT_CONTEXT(ctx); @@ -67,7 +67,7 @@ _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -76,7 +76,7 @@ _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param) { GET_CURRENT_CONTEXT(ctx); @@ -85,7 +85,7 @@ _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -94,7 +94,7 @@ _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width) { GET_CURRENT_CONTEXT(ctx); @@ -103,7 +103,7 @@ _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi } -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); @@ -112,7 +112,7 @@ _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnConvolutionFilterARB(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image) { @@ -122,7 +122,7 @@ _mesa_GetnConvolutionFilterARB(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image) { @@ -130,7 +130,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -139,7 +139,7 @@ _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -148,7 +148,7 @@ _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, @@ -160,7 +160,7 @@ _mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span) { @@ -169,32 +169,10 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column) { GET_CURRENT_CONTEXT(ctx); _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D"); } - -void -_mesa_init_convolve_dispatch(struct _glapi_table *disp) -{ - SET_ConvolutionFilter1D(disp, _mesa_ConvolutionFilter1D); - SET_ConvolutionFilter2D(disp, _mesa_ConvolutionFilter2D); - SET_ConvolutionParameterf(disp, _mesa_ConvolutionParameterf); - SET_ConvolutionParameterfv(disp, _mesa_ConvolutionParameterfv); - SET_ConvolutionParameteri(disp, _mesa_ConvolutionParameteri); - SET_ConvolutionParameteriv(disp, _mesa_ConvolutionParameteriv); - SET_CopyConvolutionFilter1D(disp, _mesa_CopyConvolutionFilter1D); - SET_CopyConvolutionFilter2D(disp, _mesa_CopyConvolutionFilter2D); - SET_GetConvolutionFilter(disp, _mesa_GetConvolutionFilter); - SET_GetConvolutionParameterfv(disp, _mesa_GetConvolutionParameterfv); - SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv); - SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D); - SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter); - - /* GL_ARB_robustness */ - SET_GetnConvolutionFilterARB(disp, _mesa_GetnConvolutionFilterARB); - SET_GetnSeparableFilterARB(disp, _mesa_GetnSeparableFilterARB); -} diff --git a/mesalib/src/mesa/main/convolve.h b/mesalib/src/mesa/main/convolve.h index 2fbe3c7f5..812debd61 100644 --- a/mesalib/src/mesa/main/convolve.h +++ b/mesalib/src/mesa/main/convolve.h @@ -33,7 +33,49 @@ struct _glapi_table; -extern void -_mesa_init_convolve_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, + GLenum format, GLenum type, const GLvoid *image); +void GLAPIENTRY +_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, + GLsizei height, GLenum format, GLenum type, + const GLvoid *image); +void GLAPIENTRY +_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, + const GLfloat *params); +void GLAPIENTRY +_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param); +void GLAPIENTRY +_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, + GLint y, GLsizei width); +void GLAPIENTRY +_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, + GLint y, GLsizei width, GLsizei height); +void GLAPIENTRY +_mesa_GetnConvolutionFilterARB(GLenum target, GLenum format, GLenum type, + GLsizei bufSize, GLvoid *image); +void GLAPIENTRY +_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, + GLvoid *image); +void GLAPIENTRY +_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type, + GLsizei rowBufSize, GLvoid *row, + GLsizei columnBufSize, GLvoid *column, + GLvoid *span); +void GLAPIENTRY +_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, + GLvoid *row, GLvoid *column, GLvoid *span); +void GLAPIENTRY +_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, + GLsizei height, GLenum format, GLenum type, + const GLvoid *row, const GLvoid *column); #endif /* CONVOLVE_H */ diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index c15043694..8bbead7c4 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -8580,7 +8580,7 @@ execute_list(struct gl_context *ctx, GLuint list) /** * Test if a display list number is valid. */ -static GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsList(GLuint list) { GET_CURRENT_CONTEXT(ctx); @@ -8593,7 +8593,7 @@ _mesa_IsList(GLuint list) /** * Delete a sequence of consecutive display lists. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteLists(GLuint list, GLsizei range) { GET_CURRENT_CONTEXT(ctx); @@ -8615,7 +8615,7 @@ _mesa_DeleteLists(GLuint list, GLsizei range) * Return a display list number, n, such that lists n through n+range-1 * are free. */ -static GLuint GLAPIENTRY +GLuint GLAPIENTRY _mesa_GenLists(GLsizei range) { GET_CURRENT_CONTEXT(ctx); @@ -8655,7 +8655,7 @@ _mesa_GenLists(GLsizei range) /** * Begin a new display list. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_NewList(GLuint name, GLenum mode) { GET_CURRENT_CONTEXT(ctx); @@ -8705,7 +8705,7 @@ _mesa_NewList(GLuint name, GLenum mode) /** * End definition of current display list. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_EndList(void) { GET_CURRENT_CONTEXT(ctx); @@ -8841,7 +8841,7 @@ _mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists) /** * Set the offset added to list numbers in glCallLists. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_ListBase(GLuint base) { GET_CURRENT_CONTEXT(ctx); @@ -10633,20 +10633,6 @@ _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, } -void _mesa_init_dlist_dispatch(struct _glapi_table *disp) -{ - SET_CallList(disp, _mesa_CallList); - SET_CallLists(disp, _mesa_CallLists); - - SET_DeleteLists(disp, _mesa_DeleteLists); - SET_EndList(disp, _mesa_EndList); - SET_GenLists(disp, _mesa_GenLists); - SET_IsList(disp, _mesa_IsList); - SET_ListBase(disp, _mesa_ListBase); - SET_NewList(disp, _mesa_NewList); -} - - /** * Initialize display list state for given context. */ diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h index 137245161..9d4fc6899 100644 --- a/mesalib/src/mesa/main/dlist.h +++ b/mesalib/src/mesa/main/dlist.h @@ -43,9 +43,22 @@ (vfmt)->CallLists = impl ## CallLists; \ } while (0) -extern void GLAPIENTRY _mesa_CallList( GLuint list ); - -extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); +GLboolean GLAPIENTRY +_mesa_IsList(GLuint list); +void GLAPIENTRY +_mesa_DeleteLists(GLuint list, GLsizei range); +GLuint GLAPIENTRY +_mesa_GenLists(GLsizei range); +void GLAPIENTRY +_mesa_NewList(GLuint name, GLenum mode); +void GLAPIENTRY +_mesa_EndList(void); +void GLAPIENTRY +_mesa_CallList( GLuint list ); +void GLAPIENTRY +_mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); +void GLAPIENTRY +_mesa_ListBase(GLuint base); extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s ); @@ -66,8 +79,6 @@ extern struct _glapi_table *_mesa_create_save_table(const struct gl_context *); extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); - extern void _mesa_init_display_list( struct gl_context * ctx ); extern void _mesa_free_display_list_data(struct gl_context *ctx); diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c index 8836e0a0e..3d25ae52b 100644 --- a/mesalib/src/mesa/main/drawpix.c +++ b/mesalib/src/mesa/main/drawpix.c @@ -42,7 +42,7 @@ /* * Execute glDrawPixels */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_DrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels ) { @@ -186,7 +186,7 @@ end: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLenum type ) { @@ -291,7 +291,7 @@ end: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Bitmap( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap ) @@ -365,12 +365,3 @@ _mesa_Bitmap( GLsizei width, GLsizei height, _mesa_flush(ctx); } } - - -void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp) -{ - SET_Bitmap(disp, _mesa_Bitmap); - SET_CopyPixels(disp, _mesa_CopyPixels); - SET_DrawPixels(disp, _mesa_DrawPixels); -} diff --git a/mesalib/src/mesa/main/drawpix.h b/mesalib/src/mesa/main/drawpix.h index 971d258f1..087b3a8c9 100644 --- a/mesalib/src/mesa/main/drawpix.h +++ b/mesalib/src/mesa/main/drawpix.h @@ -32,8 +32,16 @@ struct _glapi_table; -extern void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_DrawPixels( GLsizei width, GLsizei height, + GLenum format, GLenum type, const GLvoid *pixels ); +void GLAPIENTRY +_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height, + GLenum type ); +void GLAPIENTRY +_mesa_Bitmap( GLsizei width, GLsizei height, + GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, + const GLubyte *bitmap ); #endif /* DRAWPIX_H */ diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index 796b6beff..b692f3189 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -477,7 +477,7 @@ error: return GL_FALSE; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, GLenum severity, GLint length, const GLcharARB* buf) @@ -501,7 +501,7 @@ _mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, _mesa_log_msg(ctx, source, type, id, severity, length, buf); } -static GLuint GLAPIENTRY +GLuint GLAPIENTRY _mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum* sources, GLenum* types, GLenum* ids, GLenum* severities, GLsizei* lengths, GLcharARB* messageLog) @@ -672,7 +672,7 @@ control_app_messages(struct gl_context *ctx, GLenum esource, GLenum etype, control_app_messages_by_group(ctx, source, type, severity, enabled); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled) @@ -717,7 +717,7 @@ _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const GLvoid *userParam) { GET_CURRENT_CONTEXT(ctx); diff --git a/mesalib/src/mesa/main/errors.h b/mesalib/src/mesa/main/errors.h index b4490fac9..c41d36811 100644 --- a/mesalib/src/mesa/main/errors.h +++ b/mesalib/src/mesa/main/errors.h @@ -71,6 +71,22 @@ _mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLI extern void _mesa_shader_debug( struct gl_context *ctx, GLenum type, GLuint id, const char *msg, int len ); +void GLAPIENTRY +_mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id, + GLenum severity, GLint length, + const GLcharARB* buf); +GLuint GLAPIENTRY +_mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum* sources, + GLenum* types, GLenum* ids, GLenum* severities, + GLsizei* lengths, GLcharARB* messageLog); +void GLAPIENTRY +_mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, + GLsizei count, const GLuint *ids, + GLboolean enabled); +void GLAPIENTRY +_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, + const GLvoid *userParam); + #ifdef __cplusplus } #endif diff --git a/mesalib/src/mesa/main/es1_conversion.c b/mesalib/src/mesa/main/es1_conversion.c index 758fb1a66..993147c47 100644 --- a/mesalib/src/mesa/main/es1_conversion.c +++ b/mesalib/src/mesa/main/es1_conversion.c @@ -1,8 +1,6 @@ #include <stdbool.h> #include "main/mfeatures.h" -#if FEATURE_ES1 - #include "api_loopback.h" #include "api_exec.h" #include "blend.h" @@ -938,5 +936,3 @@ _es_Translatex(GLfixed x, GLfixed y, GLfixed z) (GLfloat) (y / 65536.0f), (GLfloat) (z / 65536.0f)); } - -#endif /* FEATURE_ES1 */ diff --git a/mesalib/src/mesa/main/eval.c b/mesalib/src/mesa/main/eval.c index d6e45d6e8..59627cc43 100644 --- a/mesalib/src/mesa/main/eval.c +++ b/mesalib/src/mesa/main/eval.c @@ -368,7 +368,7 @@ map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points ) { @@ -376,7 +376,7 @@ _mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points ) { @@ -467,7 +467,7 @@ map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map2f( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, @@ -478,7 +478,7 @@ _mesa_Map2f( GLenum target, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Map2d( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, @@ -490,7 +490,7 @@ _mesa_Map2d( GLenum target, -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMapdvARB( GLenum target, GLenum query, GLsizei bufSize, GLdouble *v ) { GET_CURRENT_CONTEXT(ctx); @@ -576,13 +576,13 @@ overflow: " but %d bytes are required)", bufSize, numBytes ); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v ) { _mesa_GetnMapdvARB(target, query, INT_MAX, v); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMapfvARB( GLenum target, GLenum query, GLsizei bufSize, GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); @@ -669,14 +669,14 @@ overflow: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v ) { _mesa_GetnMapfvARB(target, query, INT_MAX, v); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMapivARB( GLenum target, GLenum query, GLsizei bufSize, GLint *v ) { GET_CURRENT_CONTEXT(ctx); @@ -763,14 +763,14 @@ overflow: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMapiv( GLenum target, GLenum query, GLint *v ) { _mesa_GetnMapivARB(target, query, INT_MAX, v); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ) { GET_CURRENT_CONTEXT(ctx); @@ -788,14 +788,14 @@ _mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 ) { _mesa_MapGrid1f( un, (GLfloat) u1, (GLfloat) u2 ); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 ) { @@ -823,7 +823,7 @@ _mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 ) { @@ -848,28 +848,6 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp, } -void -_mesa_init_eval_dispatch(struct _glapi_table *disp) -{ - SET_GetMapdv(disp, _mesa_GetMapdv); - SET_GetMapfv(disp, _mesa_GetMapfv); - SET_GetMapiv(disp, _mesa_GetMapiv); - SET_Map1d(disp, _mesa_Map1d); - SET_Map1f(disp, _mesa_Map1f); - SET_Map2d(disp, _mesa_Map2d); - SET_Map2f(disp, _mesa_Map2f); - SET_MapGrid1d(disp, _mesa_MapGrid1d); - SET_MapGrid1f(disp, _mesa_MapGrid1f); - SET_MapGrid2d(disp, _mesa_MapGrid2d); - SET_MapGrid2f(disp, _mesa_MapGrid2f); - - /* GL_ARB_robustness */ - SET_GetnMapdvARB(disp, _mesa_GetnMapdvARB); - SET_GetnMapfvARB(disp, _mesa_GetnMapfvARB); - SET_GetnMapivARB(disp, _mesa_GetnMapivARB); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/mesalib/src/mesa/main/eval.h b/mesalib/src/mesa/main/eval.h index 0649de052..1b6c704ca 100644 --- a/mesalib/src/mesa/main/eval.h +++ b/mesalib/src/mesa/main/eval.h @@ -78,11 +78,47 @@ extern void _mesa_install_eval_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void -_mesa_init_eval_dispatch(struct _glapi_table *disp); - extern void _mesa_init_eval( struct gl_context *ctx ); extern void _mesa_free_eval_data( struct gl_context *ctx ); +void GLAPIENTRY +_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, + GLint order, const GLfloat *points ); +void GLAPIENTRY +_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, + GLint order, const GLdouble *points ); +void GLAPIENTRY +_mesa_Map2f( GLenum target, + GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, + GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, + const GLfloat *points); +void GLAPIENTRY +_mesa_Map2d( GLenum target, + GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, + GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, + const GLdouble *points ); +void GLAPIENTRY +_mesa_GetnMapdvARB( GLenum target, GLenum query, GLsizei bufSize, + GLdouble *v ); +void GLAPIENTRY +_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v ); +void GLAPIENTRY +_mesa_GetnMapfvARB( GLenum target, GLenum query, GLsizei bufSize, GLfloat *v ); +void GLAPIENTRY +_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v ); +void GLAPIENTRY +_mesa_GetnMapivARB( GLenum target, GLenum query, GLsizei bufSize, GLint *v ); +void GLAPIENTRY +_mesa_GetMapiv( GLenum target, GLenum query, GLint *v ); +void GLAPIENTRY +_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ); +void GLAPIENTRY +_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 ); +void GLAPIENTRY +_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, + GLint vn, GLfloat v1, GLfloat v2 ); +void GLAPIENTRY +_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, + GLint vn, GLdouble v1, GLdouble v2 ); #endif /* EVAL_H */ diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index fc5681ccc..0758d5557 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -2059,7 +2059,8 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, } else if ((texObj->Target == GL_TEXTURE_1D_ARRAY_EXT) || (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT)) { - if (zoffset < 0 || zoffset >= ctx->Const.MaxArrayTextureLayers) { + if (zoffset < 0 || + zoffset >= (GLint) ctx->Const.MaxArrayTextureLayers) { _mesa_error(ctx, GL_INVALID_VALUE, "glFramebufferTexture%sEXT(layer)", caller); return; @@ -2637,6 +2638,15 @@ _mesa_GenerateMipmapEXT(GLenum target) return; } + if (_mesa_is_enum_format_integer(srcImage->InternalFormat) || + _mesa_is_depthstencil_format(srcImage->InternalFormat) || + _mesa_is_stencil_format(srcImage->InternalFormat)) { + _mesa_unlock_texture(ctx, texObj); + _mesa_error(ctx, GL_INVALID_OPERATION, + "glGenerateMipmap(invalid internal format)"); + return; + } + if (target == GL_TEXTURE_CUBE_MAP) { GLuint face; for (face = 0; face < 6; face++) @@ -3142,7 +3152,7 @@ invalidate_framebuffer_storage(GLenum target, GLsizei numAttachments, case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT15: { - const int k = attachments[i] - GL_COLOR_ATTACHMENT0; + unsigned k = attachments[i] - GL_COLOR_ATTACHMENT0; if (k >= ctx->Const.MaxColorAttachments) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(attachment >= max. color attachments)", name); diff --git a/mesalib/src/mesa/main/feedback.c b/mesalib/src/mesa/main/feedback.c index f45b823b1..128a12622 100644 --- a/mesalib/src/mesa/main/feedback.c +++ b/mesalib/src/mesa/main/feedback.c @@ -47,7 +47,7 @@ -static void GLAPIENTRY +void GLAPIENTRY _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) { GET_CURRENT_CONTEXT(ctx); @@ -96,7 +96,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PassThrough( GLfloat token ) { GET_CURRENT_CONTEXT(ctx); @@ -159,7 +159,7 @@ _mesa_feedback_vertex(struct gl_context *ctx, * Verifies we're not in selection mode, flushes the vertices and initialize * the fields in __struct gl_contextRec::Select with the given buffer. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_SelectBuffer( GLsizei size, GLuint *buffer ) { GET_CURRENT_CONTEXT(ctx); @@ -271,7 +271,7 @@ write_hit_record(struct gl_context *ctx) * the hit record data in gl_selection. Marks new render mode in * __struct gl_contextRec::NewState. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_InitNames( void ) { GET_CURRENT_CONTEXT(ctx); @@ -302,7 +302,7 @@ _mesa_InitNames( void ) * * sa __struct gl_contextRec::Select. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_LoadName( GLuint name ) { GET_CURRENT_CONTEXT(ctx); @@ -341,7 +341,7 @@ _mesa_LoadName( GLuint name ) * * sa __struct gl_contextRec::Select. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_PushName( GLuint name ) { GET_CURRENT_CONTEXT(ctx); @@ -372,7 +372,7 @@ _mesa_PushName( GLuint name ) * * sa __struct gl_contextRec::Select. */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_PopName( void ) { GET_CURRENT_CONTEXT(ctx); @@ -494,20 +494,6 @@ _mesa_RenderMode( GLenum mode ) /*@}*/ -void -_mesa_init_feedback_dispatch(struct _glapi_table *disp) -{ - SET_InitNames(disp, _mesa_InitNames); - SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer); - SET_LoadName(disp, _mesa_LoadName); - SET_PassThrough(disp, _mesa_PassThrough); - SET_PopName(disp, _mesa_PopName); - SET_PushName(disp, _mesa_PushName); - SET_SelectBuffer(disp, _mesa_SelectBuffer); - SET_RenderMode(disp, _mesa_RenderMode); -} - - /**********************************************************************/ /** \name Initialization */ /*@{*/ diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h index cc4cf15a8..a697dc0d2 100644 --- a/mesalib/src/mesa/main/feedback.h +++ b/mesalib/src/mesa/main/feedback.h @@ -31,7 +31,21 @@ #include "main/mtypes.h" -extern GLint GLAPIENTRY +void GLAPIENTRY +_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ); +void GLAPIENTRY +_mesa_PassThrough( GLfloat token ); +void GLAPIENTRY +_mesa_SelectBuffer( GLsizei size, GLuint *buffer ); +void GLAPIENTRY +_mesa_InitNames( void ); +void GLAPIENTRY +_mesa_LoadName( GLuint name ); +void GLAPIENTRY +_mesa_PushName( GLuint name ); +void GLAPIENTRY +_mesa_PopName( void ); +GLint GLAPIENTRY _mesa_RenderMode( GLenum mode ); extern void @@ -56,10 +70,6 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z ); extern void -_mesa_init_feedback_dispatch(struct _glapi_table *disp); - - -extern void _mesa_init_feedback( struct gl_context *ctx ); #endif /* FEEDBACK_H */ diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c index efdca015e..4cdec2166 100644 --- a/mesalib/src/mesa/main/ffvertex_prog.c +++ b/mesalib/src/mesa/main/ffvertex_prog.c @@ -160,6 +160,8 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) key->need_eye_coords = ctx->_NeedEyeCoords; + /* Make sure fp->Base.InputsRead fits in a 12-bit field */ + assert(fp->Base.InputsRead < (1 << 12)); key->fragprog_inputs_read = fp->Base.InputsRead; key->varying_vp_inputs = ctx->varying_vp_inputs; diff --git a/mesalib/src/mesa/main/format_pack.c b/mesalib/src/mesa/main/format_pack.c index be6c026e8..051fb40b9 100644 --- a/mesalib/src/mesa/main/format_pack.c +++ b/mesalib/src/mesa/main/format_pack.c @@ -2248,7 +2248,7 @@ pack_uint_z_Z32_FLOAT(const GLuint *src, void *dst) { GLuint *d = ((GLuint *) dst); const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; - *d = *src * scale; + *d = (GLuint) (*src * scale); assert(*d >= 0.0f); assert(*d <= 1.0f); } @@ -2258,7 +2258,7 @@ pack_uint_z_Z32_FLOAT_X24S8(const GLuint *src, void *dst) { GLfloat *d = ((GLfloat *) dst); const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; - *d = *src * scale; + *d = (GLfloat) (*src * scale); assert(*d >= 0.0f); assert(*d <= 1.0f); } @@ -2473,7 +2473,7 @@ _mesa_pack_uint_z_row(gl_format format, GLuint n, const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; GLuint i; for (i = 0; i < n; i++) { - d[i] = src[i] * scale; + d[i] = (GLuint) (src[i] * scale); assert(d[i] >= 0.0f); assert(d[i] <= 1.0f); } @@ -2485,7 +2485,7 @@ _mesa_pack_uint_z_row(gl_format format, GLuint n, const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; GLuint i; for (i = 0; i < n; i++) { - d[i].z = src[i] * scale; + d[i].z = (GLfloat) (src[i] * scale); assert(d[i].z >= 0.0f); assert(d[i].z <= 1.0f); } @@ -2570,9 +2570,9 @@ _mesa_pack_uint_24_8_depth_stencil_row(gl_format format, GLuint n, { const GLdouble scale = 1.0 / (GLdouble) 0xffffff; struct z32f_x24s8 *d = (struct z32f_x24s8 *) dst; - GLint i; + GLuint i; for (i = 0; i < n; i++) { - GLfloat z = (src[i] >> 8) * scale; + GLfloat z = (GLfloat) ((src[i] >> 8) * scale); d[i].z = z; d[i].x24s8 = src[i]; } @@ -2599,10 +2599,10 @@ _mesa_pack_colormask(gl_format format, const GLubyte colorMask[4], void *dst) switch (_mesa_get_format_datatype(format)) { case GL_UNSIGNED_NORMALIZED: /* simple: 1.0 will convert to ~0 in the right bit positions */ - maskColor[0] = colorMask[0] ? 1.0 : 0.0; - maskColor[1] = colorMask[1] ? 1.0 : 0.0; - maskColor[2] = colorMask[2] ? 1.0 : 0.0; - maskColor[3] = colorMask[3] ? 1.0 : 0.0; + maskColor[0] = colorMask[0] ? 1.0f : 0.0f; + maskColor[1] = colorMask[1] ? 1.0f : 0.0f; + maskColor[2] = colorMask[2] ? 1.0f : 0.0f; + maskColor[3] = colorMask[3] ? 1.0f : 0.0f; _mesa_pack_float_rgba_row(format, 1, (const GLfloat (*)[4]) maskColor, dst); break; diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index c34d873f2..afae08932 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -1480,7 +1480,7 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params) } static enum value_type -find_value_indexed(const char *func, GLenum pname, int index, union value *v) +find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) { GET_CURRENT_CONTEXT(ctx); @@ -1686,7 +1686,6 @@ _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params ) } } -#if FEATURE_ES1 void GLAPIENTRY _mesa_GetFixedv(GLenum pname, GLfixed *params) { @@ -1772,4 +1771,3 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params) break; } } -#endif diff --git a/mesalib/src/mesa/main/histogram.c b/mesalib/src/mesa/main/histogram.c index d3dc7ddc4..fe454bcfb 100644 --- a/mesalib/src/mesa/main/histogram.c +++ b/mesalib/src/mesa/main/histogram.c @@ -37,11 +37,7 @@ */ -/* this is defined below */ -static void GLAPIENTRY _mesa_ResetMinmax(GLenum target); - - -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values) { @@ -51,7 +47,7 @@ _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values) { @@ -59,7 +55,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values) { @@ -69,7 +65,7 @@ _mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values) { @@ -77,7 +73,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -86,7 +82,7 @@ _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -95,7 +91,7 @@ _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -104,7 +100,7 @@ _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -113,7 +109,7 @@ _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink) { GET_CURRENT_CONTEXT(ctx); @@ -122,7 +118,7 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s } -static void GLAPIENTRY +void GLAPIENTRY _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) { GET_CURRENT_CONTEXT(ctx); @@ -131,7 +127,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ResetHistogram(GLenum target) { GET_CURRENT_CONTEXT(ctx); @@ -140,30 +136,10 @@ _mesa_ResetHistogram(GLenum target) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ResetMinmax(GLenum target) { GET_CURRENT_CONTEXT(ctx); _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax"); } - - -void -_mesa_init_histogram_dispatch(struct _glapi_table *disp) -{ - SET_GetHistogram(disp, _mesa_GetHistogram); - SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv); - SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv); - SET_GetMinmax(disp, _mesa_GetMinmax); - SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv); - SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv); - SET_Histogram(disp, _mesa_Histogram); - SET_Minmax(disp, _mesa_Minmax); - SET_ResetHistogram(disp, _mesa_ResetHistogram); - SET_ResetMinmax(disp, _mesa_ResetMinmax); - - /* GL_ARB_robustness */ - SET_GetnHistogramARB(disp, _mesa_GetnHistogramARB); - SET_GetnMinmaxARB(disp, _mesa_GetnMinmaxARB); -} diff --git a/mesalib/src/mesa/main/histogram.h b/mesalib/src/mesa/main/histogram.h index a9c312152..06781e732 100644 --- a/mesalib/src/mesa/main/histogram.h +++ b/mesalib/src/mesa/main/histogram.h @@ -41,7 +41,35 @@ struct _glapi_table; -extern void -_mesa_init_histogram_dispatch(struct _glapi_table *disp); +void GLAPIENTRY +_mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, + GLenum type, GLsizei bufSize, GLvoid *values); +void GLAPIENTRY +_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, + GLvoid *values); +void GLAPIENTRY +_mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format, + GLenum type, GLsizei bufSize, GLvoid *values); +void GLAPIENTRY +_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, + GLvoid *values); +void GLAPIENTRY +_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, + GLboolean sink); +void GLAPIENTRY +_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink); +void GLAPIENTRY +_mesa_ResetHistogram(GLenum target); +void GLAPIENTRY +_mesa_ResetMinmax(GLenum target); + #endif /* HISTOGRAM_H */ diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index a78d67966..40ba75785 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -81,7 +81,7 @@ extern "C" { * these casts generate warnings. * The following union typedef is used to solve that. */ -typedef union { GLfloat f; GLint i; } fi_type; +typedef union { GLfloat f; GLint i; GLuint u; } fi_type; diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h index 7b7fd1b6d..14a5d5fe1 100644 --- a/mesalib/src/mesa/main/macros.h +++ b/mesalib/src/mesa/main/macros.h @@ -171,6 +171,20 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256]; ub = ((GLubyte) F_TO_I((f) * 255.0F)) #endif +static inline GLfloat INT_AS_FLT(GLint i) +{ + fi_type tmp; + tmp.i = i; + return tmp.f; +} + +static inline GLfloat UINT_AS_FLT(GLuint u) +{ + fi_type tmp; + tmp.u = u; + return tmp.f; +} + /*@}*/ @@ -573,6 +587,31 @@ do { \ /*@}*/ +/** Copy \p sz elements into a homegeneous (4-element) vector, giving + * default values to the remaining components. + * The default values are chosen based on \p type. + */ +static inline void +COPY_CLEAN_4V_TYPE_AS_FLOAT(GLfloat dst[4], int sz, const GLfloat src[4], + GLenum type) +{ + switch (type) { + case GL_FLOAT: + ASSIGN_4V(dst, 0, 0, 0, 1); + break; + case GL_INT: + ASSIGN_4V(dst, INT_AS_FLT(0), INT_AS_FLT(0), + INT_AS_FLT(0), INT_AS_FLT(1)); + break; + case GL_UNSIGNED_INT: + ASSIGN_4V(dst, UINT_AS_FLT(0), UINT_AS_FLT(0), + UINT_AS_FLT(0), UINT_AS_FLT(1)); + break; + default: + ASSERT(0); + } + COPY_SZ_4V(dst, sz, src); +} /** \name Linear interpolation functions */ /*@{*/ diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c index 28c4e2b49..3c5968c85 100644 --- a/mesalib/src/mesa/main/matrix.c +++ b/mesalib/src/mesa/main/matrix.c @@ -746,7 +746,7 @@ void _mesa_free_matrix_data( struct gl_context *ctx ) */ void _mesa_init_transform( struct gl_context *ctx ) { - GLint i; + GLuint i; /* Transformation group */ ctx->Transform.MatrixMode = GL_MODELVIEW; diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c index f926c56a4..9940eda52 100644 --- a/mesalib/src/mesa/main/pixel.c +++ b/mesalib/src/mesa/main/pixel.c @@ -44,7 +44,7 @@ /***** glPixelZoom *****/ /**********************************************************************/ -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor ) { GET_CURRENT_CONTEXT(ctx); @@ -177,7 +177,7 @@ validate_pbo_access(struct gl_context *ctx, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ) { GET_CURRENT_CONTEXT(ctx); @@ -219,7 +219,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ) { GLfloat fvalues[MAX_PIXEL_MAP_TABLE]; @@ -275,7 +275,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ) { GLfloat fvalues[MAX_PIXEL_MAP_TABLE]; @@ -331,7 +331,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ) { GET_CURRENT_CONTEXT(ctx); @@ -376,13 +376,13 @@ _mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetPixelMapfv( GLenum map, GLfloat *values ) { _mesa_GetnPixelMapfvARB(map, INT_MAX, values); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ) { GET_CURRENT_CONTEXT(ctx); @@ -427,13 +427,13 @@ _mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetPixelMapuiv( GLenum map, GLuint *values ) { _mesa_GetnPixelMapuivARB(map, INT_MAX, values); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ) { GET_CURRENT_CONTEXT(ctx); @@ -486,7 +486,7 @@ _mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetPixelMapusv( GLenum map, GLushort *values ) { _mesa_GetnPixelMapusvARB(map, INT_MAX, values); @@ -600,7 +600,7 @@ _mesa_PixelTransferf( GLenum pname, GLfloat param ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_PixelTransferi( GLenum pname, GLint param ) { _mesa_PixelTransferf( pname, (GLfloat) param ); @@ -647,26 +647,6 @@ void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state ) } -void -_mesa_init_pixel_dispatch(struct _glapi_table *disp) -{ - SET_GetPixelMapfv(disp, _mesa_GetPixelMapfv); - SET_GetPixelMapuiv(disp, _mesa_GetPixelMapuiv); - SET_GetPixelMapusv(disp, _mesa_GetPixelMapusv); - SET_PixelMapfv(disp, _mesa_PixelMapfv); - SET_PixelMapuiv(disp, _mesa_PixelMapuiv); - SET_PixelMapusv(disp, _mesa_PixelMapusv); - SET_PixelTransferf(disp, _mesa_PixelTransferf); - SET_PixelTransferi(disp, _mesa_PixelTransferi); - SET_PixelZoom(disp, _mesa_PixelZoom); - - /* GL_ARB_robustness */ - SET_GetnPixelMapfvARB(disp, _mesa_GetnPixelMapfvARB); - SET_GetnPixelMapuivARB(disp, _mesa_GetnPixelMapuivARB); - SET_GetnPixelMapusvARB(disp, _mesa_GetnPixelMapusvARB); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/mesalib/src/mesa/main/pixel.h b/mesalib/src/mesa/main/pixel.h index bfd76d934..433208cb6 100644 --- a/mesalib/src/mesa/main/pixel.h +++ b/mesalib/src/mesa/main/pixel.h @@ -41,15 +41,34 @@ struct _glapi_table; struct gl_context; -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor ); +void GLAPIENTRY +_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ); +void GLAPIENTRY +_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ); +void GLAPIENTRY +_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ); +void GLAPIENTRY +_mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ); +void GLAPIENTRY +_mesa_GetPixelMapfv( GLenum map, GLfloat *values ); +void GLAPIENTRY +_mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ); +void GLAPIENTRY +_mesa_GetPixelMapuiv( GLenum map, GLuint *values ); +void GLAPIENTRY +_mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ); +void GLAPIENTRY +_mesa_GetPixelMapusv( GLenum map, GLushort *values ); +void GLAPIENTRY _mesa_PixelTransferf(GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_PixelTransferi( GLenum pname, GLint param ); extern void _mesa_update_pixel( struct gl_context *ctx, GLuint newstate ); -extern void -_mesa_init_pixel_dispatch( struct _glapi_table * disp ); - extern void _mesa_init_pixel( struct gl_context * ctx ); diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index 8bfd964ea..cb441e6fe 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -168,7 +168,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GenQueriesARB(GLsizei n, GLuint *ids) { GLuint first; @@ -207,7 +207,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) { GLint i; @@ -243,7 +243,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) } -static GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsQueryARB(GLuint id) { GET_CURRENT_CONTEXT(ctx); @@ -279,7 +279,7 @@ query_error_check_index(struct gl_context *ctx, GLenum target, GLuint index) return GL_TRUE; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) { struct gl_query_object *q, **bindpt; @@ -356,7 +356,7 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_EndQueryIndexed(GLenum target, GLuint index) { struct gl_query_object *q, **bindpt; @@ -402,19 +402,19 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index) ctx->Driver.EndQuery(ctx, q); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_BeginQueryARB(GLenum target, GLuint id) { _mesa_BeginQueryIndexed(target, 0, id); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_EndQueryARB(GLenum target) { _mesa_EndQueryIndexed(target, 0); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_QueryCounter(GLuint id, GLenum target) { struct gl_query_object *q; @@ -471,7 +471,7 @@ _mesa_QueryCounter(GLuint id, GLenum target) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params) { @@ -546,13 +546,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params) { _mesa_GetQueryIndexediv(target, 0, pname, params); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) { struct gl_query_object *q = NULL; @@ -603,7 +603,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) { struct gl_query_object *q = NULL; @@ -657,7 +657,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) /** * New with GL_EXT_timer_query */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) { struct gl_query_object *q = NULL; @@ -698,7 +698,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) /** * New with GL_EXT_timer_query */ -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params) { struct gl_query_object *q = NULL; diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index 1e35185c7..f9e916cda 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -53,5 +53,34 @@ _mesa_init_queryobj(struct gl_context *ctx); extern void _mesa_free_queryobj_data(struct gl_context *ctx); +void GLAPIENTRY +_mesa_GenQueriesARB(GLsizei n, GLuint *ids); +void GLAPIENTRY +_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids); +GLboolean GLAPIENTRY +_mesa_IsQueryARB(GLuint id); +void GLAPIENTRY +_mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id); +void GLAPIENTRY +_mesa_EndQueryIndexed(GLenum target, GLuint index); +void GLAPIENTRY +_mesa_BeginQueryARB(GLenum target, GLuint id); +void GLAPIENTRY +_mesa_EndQueryARB(GLenum target); +void GLAPIENTRY +_mesa_QueryCounter(GLuint id, GLenum target); +void GLAPIENTRY +_mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, + GLint *params); +void GLAPIENTRY +_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params); +void GLAPIENTRY +_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params); +void GLAPIENTRY +_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params); #endif /* QUERYOBJ_H */ diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c index ab8e2c1a3..0ea95b594 100644 --- a/mesalib/src/mesa/main/rastpos.c +++ b/mesalib/src/mesa/main/rastpos.c @@ -63,147 +63,147 @@ rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2d(GLdouble x, GLdouble y) { rasterpos((GLfloat)x, (GLfloat)y, (GLfloat)0.0, (GLfloat)1.0); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2f(GLfloat x, GLfloat y) { rasterpos(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2i(GLint x, GLint y) { rasterpos((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2s(GLshort x, GLshort y) { rasterpos(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) { rasterpos(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3i(GLint x, GLint y, GLint z) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3s(GLshort x, GLshort y, GLshort z) { rasterpos(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { rasterpos(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w) { rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) { rasterpos(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2dv(const GLdouble *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2fv(const GLfloat *v) { rasterpos(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2iv(const GLint *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos2sv(const GLshort *v) { rasterpos(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3dv(const GLdouble *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3fv(const GLfloat *v) { rasterpos(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3iv(const GLint *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos3sv(const GLshort *v) { rasterpos(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4dv(const GLdouble *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4fv(const GLfloat *v) { rasterpos(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4iv(const GLint *v) { rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_RasterPos4sv(const GLshort *v) { rasterpos(v[0], v[1], v[2], v[3]); @@ -288,147 +288,147 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2dMESA(GLdouble x, GLdouble y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2fMESA(GLfloat x, GLfloat y) { window_pos4f(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2iMESA(GLint x, GLint y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2sMESA(GLshort x, GLshort y) { window_pos4f(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z) { window_pos4f(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3iMESA(GLint x, GLint y, GLint z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z) { window_pos4f(x, y, z, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { window_pos4f(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w) { window_pos4f(x, y, z, w); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2dvMESA(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2fvMESA(const GLfloat *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2ivMESA(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos2svMESA(const GLshort *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3dvMESA(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3fvMESA(const GLfloat *v) { window_pos4f(v[0], v[1], v[2], 1.0); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3ivMESA(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos3svMESA(const GLshort *v) { window_pos4f(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4dvMESA(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4fvMESA(const GLfloat *v) { window_pos4f(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4ivMESA(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY +void GLAPIENTRY _mesa_WindowPos4svMESA(const GLshort *v) { window_pos4f(v[0], v[1], v[2], v[3]); @@ -474,62 +474,6 @@ void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) #endif -void -_mesa_init_rastpos_dispatch(struct _glapi_table *disp) -{ - SET_RasterPos2f(disp, _mesa_RasterPos2f); - SET_RasterPos2fv(disp, _mesa_RasterPos2fv); - SET_RasterPos2i(disp, _mesa_RasterPos2i); - SET_RasterPos2iv(disp, _mesa_RasterPos2iv); - SET_RasterPos2d(disp, _mesa_RasterPos2d); - SET_RasterPos2dv(disp, _mesa_RasterPos2dv); - SET_RasterPos2s(disp, _mesa_RasterPos2s); - SET_RasterPos2sv(disp, _mesa_RasterPos2sv); - SET_RasterPos3d(disp, _mesa_RasterPos3d); - SET_RasterPos3dv(disp, _mesa_RasterPos3dv); - SET_RasterPos3f(disp, _mesa_RasterPos3f); - SET_RasterPos3fv(disp, _mesa_RasterPos3fv); - SET_RasterPos3i(disp, _mesa_RasterPos3i); - SET_RasterPos3iv(disp, _mesa_RasterPos3iv); - SET_RasterPos3s(disp, _mesa_RasterPos3s); - SET_RasterPos3sv(disp, _mesa_RasterPos3sv); - SET_RasterPos4d(disp, _mesa_RasterPos4d); - SET_RasterPos4dv(disp, _mesa_RasterPos4dv); - SET_RasterPos4f(disp, _mesa_RasterPos4f); - SET_RasterPos4fv(disp, _mesa_RasterPos4fv); - SET_RasterPos4i(disp, _mesa_RasterPos4i); - SET_RasterPos4iv(disp, _mesa_RasterPos4iv); - SET_RasterPos4s(disp, _mesa_RasterPos4s); - SET_RasterPos4sv(disp, _mesa_RasterPos4sv); - - /* 197. GL_MESA_window_pos */ - SET_WindowPos2dMESA(disp, _mesa_WindowPos2dMESA); - SET_WindowPos2dvMESA(disp, _mesa_WindowPos2dvMESA); - SET_WindowPos2fMESA(disp, _mesa_WindowPos2fMESA); - SET_WindowPos2fvMESA(disp, _mesa_WindowPos2fvMESA); - SET_WindowPos2iMESA(disp, _mesa_WindowPos2iMESA); - SET_WindowPos2ivMESA(disp, _mesa_WindowPos2ivMESA); - SET_WindowPos2sMESA(disp, _mesa_WindowPos2sMESA); - SET_WindowPos2svMESA(disp, _mesa_WindowPos2svMESA); - SET_WindowPos3dMESA(disp, _mesa_WindowPos3dMESA); - SET_WindowPos3dvMESA(disp, _mesa_WindowPos3dvMESA); - SET_WindowPos3fMESA(disp, _mesa_WindowPos3fMESA); - SET_WindowPos3fvMESA(disp, _mesa_WindowPos3fvMESA); - SET_WindowPos3iMESA(disp, _mesa_WindowPos3iMESA); - SET_WindowPos3ivMESA(disp, _mesa_WindowPos3ivMESA); - SET_WindowPos3sMESA(disp, _mesa_WindowPos3sMESA); - SET_WindowPos3svMESA(disp, _mesa_WindowPos3svMESA); - SET_WindowPos4dMESA(disp, _mesa_WindowPos4dMESA); - SET_WindowPos4dvMESA(disp, _mesa_WindowPos4dvMESA); - SET_WindowPos4fMESA(disp, _mesa_WindowPos4fMESA); - SET_WindowPos4fvMESA(disp, _mesa_WindowPos4fvMESA); - SET_WindowPos4iMESA(disp, _mesa_WindowPos4iMESA); - SET_WindowPos4ivMESA(disp, _mesa_WindowPos4ivMESA); - SET_WindowPos4sMESA(disp, _mesa_WindowPos4sMESA); - SET_WindowPos4svMESA(disp, _mesa_WindowPos4svMESA); -} - - /**********************************************************************/ /** \name Initialization */ /**********************************************************************/ diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h index 9bb04cc9c..90351e86b 100644 --- a/mesalib/src/mesa/main/rastpos.h +++ b/mesalib/src/mesa/main/rastpos.h @@ -38,12 +38,107 @@ struct _glapi_table; struct gl_context; -extern void -_mesa_init_rastpos_dispatch(struct _glapi_table *disp); - extern void _mesa_init_rastpos(struct gl_context *ctx); +void GLAPIENTRY +_mesa_RasterPos2d(GLdouble x, GLdouble y); +void GLAPIENTRY +_mesa_RasterPos2f(GLfloat x, GLfloat y); +void GLAPIENTRY +_mesa_RasterPos2i(GLint x, GLint y); +void GLAPIENTRY +_mesa_RasterPos2s(GLshort x, GLshort y); +void GLAPIENTRY +_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z); +void GLAPIENTRY +_mesa_RasterPos3i(GLint x, GLint y, GLint z); +void GLAPIENTRY +_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w); +void GLAPIENTRY +_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +void GLAPIENTRY +_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w); +void GLAPIENTRY +_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w); +void GLAPIENTRY +_mesa_RasterPos2dv(const GLdouble *v); +void GLAPIENTRY +_mesa_RasterPos2fv(const GLfloat *v); +void GLAPIENTRY +_mesa_RasterPos2iv(const GLint *v); +void GLAPIENTRY +_mesa_RasterPos2sv(const GLshort *v); +void GLAPIENTRY +_mesa_RasterPos3dv(const GLdouble *v); +void GLAPIENTRY +_mesa_RasterPos3fv(const GLfloat *v); +void GLAPIENTRY +_mesa_RasterPos3iv(const GLint *v); +void GLAPIENTRY +_mesa_RasterPos3sv(const GLshort *v); +void GLAPIENTRY +_mesa_RasterPos4dv(const GLdouble *v); +void GLAPIENTRY +_mesa_RasterPos4fv(const GLfloat *v); +void GLAPIENTRY +_mesa_RasterPos4iv(const GLint *v); +void GLAPIENTRY +_mesa_RasterPos4sv(const GLshort *v); +void GLAPIENTRY +_mesa_WindowPos2dMESA(GLdouble x, GLdouble y); +void GLAPIENTRY +_mesa_WindowPos2fMESA(GLfloat x, GLfloat y); +void GLAPIENTRY +_mesa_WindowPos2iMESA(GLint x, GLint y); +void GLAPIENTRY +_mesa_WindowPos2sMESA(GLshort x, GLshort y); +void GLAPIENTRY +_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z); +void GLAPIENTRY +_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z); +void GLAPIENTRY +_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z); +void GLAPIENTRY +_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z); +void GLAPIENTRY +_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w); +void GLAPIENTRY +_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +void GLAPIENTRY +_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w); +void GLAPIENTRY +_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w); +void GLAPIENTRY +_mesa_WindowPos2dvMESA(const GLdouble *v); +void GLAPIENTRY +_mesa_WindowPos2fvMESA(const GLfloat *v); +void GLAPIENTRY +_mesa_WindowPos2ivMESA(const GLint *v); +void GLAPIENTRY +_mesa_WindowPos2svMESA(const GLshort *v); +void GLAPIENTRY +_mesa_WindowPos3dvMESA(const GLdouble *v); +void GLAPIENTRY +_mesa_WindowPos3fvMESA(const GLfloat *v); +void GLAPIENTRY +_mesa_WindowPos3ivMESA(const GLint *v); +void GLAPIENTRY +_mesa_WindowPos3svMESA(const GLshort *v); +void GLAPIENTRY +_mesa_WindowPos4dvMESA(const GLdouble *v); +void GLAPIENTRY +_mesa_WindowPos4fvMESA(const GLfloat *v); +void GLAPIENTRY +_mesa_WindowPos4ivMESA(const GLint *v); +void GLAPIENTRY +_mesa_WindowPos4svMESA(const GLshort *v); + + /*@}*/ #endif /* RASTPOS_H */ diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c index 09cbd2939..3c3bfffd4 100644 --- a/mesalib/src/mesa/main/samplerobj.c +++ b/mesalib/src/mesa/main/samplerobj.c @@ -224,7 +224,7 @@ _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers) } -static GLboolean GLAPIENTRY +GLboolean GLAPIENTRY _mesa_IsSampler(GLuint sampler) { struct gl_sampler_object *sampObj; @@ -684,7 +684,7 @@ _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) { struct gl_sampler_object *sampObj; @@ -770,7 +770,7 @@ _mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params) { struct gl_sampler_object *sampObj; @@ -862,7 +862,7 @@ _mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params) { struct gl_sampler_object *sampObj; @@ -949,7 +949,7 @@ _mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params) } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params) { struct gl_sampler_object *sampObj; @@ -1035,7 +1035,7 @@ _mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params) { struct gl_sampler_object *sampObj; @@ -1121,7 +1121,7 @@ _mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) { struct gl_sampler_object *sampObj; @@ -1199,7 +1199,7 @@ invalid_pname: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params) { struct gl_sampler_object *sampObj; @@ -1277,7 +1277,7 @@ invalid_pname: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params) { struct gl_sampler_object *sampObj; @@ -1356,7 +1356,7 @@ invalid_pname: } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params) { struct gl_sampler_object *sampObj; diff --git a/mesalib/src/mesa/main/samplerobj.h b/mesalib/src/mesa/main/samplerobj.h index bea4c2232..ecff032c9 100644 --- a/mesalib/src/mesa/main/samplerobj.h +++ b/mesalib/src/mesa/main/samplerobj.h @@ -80,16 +80,33 @@ extern void _mesa_init_sampler_object_dispatch(const struct gl_context *ctx, struct _glapi_table *disp); -extern void GLAPIENTRY -_mesa_BindSampler(GLuint unit, GLuint sampler); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GenSamplers(GLsizei count, GLuint *samplers); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers); - -extern void GLAPIENTRY +GLboolean GLAPIENTRY +_mesa_IsSampler(GLuint sampler); +void GLAPIENTRY +_mesa_BindSampler(GLuint unit, GLuint sampler); +void GLAPIENTRY _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param); +void GLAPIENTRY +_mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params); +void GLAPIENTRY +_mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params); +void GLAPIENTRY +_mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params); +void GLAPIENTRY +_mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params); +void GLAPIENTRY +_mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params); +void GLAPIENTRY +_mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params); #endif /* SAMPLEROBJ_H */ diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c index c5a878644..7c9c2a760 100644 --- a/mesalib/src/mesa/main/texgen.c +++ b/mesalib/src/mesa/main/texgen.c @@ -186,7 +186,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ) { GLfloat p[4]; @@ -203,7 +203,7 @@ _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ) } -static void GLAPIENTRY +void GLAPIENTRY _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ) { GLfloat p[4]; @@ -212,7 +212,6 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ) _mesa_TexGenfv( coord, pname, p ); } -#if FEATURE_ES1 void GLAPIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params) @@ -250,9 +249,8 @@ _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params) _mesa_TexGenfv(GL_R, pname, params); } -#endif -static void GLAPIENTRY +void GLAPIENTRY _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ) { GLfloat p[4]; @@ -290,7 +288,7 @@ _mesa_TexGeni( GLenum coord, GLenum pname, GLint param ) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params ) { struct gl_texture_unit *texUnit; @@ -423,20 +421,3 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ) _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" ); } } - - -void -_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp) -{ - SET_GetTexGenfv(disp, _mesa_GetTexGenfv); - SET_GetTexGeniv(disp, _mesa_GetTexGeniv); - SET_TexGenf(disp, _mesa_TexGenf); - SET_TexGenfv(disp, _mesa_TexGenfv); - SET_TexGeni(disp, _mesa_TexGeni); - SET_TexGeniv(disp, _mesa_TexGeniv); - if (ctx->API == API_OPENGL) { - SET_GetTexGendv(disp, _mesa_GetTexGendv); - SET_TexGend(disp, _mesa_TexGend); - SET_TexGendv(disp, _mesa_TexGendv); - } -} diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h index 03dd49c61..97563a0f0 100644 --- a/mesalib/src/mesa/main/texgen.h +++ b/mesalib/src/mesa/main/texgen.h @@ -34,24 +34,25 @@ struct _glapi_table; -extern void GLAPIENTRY +void GLAPIENTRY _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); - -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ); +void GLAPIENTRY +_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ); +void GLAPIENTRY +_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ); +void GLAPIENTRY _mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param ); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_TexGeni( GLenum coord, GLenum pname, GLint param ); - -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params ); +void GLAPIENTRY _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ); -extern void -_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp); - extern void GLAPIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params); diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index a3720699d..554c68b71 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -892,7 +892,7 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, if (!_mesa_is_bufferobj(ctx->Pack.BufferObj)) { /* do bounds checking on writing to client memory */ - if (clientMemSize < compressedSize) { + if (clientMemSize < (GLsizei) compressedSize) { _mesa_error(ctx, GL_INVALID_OPERATION, "glGetnCompressedTexImageARB(out of bounds access:" " bufSize (%d) is too small)", clientMemSize); diff --git a/mesalib/src/mesa/main/texstorage.c b/mesalib/src/mesa/main/texstorage.c index 283aefad3..968f6f904 100644 --- a/mesalib/src/mesa/main/texstorage.c +++ b/mesalib/src/mesa/main/texstorage.c @@ -292,7 +292,7 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target, /* check levels against width/height/depth */ maxDim = MAX3(width, height, depth); - if (levels > _mesa_logbase2(maxDim) + 1) { + if (levels > (GLint) _mesa_logbase2(maxDim) + 1) { _mesa_error(ctx, GL_INVALID_OPERATION, "glTexStorage%uD(too many levels for max texture dimension)", dims); diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c index 1afc0dccb..52cb065c2 100644 --- a/mesalib/src/mesa/main/transformfeedback.c +++ b/mesalib/src/mesa/main/transformfeedback.c @@ -245,28 +245,6 @@ _mesa_init_transform_feedback_functions(struct dd_function_table *driver) } -void -_mesa_init_transform_feedback_dispatch(const struct gl_context *ctx, - struct _glapi_table *disp) -{ - /* EXT_transform_feedback */ - SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback); - SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback); - if (_mesa_is_desktop_gl(ctx)) { - SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT); - } - SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings); - SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying); - /* ARB_transform_feedback2 */ - SET_BindTransformFeedback(disp, _mesa_BindTransformFeedback); - SET_DeleteTransformFeedbacks(disp, _mesa_DeleteTransformFeedbacks); - SET_GenTransformFeedbacks(disp, _mesa_GenTransformFeedbacks); - SET_IsTransformFeedback(disp, _mesa_IsTransformFeedback); - SET_PauseTransformFeedback(disp, _mesa_PauseTransformFeedback); - SET_ResumeTransformFeedback(disp, _mesa_ResumeTransformFeedback); -} - - /** ** Begin API functions **/ @@ -599,7 +577,7 @@ _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, } /* free existing varyings, if any */ - for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) { + for (i = 0; i < (GLint) shProg->TransformFeedback.NumVarying; i++) { free(shProg->TransformFeedback.VaryingNames[i]); } free(shProg->TransformFeedback.VaryingNames); @@ -614,7 +592,7 @@ _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, } /* Save the new names and the count */ - for (i = 0; i < (GLuint) count; i++) { + for (i = 0; i < count; i++) { shProg->TransformFeedback.VaryingNames[i] = _mesa_strdup(varyings[i]); } shProg->TransformFeedback.NumVarying = count; diff --git a/mesalib/src/mesa/main/transformfeedback.h b/mesalib/src/mesa/main/transformfeedback.h index 6ff9c50b4..dec11ffa0 100644 --- a/mesalib/src/mesa/main/transformfeedback.h +++ b/mesalib/src/mesa/main/transformfeedback.h @@ -46,10 +46,6 @@ _mesa_validate_transform_feedback_buffers(struct gl_context *ctx); extern void _mesa_init_transform_feedback_functions(struct dd_function_table *driver); -extern void -_mesa_init_transform_feedback_dispatch(const struct gl_context *ctx, - struct _glapi_table *disp); - /*** GL_EXT_transform_feedback ***/ diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index 861601efd..2b7a564f0 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/src/mesa/main/uniforms.c @@ -535,7 +535,7 @@ _mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name) return _mesa_uniform_merge_location_offset(index, offset); } -static GLuint GLAPIENTRY +GLuint GLAPIENTRY _mesa_GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName) { @@ -561,7 +561,7 @@ _mesa_GetUniformBlockIndex(GLuint program, return GL_INVALID_INDEX; } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar * const *uniformNames, @@ -594,7 +594,7 @@ _mesa_GetUniformIndices(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding) @@ -644,7 +644,7 @@ _mesa_UniformBlockBinding(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, @@ -720,7 +720,7 @@ _mesa_GetActiveUniformBlockiv(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, @@ -762,7 +762,7 @@ _mesa_GetActiveUniformBlockName(GLuint program, } } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName) @@ -799,80 +799,3 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, shProg->UniformStorage[uniformIndex].name); } } - -/** - * Plug in shader uniform-related functions into API dispatch table. - */ -void -_mesa_init_shader_uniform_dispatch(const struct gl_context *ctx, - struct _glapi_table *exec) -{ -#if FEATURE_GL - if (ctx->API != API_OPENGLES) { - SET_Uniform1fARB(exec, _mesa_Uniform1fARB); - SET_Uniform2fARB(exec, _mesa_Uniform2fARB); - SET_Uniform3fARB(exec, _mesa_Uniform3fARB); - SET_Uniform4fARB(exec, _mesa_Uniform4fARB); - SET_Uniform1iARB(exec, _mesa_Uniform1iARB); - SET_Uniform2iARB(exec, _mesa_Uniform2iARB); - SET_Uniform3iARB(exec, _mesa_Uniform3iARB); - SET_Uniform4iARB(exec, _mesa_Uniform4iARB); - SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB); - SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB); - SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB); - SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB); - SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB); - SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB); - SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB); - SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB); - SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB); - SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB); - SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB); - - SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB); - SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB); - SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB); - SET_GetUniformivARB(exec, _mesa_GetUniformivARB); - } - - /* OpenGL 2.1 */ - if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv); - SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv); - SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv); - SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv); - SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv); - SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv); - - /* OpenGL 3.0 */ - SET_Uniform1uiEXT(exec, _mesa_Uniform1ui); - SET_Uniform2uiEXT(exec, _mesa_Uniform2ui); - SET_Uniform3uiEXT(exec, _mesa_Uniform3ui); - SET_Uniform4uiEXT(exec, _mesa_Uniform4ui); - SET_Uniform1uivEXT(exec, _mesa_Uniform1uiv); - SET_Uniform2uivEXT(exec, _mesa_Uniform2uiv); - SET_Uniform3uivEXT(exec, _mesa_Uniform3uiv); - SET_Uniform4uivEXT(exec, _mesa_Uniform4uiv); - SET_GetUniformuivEXT(exec, _mesa_GetUniformuiv); - - /* GL_ARB_uniform_buffer_object / GL 3.1 */ - SET_GetUniformBlockIndex(exec, _mesa_GetUniformBlockIndex); - SET_GetUniformIndices(exec, _mesa_GetUniformIndices); - SET_GetActiveUniformsiv(exec, _mesa_GetActiveUniformsiv); - SET_GetActiveUniformBlockiv(exec, _mesa_GetActiveUniformBlockiv); - SET_GetActiveUniformBlockName(exec, _mesa_GetActiveUniformBlockName); - SET_UniformBlockBinding(exec, _mesa_UniformBlockBinding); - } - - if (_mesa_is_desktop_gl(ctx)) { - /* GL_ARB_robustness */ - SET_GetnUniformfvARB(exec, _mesa_GetnUniformfvARB); - SET_GetnUniformivARB(exec, _mesa_GetnUniformivARB); - SET_GetnUniformuivARB(exec, _mesa_GetnUniformuivARB); - SET_GetnUniformdvARB(exec, _mesa_GetnUniformdvARB); - - /* GL_ARB_uniform_buffer_object / GL 3.1 */ - SET_GetActiveUniformName(exec, _mesa_GetActiveUniformName); - } -#endif /* FEATURE_GL */ -} diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index 3fe7d4402..076bde3c8 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -38,151 +38,135 @@ extern "C" { struct gl_program; struct _glapi_table; -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1fARB(GLint, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2fARB(GLint, GLfloat, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1iARB(GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2iARB(GLint, GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3iARB(GLint, GLint, GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4ivARB(GLint, GLsizei, const GLint *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1ui(GLint location, GLuint v0); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value); - - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - - -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); +void GLAPIENTRY +_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *); +void GLAPIENTRY +_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); +void GLAPIENTRY +_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *); +void GLAPIENTRY +_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *); +void GLAPIENTRY +_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params); +void GLAPIENTRY +_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); +void GLAPIENTRY +_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); +GLint GLAPIENTRY +_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *); +GLuint GLAPIENTRY +_mesa_GetUniformBlockIndex(GLuint program, + const GLchar *uniformBlockName); +void GLAPIENTRY +_mesa_GetUniformIndices(GLuint program, + GLsizei uniformCount, + const GLchar * const *uniformNames, + GLuint *uniformIndices); +void GLAPIENTRY +_mesa_UniformBlockBinding(GLuint program, + GLuint uniformBlockIndex, + GLuint uniformBlockBinding); +void GLAPIENTRY +_mesa_GetActiveUniformBlockiv(GLuint program, + GLuint uniformBlockIndex, + GLenum pname, + GLint *params); +void GLAPIENTRY +_mesa_GetActiveUniformBlockName(GLuint program, + GLuint uniformBlockIndex, + GLsizei bufSize, + GLsizei *length, + GLchar *uniformBlockName); +void GLAPIENTRY +_mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, + GLsizei bufSize, GLsizei *length, + GLchar *uniformName); +void GLAPIENTRY _mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); - -extern void GLAPIENTRY -_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *); - -extern void GLAPIENTRY -_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); - -extern void GLAPIENTRY +void GLAPIENTRY _mesa_GetUniformivARB(GLhandleARB, GLint, GLint *); -extern void GLAPIENTRY -_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); - -extern void GLAPIENTRY -_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *); - -extern void GLAPIENTRY -_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *); - -extern void GLAPIENTRY -_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); - -extern void GLAPIENTRY -_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); - -extern GLint GLAPIENTRY -_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *); - unsigned _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg, const GLchar *name, unsigned *offset); @@ -226,10 +210,6 @@ extern bool _mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg, char *errMsg, size_t errMsgLength); -extern void -_mesa_init_shader_uniform_dispatch(const struct gl_context *ctx, - struct _glapi_table *exec); - extern const struct gl_program_parameter * get_uniform_parameter(struct gl_shader_program *shProg, GLint index); diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index b4b58db6d..cfb24f318 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -9,7 +9,7 @@ MAIN_ES_FILES = \ MAIN_FILES = \ $(SRCDIR)main/api_arrayelt.c \ - $(SRCDIR)main/api_exec.c \ + $(BUILDDIR)main/api_exec.c \ $(SRCDIR)main/api_loopback.c \ $(SRCDIR)main/api_validate.c \ $(SRCDIR)main/accum.c \ diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 882fb372b..adee00bd2 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -750,7 +750,7 @@ st_MapRenderbuffer(struct gl_context *ctx, usage, x, y2, w, h, &strb->transfer); if (map) { if (invert) { - *rowStrideOut = -strb->transfer->stride; + *rowStrideOut = -(int) strb->transfer->stride; map += (h - 1) * strb->transfer->stride; } else { diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 14b72dc80..a70a08bf3 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -285,7 +285,7 @@ public: st_src_reg return_reg; }; -class glsl_to_tgsi_visitor : public ir_visitor { +struct glsl_to_tgsi_visitor : public ir_visitor { public: glsl_to_tgsi_visitor(); ~glsl_to_tgsi_visitor(); diff --git a/mesalib/src/mesa/swrast/s_zoom.c b/mesalib/src/mesa/swrast/s_zoom.c index 24bfa22bf..828374f68 100644 --- a/mesalib/src/mesa/swrast/s_zoom.c +++ b/mesalib/src/mesa/swrast/s_zoom.c @@ -234,7 +234,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span, for (i = 0; i < zoomedWidth; i++) { GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x; ASSERT(j >= 0); - ASSERT(j < span->end); + ASSERT(j < (GLint) span->end); COPY_4V(zoomed.array->attribs[FRAG_ATTRIB_COL0][i], rgba[j]); } } @@ -272,7 +272,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span, for (i = 0; i < zoomedWidth; i++) { GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x; ASSERT(j >= 0); - ASSERT(j < span->end); + ASSERT(j < (GLint) span->end); zoomed.array->attribs[FRAG_ATTRIB_COL0][i][0] = rgb[j][0]; zoomed.array->attribs[FRAG_ATTRIB_COL0][i][1] = rgb[j][1]; zoomed.array->attribs[FRAG_ATTRIB_COL0][i][2] = rgb[j][2]; diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c index 6a3c9662e..0631eb183 100644 --- a/mesalib/src/mesa/tnl/t_draw.c +++ b/mesalib/src/mesa/tnl/t_draw.c @@ -141,7 +141,8 @@ convert_fixed_to_float(const struct gl_client_array *input, const GLubyte *ptr, GLfloat *fptr, GLuint count) { - GLuint i, j; + GLuint i; + GLint j; const GLint size = input->Size; if (input->Normalized) { diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h index e0584973f..04930b971 100644 --- a/mesalib/src/mesa/vbo/vbo.h +++ b/mesalib/src/mesa/vbo/vbo.h @@ -50,7 +50,7 @@ struct _mesa_prim { GLuint start; GLuint count; GLint basevertex; - GLsizei num_instances; + GLuint num_instances; GLuint base_instance; }; diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h index 884844535..6bc53bab3 100644 --- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h +++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h @@ -26,38 +26,46 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ /* float */ -#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 ) -#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 ) -#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 ) -#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define ATTR1FV( A, V ) ATTR( A, 1, GL_FLOAT, (V)[0], 0, 0, 1 ) +#define ATTR2FV( A, V ) ATTR( A, 2, GL_FLOAT, (V)[0], (V)[1], 0, 1 ) +#define ATTR3FV( A, V ) ATTR( A, 3, GL_FLOAT, (V)[0], (V)[1], (V)[2], 1 ) +#define ATTR4FV( A, V ) ATTR( A, 4, GL_FLOAT, (V)[0], (V)[1], (V)[2], (V)[3] ) -#define ATTR1F( A, X ) ATTR( A, 1, X, 0, 0, 1 ) -#define ATTR2F( A, X, Y ) ATTR( A, 2, X, Y, 0, 1 ) -#define ATTR3F( A, X, Y, Z ) ATTR( A, 3, X, Y, Z, 1 ) -#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W ) +#define ATTR1F( A, X ) ATTR( A, 1, GL_FLOAT, X, 0, 0, 1 ) +#define ATTR2F( A, X, Y ) ATTR( A, 2, GL_FLOAT, X, Y, 0, 1 ) +#define ATTR3F( A, X, Y, Z ) ATTR( A, 3, GL_FLOAT, X, Y, Z, 1 ) +#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, GL_FLOAT, X, Y, Z, W ) /* int */ -#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 ) -#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 ) -#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define ATTRI( A, N, X, Y, Z, W) ATTR( A, N, GL_INT, \ + INT_AS_FLT(X), INT_AS_FLT(Y), \ + INT_AS_FLT(Z), INT_AS_FLT(W) ) -#define ATTR1I( A, X ) ATTR( A, 1, X, 0, 0, 1 ) -#define ATTR2I( A, X, Y ) ATTR( A, 2, X, Y, 0, 1 ) -#define ATTR3I( A, X, Y, Z ) ATTR( A, 3, X, Y, Z, 1 ) -#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W ) +#define ATTR2IV( A, V ) ATTRI( A, 2, (V)[0], (V)[1], 0, 1 ) +#define ATTR3IV( A, V ) ATTRI( A, 3, (V)[0], (V)[1], (V)[2], 1 ) +#define ATTR4IV( A, V ) ATTRI( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) + +#define ATTR1I( A, X ) ATTRI( A, 1, X, 0, 0, 1 ) +#define ATTR2I( A, X, Y ) ATTRI( A, 2, X, Y, 0, 1 ) +#define ATTR3I( A, X, Y, Z ) ATTRI( A, 3, X, Y, Z, 1 ) +#define ATTR4I( A, X, Y, Z, W ) ATTRI( A, 4, X, Y, Z, W ) /* uint */ -#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 ) -#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 ) -#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define ATTRUI( A, N, X, Y, Z, W) ATTR( A, N, GL_UNSIGNED_INT, \ + UINT_AS_FLT(X), UINT_AS_FLT(Y), \ + UINT_AS_FLT(Z), UINT_AS_FLT(W) ) + +#define ATTR2UIV( A, V ) ATTRUI( A, 2, (V)[0], (V)[1], 0, 1 ) +#define ATTR3UIV( A, V ) ATTRUI( A, 3, (V)[0], (V)[1], (V)[2], 1 ) +#define ATTR4UIV( A, V ) ATTRUI( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] ) -#define ATTR1UI( A, X ) ATTR( A, 1, X, 0, 0, 1 ) -#define ATTR2UI( A, X, Y ) ATTR( A, 2, X, Y, 0, 1 ) -#define ATTR3UI( A, X, Y, Z ) ATTR( A, 3, X, Y, Z, 1 ) -#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W ) +#define ATTR1UI( A, X ) ATTRUI( A, 1, X, 0, 0, 1 ) +#define ATTR2UI( A, X, Y ) ATTRUI( A, 2, X, Y, 0, 1 ) +#define ATTR3UI( A, X, Y, Z ) ATTRUI( A, 3, X, Y, Z, 1 ) +#define ATTR4UI( A, X, Y, Z, W ) ATTRUI( A, 4, X, Y, Z, W ) -#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] ) +#define MAT_ATTR( A, N, V ) ATTR( A, N, GL_FLOAT, (V)[0], (V)[1], (V)[2], (V)[3] ) static inline float conv_ui10_to_norm_float(unsigned ui10) { @@ -69,20 +77,20 @@ static inline float conv_ui2_to_norm_float(unsigned ui2) return ui2 / 3.0f; } -#define ATTRUI10_1( A, UI ) ATTR( A, 1, (UI) & 0x3ff, 0, 0, 1 ) -#define ATTRUI10_2( A, UI ) ATTR( A, 2, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 ) -#define ATTRUI10_3( A, UI ) ATTR( A, 3, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 ) -#define ATTRUI10_4( A, UI ) ATTR( A, 4, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 ) +#define ATTRUI10_1( A, UI ) ATTR( A, 1, GL_FLOAT, (UI) & 0x3ff, 0, 0, 1 ) +#define ATTRUI10_2( A, UI ) ATTR( A, 2, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 ) +#define ATTRUI10_3( A, UI ) ATTR( A, 3, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 ) +#define ATTRUI10_4( A, UI ) ATTR( A, 4, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 ) -#define ATTRUI10N_1( A, UI ) ATTR( A, 1, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 ) -#define ATTRUI10N_2( A, UI ) ATTR( A, 2, \ +#define ATTRUI10N_1( A, UI ) ATTR( A, 1, GL_FLOAT, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 ) +#define ATTRUI10N_2( A, UI ) ATTR( A, 2, GL_FLOAT, \ conv_ui10_to_norm_float((UI) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), 0, 1 ) -#define ATTRUI10N_3( A, UI ) ATTR( A, 3, \ +#define ATTRUI10N_3( A, UI ) ATTR( A, 3, GL_FLOAT, \ conv_ui10_to_norm_float((UI) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), 1 ) -#define ATTRUI10N_4( A, UI ) ATTR( A, 4, \ +#define ATTRUI10N_4( A, UI ) ATTR( A, 4, GL_FLOAT, \ conv_ui10_to_norm_float((UI) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \ conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), \ @@ -119,30 +127,30 @@ static inline float conv_i2_to_norm_float(int i2) return (float)val.x; } -#define ATTRI10_1( A, I10 ) ATTR( A, 1, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 ) -#define ATTRI10_2( A, I10 ) ATTR( A, 2, \ +#define ATTRI10_1( A, I10 ) ATTR( A, 1, GL_FLOAT, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 ) +#define ATTRI10_2( A, I10 ) ATTR( A, 2, GL_FLOAT, \ conv_i10_to_i((I10) & 0x3ff), \ conv_i10_to_i(((I10) >> 10) & 0x3ff), 0, 1 ) -#define ATTRI10_3( A, I10 ) ATTR( A, 3, \ +#define ATTRI10_3( A, I10 ) ATTR( A, 3, GL_FLOAT, \ conv_i10_to_i((I10) & 0x3ff), \ conv_i10_to_i(((I10) >> 10) & 0x3ff), \ conv_i10_to_i(((I10) >> 20) & 0x3ff), 1 ) -#define ATTRI10_4( A, I10 ) ATTR( A, 4, \ +#define ATTRI10_4( A, I10 ) ATTR( A, 4, GL_FLOAT, \ conv_i10_to_i((I10) & 0x3ff), \ conv_i10_to_i(((I10) >> 10) & 0x3ff), \ conv_i10_to_i(((I10) >> 20) & 0x3ff), \ conv_i2_to_i(((I10) >> 30) & 0x3)) -#define ATTRI10N_1( A, I10 ) ATTR( A, 1, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 ) -#define ATTRI10N_2( A, I10 ) ATTR( A, 2, \ +#define ATTRI10N_1( A, I10 ) ATTR( A, 1, GL_FLOAT, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 ) +#define ATTRI10N_2( A, I10 ) ATTR( A, 2, GL_FLOAT, \ conv_i10_to_norm_float((I10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), 0, 1 ) -#define ATTRI10N_3( A, I10 ) ATTR( A, 3, \ +#define ATTRI10N_3( A, I10 ) ATTR( A, 3, GL_FLOAT, \ conv_i10_to_norm_float((I10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), 1 ) -#define ATTRI10N_4( A, I10 ) ATTR( A, 4, \ +#define ATTRI10N_4( A, I10 ) ATTR( A, 4, GL_FLOAT, \ conv_i10_to_norm_float((I10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \ conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), \ diff --git a/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h index c896f1196..1ff6ec000 100644 --- a/mesalib/src/mesa/vbo/vbo_context.h +++ b/mesalib/src/mesa/vbo/vbo_context.h @@ -147,4 +147,47 @@ vbo_draw_method(struct vbo_context *vbo, enum draw_method method) } } +/** + * Return if format is integer. The immediate mode commands only emit floats + * for non-integer types, thus everything else is integer. + */ +static inline GLboolean +vbo_attrtype_to_integer_flag(GLenum format) +{ + switch (format) { + case GL_FLOAT: + return GL_FALSE; + case GL_INT: + case GL_UNSIGNED_INT: + return GL_TRUE; + default: + ASSERT(0); + return GL_FALSE; + } +} + + +/** + * Return default component values for the given format. + * The return type is an array of floats, because that's how we declare + * the vertex storage despite the fact we sometimes store integers in there. + */ +static inline const GLfloat * +vbo_get_default_vals_as_float(GLenum format) +{ + static const GLfloat default_float[4] = { 0, 0, 0, 1 }; + static const GLint default_int[4] = { 0, 0, 0, 1 }; + + switch (format) { + case GL_FLOAT: + return default_float; + case GL_INT: + case GL_UNSIGNED_INT: + return (const GLfloat*)default_int; + default: + ASSERT(0); + return NULL; + } +} + #endif diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h index ef57a8199..96cf4c82b 100644 --- a/mesalib/src/mesa/vbo/vbo_exec.h +++ b/mesalib/src/mesa/vbo/vbo_exec.h @@ -101,6 +101,7 @@ struct vbo_exec_context struct vbo_exec_copied_vtx copied; GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLubyte active_sz[VBO_ATTRIB_MAX]; GLfloat *attrptr[VBO_ATTRIB_MAX]; diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index 2ddb71588..75e549fc4 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -157,11 +157,13 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec ) GLfloat *current = (GLfloat *)vbo->currval[i].Ptr; GLfloat tmp[4]; - COPY_CLEAN_4V(tmp, - exec->vtx.attrsz[i], - exec->vtx.attrptr[i]); + COPY_CLEAN_4V_TYPE_AS_FLOAT(tmp, + exec->vtx.attrsz[i], + exec->vtx.attrptr[i], + exec->vtx.attrtype[i]); - if (memcmp(current, tmp, sizeof(tmp)) != 0) { + if (exec->vtx.attrtype[i] != vbo->currval[i].Type || + memcmp(current, tmp, sizeof(tmp)) != 0) { memcpy(current, tmp, sizeof(tmp)); /* Given that we explicitly state size here, there is no need @@ -170,8 +172,10 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec ) * directly. */ vbo->currval[i].Size = exec->vtx.attrsz[i]; - assert(vbo->currval[i].Type == GL_FLOAT); vbo->currval[i]._ElementSize = vbo->currval[i].Size * sizeof(GLfloat); + vbo->currval[i].Type = exec->vtx.attrtype[i]; + vbo->currval[i].Integer = + vbo_attrtype_to_integer_flag(exec->vtx.attrtype[i]); /* This triggers rather too much recalculation of Mesa state * that doesn't get used (eg light positions). @@ -324,7 +328,9 @@ vbo_exec_wrap_upgrade_vertex(struct vbo_exec_context *exec, if (j == attr) { if (oldSize) { GLfloat tmp[4]; - COPY_CLEAN_4V(tmp, oldSize, data + old_offset); + COPY_CLEAN_4V_TYPE_AS_FLOAT(tmp, oldSize, + data + old_offset, + exec->vtx.attrtype[j]); COPY_SZ_4V(dest + new_offset, newSize, tmp); } else { GLfloat *current = (GLfloat *)vbo->currval[j].Ptr; @@ -365,8 +371,9 @@ vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint newSize) vbo_exec_wrap_upgrade_vertex( exec, attr, newSize ); } else if (newSize < exec->vtx.active_sz[attr]) { - static const GLfloat id[4] = { 0, 0, 0, 1 }; GLuint i; + const GLfloat *id = + vbo_get_default_vals_as_float(exec->vtx.attrtype[attr]); /* New size is smaller - just need to fill in some * zeros. Don't need to flush or wrap. @@ -390,7 +397,7 @@ vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint newSize) * This macro is used to implement all the glVertex, glColor, glTexCoord, * glVertexAttrib, etc functions. */ -#define ATTR( A, N, V0, V1, V2, V3 ) \ +#define ATTR( A, N, T, V0, V1, V2, V3 ) \ do { \ struct vbo_exec_context *exec = &vbo_context(ctx)->exec; \ \ @@ -406,6 +413,7 @@ do { \ if (N>1) dest[1] = V1; \ if (N>2) dest[2] = V2; \ if (N>3) dest[3] = V3; \ + exec->vtx.attrtype[A] = T; \ } \ \ if ((A) == 0) { \ @@ -1119,6 +1127,8 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec ) for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) { ASSERT(i < Elements(exec->vtx.attrsz)); exec->vtx.attrsz[i] = 0; + ASSERT(i < Elements(exec->vtx.attrtype)); + exec->vtx.attrtype[i] = GL_FLOAT; ASSERT(i < Elements(exec->vtx.active_sz)); exec->vtx.active_sz[i] = 0; } @@ -1255,6 +1265,7 @@ static void reset_attrfv( struct vbo_exec_context *exec ) for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) { exec->vtx.attrsz[i] = 0; + exec->vtx.attrtype[i] = GL_FLOAT; exec->vtx.active_sz[i] = 0; } @@ -1309,7 +1320,7 @@ VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); if (index < MAX_VERTEX_GENERIC_ATTRIBS) - ATTR(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w); + ATTR(VBO_ATTRIB_GENERIC0 + index, 4, GL_FLOAT, x, y, z, w); else ERROR(GL_INVALID_VALUE); } diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c index d857ac3e5..4b2c5298d 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_array.c +++ b/mesalib/src/mesa/vbo/vbo_exec_array.c @@ -779,7 +779,7 @@ vbo_validated_drawrangeelements(struct gl_context *ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, - GLint basevertex, GLint numInstances, + GLint basevertex, GLuint numInstances, GLuint baseInstance) { struct vbo_context *vbo = vbo_context(ctx); diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c index 817af4dd5..9529ce069 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_draw.c +++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c @@ -207,9 +207,6 @@ vbo_exec_bind_arrays( struct gl_context *ctx ) assert(0); } - /* Make all active attributes (including edgeflag) available as - * arrays of floats. - */ for (attr = 0; attr < VERT_ATTRIB_MAX ; attr++) { const GLuint src = map[attr]; @@ -235,7 +232,9 @@ vbo_exec_bind_arrays( struct gl_context *ctx ) arrays[attr].Size = exec->vtx.attrsz[src]; arrays[attr].StrideB = exec->vtx.vertex_size * sizeof(GLfloat); arrays[attr].Stride = exec->vtx.vertex_size * sizeof(GLfloat); - arrays[attr].Type = GL_FLOAT; + arrays[attr].Type = exec->vtx.attrtype[src]; + arrays[attr].Integer = + vbo_attrtype_to_integer_flag(exec->vtx.attrtype[src]); arrays[attr].Format = GL_RGBA; arrays[attr].Enabled = 1; arrays[attr]._ElementSize = arrays[attr].Size * sizeof(GLfloat); diff --git a/mesalib/src/mesa/vbo/vbo_save.h b/mesalib/src/mesa/vbo/vbo_save.h index f33669670..750117b12 100644 --- a/mesalib/src/mesa/vbo/vbo_save.h +++ b/mesalib/src/mesa/vbo/vbo_save.h @@ -63,6 +63,7 @@ struct vbo_save_copied_vtx { */ struct vbo_save_vertex_list { GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLuint vertex_size; /* Copy of the final vertex from node->vertex_store->bufferobj. @@ -127,6 +128,7 @@ struct vbo_save_context { const struct gl_client_array *inputs[VBO_ATTRIB_MAX]; GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLubyte active_sz[VBO_ATTRIB_MAX]; GLuint vertex_size; diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c index 89f09a8d8..75b8ca338 100644 --- a/mesalib/src/mesa/vbo/vbo_save_api.c +++ b/mesalib/src/mesa/vbo/vbo_save_api.c @@ -324,6 +324,7 @@ _save_compile_vertex_list(struct gl_context *ctx) /* Duplicate our template, increment refcounts to the storage structs: */ memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz)); + memcpy(node->attrtype, save->attrtype, sizeof(node->attrtype)); node->vertex_size = save->vertex_size; node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); @@ -510,7 +511,8 @@ _save_copy_to_current(struct gl_context *ctx) for (i = VBO_ATTRIB_POS + 1; i < VBO_ATTRIB_MAX; i++) { if (save->attrsz[i]) { save->currentsz[i][0] = save->attrsz[i]; - COPY_CLEAN_4V(save->current[i], save->attrsz[i], save->attrptr[i]); + COPY_CLEAN_4V_TYPE_AS_FLOAT(save->current[i], save->attrsz[i], + save->attrptr[i], save->attrtype[i]); } } } @@ -612,7 +614,8 @@ _save_upgrade_vertex(struct gl_context *ctx, GLuint attr, GLuint newsz) if (save->attrsz[j]) { if (j == attr) { if (oldsz) { - COPY_CLEAN_4V(dest, oldsz, data); + COPY_CLEAN_4V_TYPE_AS_FLOAT(dest, oldsz, data, + save->attrtype[j]); data += oldsz; dest += newsz; } @@ -649,8 +652,8 @@ save_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint sz) _save_upgrade_vertex(ctx, attr, sz); } else if (sz < save->active_sz[attr]) { - static GLfloat id[4] = { 0, 0, 0, 1 }; GLuint i; + const GLfloat *id = vbo_get_default_vals_as_float(save->attrtype[attr]); /* New size is equal or smaller - just need to fill in some * zeros. @@ -688,7 +691,7 @@ _save_reset_vertex(struct gl_context *ctx) * 3f version won't otherwise set color[3] to 1.0 -- this is the job * of the chooser function when switching between Color4f and Color3f. */ -#define ATTR(A, N, V0, V1, V2, V3) \ +#define ATTR(A, N, T, V0, V1, V2, V3) \ do { \ struct vbo_save_context *save = &vbo_context(ctx)->save; \ \ @@ -701,6 +704,7 @@ do { \ if (N>1) dest[1] = V1; \ if (N>2) dest[2] = V2; \ if (N>3) dest[3] = V3; \ + save->attrtype[A] = T; \ } \ \ if ((A) == 0) { \ diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c index 09b8b8ab2..efb386e5c 100644 --- a/mesalib/src/mesa/vbo/vbo_save_draw.c +++ b/mesalib/src/mesa/vbo/vbo_save_draw.c @@ -79,16 +79,20 @@ _playback_copy_to_current(struct gl_context *ctx, GLfloat *current = (GLfloat *)vbo->currval[i].Ptr; GLfloat tmp[4]; - COPY_CLEAN_4V(tmp, - node->attrsz[i], - data); + COPY_CLEAN_4V_TYPE_AS_FLOAT(tmp, + node->attrsz[i], + data, + node->attrtype[i]); - if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) { + if (node->attrtype[i] != vbo->currval[i].Type || + memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) { memcpy(current, tmp, 4 * sizeof(GLfloat)); vbo->currval[i].Size = node->attrsz[i]; - assert(vbo->currval[i].Type == GL_FLOAT); vbo->currval[i]._ElementSize = vbo->currval[i].Size * sizeof(GLfloat); + vbo->currval[i].Type = node->attrtype[i]; + vbo->currval[i].Integer = + vbo_attrtype_to_integer_flag(node->attrtype[i]); if (i >= VBO_ATTRIB_FIRST_MATERIAL && i <= VBO_ATTRIB_LAST_MATERIAL) @@ -134,9 +138,11 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, const GLuint *map; GLuint attr; GLubyte node_attrsz[VBO_ATTRIB_MAX]; /* copy of node->attrsz[] */ + GLenum node_attrtype[VBO_ATTRIB_MAX]; /* copy of node->attrtype[] */ GLbitfield64 varying_inputs = 0x0; memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz)); + memcpy(node_attrtype, node->attrtype, sizeof(node->attrtype)); /* Install the default (ie Current) attributes first, then overlay * all active ones. @@ -170,6 +176,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) { save->inputs[VERT_ATTRIB_GENERIC0] = save->inputs[0]; node_attrsz[VERT_ATTRIB_GENERIC0] = node_attrsz[0]; + node_attrtype[VERT_ATTRIB_GENERIC0] = node_attrtype[0]; node_attrsz[0] = 0; } break; @@ -188,7 +195,9 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, arrays[attr].Size = node_attrsz[src]; arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat); arrays[attr].Stride = node->vertex_size * sizeof(GLfloat); - arrays[attr].Type = GL_FLOAT; + arrays[attr].Type = node_attrtype[src]; + arrays[attr].Integer = + vbo_attrtype_to_integer_flag(node_attrtype[src]); arrays[attr].Format = GL_RGBA; arrays[attr].Enabled = 1; arrays[attr]._ElementSize = arrays[attr].Size * sizeof(GLfloat); diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 0511d3c10..4f592b660 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -45,19 +45,23 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\dispatch.h \
..\..\..\src\mesa\main\glapitable.h \
..\..\..\src\mesa\main\enums.c \
+ ..\..\..\src\mesa\main\api_exec.c \
..\..\..\src\mesa\main\get_hash.h
all: Release\swrast_dri.dll Debug\swrast_dri.dll
..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
- cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -m remap_table > ..\..\..\mesa\main\dispatch.h
+ cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h
..\..\..\src\mesa\main\glapitable.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
- cd ..\..\..\src\mapi\glapi\gen & python gl_table.py > ..\..\..\mesa\main\glapitable.h
+ cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml > ..\..\..\mesa\main\glapitable.h
..\..\..\src\mesa\main\enums.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
cd ..\..\..\src\mapi\glapi\gen & python gl_enums.py -f gl_and_es_API.xml > ..\..\..\mesa\main\enums.c
+..\..\..\src\mesa\main\api_exec.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
+ cd ..\..\..\src\mapi\glapi\gen & python gl_genexec.py -f gl_and_es_API.xml > ..\..\..\mesa\main\api_exec.c
+
API_DEFINES=-DFEATURE_GL=1
GET_HASH_GEN = ..\..\..\src\mesa\main\get_hash_generator.py
GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, $(patsubst -DFEATURE_%=0,,$(API_DEFINES)))
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index f9b8adbbd..59bed9019 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -193,7 +193,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\errors.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 0105596e4..2010982ca 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -698,6 +698,12 @@ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/xkbcomp/listing.c b/xkbcomp/listing.c index 26286b793..c05c3c65c 100644 --- a/xkbcomp/listing.c +++ b/xkbcomp/listing.c @@ -1,505 +1,505 @@ -/************************************************************
- Copyright 1996 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
- THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- ********************************************************/
-/***********************************************************
-
-Copyright 1988, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <X11/keysym.h>
-#include <X11/Xwindows.h>
-
-#if defined(sgi)
-#include <malloc.h>
-#endif
-
-#define DEBUG_VAR listingDebug
-#include "xkbcomp.h"
-#include <stdlib.h>
-
-#ifdef _POSIX_SOURCE
-# include <limits.h>
-#else
-# define _POSIX_SOURCE
-# include <limits.h>
-# undef _POSIX_SOURCE
-#endif
-
-#ifndef PATH_MAX
-#ifdef WIN32
-#define PATH_MAX 512
-#else
-#include <sys/param.h>
-#endif
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
-
-#ifdef WIN32
-# include <windows.h>
-# define FileName(file) file.cFileName
-# undef TEXT
-# undef ALTERNATE
-#else
-# include <dirent.h>
-# define FileName(file) file->d_name
-#endif
-
-#include "xkbpath.h"
-#include "parseutils.h"
-#include "misc.h"
-#include "tokens.h"
-#include <X11/extensions/XKBgeom.h>
-
-#ifndef S_ISDIR
-# if defined(_S_IFMT) && defined(_S_IFDIR)
-# define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR)
-# else
-# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
-# endif
-#endif
-
-#define lowbit(x) ((x) & (-(x)))
-
-unsigned int listingDebug;
-
-static int szListing = 0;
-static int nListed = 0;
-static int nFilesListed = 0;
-
-typedef struct _Listing
-{
- char *file;
- char *map;
-} Listing;
-
-static int szMapOnly;
-static int nMapOnly;
-static char **mapOnly;
-
-static Listing *list = NULL;
-
-/***====================================================================***/
-
-int
-AddMapOnly(char *map)
-{
- if (nMapOnly >= szMapOnly)
- {
- if (szMapOnly < 1)
- szMapOnly = 5;
- else
- szMapOnly *= 2;
- mapOnly = uTypedRealloc(list, szMapOnly, char *);
- if (!mapOnly)
- {
- WSGO("Couldn't allocate list of maps\n");
- return 0;
- }
- }
- mapOnly[nMapOnly++] = map;
- return 1;
-}
-
-int
-AddListing(char *file, char *map)
-{
- if (nListed >= szListing)
- {
- if (szListing < 1)
- szListing = 10;
- else
- szListing *= 2;
- list = uTypedRealloc(list, szListing, Listing);
- if (!list)
- {
- WSGO("Couldn't allocate list of files and maps\n");
- ACTION("Exiting\n");
- exit(1);
- }
- }
-
- list[nListed].file = file;
- list[nListed].map = map;
- nListed++;
- if (file != NULL)
- nFilesListed++;
- return 1;
-}
-
-/***====================================================================***/
-
-static void
-ListFile(FILE * outFile, char *fileName, XkbFile * map)
-{
- register unsigned flags;
- char *mapName;
-
- flags = map->flags;
- if ((flags & XkbLC_Hidden) && (!(verboseLevel & WantHiddenMaps)))
- return;
- if ((flags & XkbLC_Partial) && (!(verboseLevel & WantPartialMaps)))
- return;
- if (verboseLevel & WantLongListing)
- {
- fprintf(outFile, (flags & XkbLC_Hidden) ? "h" : "-");
- fprintf(outFile, (flags & XkbLC_Default) ? "d" : "-");
- fprintf(outFile, (flags & XkbLC_Partial) ? "p" : "-");
- fprintf(outFile, "----- ");
- if (map->type == XkmSymbolsIndex)
- {
- fprintf(outFile, (flags & XkbLC_AlphanumericKeys) ? "a" : "-");
- fprintf(outFile, (flags & XkbLC_ModifierKeys) ? "m" : "-");
- fprintf(outFile, (flags & XkbLC_KeypadKeys) ? "k" : "-");
- fprintf(outFile, (flags & XkbLC_FunctionKeys) ? "f" : "-");
- fprintf(outFile, (flags & XkbLC_AlternateGroup) ? "g" : "-");
- fprintf(outFile, "--- ");
- }
- else
- fprintf(outFile, "-------- ");
- }
- mapName = map->name;
- if ((!(verboseLevel & WantFullNames)) && ((flags & XkbLC_Default) != 0))
- mapName = NULL;
- if (dirsToStrip > 0)
- {
- char *tmp, *last;
- int i;
- for (i = 0, tmp = last = fileName; (i < dirsToStrip) && tmp; i++)
- {
- last = tmp;
- tmp = strchr(tmp, '/');
- if (tmp != NULL)
- tmp++;
- }
- fileName = (tmp ? tmp : last);
- }
- if (mapName)
- fprintf(outFile, "%s(%s)\n", fileName, mapName);
- else
- fprintf(outFile, "%s\n", fileName);
- return;
-}
-
-/***====================================================================***/
-
-static int
-AddDirectory(char *head, char *ptrn, char *rest, char *map)
-{
-#ifdef WIN32
- HANDLE dirh;
- WIN32_FIND_DATA file;
-#else
- DIR *dirp;
- struct dirent *file;
-#endif
- int nMatch;
-
- if (map == NULL)
- {
- char *tmp = ptrn;
- if ((rest == NULL) && (ptrn != NULL) && (strchr(ptrn, '/') == NULL))
- {
- tmp = ptrn;
- map = strchr(ptrn, '(');
- }
- else if ((rest == NULL) && (ptrn == NULL) &&
- (head != NULL) && (strchr(head, '/') == NULL))
- {
- tmp = head;
- map = strchr(head, '(');
- }
- if (map != NULL)
- {
- tmp = strchr(tmp, ')');
- if ((tmp == NULL) || (tmp[1] != '\0'))
- {
- ERROR1("File and map must have the format file(map)\n");
- return 0;
- }
- *map = '\0';
- map++;
- *tmp = '\0';
- }
- }
-#ifdef WIN32
- if ((dirh = FindFirstFile("*.*", &file)) == INVALID_HANDLE_VALUE)
- return 0;
- nMatch = 0;
-#else
- if ((dirp = opendir((head ? head : "."))) == NULL)
- return 0;
- nMatch = 0;
-#endif
-#ifdef WIN32
- do
-#else
- while ((file = readdir(dirp)) != NULL)
-#endif
- {
- char *tmp, *filename;
- struct stat sbuf;
-
- filename = FileName(file);
- if (!filename || filename[0] == '.')
- continue;
- if (ptrn && (!XkbNameMatchesPattern(filename, ptrn)))
- continue;
- tmp =
- (char *) uAlloc((head ? strlen(head) : 0) + strlen(filename) + 2);
- if (!tmp)
- continue;
- sprintf(tmp, "%s%s%s", (head ? head : ""), (head ? "/" : ""),
- filename);
- if (stat(tmp, &sbuf) < 0)
- {
- uFree(tmp);
- continue;
- }
- if (((rest != NULL) && (!S_ISDIR(sbuf.st_mode))) ||
- ((map != NULL) && (S_ISDIR(sbuf.st_mode))))
- {
- uFree(tmp);
- continue;
- }
- if (S_ISDIR(sbuf.st_mode))
- {
- if ((rest != NULL) || (verboseLevel & ListRecursive))
- nMatch += AddDirectory(tmp, rest, NULL, map);
- }
- else
- nMatch += AddListing(tmp, map);
- }
-#ifdef WIN32
- while (FindNextFile(dirh, &file));
-#endif
- return nMatch;
-}
-
-/***====================================================================***/
-
-Bool
-AddMatchingFiles(char *head_in)
-{
- char *str, *head, *ptrn, *rest = NULL;
-
- if (head_in == NULL)
- return 0;
- ptrn = NULL;
- for (str = head_in; (*str != '\0') && (*str != '?') && (*str != '*');
- str++)
- {
- if ((str != head_in) && (*str == '/'))
- ptrn = str;
- }
- if (*str == '\0')
- { /* no wildcards */
- head = head_in;
- ptrn = NULL;
- rest = NULL;
- }
- else if (ptrn == NULL)
- { /* no slash before the first wildcard */
- head = NULL;
- ptrn = head_in;
- }
- else
- { /* slash followed by wildcard */
- head = head_in;
- *ptrn = '\0';
- ptrn++;
- }
- if (ptrn)
- {
- rest = strchr(ptrn, '/');
- if (rest != NULL)
- {
- *rest = '\0';
- rest++;
- }
- }
- if (((rest && ptrn)
- && ((strchr(ptrn, '(') != NULL) || (strchr(ptrn, ')') != NULL)))
- || (head
- && ((strchr(head, '(') != NULL) || (strchr(head, ')') != NULL))))
- {
- ERROR1("Files/maps to list must have the form file(map)\n");
- ACTION("Illegal specifier ignored\n");
- return 0;
- }
- return AddDirectory(head, ptrn, rest, NULL);
-}
-
-/***====================================================================***/
-
-static Bool
-MapMatches(char *mapToConsider, char *ptrn)
-{
- int i;
-
- if (ptrn != NULL)
- return XkbNameMatchesPattern(mapToConsider, ptrn);
- if (nMapOnly < 1)
- return True;
- for (i = 0; i < nMapOnly; i++)
- {
- if (XkbNameMatchesPattern(mapToConsider, mapOnly[i]))
- return True;
- }
- return False;
-}
-
-int
-GenerateListing(char *out_name)
-{
- int i;
- FILE *inputFile, *outFile;
- XkbFile *rtrn, *mapToUse;
- unsigned oldWarningLevel;
- char *mapName;
-
- if (nFilesListed < 1)
- {
- ERROR1("Must specify at least one file or pattern to list\n");
- return 0;
- }
- if ((!out_name) || ((out_name[0] == '-') && (out_name[1] == '\0')))
- outFile = stdout;
- else if ((outFile = fopen(out_name, "w")) == NULL)
- {
- ERROR1("Cannot open \"%s\" to write keyboard description\n",
- out_name);
- ACTION("Exiting\n");
- return 0;
- }
-#ifdef DEBUG
- if (warningLevel > 9)
- fprintf(stderr, "should list:\n");
-#endif
- for (i = 0; i < nListed; i++)
- {
-#ifdef DEBUG
- if (warningLevel > 9)
- {
- fprintf(stderr, "%s(%s)\n",
- (list[i].file ? list[i].file : "*"),
- (list[i].map ? list[i].map : "*"));
- }
-#endif
- oldWarningLevel = warningLevel;
- warningLevel = 0;
- if (list[i].file)
- {
- struct stat sbuf;
-
- if (stat(list[i].file, &sbuf) < 0)
- {
- if (oldWarningLevel > 5)
- WARN1("Couldn't open \"%s\"\n", list[i].file);
- continue;
- }
- if (S_ISDIR(sbuf.st_mode))
- {
- if (verboseLevel & ListRecursive)
- AddDirectory(list[i].file, NULL, NULL, NULL);
- continue;
- }
-
- inputFile = fopen(list[i].file, "r");
- if (!inputFile)
- {
- if (oldWarningLevel > 5)
- WARN1("Couldn't open \"%s\"\n", list[i].file);
- continue;
- }
- setScanState(list[i].file, 1);
- if (XKBParseFile(inputFile, &rtrn) && (rtrn != NULL))
- {
- mapName = list[i].map;
- mapToUse = rtrn;
- for (; mapToUse; mapToUse = (XkbFile *) mapToUse->common.next)
- {
- if (!MapMatches(mapToUse->name, mapName))
- continue;
- ListFile(outFile, list[i].file, mapToUse);
- }
- }
- fclose(inputFile);
- }
- warningLevel = oldWarningLevel;
- }
- return 1;
-}
+/************************************************************ + Copyright 1996 by Silicon Graphics Computer Systems, Inc. + + Permission to use, copy, modify, and distribute this + software and its documentation for any purpose and without + fee is hereby granted, provided that the above copyright + notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution + of the software without specific prior written permission. + Silicon Graphics makes no representation about the suitability + of this software for any purpose. It is provided "as is" + without any express or implied warranty. + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH + THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ********************************************************/ +/*********************************************************** + +Copyright 1988, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + + +Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +******************************************************************/ + +#include <stdio.h> +#include <ctype.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <X11/keysym.h> +#include <X11/Xwindows.h> + +#if defined(sgi) +#include <malloc.h> +#endif + +#define DEBUG_VAR listingDebug +#include "xkbcomp.h" +#include <stdlib.h> + +#ifdef _POSIX_SOURCE +# include <limits.h> +#else +# define _POSIX_SOURCE +# include <limits.h> +# undef _POSIX_SOURCE +#endif + +#ifndef PATH_MAX +#ifdef WIN32 +#define PATH_MAX 512 +#else +#include <sys/param.h> +#endif +#ifndef PATH_MAX +#ifdef MAXPATHLEN +#define PATH_MAX MAXPATHLEN +#else +#define PATH_MAX 1024 +#endif +#endif +#endif + +#ifdef WIN32 +# include <X11/Xwindows.h> +# define FileName(file) file.cFileName +# undef TEXT +# undef ALTERNATE +#else +# include <dirent.h> +# define FileName(file) file->d_name +#endif + +#include "xkbpath.h" +#include "parseutils.h" +#include "misc.h" +#include "tokens.h" +#include <X11/extensions/XKBgeom.h> + +#ifndef S_ISDIR +# if defined(_S_IFMT) && defined(_S_IFDIR) +# define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR) +# else +# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR) +# endif +#endif + +#define lowbit(x) ((x) & (-(x))) + +unsigned int listingDebug; + +static int szListing = 0; +static int nListed = 0; +static int nFilesListed = 0; + +typedef struct _Listing +{ + char *file; + char *map; +} Listing; + +static int szMapOnly; +static int nMapOnly; +static char **mapOnly; + +static Listing *list = NULL; + +/***====================================================================***/ + +int +AddMapOnly(char *map) +{ + if (nMapOnly >= szMapOnly) + { + if (szMapOnly < 1) + szMapOnly = 5; + else + szMapOnly *= 2; + mapOnly = uTypedRealloc(list, szMapOnly, char *); + if (!mapOnly) + { + WSGO("Couldn't allocate list of maps\n"); + return 0; + } + } + mapOnly[nMapOnly++] = map; + return 1; +} + +int +AddListing(char *file, char *map) +{ + if (nListed >= szListing) + { + if (szListing < 1) + szListing = 10; + else + szListing *= 2; + list = uTypedRealloc(list, szListing, Listing); + if (!list) + { + WSGO("Couldn't allocate list of files and maps\n"); + ACTION("Exiting\n"); + exit(1); + } + } + + list[nListed].file = file; + list[nListed].map = map; + nListed++; + if (file != NULL) + nFilesListed++; + return 1; +} + +/***====================================================================***/ + +static void +ListFile(FILE * outFile, char *fileName, XkbFile * map) +{ + register unsigned flags; + char *mapName; + + flags = map->flags; + if ((flags & XkbLC_Hidden) && (!(verboseLevel & WantHiddenMaps))) + return; + if ((flags & XkbLC_Partial) && (!(verboseLevel & WantPartialMaps))) + return; + if (verboseLevel & WantLongListing) + { + fprintf(outFile, (flags & XkbLC_Hidden) ? "h" : "-"); + fprintf(outFile, (flags & XkbLC_Default) ? "d" : "-"); + fprintf(outFile, (flags & XkbLC_Partial) ? "p" : "-"); + fprintf(outFile, "----- "); + if (map->type == XkmSymbolsIndex) + { + fprintf(outFile, (flags & XkbLC_AlphanumericKeys) ? "a" : "-"); + fprintf(outFile, (flags & XkbLC_ModifierKeys) ? "m" : "-"); + fprintf(outFile, (flags & XkbLC_KeypadKeys) ? "k" : "-"); + fprintf(outFile, (flags & XkbLC_FunctionKeys) ? "f" : "-"); + fprintf(outFile, (flags & XkbLC_AlternateGroup) ? "g" : "-"); + fprintf(outFile, "--- "); + } + else + fprintf(outFile, "-------- "); + } + mapName = map->name; + if ((!(verboseLevel & WantFullNames)) && ((flags & XkbLC_Default) != 0)) + mapName = NULL; + if (dirsToStrip > 0) + { + char *tmp, *last; + int i; + for (i = 0, tmp = last = fileName; (i < dirsToStrip) && tmp; i++) + { + last = tmp; + tmp = strchr(tmp, '/'); + if (tmp != NULL) + tmp++; + } + fileName = (tmp ? tmp : last); + } + if (mapName) + fprintf(outFile, "%s(%s)\n", fileName, mapName); + else + fprintf(outFile, "%s\n", fileName); + return; +} + +/***====================================================================***/ + +static int +AddDirectory(char *head, char *ptrn, char *rest, char *map) +{ +#ifdef WIN32 + HANDLE dirh; + WIN32_FIND_DATA file; +#else + DIR *dirp; + struct dirent *file; +#endif + int nMatch; + + if (map == NULL) + { + char *tmp = ptrn; + if ((rest == NULL) && (ptrn != NULL) && (strchr(ptrn, '/') == NULL)) + { + tmp = ptrn; + map = strchr(ptrn, '('); + } + else if ((rest == NULL) && (ptrn == NULL) && + (head != NULL) && (strchr(head, '/') == NULL)) + { + tmp = head; + map = strchr(head, '('); + } + if (map != NULL) + { + tmp = strchr(tmp, ')'); + if ((tmp == NULL) || (tmp[1] != '\0')) + { + ERROR1("File and map must have the format file(map)\n"); + return 0; + } + *map = '\0'; + map++; + *tmp = '\0'; + } + } +#ifdef WIN32 + if ((dirh = FindFirstFile("*.*", &file)) == INVALID_HANDLE_VALUE) + return 0; + nMatch = 0; +#else + if ((dirp = opendir((head ? head : "."))) == NULL) + return 0; + nMatch = 0; +#endif +#ifdef WIN32 + do +#else + while ((file = readdir(dirp)) != NULL) +#endif + { + char *tmp, *filename; + struct stat sbuf; + + filename = FileName(file); + if (!filename || filename[0] == '.') + continue; + if (ptrn && (!XkbNameMatchesPattern(filename, ptrn))) + continue; + tmp = + (char *) uAlloc((head ? strlen(head) : 0) + strlen(filename) + 2); + if (!tmp) + continue; + sprintf(tmp, "%s%s%s", (head ? head : ""), (head ? "/" : ""), + filename); + if (stat(tmp, &sbuf) < 0) + { + uFree(tmp); + continue; + } + if (((rest != NULL) && (!S_ISDIR(sbuf.st_mode))) || + ((map != NULL) && (S_ISDIR(sbuf.st_mode)))) + { + uFree(tmp); + continue; + } + if (S_ISDIR(sbuf.st_mode)) + { + if ((rest != NULL) || (verboseLevel & ListRecursive)) + nMatch += AddDirectory(tmp, rest, NULL, map); + } + else + nMatch += AddListing(tmp, map); + } +#ifdef WIN32 + while (FindNextFile(dirh, &file)); +#endif + return nMatch; +} + +/***====================================================================***/ + +Bool +AddMatchingFiles(char *head_in) +{ + char *str, *head, *ptrn, *rest = NULL; + + if (head_in == NULL) + return 0; + ptrn = NULL; + for (str = head_in; (*str != '\0') && (*str != '?') && (*str != '*'); + str++) + { + if ((str != head_in) && (*str == '/')) + ptrn = str; + } + if (*str == '\0') + { /* no wildcards */ + head = head_in; + ptrn = NULL; + rest = NULL; + } + else if (ptrn == NULL) + { /* no slash before the first wildcard */ + head = NULL; + ptrn = head_in; + } + else + { /* slash followed by wildcard */ + head = head_in; + *ptrn = '\0'; + ptrn++; + } + if (ptrn) + { + rest = strchr(ptrn, '/'); + if (rest != NULL) + { + *rest = '\0'; + rest++; + } + } + if (((rest && ptrn) + && ((strchr(ptrn, '(') != NULL) || (strchr(ptrn, ')') != NULL))) + || (head + && ((strchr(head, '(') != NULL) || (strchr(head, ')') != NULL)))) + { + ERROR1("Files/maps to list must have the form file(map)\n"); + ACTION("Illegal specifier ignored\n"); + return 0; + } + return AddDirectory(head, ptrn, rest, NULL); +} + +/***====================================================================***/ + +static Bool +MapMatches(char *mapToConsider, char *ptrn) +{ + int i; + + if (ptrn != NULL) + return XkbNameMatchesPattern(mapToConsider, ptrn); + if (nMapOnly < 1) + return True; + for (i = 0; i < nMapOnly; i++) + { + if (XkbNameMatchesPattern(mapToConsider, mapOnly[i])) + return True; + } + return False; +} + +int +GenerateListing(char *out_name) +{ + int i; + FILE *inputFile, *outFile; + XkbFile *rtrn, *mapToUse; + unsigned oldWarningLevel; + char *mapName; + + if (nFilesListed < 1) + { + ERROR1("Must specify at least one file or pattern to list\n"); + return 0; + } + if ((!out_name) || ((out_name[0] == '-') && (out_name[1] == '\0'))) + outFile = stdout; + else if ((outFile = fopen(out_name, "w")) == NULL) + { + ERROR1("Cannot open \"%s\" to write keyboard description\n", + out_name); + ACTION("Exiting\n"); + return 0; + } +#ifdef DEBUG + if (warningLevel > 9) + fprintf(stderr, "should list:\n"); +#endif + for (i = 0; i < nListed; i++) + { +#ifdef DEBUG + if (warningLevel > 9) + { + fprintf(stderr, "%s(%s)\n", + (list[i].file ? list[i].file : "*"), + (list[i].map ? list[i].map : "*")); + } +#endif + oldWarningLevel = warningLevel; + warningLevel = 0; + if (list[i].file) + { + struct stat sbuf; + + if (stat(list[i].file, &sbuf) < 0) + { + if (oldWarningLevel > 5) + WARN1("Couldn't open \"%s\"\n", list[i].file); + continue; + } + if (S_ISDIR(sbuf.st_mode)) + { + if (verboseLevel & ListRecursive) + AddDirectory(list[i].file, NULL, NULL, NULL); + continue; + } + + inputFile = fopen(list[i].file, "r"); + if (!inputFile) + { + if (oldWarningLevel > 5) + WARN1("Couldn't open \"%s\"\n", list[i].file); + continue; + } + setScanState(list[i].file, 1); + if (XKBParseFile(inputFile, &rtrn) && (rtrn != NULL)) + { + mapName = list[i].map; + mapToUse = rtrn; + for (; mapToUse; mapToUse = (XkbFile *) mapToUse->common.next) + { + if (!MapMatches(mapToUse->name, mapName)) + continue; + ListFile(outFile, list[i].file, mapToUse); + } + } + fclose(inputFile); + } + warningLevel = oldWarningLevel; + } + return 1; +} diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 6eefa9789..92437dde5 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -592,8 +592,6 @@ PanoramiXExtensionInit(void) } -extern Bool CreateConnectionBlock(void); - Bool PanoramiXCreateConnectionBlock(void) { diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 843956008..37c1ed88f 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -137,11 +137,11 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL }; #define VERIFY_SHMSEG(shmseg,shmdesc,client) \ { \ - int rc; \ - rc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ - client, DixReadAccess); \ - if (rc != Success) \ - return rc; \ + int tmprc; \ + tmprc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ + client, DixReadAccess); \ + if (tmprc != Success) \ + return tmprc; \ } #define VERIFY_SHMPTR(shmseg,offset,needwrite,shmdesc,client) \ diff --git a/xorg-server/Xext/xace.c b/xorg-server/Xext/xace.c index b4884fb6e..2bfe5ecf4 100644 --- a/xorg-server/Xext/xace.c +++ b/xorg-server/Xext/xace.c @@ -49,18 +49,18 @@ XaceHookDispatch(ClientPtr client, int major) if (major < 128) { /* Call the core dispatch hook */ - XaceCoreDispatchRec rec = { client, Success /* default allow */ }; - CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &rec); - return rec.status; + XaceCoreDispatchRec drec = { client, Success /* default allow */ }; + CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &drec); + return drec.status; } else { /* Call the extension dispatch hook */ ExtensionEntry *ext = GetExtensionEntry(major); - XaceExtAccessRec rec = { client, ext, DixUseAccess, Success }; + XaceExtAccessRec erec = { client, ext, DixUseAccess, Success }; if (ext) - CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &rec); + CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &erec); /* On error, pretend extension doesn't exist */ - return (rec.status == Success) ? Success : BadRequest; + return (erec.status == Success) ? Success : BadRequest; } } diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c index 42f5549be..5877a7174 100644 --- a/xorg-server/Xext/xf86bigfont.c +++ b/xorg-server/Xext/xf86bigfont.c @@ -301,8 +301,6 @@ ProcXF86BigfontQueryVersion(ClientPtr client) #endif if (client->swapped) { - char tmp; - swaps(&reply.sequenceNumber); swapl(&reply.length); swaps(&reply.majorVersion); @@ -318,8 +316,6 @@ ProcXF86BigfontQueryVersion(ClientPtr client) static void swapCharInfo(xCharInfo * pCI) { - char tmp; - swaps(&pCI->leftSideBearing); swaps(&pCI->rightSideBearing); swaps(&pCI->characterWidth); @@ -590,8 +586,6 @@ ProcXF86BigfontQueryFont(ClientPtr client) reply->shmid = shmid; reply->shmsegoffset = 0; if (client->swapped) { - char tmp; - swaps(&reply->sequenceNumber); swapl(&reply->length); swapCharInfo(&reply->minBounds); @@ -618,8 +612,6 @@ ProcXF86BigfontQueryFont(ClientPtr client) prFP->name = pFP->name; prFP->value = pFP->value; if (client->swapped) { - char tmp; - swapl(&prFP->name); swapl(&prFP->value); } @@ -641,8 +633,6 @@ ProcXF86BigfontQueryFont(ClientPtr client) for (j = 0; j < nCharInfos; j++, ps++) { *ps = pIndex2UniqIndex[j]; if (client->swapped) { - char tmp; - swaps(ps); } } @@ -678,7 +668,6 @@ static int SProcXF86BigfontQueryVersion(ClientPtr client) { REQUEST(xXF86BigfontQueryVersionReq); - char tmp; swaps(&stuff->length); return ProcXF86BigfontQueryVersion(client); @@ -688,7 +677,6 @@ static int SProcXF86BigfontQueryFont(ClientPtr client) { REQUEST(xXF86BigfontQueryFontReq); - char tmp; swaps(&stuff->length); REQUEST_SIZE_MATCH(xXF86BigfontQueryFontReq); diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c index a08a5778b..cac2e12ab 100644 --- a/xorg-server/Xext/xres.c +++ b/xorg-server/Xext/xres.c @@ -190,8 +190,6 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx) ht_destroy(ctx->visitedResources); } -extern void ResExtensionInit(void); - static int ProcXResQueryVersion(ClientPtr client) { diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c index a0e463e0e..e7f94d3d9 100644 --- a/xorg-server/Xext/xtest.c +++ b/xorg-server/Xext/xtest.c @@ -57,8 +57,6 @@ #include "extinit.h" -extern int DeviceValuator; - /* XTest events are sent during request processing and may be interruped by * a SIGIO. We need a separate event list to avoid events overwriting each * other's memory */ diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c index 916226ea4..84aa1c4df 100644 --- a/xorg-server/Xi/chgdctl.c +++ b/xorg-server/Xi/chgdctl.c @@ -186,7 +186,10 @@ ProcXChangeDeviceControl(ClientPtr client) case DEVICE_ENABLE: e = (xDeviceEnableCtl *) &stuff[1]; - status = ChangeDeviceControl(client, dev, (xDeviceCtl *) e); + if (IsXTestDevice(dev, NULL)) + status = !Success; + else + status = ChangeDeviceControl(client, dev, (xDeviceCtl *) e); if (status == Success) { if (e->enable) diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c index 2a77ac22d..340666860 100644 --- a/xorg-server/Xi/exevents.c +++ b/xorg-server/Xi/exevents.c @@ -1561,6 +1561,7 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev) uint32_t touchid; int type = ev->any.type; int emulate_pointer = ! !(ev->device_event.flags & TOUCH_POINTER_EMULATED); + DeviceIntPtr kbd; if (!t) return; @@ -1570,9 +1571,6 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev) else touchid = ev->device_event.touchid; - if (emulate_pointer) - UpdateDeviceState(dev, &ev->device_event); - if (type == ET_TouchBegin) { ti = TouchBeginTouch(dev, ev->device_event.sourceid, touchid, emulate_pointer); @@ -1600,7 +1598,7 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev) if (!ti) { DebugF("[Xi] %s: Failed to create new dix record for explicitly " "grabbed touchpoint %d\n", - dev->name, type, touchid); + dev->name, touchid); return; } @@ -1619,9 +1617,14 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev) * events which _only_ emulate motion just work normally */ if (emulate_pointer && ev->any.type != ET_TouchUpdate) DeliverEmulatedMotionEvent(dev, ti, ev); + if (emulate_pointer && IsMaster(dev)) CheckMotion(&ev->device_event, dev); + kbd = GetMaster(dev, KEYBOARD_OR_FLOAT); + event_set_state(NULL, kbd, &ev->device_event); + ev->device_event.corestate = event_get_corestate(NULL, kbd); + /* Make sure we have a valid window trace for event delivery; must be * called after event type mutation. Touch end events are always processed * in order to end touch records. */ @@ -1643,6 +1646,9 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev) if (ev->any.type == ET_TouchEnd) TouchEndTouch(dev, ti); } + + if (emulate_pointer) + UpdateDeviceState(dev, &ev->device_event); } /** diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 86153ec81..38ac240df 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -1360,7 +1360,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' # SHA1 hashing AC_ARG_WITH([sha1], - [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI], + [AS_HELP_STRING([--with-sha1=libc|libmd|libnettle|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI], [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then @@ -1423,6 +1423,18 @@ if test "x$with_sha1" = xlibsha1; then [Use libsha1 for SHA1]) SHA1_LIBS=-lsha1 fi +AC_CHECK_LIB([nettle], [nettle_sha1_init], [HAVE_LIBNETTLE=yes]) +if test "x$with_sha1" = x && test "x$HAVE_LIBNETTLE" = xyes; then + with_sha1=libnettle +fi +if test "x$with_sha1" = xlibnettle && test "x$HAVE_LIBNETTLE" != xyes; then + AC_MSG_ERROR([libnettle requested but not found]) +fi +if test "x$with_sha1" = xlibnettle; then + AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1], + [Use libnettle SHA1 functions]) + SHA1_LIBS=-lnettle +fi AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes]) if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then with_sha1=libgcrypt diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index f30407a4e..c190b1bde 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -149,9 +149,11 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, if (prop->format != 8 || prop->type != XA_INTEGER || prop->size != 1) return BadValue; - /* Don't allow disabling of VCP/VCK */ - if ((dev == inputInfo.pointer ||dev == - inputInfo.keyboard) &&!(*(CARD8 *) prop->data)) + /* Don't allow disabling of VCP/VCK or XTest devices */ + if ((dev == inputInfo.pointer || + dev == inputInfo.keyboard || + IsXTestDevice(dev, NULL)) + &&!(*(CARD8 *) prop->data)) return BadAccess; if (!checkonly) { diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index 4feca742f..22c236553 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -1860,12 +1860,14 @@ InitFonts(void) register_fpe_functions(); } +_X_EXPORT int GetDefaultPointSize(void) { return 120; } +_X_EXPORT FontResolutionPtr GetClientResolutions(int *num) { @@ -1898,6 +1900,7 @@ GetClientResolutions(int *num) * should be called (only once!) by each type of fpe when initialized */ +_X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func, InitFpeFunc init_func, @@ -1969,24 +1972,28 @@ find_old_font(XID id) return (FontPtr) pFont; } +_X_EXPORT Font GetNewFontClientID(void) { return FakeClientID(0); } +_X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id) { return AddResource(id, RT_NONE, (pointer) pfont); } +_X_EXPORT void DeleteFontClientID(Font id) { FreeResource(id, RT_NONE); } +_X_EXPORT int client_auth_generation(ClientPtr client) { @@ -1996,6 +2003,7 @@ client_auth_generation(ClientPtr client) static int fs_handlers_installed = 0; static unsigned int last_server_gen; +_X_EXPORT int init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler) { @@ -2014,6 +2022,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler) return Successful; } +_X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all) diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 4f9a762bb..1475fe6a2 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -2030,19 +2030,19 @@ DeliverToWindowOwner(DeviceIntPtr dev, WindowPtr win, */ static Bool GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win, - xEvent *events, Mask filter, InputClients ** clients) + xEvent *events, Mask filter, InputClients ** iclients) { int rc = 0; if (core_get_type(events) != 0) - *clients = (InputClients *) wOtherClients(win); + *iclients = (InputClients *) wOtherClients(win); else if (xi2_get_type(events) != 0) { OtherInputMasks *inputMasks = wOtherInputMasks(win); /* Has any client selected for the event? */ if (!WindowXI2MaskIsset(dev, win, events)) goto out; - *clients = inputMasks->inputClients; + *iclients = inputMasks->inputClients; } else { OtherInputMasks *inputMasks = wOtherInputMasks(win); @@ -2051,7 +2051,7 @@ GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win, if (!inputMasks || !(inputMasks->inputEvents[dev->id] & filter)) goto out; - *clients = inputMasks->inputClients; + *iclients = inputMasks->inputClients; } rc = 1; @@ -2113,12 +2113,12 @@ DeliverEventToWindowMask(DeviceIntPtr dev, WindowPtr win, xEvent *events, int count, Mask filter, GrabPtr grab, ClientPtr *client_return, Mask *mask_return) { - InputClients *clients; + InputClients *iclients; - if (!GetClientsForDelivery(dev, win, events, filter, &clients)) + if (!GetClientsForDelivery(dev, win, events, filter, &iclients)) return EVENT_SKIP; - return DeliverEventToInputClients(dev, clients, win, events, count, filter, + return DeliverEventToInputClients(dev, iclients, win, events, count, filter, grab, client_return, mask_return); } @@ -4422,7 +4422,7 @@ int EventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask, Bool *checkOptional) { - int i, free; + int i, freed; if (mask & ~PropagateMask) { client->errorValue = mask; @@ -4433,14 +4433,14 @@ EventSuppressForWindow(WindowPtr pWin, ClientPtr client, if (!mask) i = 0; else { - for (i = DNPMCOUNT, free = 0; --i > 0;) { + for (i = DNPMCOUNT, freed = 0; --i > 0;) { if (!DontPropagateRefCnts[i]) - free = i; + freed = i; else if (mask == DontPropagateMasks[i]) break; } - if (!i && free) { - i = free; + if (!i && freed) { + i = freed; DontPropagateMasks[i] = mask; } } diff --git a/xorg-server/fb/fbblt.c b/xorg-server/fb/fbblt.c index 17bd6986b..72a05f61a 100644 --- a/xorg-server/fb/fbblt.c +++ b/xorg-server/fb/fbblt.c @@ -73,21 +73,21 @@ fbBlt(FbBits * srcLine, if (alu == GXcopy && pm == FB_ALLONES && !careful && !(srcX & 7) && !(dstX & 7) && !(width & 7)) { int i; - CARD8 *src = (CARD8 *) srcLine; - CARD8 *dst = (CARD8 *) dstLine; + CARD8 *tmpsrc = (CARD8 *) srcLine; + CARD8 *tmpdst = (CARD8 *) dstLine; srcStride *= sizeof(FbBits); dstStride *= sizeof(FbBits); width >>= 3; - src += (srcX >> 3); - dst += (dstX >> 3); + tmpsrc += (srcX >> 3); + tmpdst += (dstX >> 3); if (!upsidedown) for (i = 0; i < height; i++) - MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width); + MEMCPY_WRAPPED(tmpdst + i * dstStride, tmpsrc + i * srcStride, width); else for (i = height - 1; i >= 0; i--) - MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width); + MEMCPY_WRAPPED(tmpdst + i * dstStride, tmpsrc + i * srcStride, width); return; } diff --git a/xorg-server/fb/fbbltone.c b/xorg-server/fb/fbbltone.c index eb7cf9483..bfcb5a263 100644 --- a/xorg-server/fb/fbbltone.c +++ b/xorg-server/fb/fbbltone.c @@ -739,12 +739,12 @@ fbBltPlane(FbBits * src, pm = fbReplicatePixel(planeMask, srcBpp); if (srcBpp == 24) { - int w = 24; + int tmpw = 24; rot0 = FbFirst24Rot(srcX); - if (srcX + w > FB_UNIT) - w = FB_UNIT - srcX; - srcMaskFirst = FbRot24(pm, rot0) & FbBitsMask(srcX, w); + if (srcX + tmpw > FB_UNIT) + tmpw = FB_UNIT - srcX; + srcMaskFirst = FbRot24(pm, rot0) & FbBitsMask(srcX, tmpw); } else { rot0 = 0; diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h index feab6b6ad..41a79eb0e 100644 --- a/xorg-server/glx/dispatch.h +++ b/xorg-server/glx/dispatch.h @@ -69,7 +69,7 @@ } while(0)
/* total number of offsets below */
-#define _gloffset_COUNT 969
+#define _gloffset_COUNT 1025
#define _gloffset_NewList 0
#define _gloffset_EndList 1
@@ -793,260 +793,316 @@ #define _gloffset_InvalidateTexImage 716
#define _gloffset_InvalidateTexSubImage 717
#define _gloffset_PolygonOffsetEXT 718
-#define _gloffset_SampleMaskSGIS 719
-#define _gloffset_SamplePatternSGIS 720
-#define _gloffset_ColorPointerEXT 721
-#define _gloffset_EdgeFlagPointerEXT 722
-#define _gloffset_IndexPointerEXT 723
-#define _gloffset_NormalPointerEXT 724
-#define _gloffset_TexCoordPointerEXT 725
-#define _gloffset_VertexPointerEXT 726
-#define _gloffset_PointParameterfEXT 727
-#define _gloffset_PointParameterfvEXT 728
-#define _gloffset_LockArraysEXT 729
-#define _gloffset_UnlockArraysEXT 730
-#define _gloffset_SecondaryColor3bEXT 731
-#define _gloffset_SecondaryColor3bvEXT 732
-#define _gloffset_SecondaryColor3dEXT 733
-#define _gloffset_SecondaryColor3dvEXT 734
-#define _gloffset_SecondaryColor3fEXT 735
-#define _gloffset_SecondaryColor3fvEXT 736
-#define _gloffset_SecondaryColor3iEXT 737
-#define _gloffset_SecondaryColor3ivEXT 738
-#define _gloffset_SecondaryColor3sEXT 739
-#define _gloffset_SecondaryColor3svEXT 740
-#define _gloffset_SecondaryColor3ubEXT 741
-#define _gloffset_SecondaryColor3ubvEXT 742
-#define _gloffset_SecondaryColor3uiEXT 743
-#define _gloffset_SecondaryColor3uivEXT 744
-#define _gloffset_SecondaryColor3usEXT 745
-#define _gloffset_SecondaryColor3usvEXT 746
-#define _gloffset_SecondaryColorPointerEXT 747
-#define _gloffset_MultiDrawArraysEXT 748
-#define _gloffset_MultiDrawElementsEXT 749
-#define _gloffset_FogCoordPointerEXT 750
-#define _gloffset_FogCoorddEXT 751
-#define _gloffset_FogCoorddvEXT 752
-#define _gloffset_FogCoordfEXT 753
-#define _gloffset_FogCoordfvEXT 754
-#define _gloffset_BlendFuncSeparateEXT 755
-#define _gloffset_ResizeBuffersMESA 756
-#define _gloffset_WindowPos2dMESA 757
-#define _gloffset_WindowPos2dvMESA 758
-#define _gloffset_WindowPos2fMESA 759
-#define _gloffset_WindowPos2fvMESA 760
-#define _gloffset_WindowPos2iMESA 761
-#define _gloffset_WindowPos2ivMESA 762
-#define _gloffset_WindowPos2sMESA 763
-#define _gloffset_WindowPos2svMESA 764
-#define _gloffset_WindowPos3dMESA 765
-#define _gloffset_WindowPos3dvMESA 766
-#define _gloffset_WindowPos3fMESA 767
-#define _gloffset_WindowPos3fvMESA 768
-#define _gloffset_WindowPos3iMESA 769
-#define _gloffset_WindowPos3ivMESA 770
-#define _gloffset_WindowPos3sMESA 771
-#define _gloffset_WindowPos3svMESA 772
-#define _gloffset_WindowPos4dMESA 773
-#define _gloffset_WindowPos4dvMESA 774
-#define _gloffset_WindowPos4fMESA 775
-#define _gloffset_WindowPos4fvMESA 776
-#define _gloffset_WindowPos4iMESA 777
-#define _gloffset_WindowPos4ivMESA 778
-#define _gloffset_WindowPos4sMESA 779
-#define _gloffset_WindowPos4svMESA 780
-#define _gloffset_MultiModeDrawArraysIBM 781
-#define _gloffset_MultiModeDrawElementsIBM 782
-#define _gloffset_AreProgramsResidentNV 783
-#define _gloffset_BindProgramNV 784
-#define _gloffset_DeleteProgramsNV 785
-#define _gloffset_ExecuteProgramNV 786
-#define _gloffset_GenProgramsNV 787
-#define _gloffset_GetProgramParameterdvNV 788
-#define _gloffset_GetProgramParameterfvNV 789
-#define _gloffset_GetProgramStringNV 790
-#define _gloffset_GetProgramivNV 791
-#define _gloffset_GetTrackMatrixivNV 792
-#define _gloffset_GetVertexAttribPointervNV 793
-#define _gloffset_GetVertexAttribdvNV 794
-#define _gloffset_GetVertexAttribfvNV 795
-#define _gloffset_GetVertexAttribivNV 796
-#define _gloffset_IsProgramNV 797
-#define _gloffset_LoadProgramNV 798
-#define _gloffset_ProgramParameters4dvNV 799
-#define _gloffset_ProgramParameters4fvNV 800
-#define _gloffset_RequestResidentProgramsNV 801
-#define _gloffset_TrackMatrixNV 802
-#define _gloffset_VertexAttrib1dNV 803
-#define _gloffset_VertexAttrib1dvNV 804
-#define _gloffset_VertexAttrib1fNV 805
-#define _gloffset_VertexAttrib1fvNV 806
-#define _gloffset_VertexAttrib1sNV 807
-#define _gloffset_VertexAttrib1svNV 808
-#define _gloffset_VertexAttrib2dNV 809
-#define _gloffset_VertexAttrib2dvNV 810
-#define _gloffset_VertexAttrib2fNV 811
-#define _gloffset_VertexAttrib2fvNV 812
-#define _gloffset_VertexAttrib2sNV 813
-#define _gloffset_VertexAttrib2svNV 814
-#define _gloffset_VertexAttrib3dNV 815
-#define _gloffset_VertexAttrib3dvNV 816
-#define _gloffset_VertexAttrib3fNV 817
-#define _gloffset_VertexAttrib3fvNV 818
-#define _gloffset_VertexAttrib3sNV 819
-#define _gloffset_VertexAttrib3svNV 820
-#define _gloffset_VertexAttrib4dNV 821
-#define _gloffset_VertexAttrib4dvNV 822
-#define _gloffset_VertexAttrib4fNV 823
-#define _gloffset_VertexAttrib4fvNV 824
-#define _gloffset_VertexAttrib4sNV 825
-#define _gloffset_VertexAttrib4svNV 826
-#define _gloffset_VertexAttrib4ubNV 827
-#define _gloffset_VertexAttrib4ubvNV 828
-#define _gloffset_VertexAttribPointerNV 829
-#define _gloffset_VertexAttribs1dvNV 830
-#define _gloffset_VertexAttribs1fvNV 831
-#define _gloffset_VertexAttribs1svNV 832
-#define _gloffset_VertexAttribs2dvNV 833
-#define _gloffset_VertexAttribs2fvNV 834
-#define _gloffset_VertexAttribs2svNV 835
-#define _gloffset_VertexAttribs3dvNV 836
-#define _gloffset_VertexAttribs3fvNV 837
-#define _gloffset_VertexAttribs3svNV 838
-#define _gloffset_VertexAttribs4dvNV 839
-#define _gloffset_VertexAttribs4fvNV 840
-#define _gloffset_VertexAttribs4svNV 841
-#define _gloffset_VertexAttribs4ubvNV 842
-#define _gloffset_GetTexBumpParameterfvATI 843
-#define _gloffset_GetTexBumpParameterivATI 844
-#define _gloffset_TexBumpParameterfvATI 845
-#define _gloffset_TexBumpParameterivATI 846
-#define _gloffset_AlphaFragmentOp1ATI 847
-#define _gloffset_AlphaFragmentOp2ATI 848
-#define _gloffset_AlphaFragmentOp3ATI 849
-#define _gloffset_BeginFragmentShaderATI 850
-#define _gloffset_BindFragmentShaderATI 851
-#define _gloffset_ColorFragmentOp1ATI 852
-#define _gloffset_ColorFragmentOp2ATI 853
-#define _gloffset_ColorFragmentOp3ATI 854
-#define _gloffset_DeleteFragmentShaderATI 855
-#define _gloffset_EndFragmentShaderATI 856
-#define _gloffset_GenFragmentShadersATI 857
-#define _gloffset_PassTexCoordATI 858
-#define _gloffset_SampleMapATI 859
-#define _gloffset_SetFragmentShaderConstantATI 860
-#define _gloffset_PointParameteriNV 861
-#define _gloffset_PointParameterivNV 862
-#define _gloffset_ActiveStencilFaceEXT 863
-#define _gloffset_BindVertexArrayAPPLE 864
-#define _gloffset_DeleteVertexArraysAPPLE 865
-#define _gloffset_GenVertexArraysAPPLE 866
-#define _gloffset_IsVertexArrayAPPLE 867
-#define _gloffset_GetProgramNamedParameterdvNV 868
-#define _gloffset_GetProgramNamedParameterfvNV 869
-#define _gloffset_ProgramNamedParameter4dNV 870
-#define _gloffset_ProgramNamedParameter4dvNV 871
-#define _gloffset_ProgramNamedParameter4fNV 872
-#define _gloffset_ProgramNamedParameter4fvNV 873
-#define _gloffset_PrimitiveRestartIndexNV 874
-#define _gloffset_PrimitiveRestartNV 875
-#define _gloffset_DepthBoundsEXT 876
-#define _gloffset_BlendEquationSeparateEXT 877
-#define _gloffset_BindFramebufferEXT 878
-#define _gloffset_BindRenderbufferEXT 879
-#define _gloffset_CheckFramebufferStatusEXT 880
-#define _gloffset_DeleteFramebuffersEXT 881
-#define _gloffset_DeleteRenderbuffersEXT 882
-#define _gloffset_FramebufferRenderbufferEXT 883
-#define _gloffset_FramebufferTexture1DEXT 884
-#define _gloffset_FramebufferTexture2DEXT 885
-#define _gloffset_FramebufferTexture3DEXT 886
-#define _gloffset_GenFramebuffersEXT 887
-#define _gloffset_GenRenderbuffersEXT 888
-#define _gloffset_GenerateMipmapEXT 889
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 890
-#define _gloffset_GetRenderbufferParameterivEXT 891
-#define _gloffset_IsFramebufferEXT 892
-#define _gloffset_IsRenderbufferEXT 893
-#define _gloffset_RenderbufferStorageEXT 894
-#define _gloffset_BlitFramebufferEXT 895
-#define _gloffset_BufferParameteriAPPLE 896
-#define _gloffset_FlushMappedBufferRangeAPPLE 897
-#define _gloffset_BindFragDataLocationEXT 898
-#define _gloffset_GetFragDataLocationEXT 899
-#define _gloffset_GetUniformuivEXT 900
-#define _gloffset_GetVertexAttribIivEXT 901
-#define _gloffset_GetVertexAttribIuivEXT 902
-#define _gloffset_Uniform1uiEXT 903
-#define _gloffset_Uniform1uivEXT 904
-#define _gloffset_Uniform2uiEXT 905
-#define _gloffset_Uniform2uivEXT 906
-#define _gloffset_Uniform3uiEXT 907
-#define _gloffset_Uniform3uivEXT 908
-#define _gloffset_Uniform4uiEXT 909
-#define _gloffset_Uniform4uivEXT 910
-#define _gloffset_VertexAttribI1iEXT 911
-#define _gloffset_VertexAttribI1ivEXT 912
-#define _gloffset_VertexAttribI1uiEXT 913
-#define _gloffset_VertexAttribI1uivEXT 914
-#define _gloffset_VertexAttribI2iEXT 915
-#define _gloffset_VertexAttribI2ivEXT 916
-#define _gloffset_VertexAttribI2uiEXT 917
-#define _gloffset_VertexAttribI2uivEXT 918
-#define _gloffset_VertexAttribI3iEXT 919
-#define _gloffset_VertexAttribI3ivEXT 920
-#define _gloffset_VertexAttribI3uiEXT 921
-#define _gloffset_VertexAttribI3uivEXT 922
-#define _gloffset_VertexAttribI4bvEXT 923
-#define _gloffset_VertexAttribI4iEXT 924
-#define _gloffset_VertexAttribI4ivEXT 925
-#define _gloffset_VertexAttribI4svEXT 926
-#define _gloffset_VertexAttribI4ubvEXT 927
-#define _gloffset_VertexAttribI4uiEXT 928
-#define _gloffset_VertexAttribI4uivEXT 929
-#define _gloffset_VertexAttribI4usvEXT 930
-#define _gloffset_VertexAttribIPointerEXT 931
-#define _gloffset_FramebufferTextureLayerEXT 932
-#define _gloffset_ColorMaskIndexedEXT 933
-#define _gloffset_DisableIndexedEXT 934
-#define _gloffset_EnableIndexedEXT 935
-#define _gloffset_GetBooleanIndexedvEXT 936
-#define _gloffset_GetIntegerIndexedvEXT 937
-#define _gloffset_IsEnabledIndexedEXT 938
-#define _gloffset_ClearColorIiEXT 939
-#define _gloffset_ClearColorIuiEXT 940
-#define _gloffset_GetTexParameterIivEXT 941
-#define _gloffset_GetTexParameterIuivEXT 942
-#define _gloffset_TexParameterIivEXT 943
-#define _gloffset_TexParameterIuivEXT 944
-#define _gloffset_BeginConditionalRenderNV 945
-#define _gloffset_EndConditionalRenderNV 946
-#define _gloffset_BeginTransformFeedbackEXT 947
-#define _gloffset_BindBufferBaseEXT 948
-#define _gloffset_BindBufferOffsetEXT 949
-#define _gloffset_BindBufferRangeEXT 950
-#define _gloffset_EndTransformFeedbackEXT 951
-#define _gloffset_GetTransformFeedbackVaryingEXT 952
-#define _gloffset_TransformFeedbackVaryingsEXT 953
-#define _gloffset_ProvokingVertexEXT 954
-#define _gloffset_GetObjectParameterivAPPLE 955
-#define _gloffset_ObjectPurgeableAPPLE 956
-#define _gloffset_ObjectUnpurgeableAPPLE 957
-#define _gloffset_ActiveProgramEXT 958
-#define _gloffset_CreateShaderProgramEXT 959
-#define _gloffset_UseShaderProgramEXT 960
-#define _gloffset_TextureBarrierNV 961
-#define _gloffset_StencilFuncSeparateATI 962
-#define _gloffset_ProgramEnvParameters4fvEXT 963
-#define _gloffset_ProgramLocalParameters4fvEXT 964
-#define _gloffset_GetQueryObjecti64vEXT 965
-#define _gloffset_GetQueryObjectui64vEXT 966
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 967
-#define _gloffset_EGLImageTargetTexture2DOES 968
+#define _gloffset_DrawTexfOES 719
+#define _gloffset_DrawTexfvOES 720
+#define _gloffset_DrawTexiOES 721
+#define _gloffset_DrawTexivOES 722
+#define _gloffset_DrawTexsOES 723
+#define _gloffset_DrawTexsvOES 724
+#define _gloffset_DrawTexxOES 725
+#define _gloffset_DrawTexxvOES 726
+#define _gloffset_PointSizePointerOES 727
+#define _gloffset_QueryMatrixxOES 728
+#define _gloffset_SampleMaskSGIS 729
+#define _gloffset_SamplePatternSGIS 730
+#define _gloffset_ColorPointerEXT 731
+#define _gloffset_EdgeFlagPointerEXT 732
+#define _gloffset_IndexPointerEXT 733
+#define _gloffset_NormalPointerEXT 734
+#define _gloffset_TexCoordPointerEXT 735
+#define _gloffset_VertexPointerEXT 736
+#define _gloffset_PointParameterfEXT 737
+#define _gloffset_PointParameterfvEXT 738
+#define _gloffset_LockArraysEXT 739
+#define _gloffset_UnlockArraysEXT 740
+#define _gloffset_SecondaryColor3bEXT 741
+#define _gloffset_SecondaryColor3bvEXT 742
+#define _gloffset_SecondaryColor3dEXT 743
+#define _gloffset_SecondaryColor3dvEXT 744
+#define _gloffset_SecondaryColor3fEXT 745
+#define _gloffset_SecondaryColor3fvEXT 746
+#define _gloffset_SecondaryColor3iEXT 747
+#define _gloffset_SecondaryColor3ivEXT 748
+#define _gloffset_SecondaryColor3sEXT 749
+#define _gloffset_SecondaryColor3svEXT 750
+#define _gloffset_SecondaryColor3ubEXT 751
+#define _gloffset_SecondaryColor3ubvEXT 752
+#define _gloffset_SecondaryColor3uiEXT 753
+#define _gloffset_SecondaryColor3uivEXT 754
+#define _gloffset_SecondaryColor3usEXT 755
+#define _gloffset_SecondaryColor3usvEXT 756
+#define _gloffset_SecondaryColorPointerEXT 757
+#define _gloffset_MultiDrawArraysEXT 758
+#define _gloffset_MultiDrawElementsEXT 759
+#define _gloffset_FogCoordPointerEXT 760
+#define _gloffset_FogCoorddEXT 761
+#define _gloffset_FogCoorddvEXT 762
+#define _gloffset_FogCoordfEXT 763
+#define _gloffset_FogCoordfvEXT 764
+#define _gloffset_BlendFuncSeparateEXT 765
+#define _gloffset_ResizeBuffersMESA 766
+#define _gloffset_WindowPos2dMESA 767
+#define _gloffset_WindowPos2dvMESA 768
+#define _gloffset_WindowPos2fMESA 769
+#define _gloffset_WindowPos2fvMESA 770
+#define _gloffset_WindowPos2iMESA 771
+#define _gloffset_WindowPos2ivMESA 772
+#define _gloffset_WindowPos2sMESA 773
+#define _gloffset_WindowPos2svMESA 774
+#define _gloffset_WindowPos3dMESA 775
+#define _gloffset_WindowPos3dvMESA 776
+#define _gloffset_WindowPos3fMESA 777
+#define _gloffset_WindowPos3fvMESA 778
+#define _gloffset_WindowPos3iMESA 779
+#define _gloffset_WindowPos3ivMESA 780
+#define _gloffset_WindowPos3sMESA 781
+#define _gloffset_WindowPos3svMESA 782
+#define _gloffset_WindowPos4dMESA 783
+#define _gloffset_WindowPos4dvMESA 784
+#define _gloffset_WindowPos4fMESA 785
+#define _gloffset_WindowPos4fvMESA 786
+#define _gloffset_WindowPos4iMESA 787
+#define _gloffset_WindowPos4ivMESA 788
+#define _gloffset_WindowPos4sMESA 789
+#define _gloffset_WindowPos4svMESA 790
+#define _gloffset_MultiModeDrawArraysIBM 791
+#define _gloffset_MultiModeDrawElementsIBM 792
+#define _gloffset_AreProgramsResidentNV 793
+#define _gloffset_BindProgramNV 794
+#define _gloffset_DeleteProgramsNV 795
+#define _gloffset_ExecuteProgramNV 796
+#define _gloffset_GenProgramsNV 797
+#define _gloffset_GetProgramParameterdvNV 798
+#define _gloffset_GetProgramParameterfvNV 799
+#define _gloffset_GetProgramStringNV 800
+#define _gloffset_GetProgramivNV 801
+#define _gloffset_GetTrackMatrixivNV 802
+#define _gloffset_GetVertexAttribPointervNV 803
+#define _gloffset_GetVertexAttribdvNV 804
+#define _gloffset_GetVertexAttribfvNV 805
+#define _gloffset_GetVertexAttribivNV 806
+#define _gloffset_IsProgramNV 807
+#define _gloffset_LoadProgramNV 808
+#define _gloffset_ProgramParameters4dvNV 809
+#define _gloffset_ProgramParameters4fvNV 810
+#define _gloffset_RequestResidentProgramsNV 811
+#define _gloffset_TrackMatrixNV 812
+#define _gloffset_VertexAttrib1dNV 813
+#define _gloffset_VertexAttrib1dvNV 814
+#define _gloffset_VertexAttrib1fNV 815
+#define _gloffset_VertexAttrib1fvNV 816
+#define _gloffset_VertexAttrib1sNV 817
+#define _gloffset_VertexAttrib1svNV 818
+#define _gloffset_VertexAttrib2dNV 819
+#define _gloffset_VertexAttrib2dvNV 820
+#define _gloffset_VertexAttrib2fNV 821
+#define _gloffset_VertexAttrib2fvNV 822
+#define _gloffset_VertexAttrib2sNV 823
+#define _gloffset_VertexAttrib2svNV 824
+#define _gloffset_VertexAttrib3dNV 825
+#define _gloffset_VertexAttrib3dvNV 826
+#define _gloffset_VertexAttrib3fNV 827
+#define _gloffset_VertexAttrib3fvNV 828
+#define _gloffset_VertexAttrib3sNV 829
+#define _gloffset_VertexAttrib3svNV 830
+#define _gloffset_VertexAttrib4dNV 831
+#define _gloffset_VertexAttrib4dvNV 832
+#define _gloffset_VertexAttrib4fNV 833
+#define _gloffset_VertexAttrib4fvNV 834
+#define _gloffset_VertexAttrib4sNV 835
+#define _gloffset_VertexAttrib4svNV 836
+#define _gloffset_VertexAttrib4ubNV 837
+#define _gloffset_VertexAttrib4ubvNV 838
+#define _gloffset_VertexAttribPointerNV 839
+#define _gloffset_VertexAttribs1dvNV 840
+#define _gloffset_VertexAttribs1fvNV 841
+#define _gloffset_VertexAttribs1svNV 842
+#define _gloffset_VertexAttribs2dvNV 843
+#define _gloffset_VertexAttribs2fvNV 844
+#define _gloffset_VertexAttribs2svNV 845
+#define _gloffset_VertexAttribs3dvNV 846
+#define _gloffset_VertexAttribs3fvNV 847
+#define _gloffset_VertexAttribs3svNV 848
+#define _gloffset_VertexAttribs4dvNV 849
+#define _gloffset_VertexAttribs4fvNV 850
+#define _gloffset_VertexAttribs4svNV 851
+#define _gloffset_VertexAttribs4ubvNV 852
+#define _gloffset_GetTexBumpParameterfvATI 853
+#define _gloffset_GetTexBumpParameterivATI 854
+#define _gloffset_TexBumpParameterfvATI 855
+#define _gloffset_TexBumpParameterivATI 856
+#define _gloffset_AlphaFragmentOp1ATI 857
+#define _gloffset_AlphaFragmentOp2ATI 858
+#define _gloffset_AlphaFragmentOp3ATI 859
+#define _gloffset_BeginFragmentShaderATI 860
+#define _gloffset_BindFragmentShaderATI 861
+#define _gloffset_ColorFragmentOp1ATI 862
+#define _gloffset_ColorFragmentOp2ATI 863
+#define _gloffset_ColorFragmentOp3ATI 864
+#define _gloffset_DeleteFragmentShaderATI 865
+#define _gloffset_EndFragmentShaderATI 866
+#define _gloffset_GenFragmentShadersATI 867
+#define _gloffset_PassTexCoordATI 868
+#define _gloffset_SampleMapATI 869
+#define _gloffset_SetFragmentShaderConstantATI 870
+#define _gloffset_PointParameteriNV 871
+#define _gloffset_PointParameterivNV 872
+#define _gloffset_ActiveStencilFaceEXT 873
+#define _gloffset_BindVertexArrayAPPLE 874
+#define _gloffset_DeleteVertexArraysAPPLE 875
+#define _gloffset_GenVertexArraysAPPLE 876
+#define _gloffset_IsVertexArrayAPPLE 877
+#define _gloffset_GetProgramNamedParameterdvNV 878
+#define _gloffset_GetProgramNamedParameterfvNV 879
+#define _gloffset_ProgramNamedParameter4dNV 880
+#define _gloffset_ProgramNamedParameter4dvNV 881
+#define _gloffset_ProgramNamedParameter4fNV 882
+#define _gloffset_ProgramNamedParameter4fvNV 883
+#define _gloffset_PrimitiveRestartIndexNV 884
+#define _gloffset_PrimitiveRestartNV 885
+#define _gloffset_AlphaFuncxOES 886
+#define _gloffset_ClearColorxOES 887
+#define _gloffset_ClearDepthxOES 888
+#define _gloffset_ClipPlanexOES 889
+#define _gloffset_Color4xOES 890
+#define _gloffset_DepthRangexOES 891
+#define _gloffset_FogxOES 892
+#define _gloffset_FogxvOES 893
+#define _gloffset_FrustumxOES 894
+#define _gloffset_GetClipPlanexOES 895
+#define _gloffset_GetFixedvOES 896
+#define _gloffset_GetLightxvOES 897
+#define _gloffset_GetMaterialxvOES 898
+#define _gloffset_GetTexEnvxvOES 899
+#define _gloffset_GetTexGenxvOES 900
+#define _gloffset_GetTexParameterxvOES 901
+#define _gloffset_LightModelxOES 902
+#define _gloffset_LightModelxvOES 903
+#define _gloffset_LightxOES 904
+#define _gloffset_LightxvOES 905
+#define _gloffset_LineWidthxOES 906
+#define _gloffset_LoadMatrixxOES 907
+#define _gloffset_MaterialxOES 908
+#define _gloffset_MaterialxvOES 909
+#define _gloffset_MultMatrixxOES 910
+#define _gloffset_MultiTexCoord4xOES 911
+#define _gloffset_Normal3xOES 912
+#define _gloffset_OrthoxOES 913
+#define _gloffset_PointParameterxOES 914
+#define _gloffset_PointParameterxvOES 915
+#define _gloffset_PointSizexOES 916
+#define _gloffset_PolygonOffsetxOES 917
+#define _gloffset_RotatexOES 918
+#define _gloffset_SampleCoveragexOES 919
+#define _gloffset_ScalexOES 920
+#define _gloffset_TexEnvxOES 921
+#define _gloffset_TexEnvxvOES 922
+#define _gloffset_TexGenxOES 923
+#define _gloffset_TexGenxvOES 924
+#define _gloffset_TexParameterxOES 925
+#define _gloffset_TexParameterxvOES 926
+#define _gloffset_TranslatexOES 927
+#define _gloffset_ClipPlanefOES 928
+#define _gloffset_FrustumfOES 929
+#define _gloffset_GetClipPlanefOES 930
+#define _gloffset_OrthofOES 931
+#define _gloffset_DepthBoundsEXT 932
+#define _gloffset_BlendEquationSeparateEXT 933
+#define _gloffset_BindFramebufferEXT 934
+#define _gloffset_BindRenderbufferEXT 935
+#define _gloffset_CheckFramebufferStatusEXT 936
+#define _gloffset_DeleteFramebuffersEXT 937
+#define _gloffset_DeleteRenderbuffersEXT 938
+#define _gloffset_FramebufferRenderbufferEXT 939
+#define _gloffset_FramebufferTexture1DEXT 940
+#define _gloffset_FramebufferTexture2DEXT 941
+#define _gloffset_FramebufferTexture3DEXT 942
+#define _gloffset_GenFramebuffersEXT 943
+#define _gloffset_GenRenderbuffersEXT 944
+#define _gloffset_GenerateMipmapEXT 945
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 946
+#define _gloffset_GetRenderbufferParameterivEXT 947
+#define _gloffset_IsFramebufferEXT 948
+#define _gloffset_IsRenderbufferEXT 949
+#define _gloffset_RenderbufferStorageEXT 950
+#define _gloffset_BlitFramebufferEXT 951
+#define _gloffset_BufferParameteriAPPLE 952
+#define _gloffset_FlushMappedBufferRangeAPPLE 953
+#define _gloffset_BindFragDataLocationEXT 954
+#define _gloffset_GetFragDataLocationEXT 955
+#define _gloffset_GetUniformuivEXT 956
+#define _gloffset_GetVertexAttribIivEXT 957
+#define _gloffset_GetVertexAttribIuivEXT 958
+#define _gloffset_Uniform1uiEXT 959
+#define _gloffset_Uniform1uivEXT 960
+#define _gloffset_Uniform2uiEXT 961
+#define _gloffset_Uniform2uivEXT 962
+#define _gloffset_Uniform3uiEXT 963
+#define _gloffset_Uniform3uivEXT 964
+#define _gloffset_Uniform4uiEXT 965
+#define _gloffset_Uniform4uivEXT 966
+#define _gloffset_VertexAttribI1iEXT 967
+#define _gloffset_VertexAttribI1ivEXT 968
+#define _gloffset_VertexAttribI1uiEXT 969
+#define _gloffset_VertexAttribI1uivEXT 970
+#define _gloffset_VertexAttribI2iEXT 971
+#define _gloffset_VertexAttribI2ivEXT 972
+#define _gloffset_VertexAttribI2uiEXT 973
+#define _gloffset_VertexAttribI2uivEXT 974
+#define _gloffset_VertexAttribI3iEXT 975
+#define _gloffset_VertexAttribI3ivEXT 976
+#define _gloffset_VertexAttribI3uiEXT 977
+#define _gloffset_VertexAttribI3uivEXT 978
+#define _gloffset_VertexAttribI4bvEXT 979
+#define _gloffset_VertexAttribI4iEXT 980
+#define _gloffset_VertexAttribI4ivEXT 981
+#define _gloffset_VertexAttribI4svEXT 982
+#define _gloffset_VertexAttribI4ubvEXT 983
+#define _gloffset_VertexAttribI4uiEXT 984
+#define _gloffset_VertexAttribI4uivEXT 985
+#define _gloffset_VertexAttribI4usvEXT 986
+#define _gloffset_VertexAttribIPointerEXT 987
+#define _gloffset_FramebufferTextureLayerEXT 988
+#define _gloffset_ColorMaskIndexedEXT 989
+#define _gloffset_DisableIndexedEXT 990
+#define _gloffset_EnableIndexedEXT 991
+#define _gloffset_GetBooleanIndexedvEXT 992
+#define _gloffset_GetIntegerIndexedvEXT 993
+#define _gloffset_IsEnabledIndexedEXT 994
+#define _gloffset_ClearColorIiEXT 995
+#define _gloffset_ClearColorIuiEXT 996
+#define _gloffset_GetTexParameterIivEXT 997
+#define _gloffset_GetTexParameterIuivEXT 998
+#define _gloffset_TexParameterIivEXT 999
+#define _gloffset_TexParameterIuivEXT 1000
+#define _gloffset_BeginConditionalRenderNV 1001
+#define _gloffset_EndConditionalRenderNV 1002
+#define _gloffset_BeginTransformFeedbackEXT 1003
+#define _gloffset_BindBufferBaseEXT 1004
+#define _gloffset_BindBufferOffsetEXT 1005
+#define _gloffset_BindBufferRangeEXT 1006
+#define _gloffset_EndTransformFeedbackEXT 1007
+#define _gloffset_GetTransformFeedbackVaryingEXT 1008
+#define _gloffset_TransformFeedbackVaryingsEXT 1009
+#define _gloffset_ProvokingVertexEXT 1010
+#define _gloffset_GetObjectParameterivAPPLE 1011
+#define _gloffset_ObjectPurgeableAPPLE 1012
+#define _gloffset_ObjectUnpurgeableAPPLE 1013
+#define _gloffset_ActiveProgramEXT 1014
+#define _gloffset_CreateShaderProgramEXT 1015
+#define _gloffset_UseShaderProgramEXT 1016
+#define _gloffset_TextureBarrierNV 1017
+#define _gloffset_StencilFuncSeparateATI 1018
+#define _gloffset_ProgramEnvParameters4fvEXT 1019
+#define _gloffset_ProgramLocalParameters4fvEXT 1020
+#define _gloffset_GetQueryObjecti64vEXT 1021
+#define _gloffset_GetQueryObjectui64vEXT 1022
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 1023
+#define _gloffset_EGLImageTargetTexture2DOES 1024
#else /* !FEATURE_remap_table */
-#define driDispatchRemapTable_size 561
+#define driDispatchRemapTable_size 617
extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define AttachShader_remap_index 0
@@ -1360,256 +1416,312 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; #define InvalidateTexImage_remap_index 308
#define InvalidateTexSubImage_remap_index 309
#define PolygonOffsetEXT_remap_index 310
-#define SampleMaskSGIS_remap_index 311
-#define SamplePatternSGIS_remap_index 312
-#define ColorPointerEXT_remap_index 313
-#define EdgeFlagPointerEXT_remap_index 314
-#define IndexPointerEXT_remap_index 315
-#define NormalPointerEXT_remap_index 316
-#define TexCoordPointerEXT_remap_index 317
-#define VertexPointerEXT_remap_index 318
-#define PointParameterfEXT_remap_index 319
-#define PointParameterfvEXT_remap_index 320
-#define LockArraysEXT_remap_index 321
-#define UnlockArraysEXT_remap_index 322
-#define SecondaryColor3bEXT_remap_index 323
-#define SecondaryColor3bvEXT_remap_index 324
-#define SecondaryColor3dEXT_remap_index 325
-#define SecondaryColor3dvEXT_remap_index 326
-#define SecondaryColor3fEXT_remap_index 327
-#define SecondaryColor3fvEXT_remap_index 328
-#define SecondaryColor3iEXT_remap_index 329
-#define SecondaryColor3ivEXT_remap_index 330
-#define SecondaryColor3sEXT_remap_index 331
-#define SecondaryColor3svEXT_remap_index 332
-#define SecondaryColor3ubEXT_remap_index 333
-#define SecondaryColor3ubvEXT_remap_index 334
-#define SecondaryColor3uiEXT_remap_index 335
-#define SecondaryColor3uivEXT_remap_index 336
-#define SecondaryColor3usEXT_remap_index 337
-#define SecondaryColor3usvEXT_remap_index 338
-#define SecondaryColorPointerEXT_remap_index 339
-#define MultiDrawArraysEXT_remap_index 340
-#define MultiDrawElementsEXT_remap_index 341
-#define FogCoordPointerEXT_remap_index 342
-#define FogCoorddEXT_remap_index 343
-#define FogCoorddvEXT_remap_index 344
-#define FogCoordfEXT_remap_index 345
-#define FogCoordfvEXT_remap_index 346
-#define BlendFuncSeparateEXT_remap_index 347
-#define ResizeBuffersMESA_remap_index 348
-#define WindowPos2dMESA_remap_index 349
-#define WindowPos2dvMESA_remap_index 350
-#define WindowPos2fMESA_remap_index 351
-#define WindowPos2fvMESA_remap_index 352
-#define WindowPos2iMESA_remap_index 353
-#define WindowPos2ivMESA_remap_index 354
-#define WindowPos2sMESA_remap_index 355
-#define WindowPos2svMESA_remap_index 356
-#define WindowPos3dMESA_remap_index 357
-#define WindowPos3dvMESA_remap_index 358
-#define WindowPos3fMESA_remap_index 359
-#define WindowPos3fvMESA_remap_index 360
-#define WindowPos3iMESA_remap_index 361
-#define WindowPos3ivMESA_remap_index 362
-#define WindowPos3sMESA_remap_index 363
-#define WindowPos3svMESA_remap_index 364
-#define WindowPos4dMESA_remap_index 365
-#define WindowPos4dvMESA_remap_index 366
-#define WindowPos4fMESA_remap_index 367
-#define WindowPos4fvMESA_remap_index 368
-#define WindowPos4iMESA_remap_index 369
-#define WindowPos4ivMESA_remap_index 370
-#define WindowPos4sMESA_remap_index 371
-#define WindowPos4svMESA_remap_index 372
-#define MultiModeDrawArraysIBM_remap_index 373
-#define MultiModeDrawElementsIBM_remap_index 374
-#define AreProgramsResidentNV_remap_index 375
-#define BindProgramNV_remap_index 376
-#define DeleteProgramsNV_remap_index 377
-#define ExecuteProgramNV_remap_index 378
-#define GenProgramsNV_remap_index 379
-#define GetProgramParameterdvNV_remap_index 380
-#define GetProgramParameterfvNV_remap_index 381
-#define GetProgramStringNV_remap_index 382
-#define GetProgramivNV_remap_index 383
-#define GetTrackMatrixivNV_remap_index 384
-#define GetVertexAttribPointervNV_remap_index 385
-#define GetVertexAttribdvNV_remap_index 386
-#define GetVertexAttribfvNV_remap_index 387
-#define GetVertexAttribivNV_remap_index 388
-#define IsProgramNV_remap_index 389
-#define LoadProgramNV_remap_index 390
-#define ProgramParameters4dvNV_remap_index 391
-#define ProgramParameters4fvNV_remap_index 392
-#define RequestResidentProgramsNV_remap_index 393
-#define TrackMatrixNV_remap_index 394
-#define VertexAttrib1dNV_remap_index 395
-#define VertexAttrib1dvNV_remap_index 396
-#define VertexAttrib1fNV_remap_index 397
-#define VertexAttrib1fvNV_remap_index 398
-#define VertexAttrib1sNV_remap_index 399
-#define VertexAttrib1svNV_remap_index 400
-#define VertexAttrib2dNV_remap_index 401
-#define VertexAttrib2dvNV_remap_index 402
-#define VertexAttrib2fNV_remap_index 403
-#define VertexAttrib2fvNV_remap_index 404
-#define VertexAttrib2sNV_remap_index 405
-#define VertexAttrib2svNV_remap_index 406
-#define VertexAttrib3dNV_remap_index 407
-#define VertexAttrib3dvNV_remap_index 408
-#define VertexAttrib3fNV_remap_index 409
-#define VertexAttrib3fvNV_remap_index 410
-#define VertexAttrib3sNV_remap_index 411
-#define VertexAttrib3svNV_remap_index 412
-#define VertexAttrib4dNV_remap_index 413
-#define VertexAttrib4dvNV_remap_index 414
-#define VertexAttrib4fNV_remap_index 415
-#define VertexAttrib4fvNV_remap_index 416
-#define VertexAttrib4sNV_remap_index 417
-#define VertexAttrib4svNV_remap_index 418
-#define VertexAttrib4ubNV_remap_index 419
-#define VertexAttrib4ubvNV_remap_index 420
-#define VertexAttribPointerNV_remap_index 421
-#define VertexAttribs1dvNV_remap_index 422
-#define VertexAttribs1fvNV_remap_index 423
-#define VertexAttribs1svNV_remap_index 424
-#define VertexAttribs2dvNV_remap_index 425
-#define VertexAttribs2fvNV_remap_index 426
-#define VertexAttribs2svNV_remap_index 427
-#define VertexAttribs3dvNV_remap_index 428
-#define VertexAttribs3fvNV_remap_index 429
-#define VertexAttribs3svNV_remap_index 430
-#define VertexAttribs4dvNV_remap_index 431
-#define VertexAttribs4fvNV_remap_index 432
-#define VertexAttribs4svNV_remap_index 433
-#define VertexAttribs4ubvNV_remap_index 434
-#define GetTexBumpParameterfvATI_remap_index 435
-#define GetTexBumpParameterivATI_remap_index 436
-#define TexBumpParameterfvATI_remap_index 437
-#define TexBumpParameterivATI_remap_index 438
-#define AlphaFragmentOp1ATI_remap_index 439
-#define AlphaFragmentOp2ATI_remap_index 440
-#define AlphaFragmentOp3ATI_remap_index 441
-#define BeginFragmentShaderATI_remap_index 442
-#define BindFragmentShaderATI_remap_index 443
-#define ColorFragmentOp1ATI_remap_index 444
-#define ColorFragmentOp2ATI_remap_index 445
-#define ColorFragmentOp3ATI_remap_index 446
-#define DeleteFragmentShaderATI_remap_index 447
-#define EndFragmentShaderATI_remap_index 448
-#define GenFragmentShadersATI_remap_index 449
-#define PassTexCoordATI_remap_index 450
-#define SampleMapATI_remap_index 451
-#define SetFragmentShaderConstantATI_remap_index 452
-#define PointParameteriNV_remap_index 453
-#define PointParameterivNV_remap_index 454
-#define ActiveStencilFaceEXT_remap_index 455
-#define BindVertexArrayAPPLE_remap_index 456
-#define DeleteVertexArraysAPPLE_remap_index 457
-#define GenVertexArraysAPPLE_remap_index 458
-#define IsVertexArrayAPPLE_remap_index 459
-#define GetProgramNamedParameterdvNV_remap_index 460
-#define GetProgramNamedParameterfvNV_remap_index 461
-#define ProgramNamedParameter4dNV_remap_index 462
-#define ProgramNamedParameter4dvNV_remap_index 463
-#define ProgramNamedParameter4fNV_remap_index 464
-#define ProgramNamedParameter4fvNV_remap_index 465
-#define PrimitiveRestartIndexNV_remap_index 466
-#define PrimitiveRestartNV_remap_index 467
-#define DepthBoundsEXT_remap_index 468
-#define BlendEquationSeparateEXT_remap_index 469
-#define BindFramebufferEXT_remap_index 470
-#define BindRenderbufferEXT_remap_index 471
-#define CheckFramebufferStatusEXT_remap_index 472
-#define DeleteFramebuffersEXT_remap_index 473
-#define DeleteRenderbuffersEXT_remap_index 474
-#define FramebufferRenderbufferEXT_remap_index 475
-#define FramebufferTexture1DEXT_remap_index 476
-#define FramebufferTexture2DEXT_remap_index 477
-#define FramebufferTexture3DEXT_remap_index 478
-#define GenFramebuffersEXT_remap_index 479
-#define GenRenderbuffersEXT_remap_index 480
-#define GenerateMipmapEXT_remap_index 481
-#define GetFramebufferAttachmentParameterivEXT_remap_index 482
-#define GetRenderbufferParameterivEXT_remap_index 483
-#define IsFramebufferEXT_remap_index 484
-#define IsRenderbufferEXT_remap_index 485
-#define RenderbufferStorageEXT_remap_index 486
-#define BlitFramebufferEXT_remap_index 487
-#define BufferParameteriAPPLE_remap_index 488
-#define FlushMappedBufferRangeAPPLE_remap_index 489
-#define BindFragDataLocationEXT_remap_index 490
-#define GetFragDataLocationEXT_remap_index 491
-#define GetUniformuivEXT_remap_index 492
-#define GetVertexAttribIivEXT_remap_index 493
-#define GetVertexAttribIuivEXT_remap_index 494
-#define Uniform1uiEXT_remap_index 495
-#define Uniform1uivEXT_remap_index 496
-#define Uniform2uiEXT_remap_index 497
-#define Uniform2uivEXT_remap_index 498
-#define Uniform3uiEXT_remap_index 499
-#define Uniform3uivEXT_remap_index 500
-#define Uniform4uiEXT_remap_index 501
-#define Uniform4uivEXT_remap_index 502
-#define VertexAttribI1iEXT_remap_index 503
-#define VertexAttribI1ivEXT_remap_index 504
-#define VertexAttribI1uiEXT_remap_index 505
-#define VertexAttribI1uivEXT_remap_index 506
-#define VertexAttribI2iEXT_remap_index 507
-#define VertexAttribI2ivEXT_remap_index 508
-#define VertexAttribI2uiEXT_remap_index 509
-#define VertexAttribI2uivEXT_remap_index 510
-#define VertexAttribI3iEXT_remap_index 511
-#define VertexAttribI3ivEXT_remap_index 512
-#define VertexAttribI3uiEXT_remap_index 513
-#define VertexAttribI3uivEXT_remap_index 514
-#define VertexAttribI4bvEXT_remap_index 515
-#define VertexAttribI4iEXT_remap_index 516
-#define VertexAttribI4ivEXT_remap_index 517
-#define VertexAttribI4svEXT_remap_index 518
-#define VertexAttribI4ubvEXT_remap_index 519
-#define VertexAttribI4uiEXT_remap_index 520
-#define VertexAttribI4uivEXT_remap_index 521
-#define VertexAttribI4usvEXT_remap_index 522
-#define VertexAttribIPointerEXT_remap_index 523
-#define FramebufferTextureLayerEXT_remap_index 524
-#define ColorMaskIndexedEXT_remap_index 525
-#define DisableIndexedEXT_remap_index 526
-#define EnableIndexedEXT_remap_index 527
-#define GetBooleanIndexedvEXT_remap_index 528
-#define GetIntegerIndexedvEXT_remap_index 529
-#define IsEnabledIndexedEXT_remap_index 530
-#define ClearColorIiEXT_remap_index 531
-#define ClearColorIuiEXT_remap_index 532
-#define GetTexParameterIivEXT_remap_index 533
-#define GetTexParameterIuivEXT_remap_index 534
-#define TexParameterIivEXT_remap_index 535
-#define TexParameterIuivEXT_remap_index 536
-#define BeginConditionalRenderNV_remap_index 537
-#define EndConditionalRenderNV_remap_index 538
-#define BeginTransformFeedbackEXT_remap_index 539
-#define BindBufferBaseEXT_remap_index 540
-#define BindBufferOffsetEXT_remap_index 541
-#define BindBufferRangeEXT_remap_index 542
-#define EndTransformFeedbackEXT_remap_index 543
-#define GetTransformFeedbackVaryingEXT_remap_index 544
-#define TransformFeedbackVaryingsEXT_remap_index 545
-#define ProvokingVertexEXT_remap_index 546
-#define GetObjectParameterivAPPLE_remap_index 547
-#define ObjectPurgeableAPPLE_remap_index 548
-#define ObjectUnpurgeableAPPLE_remap_index 549
-#define ActiveProgramEXT_remap_index 550
-#define CreateShaderProgramEXT_remap_index 551
-#define UseShaderProgramEXT_remap_index 552
-#define TextureBarrierNV_remap_index 553
-#define StencilFuncSeparateATI_remap_index 554
-#define ProgramEnvParameters4fvEXT_remap_index 555
-#define ProgramLocalParameters4fvEXT_remap_index 556
-#define GetQueryObjecti64vEXT_remap_index 557
-#define GetQueryObjectui64vEXT_remap_index 558
-#define EGLImageTargetRenderbufferStorageOES_remap_index 559
-#define EGLImageTargetTexture2DOES_remap_index 560
+#define DrawTexfOES_remap_index 311
+#define DrawTexfvOES_remap_index 312
+#define DrawTexiOES_remap_index 313
+#define DrawTexivOES_remap_index 314
+#define DrawTexsOES_remap_index 315
+#define DrawTexsvOES_remap_index 316
+#define DrawTexxOES_remap_index 317
+#define DrawTexxvOES_remap_index 318
+#define PointSizePointerOES_remap_index 319
+#define QueryMatrixxOES_remap_index 320
+#define SampleMaskSGIS_remap_index 321
+#define SamplePatternSGIS_remap_index 322
+#define ColorPointerEXT_remap_index 323
+#define EdgeFlagPointerEXT_remap_index 324
+#define IndexPointerEXT_remap_index 325
+#define NormalPointerEXT_remap_index 326
+#define TexCoordPointerEXT_remap_index 327
+#define VertexPointerEXT_remap_index 328
+#define PointParameterfEXT_remap_index 329
+#define PointParameterfvEXT_remap_index 330
+#define LockArraysEXT_remap_index 331
+#define UnlockArraysEXT_remap_index 332
+#define SecondaryColor3bEXT_remap_index 333
+#define SecondaryColor3bvEXT_remap_index 334
+#define SecondaryColor3dEXT_remap_index 335
+#define SecondaryColor3dvEXT_remap_index 336
+#define SecondaryColor3fEXT_remap_index 337
+#define SecondaryColor3fvEXT_remap_index 338
+#define SecondaryColor3iEXT_remap_index 339
+#define SecondaryColor3ivEXT_remap_index 340
+#define SecondaryColor3sEXT_remap_index 341
+#define SecondaryColor3svEXT_remap_index 342
+#define SecondaryColor3ubEXT_remap_index 343
+#define SecondaryColor3ubvEXT_remap_index 344
+#define SecondaryColor3uiEXT_remap_index 345
+#define SecondaryColor3uivEXT_remap_index 346
+#define SecondaryColor3usEXT_remap_index 347
+#define SecondaryColor3usvEXT_remap_index 348
+#define SecondaryColorPointerEXT_remap_index 349
+#define MultiDrawArraysEXT_remap_index 350
+#define MultiDrawElementsEXT_remap_index 351
+#define FogCoordPointerEXT_remap_index 352
+#define FogCoorddEXT_remap_index 353
+#define FogCoorddvEXT_remap_index 354
+#define FogCoordfEXT_remap_index 355
+#define FogCoordfvEXT_remap_index 356
+#define BlendFuncSeparateEXT_remap_index 357
+#define ResizeBuffersMESA_remap_index 358
+#define WindowPos2dMESA_remap_index 359
+#define WindowPos2dvMESA_remap_index 360
+#define WindowPos2fMESA_remap_index 361
+#define WindowPos2fvMESA_remap_index 362
+#define WindowPos2iMESA_remap_index 363
+#define WindowPos2ivMESA_remap_index 364
+#define WindowPos2sMESA_remap_index 365
+#define WindowPos2svMESA_remap_index 366
+#define WindowPos3dMESA_remap_index 367
+#define WindowPos3dvMESA_remap_index 368
+#define WindowPos3fMESA_remap_index 369
+#define WindowPos3fvMESA_remap_index 370
+#define WindowPos3iMESA_remap_index 371
+#define WindowPos3ivMESA_remap_index 372
+#define WindowPos3sMESA_remap_index 373
+#define WindowPos3svMESA_remap_index 374
+#define WindowPos4dMESA_remap_index 375
+#define WindowPos4dvMESA_remap_index 376
+#define WindowPos4fMESA_remap_index 377
+#define WindowPos4fvMESA_remap_index 378
+#define WindowPos4iMESA_remap_index 379
+#define WindowPos4ivMESA_remap_index 380
+#define WindowPos4sMESA_remap_index 381
+#define WindowPos4svMESA_remap_index 382
+#define MultiModeDrawArraysIBM_remap_index 383
+#define MultiModeDrawElementsIBM_remap_index 384
+#define AreProgramsResidentNV_remap_index 385
+#define BindProgramNV_remap_index 386
+#define DeleteProgramsNV_remap_index 387
+#define ExecuteProgramNV_remap_index 388
+#define GenProgramsNV_remap_index 389
+#define GetProgramParameterdvNV_remap_index 390
+#define GetProgramParameterfvNV_remap_index 391
+#define GetProgramStringNV_remap_index 392
+#define GetProgramivNV_remap_index 393
+#define GetTrackMatrixivNV_remap_index 394
+#define GetVertexAttribPointervNV_remap_index 395
+#define GetVertexAttribdvNV_remap_index 396
+#define GetVertexAttribfvNV_remap_index 397
+#define GetVertexAttribivNV_remap_index 398
+#define IsProgramNV_remap_index 399
+#define LoadProgramNV_remap_index 400
+#define ProgramParameters4dvNV_remap_index 401
+#define ProgramParameters4fvNV_remap_index 402
+#define RequestResidentProgramsNV_remap_index 403
+#define TrackMatrixNV_remap_index 404
+#define VertexAttrib1dNV_remap_index 405
+#define VertexAttrib1dvNV_remap_index 406
+#define VertexAttrib1fNV_remap_index 407
+#define VertexAttrib1fvNV_remap_index 408
+#define VertexAttrib1sNV_remap_index 409
+#define VertexAttrib1svNV_remap_index 410
+#define VertexAttrib2dNV_remap_index 411
+#define VertexAttrib2dvNV_remap_index 412
+#define VertexAttrib2fNV_remap_index 413
+#define VertexAttrib2fvNV_remap_index 414
+#define VertexAttrib2sNV_remap_index 415
+#define VertexAttrib2svNV_remap_index 416
+#define VertexAttrib3dNV_remap_index 417
+#define VertexAttrib3dvNV_remap_index 418
+#define VertexAttrib3fNV_remap_index 419
+#define VertexAttrib3fvNV_remap_index 420
+#define VertexAttrib3sNV_remap_index 421
+#define VertexAttrib3svNV_remap_index 422
+#define VertexAttrib4dNV_remap_index 423
+#define VertexAttrib4dvNV_remap_index 424
+#define VertexAttrib4fNV_remap_index 425
+#define VertexAttrib4fvNV_remap_index 426
+#define VertexAttrib4sNV_remap_index 427
+#define VertexAttrib4svNV_remap_index 428
+#define VertexAttrib4ubNV_remap_index 429
+#define VertexAttrib4ubvNV_remap_index 430
+#define VertexAttribPointerNV_remap_index 431
+#define VertexAttribs1dvNV_remap_index 432
+#define VertexAttribs1fvNV_remap_index 433
+#define VertexAttribs1svNV_remap_index 434
+#define VertexAttribs2dvNV_remap_index 435
+#define VertexAttribs2fvNV_remap_index 436
+#define VertexAttribs2svNV_remap_index 437
+#define VertexAttribs3dvNV_remap_index 438
+#define VertexAttribs3fvNV_remap_index 439
+#define VertexAttribs3svNV_remap_index 440
+#define VertexAttribs4dvNV_remap_index 441
+#define VertexAttribs4fvNV_remap_index 442
+#define VertexAttribs4svNV_remap_index 443
+#define VertexAttribs4ubvNV_remap_index 444
+#define GetTexBumpParameterfvATI_remap_index 445
+#define GetTexBumpParameterivATI_remap_index 446
+#define TexBumpParameterfvATI_remap_index 447
+#define TexBumpParameterivATI_remap_index 448
+#define AlphaFragmentOp1ATI_remap_index 449
+#define AlphaFragmentOp2ATI_remap_index 450
+#define AlphaFragmentOp3ATI_remap_index 451
+#define BeginFragmentShaderATI_remap_index 452
+#define BindFragmentShaderATI_remap_index 453
+#define ColorFragmentOp1ATI_remap_index 454
+#define ColorFragmentOp2ATI_remap_index 455
+#define ColorFragmentOp3ATI_remap_index 456
+#define DeleteFragmentShaderATI_remap_index 457
+#define EndFragmentShaderATI_remap_index 458
+#define GenFragmentShadersATI_remap_index 459
+#define PassTexCoordATI_remap_index 460
+#define SampleMapATI_remap_index 461
+#define SetFragmentShaderConstantATI_remap_index 462
+#define PointParameteriNV_remap_index 463
+#define PointParameterivNV_remap_index 464
+#define ActiveStencilFaceEXT_remap_index 465
+#define BindVertexArrayAPPLE_remap_index 466
+#define DeleteVertexArraysAPPLE_remap_index 467
+#define GenVertexArraysAPPLE_remap_index 468
+#define IsVertexArrayAPPLE_remap_index 469
+#define GetProgramNamedParameterdvNV_remap_index 470
+#define GetProgramNamedParameterfvNV_remap_index 471
+#define ProgramNamedParameter4dNV_remap_index 472
+#define ProgramNamedParameter4dvNV_remap_index 473
+#define ProgramNamedParameter4fNV_remap_index 474
+#define ProgramNamedParameter4fvNV_remap_index 475
+#define PrimitiveRestartIndexNV_remap_index 476
+#define PrimitiveRestartNV_remap_index 477
+#define AlphaFuncxOES_remap_index 478
+#define ClearColorxOES_remap_index 479
+#define ClearDepthxOES_remap_index 480
+#define ClipPlanexOES_remap_index 481
+#define Color4xOES_remap_index 482
+#define DepthRangexOES_remap_index 483
+#define FogxOES_remap_index 484
+#define FogxvOES_remap_index 485
+#define FrustumxOES_remap_index 486
+#define GetClipPlanexOES_remap_index 487
+#define GetFixedvOES_remap_index 488
+#define GetLightxvOES_remap_index 489
+#define GetMaterialxvOES_remap_index 490
+#define GetTexEnvxvOES_remap_index 491
+#define GetTexGenxvOES_remap_index 492
+#define GetTexParameterxvOES_remap_index 493
+#define LightModelxOES_remap_index 494
+#define LightModelxvOES_remap_index 495
+#define LightxOES_remap_index 496
+#define LightxvOES_remap_index 497
+#define LineWidthxOES_remap_index 498
+#define LoadMatrixxOES_remap_index 499
+#define MaterialxOES_remap_index 500
+#define MaterialxvOES_remap_index 501
+#define MultMatrixxOES_remap_index 502
+#define MultiTexCoord4xOES_remap_index 503
+#define Normal3xOES_remap_index 504
+#define OrthoxOES_remap_index 505
+#define PointParameterxOES_remap_index 506
+#define PointParameterxvOES_remap_index 507
+#define PointSizexOES_remap_index 508
+#define PolygonOffsetxOES_remap_index 509
+#define RotatexOES_remap_index 510
+#define SampleCoveragexOES_remap_index 511
+#define ScalexOES_remap_index 512
+#define TexEnvxOES_remap_index 513
+#define TexEnvxvOES_remap_index 514
+#define TexGenxOES_remap_index 515
+#define TexGenxvOES_remap_index 516
+#define TexParameterxOES_remap_index 517
+#define TexParameterxvOES_remap_index 518
+#define TranslatexOES_remap_index 519
+#define ClipPlanefOES_remap_index 520
+#define FrustumfOES_remap_index 521
+#define GetClipPlanefOES_remap_index 522
+#define OrthofOES_remap_index 523
+#define DepthBoundsEXT_remap_index 524
+#define BlendEquationSeparateEXT_remap_index 525
+#define BindFramebufferEXT_remap_index 526
+#define BindRenderbufferEXT_remap_index 527
+#define CheckFramebufferStatusEXT_remap_index 528
+#define DeleteFramebuffersEXT_remap_index 529
+#define DeleteRenderbuffersEXT_remap_index 530
+#define FramebufferRenderbufferEXT_remap_index 531
+#define FramebufferTexture1DEXT_remap_index 532
+#define FramebufferTexture2DEXT_remap_index 533
+#define FramebufferTexture3DEXT_remap_index 534
+#define GenFramebuffersEXT_remap_index 535
+#define GenRenderbuffersEXT_remap_index 536
+#define GenerateMipmapEXT_remap_index 537
+#define GetFramebufferAttachmentParameterivEXT_remap_index 538
+#define GetRenderbufferParameterivEXT_remap_index 539
+#define IsFramebufferEXT_remap_index 540
+#define IsRenderbufferEXT_remap_index 541
+#define RenderbufferStorageEXT_remap_index 542
+#define BlitFramebufferEXT_remap_index 543
+#define BufferParameteriAPPLE_remap_index 544
+#define FlushMappedBufferRangeAPPLE_remap_index 545
+#define BindFragDataLocationEXT_remap_index 546
+#define GetFragDataLocationEXT_remap_index 547
+#define GetUniformuivEXT_remap_index 548
+#define GetVertexAttribIivEXT_remap_index 549
+#define GetVertexAttribIuivEXT_remap_index 550
+#define Uniform1uiEXT_remap_index 551
+#define Uniform1uivEXT_remap_index 552
+#define Uniform2uiEXT_remap_index 553
+#define Uniform2uivEXT_remap_index 554
+#define Uniform3uiEXT_remap_index 555
+#define Uniform3uivEXT_remap_index 556
+#define Uniform4uiEXT_remap_index 557
+#define Uniform4uivEXT_remap_index 558
+#define VertexAttribI1iEXT_remap_index 559
+#define VertexAttribI1ivEXT_remap_index 560
+#define VertexAttribI1uiEXT_remap_index 561
+#define VertexAttribI1uivEXT_remap_index 562
+#define VertexAttribI2iEXT_remap_index 563
+#define VertexAttribI2ivEXT_remap_index 564
+#define VertexAttribI2uiEXT_remap_index 565
+#define VertexAttribI2uivEXT_remap_index 566
+#define VertexAttribI3iEXT_remap_index 567
+#define VertexAttribI3ivEXT_remap_index 568
+#define VertexAttribI3uiEXT_remap_index 569
+#define VertexAttribI3uivEXT_remap_index 570
+#define VertexAttribI4bvEXT_remap_index 571
+#define VertexAttribI4iEXT_remap_index 572
+#define VertexAttribI4ivEXT_remap_index 573
+#define VertexAttribI4svEXT_remap_index 574
+#define VertexAttribI4ubvEXT_remap_index 575
+#define VertexAttribI4uiEXT_remap_index 576
+#define VertexAttribI4uivEXT_remap_index 577
+#define VertexAttribI4usvEXT_remap_index 578
+#define VertexAttribIPointerEXT_remap_index 579
+#define FramebufferTextureLayerEXT_remap_index 580
+#define ColorMaskIndexedEXT_remap_index 581
+#define DisableIndexedEXT_remap_index 582
+#define EnableIndexedEXT_remap_index 583
+#define GetBooleanIndexedvEXT_remap_index 584
+#define GetIntegerIndexedvEXT_remap_index 585
+#define IsEnabledIndexedEXT_remap_index 586
+#define ClearColorIiEXT_remap_index 587
+#define ClearColorIuiEXT_remap_index 588
+#define GetTexParameterIivEXT_remap_index 589
+#define GetTexParameterIuivEXT_remap_index 590
+#define TexParameterIivEXT_remap_index 591
+#define TexParameterIuivEXT_remap_index 592
+#define BeginConditionalRenderNV_remap_index 593
+#define EndConditionalRenderNV_remap_index 594
+#define BeginTransformFeedbackEXT_remap_index 595
+#define BindBufferBaseEXT_remap_index 596
+#define BindBufferOffsetEXT_remap_index 597
+#define BindBufferRangeEXT_remap_index 598
+#define EndTransformFeedbackEXT_remap_index 599
+#define GetTransformFeedbackVaryingEXT_remap_index 600
+#define TransformFeedbackVaryingsEXT_remap_index 601
+#define ProvokingVertexEXT_remap_index 602
+#define GetObjectParameterivAPPLE_remap_index 603
+#define ObjectPurgeableAPPLE_remap_index 604
+#define ObjectUnpurgeableAPPLE_remap_index 605
+#define ActiveProgramEXT_remap_index 606
+#define CreateShaderProgramEXT_remap_index 607
+#define UseShaderProgramEXT_remap_index 608
+#define TextureBarrierNV_remap_index 609
+#define StencilFuncSeparateATI_remap_index 610
+#define ProgramEnvParameters4fvEXT_remap_index 611
+#define ProgramLocalParameters4fvEXT_remap_index 612
+#define GetQueryObjecti64vEXT_remap_index 613
+#define GetQueryObjectui64vEXT_remap_index 614
+#define EGLImageTargetRenderbufferStorageOES_remap_index 615
+#define EGLImageTargetTexture2DOES_remap_index 616
#define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
#define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1922,6 +2034,16 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; #define _gloffset_InvalidateTexImage driDispatchRemapTable[InvalidateTexImage_remap_index]
#define _gloffset_InvalidateTexSubImage driDispatchRemapTable[InvalidateTexSubImage_remap_index]
#define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
+#define _gloffset_DrawTexfOES driDispatchRemapTable[DrawTexfOES_remap_index]
+#define _gloffset_DrawTexfvOES driDispatchRemapTable[DrawTexfvOES_remap_index]
+#define _gloffset_DrawTexiOES driDispatchRemapTable[DrawTexiOES_remap_index]
+#define _gloffset_DrawTexivOES driDispatchRemapTable[DrawTexivOES_remap_index]
+#define _gloffset_DrawTexsOES driDispatchRemapTable[DrawTexsOES_remap_index]
+#define _gloffset_DrawTexsvOES driDispatchRemapTable[DrawTexsvOES_remap_index]
+#define _gloffset_DrawTexxOES driDispatchRemapTable[DrawTexxOES_remap_index]
+#define _gloffset_DrawTexxvOES driDispatchRemapTable[DrawTexxvOES_remap_index]
+#define _gloffset_PointSizePointerOES driDispatchRemapTable[PointSizePointerOES_remap_index]
+#define _gloffset_QueryMatrixxOES driDispatchRemapTable[QueryMatrixxOES_remap_index]
#define _gloffset_SampleMaskSGIS driDispatchRemapTable[SampleMaskSGIS_remap_index]
#define _gloffset_SamplePatternSGIS driDispatchRemapTable[SamplePatternSGIS_remap_index]
#define _gloffset_ColorPointerEXT driDispatchRemapTable[ColorPointerEXT_remap_index]
@@ -2079,6 +2201,52 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; #define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index]
#define _gloffset_PrimitiveRestartIndexNV driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index]
#define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index]
+#define _gloffset_AlphaFuncxOES driDispatchRemapTable[AlphaFuncxOES_remap_index]
+#define _gloffset_ClearColorxOES driDispatchRemapTable[ClearColorxOES_remap_index]
+#define _gloffset_ClearDepthxOES driDispatchRemapTable[ClearDepthxOES_remap_index]
+#define _gloffset_ClipPlanexOES driDispatchRemapTable[ClipPlanexOES_remap_index]
+#define _gloffset_Color4xOES driDispatchRemapTable[Color4xOES_remap_index]
+#define _gloffset_DepthRangexOES driDispatchRemapTable[DepthRangexOES_remap_index]
+#define _gloffset_FogxOES driDispatchRemapTable[FogxOES_remap_index]
+#define _gloffset_FogxvOES driDispatchRemapTable[FogxvOES_remap_index]
+#define _gloffset_FrustumxOES driDispatchRemapTable[FrustumxOES_remap_index]
+#define _gloffset_GetClipPlanexOES driDispatchRemapTable[GetClipPlanexOES_remap_index]
+#define _gloffset_GetFixedvOES driDispatchRemapTable[GetFixedvOES_remap_index]
+#define _gloffset_GetLightxvOES driDispatchRemapTable[GetLightxvOES_remap_index]
+#define _gloffset_GetMaterialxvOES driDispatchRemapTable[GetMaterialxvOES_remap_index]
+#define _gloffset_GetTexEnvxvOES driDispatchRemapTable[GetTexEnvxvOES_remap_index]
+#define _gloffset_GetTexGenxvOES driDispatchRemapTable[GetTexGenxvOES_remap_index]
+#define _gloffset_GetTexParameterxvOES driDispatchRemapTable[GetTexParameterxvOES_remap_index]
+#define _gloffset_LightModelxOES driDispatchRemapTable[LightModelxOES_remap_index]
+#define _gloffset_LightModelxvOES driDispatchRemapTable[LightModelxvOES_remap_index]
+#define _gloffset_LightxOES driDispatchRemapTable[LightxOES_remap_index]
+#define _gloffset_LightxvOES driDispatchRemapTable[LightxvOES_remap_index]
+#define _gloffset_LineWidthxOES driDispatchRemapTable[LineWidthxOES_remap_index]
+#define _gloffset_LoadMatrixxOES driDispatchRemapTable[LoadMatrixxOES_remap_index]
+#define _gloffset_MaterialxOES driDispatchRemapTable[MaterialxOES_remap_index]
+#define _gloffset_MaterialxvOES driDispatchRemapTable[MaterialxvOES_remap_index]
+#define _gloffset_MultMatrixxOES driDispatchRemapTable[MultMatrixxOES_remap_index]
+#define _gloffset_MultiTexCoord4xOES driDispatchRemapTable[MultiTexCoord4xOES_remap_index]
+#define _gloffset_Normal3xOES driDispatchRemapTable[Normal3xOES_remap_index]
+#define _gloffset_OrthoxOES driDispatchRemapTable[OrthoxOES_remap_index]
+#define _gloffset_PointParameterxOES driDispatchRemapTable[PointParameterxOES_remap_index]
+#define _gloffset_PointParameterxvOES driDispatchRemapTable[PointParameterxvOES_remap_index]
+#define _gloffset_PointSizexOES driDispatchRemapTable[PointSizexOES_remap_index]
+#define _gloffset_PolygonOffsetxOES driDispatchRemapTable[PolygonOffsetxOES_remap_index]
+#define _gloffset_RotatexOES driDispatchRemapTable[RotatexOES_remap_index]
+#define _gloffset_SampleCoveragexOES driDispatchRemapTable[SampleCoveragexOES_remap_index]
+#define _gloffset_ScalexOES driDispatchRemapTable[ScalexOES_remap_index]
+#define _gloffset_TexEnvxOES driDispatchRemapTable[TexEnvxOES_remap_index]
+#define _gloffset_TexEnvxvOES driDispatchRemapTable[TexEnvxvOES_remap_index]
+#define _gloffset_TexGenxOES driDispatchRemapTable[TexGenxOES_remap_index]
+#define _gloffset_TexGenxvOES driDispatchRemapTable[TexGenxvOES_remap_index]
+#define _gloffset_TexParameterxOES driDispatchRemapTable[TexParameterxOES_remap_index]
+#define _gloffset_TexParameterxvOES driDispatchRemapTable[TexParameterxvOES_remap_index]
+#define _gloffset_TranslatexOES driDispatchRemapTable[TranslatexOES_remap_index]
+#define _gloffset_ClipPlanefOES driDispatchRemapTable[ClipPlanefOES_remap_index]
+#define _gloffset_FrustumfOES driDispatchRemapTable[FrustumfOES_remap_index]
+#define _gloffset_GetClipPlanefOES driDispatchRemapTable[GetClipPlanefOES_remap_index]
+#define _gloffset_OrthofOES driDispatchRemapTable[OrthofOES_remap_index]
#define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index]
#define _gloffset_BlendEquationSeparateEXT driDispatchRemapTable[BlendEquationSeparateEXT_remap_index]
#define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index]
@@ -10084,6 +10252,116 @@ static INLINE void SET_PolygonOffsetEXT(struct _glapi_table *disp, void (GLAPIEN SET_by_offset(disp, _gloffset_PolygonOffsetEXT, fn);
}
+typedef void (GLAPIENTRYP _glptr_DrawTexfOES)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_DrawTexfOES(disp, parameters) \
+ (* GET_DrawTexfOES(disp)) parameters
+static INLINE _glptr_DrawTexfOES GET_DrawTexfOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexfOES) (GET_by_offset(disp, _gloffset_DrawTexfOES));
+}
+
+static INLINE void SET_DrawTexfOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) {
+ SET_by_offset(disp, _gloffset_DrawTexfOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexfvOES)(const GLfloat *);
+#define CALL_DrawTexfvOES(disp, parameters) \
+ (* GET_DrawTexfvOES(disp)) parameters
+static INLINE _glptr_DrawTexfvOES GET_DrawTexfvOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexfvOES) (GET_by_offset(disp, _gloffset_DrawTexfvOES));
+}
+
+static INLINE void SET_DrawTexfvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+ SET_by_offset(disp, _gloffset_DrawTexfvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexiOES)(GLint, GLint, GLint, GLint, GLint);
+#define CALL_DrawTexiOES(disp, parameters) \
+ (* GET_DrawTexiOES(disp)) parameters
+static INLINE _glptr_DrawTexiOES GET_DrawTexiOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexiOES) (GET_by_offset(disp, _gloffset_DrawTexiOES));
+}
+
+static INLINE void SET_DrawTexiOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) {
+ SET_by_offset(disp, _gloffset_DrawTexiOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexivOES)(const GLint *);
+#define CALL_DrawTexivOES(disp, parameters) \
+ (* GET_DrawTexivOES(disp)) parameters
+static INLINE _glptr_DrawTexivOES GET_DrawTexivOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexivOES) (GET_by_offset(disp, _gloffset_DrawTexivOES));
+}
+
+static INLINE void SET_DrawTexivOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+ SET_by_offset(disp, _gloffset_DrawTexivOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexsOES)(GLshort, GLshort, GLshort, GLshort, GLshort);
+#define CALL_DrawTexsOES(disp, parameters) \
+ (* GET_DrawTexsOES(disp)) parameters
+static INLINE _glptr_DrawTexsOES GET_DrawTexsOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexsOES) (GET_by_offset(disp, _gloffset_DrawTexsOES));
+}
+
+static INLINE void SET_DrawTexsOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort, GLshort)) {
+ SET_by_offset(disp, _gloffset_DrawTexsOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexsvOES)(const GLshort *);
+#define CALL_DrawTexsvOES(disp, parameters) \
+ (* GET_DrawTexsvOES(disp)) parameters
+static INLINE _glptr_DrawTexsvOES GET_DrawTexsvOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexsvOES) (GET_by_offset(disp, _gloffset_DrawTexsvOES));
+}
+
+static INLINE void SET_DrawTexsvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+ SET_by_offset(disp, _gloffset_DrawTexsvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexxOES)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_DrawTexxOES(disp, parameters) \
+ (* GET_DrawTexxOES(disp)) parameters
+static INLINE _glptr_DrawTexxOES GET_DrawTexxOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexxOES) (GET_by_offset(disp, _gloffset_DrawTexxOES));
+}
+
+static INLINE void SET_DrawTexxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_DrawTexxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTexxvOES)(const GLfixed *);
+#define CALL_DrawTexxvOES(disp, parameters) \
+ (* GET_DrawTexxvOES(disp)) parameters
+static INLINE _glptr_DrawTexxvOES GET_DrawTexxvOES(struct _glapi_table *disp) {
+ return (_glptr_DrawTexxvOES) (GET_by_offset(disp, _gloffset_DrawTexxvOES));
+}
+
+static INLINE void SET_DrawTexxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_DrawTexxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointSizePointerOES)(GLenum, GLsizei, const GLvoid *);
+#define CALL_PointSizePointerOES(disp, parameters) \
+ (* GET_PointSizePointerOES(disp)) parameters
+static INLINE _glptr_PointSizePointerOES GET_PointSizePointerOES(struct _glapi_table *disp) {
+ return (_glptr_PointSizePointerOES) (GET_by_offset(disp, _gloffset_PointSizePointerOES));
+}
+
+static INLINE void SET_PointSizePointerOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_PointSizePointerOES, fn);
+}
+
+typedef GLbitfield (GLAPIENTRYP _glptr_QueryMatrixxOES)(GLfixed *, GLint *);
+#define CALL_QueryMatrixxOES(disp, parameters) \
+ (* GET_QueryMatrixxOES(disp)) parameters
+static INLINE _glptr_QueryMatrixxOES GET_QueryMatrixxOES(struct _glapi_table *disp) {
+ return (_glptr_QueryMatrixxOES) (GET_by_offset(disp, _gloffset_QueryMatrixxOES));
+}
+
+static INLINE void SET_QueryMatrixxOES(struct _glapi_table *disp, GLbitfield (GLAPIENTRYP fn)(GLfixed *, GLint *)) {
+ SET_by_offset(disp, _gloffset_QueryMatrixxOES, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_SampleMaskSGIS)(GLclampf, GLboolean);
#define CALL_SampleMaskSGIS(disp, parameters) \
(* GET_SampleMaskSGIS(disp)) parameters
@@ -11811,6 +12089,512 @@ static INLINE void SET_PrimitiveRestartNV(struct _glapi_table *disp, void (GLAPI SET_by_offset(disp, _gloffset_PrimitiveRestartNV, fn);
}
+typedef void (GLAPIENTRYP _glptr_AlphaFuncxOES)(GLenum, GLclampx);
+#define CALL_AlphaFuncxOES(disp, parameters) \
+ (* GET_AlphaFuncxOES(disp)) parameters
+static INLINE _glptr_AlphaFuncxOES GET_AlphaFuncxOES(struct _glapi_table *disp) {
+ return (_glptr_AlphaFuncxOES) (GET_by_offset(disp, _gloffset_AlphaFuncxOES));
+}
+
+static INLINE void SET_AlphaFuncxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLclampx)) {
+ SET_by_offset(disp, _gloffset_AlphaFuncxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClearColorxOES)(GLclampx, GLclampx, GLclampx, GLclampx);
+#define CALL_ClearColorxOES(disp, parameters) \
+ (* GET_ClearColorxOES(disp)) parameters
+static INLINE _glptr_ClearColorxOES GET_ClearColorxOES(struct _glapi_table *disp) {
+ return (_glptr_ClearColorxOES) (GET_by_offset(disp, _gloffset_ClearColorxOES));
+}
+
+static INLINE void SET_ClearColorxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLclampx, GLclampx, GLclampx)) {
+ SET_by_offset(disp, _gloffset_ClearColorxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClearDepthxOES)(GLclampx);
+#define CALL_ClearDepthxOES(disp, parameters) \
+ (* GET_ClearDepthxOES(disp)) parameters
+static INLINE _glptr_ClearDepthxOES GET_ClearDepthxOES(struct _glapi_table *disp) {
+ return (_glptr_ClearDepthxOES) (GET_by_offset(disp, _gloffset_ClearDepthxOES));
+}
+
+static INLINE void SET_ClearDepthxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx)) {
+ SET_by_offset(disp, _gloffset_ClearDepthxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClipPlanexOES)(GLenum, const GLfixed *);
+#define CALL_ClipPlanexOES(disp, parameters) \
+ (* GET_ClipPlanexOES(disp)) parameters
+static INLINE _glptr_ClipPlanexOES GET_ClipPlanexOES(struct _glapi_table *disp) {
+ return (_glptr_ClipPlanexOES) (GET_by_offset(disp, _gloffset_ClipPlanexOES));
+}
+
+static INLINE void SET_ClipPlanexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_ClipPlanexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Color4xOES)(GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_Color4xOES(disp, parameters) \
+ (* GET_Color4xOES(disp)) parameters
+static INLINE _glptr_Color4xOES GET_Color4xOES(struct _glapi_table *disp) {
+ return (_glptr_Color4xOES) (GET_by_offset(disp, _gloffset_Color4xOES));
+}
+
+static INLINE void SET_Color4xOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_Color4xOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DepthRangexOES)(GLclampx, GLclampx);
+#define CALL_DepthRangexOES(disp, parameters) \
+ (* GET_DepthRangexOES(disp)) parameters
+static INLINE _glptr_DepthRangexOES GET_DepthRangexOES(struct _glapi_table *disp) {
+ return (_glptr_DepthRangexOES) (GET_by_offset(disp, _gloffset_DepthRangexOES));
+}
+
+static INLINE void SET_DepthRangexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLclampx)) {
+ SET_by_offset(disp, _gloffset_DepthRangexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FogxOES)(GLenum, GLfixed);
+#define CALL_FogxOES(disp, parameters) \
+ (* GET_FogxOES(disp)) parameters
+static INLINE _glptr_FogxOES GET_FogxOES(struct _glapi_table *disp) {
+ return (_glptr_FogxOES) (GET_by_offset(disp, _gloffset_FogxOES));
+}
+
+static INLINE void SET_FogxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_FogxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FogxvOES)(GLenum, const GLfixed *);
+#define CALL_FogxvOES(disp, parameters) \
+ (* GET_FogxvOES(disp)) parameters
+static INLINE _glptr_FogxvOES GET_FogxvOES(struct _glapi_table *disp) {
+ return (_glptr_FogxvOES) (GET_by_offset(disp, _gloffset_FogxvOES));
+}
+
+static INLINE void SET_FogxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_FogxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FrustumxOES)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_FrustumxOES(disp, parameters) \
+ (* GET_FrustumxOES(disp)) parameters
+static INLINE _glptr_FrustumxOES GET_FrustumxOES(struct _glapi_table *disp) {
+ return (_glptr_FrustumxOES) (GET_by_offset(disp, _gloffset_FrustumxOES));
+}
+
+static INLINE void SET_FrustumxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_FrustumxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetClipPlanexOES)(GLenum, GLfixed *);
+#define CALL_GetClipPlanexOES(disp, parameters) \
+ (* GET_GetClipPlanexOES(disp)) parameters
+static INLINE _glptr_GetClipPlanexOES GET_GetClipPlanexOES(struct _glapi_table *disp) {
+ return (_glptr_GetClipPlanexOES) (GET_by_offset(disp, _gloffset_GetClipPlanexOES));
+}
+
+static INLINE void SET_GetClipPlanexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetClipPlanexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetFixedvOES)(GLenum, GLfixed *);
+#define CALL_GetFixedvOES(disp, parameters) \
+ (* GET_GetFixedvOES(disp)) parameters
+static INLINE _glptr_GetFixedvOES GET_GetFixedvOES(struct _glapi_table *disp) {
+ return (_glptr_GetFixedvOES) (GET_by_offset(disp, _gloffset_GetFixedvOES));
+}
+
+static INLINE void SET_GetFixedvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetFixedvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetLightxvOES)(GLenum, GLenum, GLfixed *);
+#define CALL_GetLightxvOES(disp, parameters) \
+ (* GET_GetLightxvOES(disp)) parameters
+static INLINE _glptr_GetLightxvOES GET_GetLightxvOES(struct _glapi_table *disp) {
+ return (_glptr_GetLightxvOES) (GET_by_offset(disp, _gloffset_GetLightxvOES));
+}
+
+static INLINE void SET_GetLightxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetLightxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetMaterialxvOES)(GLenum, GLenum, GLfixed *);
+#define CALL_GetMaterialxvOES(disp, parameters) \
+ (* GET_GetMaterialxvOES(disp)) parameters
+static INLINE _glptr_GetMaterialxvOES GET_GetMaterialxvOES(struct _glapi_table *disp) {
+ return (_glptr_GetMaterialxvOES) (GET_by_offset(disp, _gloffset_GetMaterialxvOES));
+}
+
+static INLINE void SET_GetMaterialxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetMaterialxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTexEnvxvOES)(GLenum, GLenum, GLfixed *);
+#define CALL_GetTexEnvxvOES(disp, parameters) \
+ (* GET_GetTexEnvxvOES(disp)) parameters
+static INLINE _glptr_GetTexEnvxvOES GET_GetTexEnvxvOES(struct _glapi_table *disp) {
+ return (_glptr_GetTexEnvxvOES) (GET_by_offset(disp, _gloffset_GetTexEnvxvOES));
+}
+
+static INLINE void SET_GetTexEnvxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetTexEnvxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTexGenxvOES)(GLenum, GLenum, GLfixed *);
+#define CALL_GetTexGenxvOES(disp, parameters) \
+ (* GET_GetTexGenxvOES(disp)) parameters
+static INLINE _glptr_GetTexGenxvOES GET_GetTexGenxvOES(struct _glapi_table *disp) {
+ return (_glptr_GetTexGenxvOES) (GET_by_offset(disp, _gloffset_GetTexGenxvOES));
+}
+
+static INLINE void SET_GetTexGenxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetTexGenxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTexParameterxvOES)(GLenum, GLenum, GLfixed *);
+#define CALL_GetTexParameterxvOES(disp, parameters) \
+ (* GET_GetTexParameterxvOES(disp)) parameters
+static INLINE _glptr_GetTexParameterxvOES GET_GetTexParameterxvOES(struct _glapi_table *disp) {
+ return (_glptr_GetTexParameterxvOES) (GET_by_offset(disp, _gloffset_GetTexParameterxvOES));
+}
+
+static INLINE void SET_GetTexParameterxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+ SET_by_offset(disp, _gloffset_GetTexParameterxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LightModelxOES)(GLenum, GLfixed);
+#define CALL_LightModelxOES(disp, parameters) \
+ (* GET_LightModelxOES(disp)) parameters
+static INLINE _glptr_LightModelxOES GET_LightModelxOES(struct _glapi_table *disp) {
+ return (_glptr_LightModelxOES) (GET_by_offset(disp, _gloffset_LightModelxOES));
+}
+
+static INLINE void SET_LightModelxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_LightModelxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LightModelxvOES)(GLenum, const GLfixed *);
+#define CALL_LightModelxvOES(disp, parameters) \
+ (* GET_LightModelxvOES(disp)) parameters
+static INLINE _glptr_LightModelxvOES GET_LightModelxvOES(struct _glapi_table *disp) {
+ return (_glptr_LightModelxvOES) (GET_by_offset(disp, _gloffset_LightModelxvOES));
+}
+
+static INLINE void SET_LightModelxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_LightModelxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LightxOES)(GLenum, GLenum, GLfixed);
+#define CALL_LightxOES(disp, parameters) \
+ (* GET_LightxOES(disp)) parameters
+static INLINE _glptr_LightxOES GET_LightxOES(struct _glapi_table *disp) {
+ return (_glptr_LightxOES) (GET_by_offset(disp, _gloffset_LightxOES));
+}
+
+static INLINE void SET_LightxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_LightxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LightxvOES)(GLenum, GLenum, const GLfixed *);
+#define CALL_LightxvOES(disp, parameters) \
+ (* GET_LightxvOES(disp)) parameters
+static INLINE _glptr_LightxvOES GET_LightxvOES(struct _glapi_table *disp) {
+ return (_glptr_LightxvOES) (GET_by_offset(disp, _gloffset_LightxvOES));
+}
+
+static INLINE void SET_LightxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_LightxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LineWidthxOES)(GLfixed);
+#define CALL_LineWidthxOES(disp, parameters) \
+ (* GET_LineWidthxOES(disp)) parameters
+static INLINE _glptr_LineWidthxOES GET_LineWidthxOES(struct _glapi_table *disp) {
+ return (_glptr_LineWidthxOES) (GET_by_offset(disp, _gloffset_LineWidthxOES));
+}
+
+static INLINE void SET_LineWidthxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed)) {
+ SET_by_offset(disp, _gloffset_LineWidthxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LoadMatrixxOES)(const GLfixed *);
+#define CALL_LoadMatrixxOES(disp, parameters) \
+ (* GET_LoadMatrixxOES(disp)) parameters
+static INLINE _glptr_LoadMatrixxOES GET_LoadMatrixxOES(struct _glapi_table *disp) {
+ return (_glptr_LoadMatrixxOES) (GET_by_offset(disp, _gloffset_LoadMatrixxOES));
+}
+
+static INLINE void SET_LoadMatrixxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_LoadMatrixxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MaterialxOES)(GLenum, GLenum, GLfixed);
+#define CALL_MaterialxOES(disp, parameters) \
+ (* GET_MaterialxOES(disp)) parameters
+static INLINE _glptr_MaterialxOES GET_MaterialxOES(struct _glapi_table *disp) {
+ return (_glptr_MaterialxOES) (GET_by_offset(disp, _gloffset_MaterialxOES));
+}
+
+static INLINE void SET_MaterialxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_MaterialxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MaterialxvOES)(GLenum, GLenum, const GLfixed *);
+#define CALL_MaterialxvOES(disp, parameters) \
+ (* GET_MaterialxvOES(disp)) parameters
+static INLINE _glptr_MaterialxvOES GET_MaterialxvOES(struct _glapi_table *disp) {
+ return (_glptr_MaterialxvOES) (GET_by_offset(disp, _gloffset_MaterialxvOES));
+}
+
+static INLINE void SET_MaterialxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_MaterialxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultMatrixxOES)(const GLfixed *);
+#define CALL_MultMatrixxOES(disp, parameters) \
+ (* GET_MultMatrixxOES(disp)) parameters
+static INLINE _glptr_MultMatrixxOES GET_MultMatrixxOES(struct _glapi_table *disp) {
+ return (_glptr_MultMatrixxOES) (GET_by_offset(disp, _gloffset_MultMatrixxOES));
+}
+
+static INLINE void SET_MultMatrixxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_MultMatrixxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4xOES)(GLenum, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_MultiTexCoord4xOES(disp, parameters) \
+ (* GET_MultiTexCoord4xOES(disp)) parameters
+static INLINE _glptr_MultiTexCoord4xOES GET_MultiTexCoord4xOES(struct _glapi_table *disp) {
+ return (_glptr_MultiTexCoord4xOES) (GET_by_offset(disp, _gloffset_MultiTexCoord4xOES));
+}
+
+static INLINE void SET_MultiTexCoord4xOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed, GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_MultiTexCoord4xOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Normal3xOES)(GLfixed, GLfixed, GLfixed);
+#define CALL_Normal3xOES(disp, parameters) \
+ (* GET_Normal3xOES(disp)) parameters
+static INLINE _glptr_Normal3xOES GET_Normal3xOES(struct _glapi_table *disp) {
+ return (_glptr_Normal3xOES) (GET_by_offset(disp, _gloffset_Normal3xOES));
+}
+
+static INLINE void SET_Normal3xOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_Normal3xOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_OrthoxOES)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_OrthoxOES(disp, parameters) \
+ (* GET_OrthoxOES(disp)) parameters
+static INLINE _glptr_OrthoxOES GET_OrthoxOES(struct _glapi_table *disp) {
+ return (_glptr_OrthoxOES) (GET_by_offset(disp, _gloffset_OrthoxOES));
+}
+
+static INLINE void SET_OrthoxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_OrthoxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameterxOES)(GLenum, GLfixed);
+#define CALL_PointParameterxOES(disp, parameters) \
+ (* GET_PointParameterxOES(disp)) parameters
+static INLINE _glptr_PointParameterxOES GET_PointParameterxOES(struct _glapi_table *disp) {
+ return (_glptr_PointParameterxOES) (GET_by_offset(disp, _gloffset_PointParameterxOES));
+}
+
+static INLINE void SET_PointParameterxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_PointParameterxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameterxvOES)(GLenum, const GLfixed *);
+#define CALL_PointParameterxvOES(disp, parameters) \
+ (* GET_PointParameterxvOES(disp)) parameters
+static INLINE _glptr_PointParameterxvOES GET_PointParameterxvOES(struct _glapi_table *disp) {
+ return (_glptr_PointParameterxvOES) (GET_by_offset(disp, _gloffset_PointParameterxvOES));
+}
+
+static INLINE void SET_PointParameterxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_PointParameterxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointSizexOES)(GLfixed);
+#define CALL_PointSizexOES(disp, parameters) \
+ (* GET_PointSizexOES(disp)) parameters
+static INLINE _glptr_PointSizexOES GET_PointSizexOES(struct _glapi_table *disp) {
+ return (_glptr_PointSizexOES) (GET_by_offset(disp, _gloffset_PointSizexOES));
+}
+
+static INLINE void SET_PointSizexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed)) {
+ SET_by_offset(disp, _gloffset_PointSizexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PolygonOffsetxOES)(GLfixed, GLfixed);
+#define CALL_PolygonOffsetxOES(disp, parameters) \
+ (* GET_PolygonOffsetxOES(disp)) parameters
+static INLINE _glptr_PolygonOffsetxOES GET_PolygonOffsetxOES(struct _glapi_table *disp) {
+ return (_glptr_PolygonOffsetxOES) (GET_by_offset(disp, _gloffset_PolygonOffsetxOES));
+}
+
+static INLINE void SET_PolygonOffsetxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_PolygonOffsetxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_RotatexOES)(GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_RotatexOES(disp, parameters) \
+ (* GET_RotatexOES(disp)) parameters
+static INLINE _glptr_RotatexOES GET_RotatexOES(struct _glapi_table *disp) {
+ return (_glptr_RotatexOES) (GET_by_offset(disp, _gloffset_RotatexOES));
+}
+
+static INLINE void SET_RotatexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_RotatexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SampleCoveragexOES)(GLclampx, GLboolean);
+#define CALL_SampleCoveragexOES(disp, parameters) \
+ (* GET_SampleCoveragexOES(disp)) parameters
+static INLINE _glptr_SampleCoveragexOES GET_SampleCoveragexOES(struct _glapi_table *disp) {
+ return (_glptr_SampleCoveragexOES) (GET_by_offset(disp, _gloffset_SampleCoveragexOES));
+}
+
+static INLINE void SET_SampleCoveragexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLboolean)) {
+ SET_by_offset(disp, _gloffset_SampleCoveragexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ScalexOES)(GLfixed, GLfixed, GLfixed);
+#define CALL_ScalexOES(disp, parameters) \
+ (* GET_ScalexOES(disp)) parameters
+static INLINE _glptr_ScalexOES GET_ScalexOES(struct _glapi_table *disp) {
+ return (_glptr_ScalexOES) (GET_by_offset(disp, _gloffset_ScalexOES));
+}
+
+static INLINE void SET_ScalexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_ScalexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexEnvxOES)(GLenum, GLenum, GLfixed);
+#define CALL_TexEnvxOES(disp, parameters) \
+ (* GET_TexEnvxOES(disp)) parameters
+static INLINE _glptr_TexEnvxOES GET_TexEnvxOES(struct _glapi_table *disp) {
+ return (_glptr_TexEnvxOES) (GET_by_offset(disp, _gloffset_TexEnvxOES));
+}
+
+static INLINE void SET_TexEnvxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_TexEnvxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexEnvxvOES)(GLenum, GLenum, const GLfixed *);
+#define CALL_TexEnvxvOES(disp, parameters) \
+ (* GET_TexEnvxvOES(disp)) parameters
+static INLINE _glptr_TexEnvxvOES GET_TexEnvxvOES(struct _glapi_table *disp) {
+ return (_glptr_TexEnvxvOES) (GET_by_offset(disp, _gloffset_TexEnvxvOES));
+}
+
+static INLINE void SET_TexEnvxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_TexEnvxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexGenxOES)(GLenum, GLenum, GLint);
+#define CALL_TexGenxOES(disp, parameters) \
+ (* GET_TexGenxOES(disp)) parameters
+static INLINE _glptr_TexGenxOES GET_TexGenxOES(struct _glapi_table *disp) {
+ return (_glptr_TexGenxOES) (GET_by_offset(disp, _gloffset_TexGenxOES));
+}
+
+static INLINE void SET_TexGenxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+ SET_by_offset(disp, _gloffset_TexGenxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexGenxvOES)(GLenum, GLenum, const GLfixed *);
+#define CALL_TexGenxvOES(disp, parameters) \
+ (* GET_TexGenxvOES(disp)) parameters
+static INLINE _glptr_TexGenxvOES GET_TexGenxvOES(struct _glapi_table *disp) {
+ return (_glptr_TexGenxvOES) (GET_by_offset(disp, _gloffset_TexGenxvOES));
+}
+
+static INLINE void SET_TexGenxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_TexGenxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexParameterxOES)(GLenum, GLenum, GLfixed);
+#define CALL_TexParameterxOES(disp, parameters) \
+ (* GET_TexParameterxOES(disp)) parameters
+static INLINE _glptr_TexParameterxOES GET_TexParameterxOES(struct _glapi_table *disp) {
+ return (_glptr_TexParameterxOES) (GET_by_offset(disp, _gloffset_TexParameterxOES));
+}
+
+static INLINE void SET_TexParameterxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+ SET_by_offset(disp, _gloffset_TexParameterxOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexParameterxvOES)(GLenum, GLenum, const GLfixed *);
+#define CALL_TexParameterxvOES(disp, parameters) \
+ (* GET_TexParameterxvOES(disp)) parameters
+static INLINE _glptr_TexParameterxvOES GET_TexParameterxvOES(struct _glapi_table *disp) {
+ return (_glptr_TexParameterxvOES) (GET_by_offset(disp, _gloffset_TexParameterxvOES));
+}
+
+static INLINE void SET_TexParameterxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+ SET_by_offset(disp, _gloffset_TexParameterxvOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TranslatexOES)(GLfixed, GLfixed, GLfixed);
+#define CALL_TranslatexOES(disp, parameters) \
+ (* GET_TranslatexOES(disp)) parameters
+static INLINE _glptr_TranslatexOES GET_TranslatexOES(struct _glapi_table *disp) {
+ return (_glptr_TranslatexOES) (GET_by_offset(disp, _gloffset_TranslatexOES));
+}
+
+static INLINE void SET_TranslatexOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) {
+ SET_by_offset(disp, _gloffset_TranslatexOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClipPlanefOES)(GLenum, const GLfloat *);
+#define CALL_ClipPlanefOES(disp, parameters) \
+ (* GET_ClipPlanefOES(disp)) parameters
+static INLINE _glptr_ClipPlanefOES GET_ClipPlanefOES(struct _glapi_table *disp) {
+ return (_glptr_ClipPlanefOES) (GET_by_offset(disp, _gloffset_ClipPlanefOES));
+}
+
+static INLINE void SET_ClipPlanefOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+ SET_by_offset(disp, _gloffset_ClipPlanefOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FrustumfOES)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_FrustumfOES(disp, parameters) \
+ (* GET_FrustumfOES(disp)) parameters
+static INLINE _glptr_FrustumfOES GET_FrustumfOES(struct _glapi_table *disp) {
+ return (_glptr_FrustumfOES) (GET_by_offset(disp, _gloffset_FrustumfOES));
+}
+
+static INLINE void SET_FrustumfOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) {
+ SET_by_offset(disp, _gloffset_FrustumfOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetClipPlanefOES)(GLenum, GLfloat *);
+#define CALL_GetClipPlanefOES(disp, parameters) \
+ (* GET_GetClipPlanefOES(disp)) parameters
+static INLINE _glptr_GetClipPlanefOES GET_GetClipPlanefOES(struct _glapi_table *disp) {
+ return (_glptr_GetClipPlanefOES) (GET_by_offset(disp, _gloffset_GetClipPlanefOES));
+}
+
+static INLINE void SET_GetClipPlanefOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
+ SET_by_offset(disp, _gloffset_GetClipPlanefOES, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_OrthofOES)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_OrthofOES(disp, parameters) \
+ (* GET_OrthofOES(disp)) parameters
+static INLINE _glptr_OrthofOES GET_OrthofOES(struct _glapi_table *disp) {
+ return (_glptr_OrthofOES) (GET_by_offset(disp, _gloffset_OrthofOES));
+}
+
+static INLINE void SET_OrthofOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) {
+ SET_by_offset(disp, _gloffset_OrthofOES, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_DepthBoundsEXT)(GLclampd, GLclampd);
#define CALL_DepthBoundsEXT(disp, parameters) \
(* GET_DepthBoundsEXT(disp)) parameters
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c index 29a28f414..334f33f9f 100644 --- a/xorg-server/glx/glapi.c +++ b/xorg-server/glx/glapi.c @@ -49,6 +49,7 @@ #include <unistd.h> #include "glapi.h" +#include "glheader.h" #include "dispatch.h" #include "glapitable.h" diff --git a/xorg-server/glx/glapi_gentable.c b/xorg-server/glx/glapi_gentable.c index cfbfb671f..c4f3a4180 100644 --- a/xorg-server/glx/glapi_gentable.c +++ b/xorg-server/glx/glapi_gentable.c @@ -1452,6 +1452,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->TexGenf) {
+ void ** procp = (void **) &disp->TexGenf;
+ snprintf(symboln, sizeof(symboln), "%sTexGenfOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->TexGenfv) {
void ** procp = (void **) &disp->TexGenfv;
snprintf(symboln, sizeof(symboln), "%sTexGenfv", symbol_prefix);
@@ -1459,6 +1466,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->TexGenfv) {
+ void ** procp = (void **) &disp->TexGenfv;
+ snprintf(symboln, sizeof(symboln), "%sTexGenfvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->TexGeni) {
void ** procp = (void **) &disp->TexGeni;
snprintf(symboln, sizeof(symboln), "%sTexGeni", symbol_prefix);
@@ -1466,6 +1480,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->TexGeni) {
+ void ** procp = (void **) &disp->TexGeni;
+ snprintf(symboln, sizeof(symboln), "%sTexGeniOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->TexGeniv) {
void ** procp = (void **) &disp->TexGeniv;
snprintf(symboln, sizeof(symboln), "%sTexGeniv", symbol_prefix);
@@ -1473,6 +1494,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->TexGeniv) {
+ void ** procp = (void **) &disp->TexGeniv;
+ snprintf(symboln, sizeof(symboln), "%sTexGenivOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->FeedbackBuffer) {
void ** procp = (void **) &disp->FeedbackBuffer;
snprintf(symboln, sizeof(symboln), "%sFeedbackBuffer", symbol_prefix);
@@ -1900,6 +1928,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->ReadBuffer) {
+ void ** procp = (void **) &disp->ReadBuffer;
+ snprintf(symboln, sizeof(symboln), "%sReadBufferNV", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->CopyPixels) {
void ** procp = (void **) &disp->CopyPixels;
snprintf(symboln, sizeof(symboln), "%sCopyPixels", symbol_prefix);
@@ -2075,6 +2110,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GetTexGenfv) {
+ void ** procp = (void **) &disp->GetTexGenfv;
+ snprintf(symboln, sizeof(symboln), "%sGetTexGenfvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetTexGeniv) {
void ** procp = (void **) &disp->GetTexGeniv;
snprintf(symboln, sizeof(symboln), "%sGetTexGeniv", symbol_prefix);
@@ -2082,6 +2124,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GetTexGeniv) {
+ void ** procp = (void **) &disp->GetTexGeniv;
+ snprintf(symboln, sizeof(symboln), "%sGetTexGenivOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetTexImage) {
void ** procp = (void **) &disp->GetTexImage;
snprintf(symboln, sizeof(symboln), "%sGetTexImage", symbol_prefix);
@@ -2600,6 +2649,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->BlendEquation) {
+ void ** procp = (void **) &disp->BlendEquation;
+ snprintf(symboln, sizeof(symboln), "%sBlendEquationOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->DrawRangeElements) {
void ** procp = (void **) &disp->DrawRangeElements;
snprintf(symboln, sizeof(symboln), "%sDrawRangeElements", symbol_prefix);
@@ -3104,6 +3160,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->TexImage3D) {
+ void ** procp = (void **) &disp->TexImage3D;
+ snprintf(symboln, sizeof(symboln), "%sTexImage3DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->TexSubImage3D) {
void ** procp = (void **) &disp->TexSubImage3D;
snprintf(symboln, sizeof(symboln), "%sTexSubImage3D", symbol_prefix);
@@ -3118,6 +3181,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->TexSubImage3D) {
+ void ** procp = (void **) &disp->TexSubImage3D;
+ snprintf(symboln, sizeof(symboln), "%sTexSubImage3DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->CopyTexSubImage3D) {
void ** procp = (void **) &disp->CopyTexSubImage3D;
snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3D", symbol_prefix);
@@ -3132,6 +3202,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->CopyTexSubImage3D) {
+ void ** procp = (void **) &disp->CopyTexSubImage3D;
+ snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->ActiveTextureARB) {
void ** procp = (void **) &disp->ActiveTextureARB;
snprintf(symboln, sizeof(symboln), "%sActiveTexture", symbol_prefix);
@@ -3944,6 +4021,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->CompressedTexImage3DARB) {
+ void ** procp = (void **) &disp->CompressedTexImage3DARB;
+ snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->CompressedTexSubImage1DARB) {
void ** procp = (void **) &disp->CompressedTexSubImage1DARB;
snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1D", symbol_prefix);
@@ -3986,6 +4070,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->CompressedTexSubImage3DARB) {
+ void ** procp = (void **) &disp->CompressedTexSubImage3DARB;
+ snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetCompressedTexImageARB) {
void ** procp = (void **) &disp->GetCompressedTexImageARB;
snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImage", symbol_prefix);
@@ -4819,6 +4910,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GetBufferPointervARB) {
+ void ** procp = (void **) &disp->GetBufferPointervARB;
+ snprintf(symboln, sizeof(symboln), "%sGetBufferPointervOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetBufferSubDataARB) {
void ** procp = (void **) &disp->GetBufferSubDataARB;
snprintf(symboln, sizeof(symboln), "%sGetBufferSubData", symbol_prefix);
@@ -4861,6 +4959,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->MapBufferARB) {
+ void ** procp = (void **) &disp->MapBufferARB;
+ snprintf(symboln, sizeof(symboln), "%sMapBufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->UnmapBufferARB) {
void ** procp = (void **) &disp->UnmapBufferARB;
snprintf(symboln, sizeof(symboln), "%sUnmapBuffer", symbol_prefix);
@@ -4875,6 +4980,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->UnmapBufferARB) {
+ void ** procp = (void **) &disp->UnmapBufferARB;
+ snprintf(symboln, sizeof(symboln), "%sUnmapBufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->BeginQueryARB) {
void ** procp = (void **) &disp->BeginQueryARB;
snprintf(symboln, sizeof(symboln), "%sBeginQuery", symbol_prefix);
@@ -5526,6 +5638,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->DrawBuffersARB) {
+ void ** procp = (void **) &disp->DrawBuffersARB;
+ snprintf(symboln, sizeof(symboln), "%sDrawBuffersNV", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->ClampColorARB) {
void ** procp = (void **) &disp->ClampColorARB;
snprintf(symboln, sizeof(symboln), "%sClampColorARB", symbol_prefix);
@@ -5624,6 +5743,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->FlushMappedBufferRange) {
+ void ** procp = (void **) &disp->FlushMappedBufferRange;
+ snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRangeEXT", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->MapBufferRange) {
void ** procp = (void **) &disp->MapBufferRange;
snprintf(symboln, sizeof(symboln), "%sMapBufferRange", symbol_prefix);
@@ -5631,6 +5757,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->MapBufferRange) {
+ void ** procp = (void **) &disp->MapBufferRange;
+ snprintf(symboln, sizeof(symboln), "%sMapBufferRangeEXT", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->TexBufferARB) {
void ** procp = (void **) &disp->TexBufferARB;
snprintf(symboln, sizeof(symboln), "%sTexBufferARB", symbol_prefix);
@@ -5652,6 +5785,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->BindVertexArray) {
+ void ** procp = (void **) &disp->BindVertexArray;
+ snprintf(symboln, sizeof(symboln), "%sBindVertexArrayOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GenVertexArrays) {
void ** procp = (void **) &disp->GenVertexArrays;
snprintf(symboln, sizeof(symboln), "%sGenVertexArrays", symbol_prefix);
@@ -5659,6 +5799,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GenVertexArrays) {
+ void ** procp = (void **) &disp->GenVertexArrays;
+ snprintf(symboln, sizeof(symboln), "%sGenVertexArraysOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetActiveUniformBlockName) {
void ** procp = (void **) &disp->GetActiveUniformBlockName;
snprintf(symboln, sizeof(symboln), "%sGetActiveUniformBlockName", symbol_prefix);
@@ -6317,6 +6464,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->ClearDepthf) {
+ void ** procp = (void **) &disp->ClearDepthf;
+ snprintf(symboln, sizeof(symboln), "%sClearDepthfOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->DepthRangef) {
void ** procp = (void **) &disp->DepthRangef;
snprintf(symboln, sizeof(symboln), "%sDepthRangef", symbol_prefix);
@@ -6324,6 +6478,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->DepthRangef) {
+ void ** procp = (void **) &disp->DepthRangef;
+ snprintf(symboln, sizeof(symboln), "%sDepthRangefOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetShaderPrecisionFormat) {
void ** procp = (void **) &disp->GetShaderPrecisionFormat;
snprintf(symboln, sizeof(symboln), "%sGetShaderPrecisionFormat", symbol_prefix);
@@ -6352,6 +6513,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GetProgramBinary) {
+ void ** procp = (void **) &disp->GetProgramBinary;
+ snprintf(symboln, sizeof(symboln), "%sGetProgramBinaryOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->ProgramBinary) {
void ** procp = (void **) &disp->ProgramBinary;
snprintf(symboln, sizeof(symboln), "%sProgramBinary", symbol_prefix);
@@ -6359,6 +6527,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->ProgramBinary) {
+ void ** procp = (void **) &disp->ProgramBinary;
+ snprintf(symboln, sizeof(symboln), "%sProgramBinaryOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->ProgramParameteri) {
void ** procp = (void **) &disp->ProgramParameteri;
snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB", symbol_prefix);
@@ -6667,6 +6842,76 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->DrawTexfOES) {
+ void ** procp = (void **) &disp->DrawTexfOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexfOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexfvOES) {
+ void ** procp = (void **) &disp->DrawTexfvOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexfvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexiOES) {
+ void ** procp = (void **) &disp->DrawTexiOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexiOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexivOES) {
+ void ** procp = (void **) &disp->DrawTexivOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexivOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexsOES) {
+ void ** procp = (void **) &disp->DrawTexsOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexsOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexsvOES) {
+ void ** procp = (void **) &disp->DrawTexsvOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexsvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexxOES) {
+ void ** procp = (void **) &disp->DrawTexxOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DrawTexxvOES) {
+ void ** procp = (void **) &disp->DrawTexxvOES;
+ snprintf(symboln, sizeof(symboln), "%sDrawTexxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointSizePointerOES) {
+ void ** procp = (void **) &disp->PointSizePointerOES;
+ snprintf(symboln, sizeof(symboln), "%sPointSizePointerOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->QueryMatrixxOES) {
+ void ** procp = (void **) &disp->QueryMatrixxOES;
+ snprintf(symboln, sizeof(symboln), "%sQueryMatrixxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->SampleMaskSGIS) {
void ** procp = (void **) &disp->SampleMaskSGIS;
snprintf(symboln, sizeof(symboln), "%sSampleMaskSGIS", symbol_prefix);
@@ -7164,6 +7409,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->BlendFuncSeparateEXT) {
+ void ** procp = (void **) &disp->BlendFuncSeparateEXT;
+ snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->ResizeBuffersMESA) {
void ** procp = (void **) &disp->ResizeBuffersMESA;
snprintf(symboln, sizeof(symboln), "%sResizeBuffersMESA", symbol_prefix);
@@ -8221,6 +8473,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->DeleteVertexArraysAPPLE) {
+ void ** procp = (void **) &disp->DeleteVertexArraysAPPLE;
+ snprintf(symboln, sizeof(symboln), "%sDeleteVertexArraysOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GenVertexArraysAPPLE) {
void ** procp = (void **) &disp->GenVertexArraysAPPLE;
snprintf(symboln, sizeof(symboln), "%sGenVertexArraysAPPLE", symbol_prefix);
@@ -8242,6 +8501,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->IsVertexArrayAPPLE) {
+ void ** procp = (void **) &disp->IsVertexArrayAPPLE;
+ snprintf(symboln, sizeof(symboln), "%sIsVertexArrayOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetProgramNamedParameterdvNV) {
void ** procp = (void **) &disp->GetProgramNamedParameterdvNV;
snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterdvNV", symbol_prefix);
@@ -8305,6 +8571,629 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->AlphaFuncxOES) {
+ void ** procp = (void **) &disp->AlphaFuncxOES;
+ snprintf(symboln, sizeof(symboln), "%sAlphaFuncxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->AlphaFuncxOES) {
+ void ** procp = (void **) &disp->AlphaFuncxOES;
+ snprintf(symboln, sizeof(symboln), "%sAlphaFuncx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClearColorxOES) {
+ void ** procp = (void **) &disp->ClearColorxOES;
+ snprintf(symboln, sizeof(symboln), "%sClearColorxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClearColorxOES) {
+ void ** procp = (void **) &disp->ClearColorxOES;
+ snprintf(symboln, sizeof(symboln), "%sClearColorx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClearDepthxOES) {
+ void ** procp = (void **) &disp->ClearDepthxOES;
+ snprintf(symboln, sizeof(symboln), "%sClearDepthxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClearDepthxOES) {
+ void ** procp = (void **) &disp->ClearDepthxOES;
+ snprintf(symboln, sizeof(symboln), "%sClearDepthx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClipPlanexOES) {
+ void ** procp = (void **) &disp->ClipPlanexOES;
+ snprintf(symboln, sizeof(symboln), "%sClipPlanexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClipPlanexOES) {
+ void ** procp = (void **) &disp->ClipPlanexOES;
+ snprintf(symboln, sizeof(symboln), "%sClipPlanex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->Color4xOES) {
+ void ** procp = (void **) &disp->Color4xOES;
+ snprintf(symboln, sizeof(symboln), "%sColor4xOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->Color4xOES) {
+ void ** procp = (void **) &disp->Color4xOES;
+ snprintf(symboln, sizeof(symboln), "%sColor4x", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DepthRangexOES) {
+ void ** procp = (void **) &disp->DepthRangexOES;
+ snprintf(symboln, sizeof(symboln), "%sDepthRangexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->DepthRangexOES) {
+ void ** procp = (void **) &disp->DepthRangexOES;
+ snprintf(symboln, sizeof(symboln), "%sDepthRangex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FogxOES) {
+ void ** procp = (void **) &disp->FogxOES;
+ snprintf(symboln, sizeof(symboln), "%sFogxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FogxOES) {
+ void ** procp = (void **) &disp->FogxOES;
+ snprintf(symboln, sizeof(symboln), "%sFogx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FogxvOES) {
+ void ** procp = (void **) &disp->FogxvOES;
+ snprintf(symboln, sizeof(symboln), "%sFogxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FogxvOES) {
+ void ** procp = (void **) &disp->FogxvOES;
+ snprintf(symboln, sizeof(symboln), "%sFogxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FrustumxOES) {
+ void ** procp = (void **) &disp->FrustumxOES;
+ snprintf(symboln, sizeof(symboln), "%sFrustumxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FrustumxOES) {
+ void ** procp = (void **) &disp->FrustumxOES;
+ snprintf(symboln, sizeof(symboln), "%sFrustumx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetClipPlanexOES) {
+ void ** procp = (void **) &disp->GetClipPlanexOES;
+ snprintf(symboln, sizeof(symboln), "%sGetClipPlanexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetClipPlanexOES) {
+ void ** procp = (void **) &disp->GetClipPlanexOES;
+ snprintf(symboln, sizeof(symboln), "%sGetClipPlanex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetFixedvOES) {
+ void ** procp = (void **) &disp->GetFixedvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetFixedvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetFixedvOES) {
+ void ** procp = (void **) &disp->GetFixedvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetFixedv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetLightxvOES) {
+ void ** procp = (void **) &disp->GetLightxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetLightxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetLightxvOES) {
+ void ** procp = (void **) &disp->GetLightxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetLightxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetMaterialxvOES) {
+ void ** procp = (void **) &disp->GetMaterialxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetMaterialxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetMaterialxvOES) {
+ void ** procp = (void **) &disp->GetMaterialxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetMaterialxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetTexEnvxvOES) {
+ void ** procp = (void **) &disp->GetTexEnvxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetTexEnvxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetTexEnvxvOES) {
+ void ** procp = (void **) &disp->GetTexEnvxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetTexEnvxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetTexGenxvOES) {
+ void ** procp = (void **) &disp->GetTexGenxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetTexGenxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetTexParameterxvOES) {
+ void ** procp = (void **) &disp->GetTexParameterxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetTexParameterxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetTexParameterxvOES) {
+ void ** procp = (void **) &disp->GetTexParameterxvOES;
+ snprintf(symboln, sizeof(symboln), "%sGetTexParameterxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightModelxOES) {
+ void ** procp = (void **) &disp->LightModelxOES;
+ snprintf(symboln, sizeof(symboln), "%sLightModelxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightModelxOES) {
+ void ** procp = (void **) &disp->LightModelxOES;
+ snprintf(symboln, sizeof(symboln), "%sLightModelx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightModelxvOES) {
+ void ** procp = (void **) &disp->LightModelxvOES;
+ snprintf(symboln, sizeof(symboln), "%sLightModelxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightModelxvOES) {
+ void ** procp = (void **) &disp->LightModelxvOES;
+ snprintf(symboln, sizeof(symboln), "%sLightModelxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightxOES) {
+ void ** procp = (void **) &disp->LightxOES;
+ snprintf(symboln, sizeof(symboln), "%sLightxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightxOES) {
+ void ** procp = (void **) &disp->LightxOES;
+ snprintf(symboln, sizeof(symboln), "%sLightx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightxvOES) {
+ void ** procp = (void **) &disp->LightxvOES;
+ snprintf(symboln, sizeof(symboln), "%sLightxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LightxvOES) {
+ void ** procp = (void **) &disp->LightxvOES;
+ snprintf(symboln, sizeof(symboln), "%sLightxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LineWidthxOES) {
+ void ** procp = (void **) &disp->LineWidthxOES;
+ snprintf(symboln, sizeof(symboln), "%sLineWidthxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LineWidthxOES) {
+ void ** procp = (void **) &disp->LineWidthxOES;
+ snprintf(symboln, sizeof(symboln), "%sLineWidthx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LoadMatrixxOES) {
+ void ** procp = (void **) &disp->LoadMatrixxOES;
+ snprintf(symboln, sizeof(symboln), "%sLoadMatrixxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->LoadMatrixxOES) {
+ void ** procp = (void **) &disp->LoadMatrixxOES;
+ snprintf(symboln, sizeof(symboln), "%sLoadMatrixx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MaterialxOES) {
+ void ** procp = (void **) &disp->MaterialxOES;
+ snprintf(symboln, sizeof(symboln), "%sMaterialxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MaterialxOES) {
+ void ** procp = (void **) &disp->MaterialxOES;
+ snprintf(symboln, sizeof(symboln), "%sMaterialx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MaterialxvOES) {
+ void ** procp = (void **) &disp->MaterialxvOES;
+ snprintf(symboln, sizeof(symboln), "%sMaterialxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MaterialxvOES) {
+ void ** procp = (void **) &disp->MaterialxvOES;
+ snprintf(symboln, sizeof(symboln), "%sMaterialxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MultMatrixxOES) {
+ void ** procp = (void **) &disp->MultMatrixxOES;
+ snprintf(symboln, sizeof(symboln), "%sMultMatrixxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MultMatrixxOES) {
+ void ** procp = (void **) &disp->MultMatrixxOES;
+ snprintf(symboln, sizeof(symboln), "%sMultMatrixx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MultiTexCoord4xOES) {
+ void ** procp = (void **) &disp->MultiTexCoord4xOES;
+ snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4xOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->MultiTexCoord4xOES) {
+ void ** procp = (void **) &disp->MultiTexCoord4xOES;
+ snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4x", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->Normal3xOES) {
+ void ** procp = (void **) &disp->Normal3xOES;
+ snprintf(symboln, sizeof(symboln), "%sNormal3xOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->Normal3xOES) {
+ void ** procp = (void **) &disp->Normal3xOES;
+ snprintf(symboln, sizeof(symboln), "%sNormal3x", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->OrthoxOES) {
+ void ** procp = (void **) &disp->OrthoxOES;
+ snprintf(symboln, sizeof(symboln), "%sOrthoxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->OrthoxOES) {
+ void ** procp = (void **) &disp->OrthoxOES;
+ snprintf(symboln, sizeof(symboln), "%sOrthox", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointParameterxOES) {
+ void ** procp = (void **) &disp->PointParameterxOES;
+ snprintf(symboln, sizeof(symboln), "%sPointParameterxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointParameterxOES) {
+ void ** procp = (void **) &disp->PointParameterxOES;
+ snprintf(symboln, sizeof(symboln), "%sPointParameterx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointParameterxvOES) {
+ void ** procp = (void **) &disp->PointParameterxvOES;
+ snprintf(symboln, sizeof(symboln), "%sPointParameterxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointParameterxvOES) {
+ void ** procp = (void **) &disp->PointParameterxvOES;
+ snprintf(symboln, sizeof(symboln), "%sPointParameterxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointSizexOES) {
+ void ** procp = (void **) &disp->PointSizexOES;
+ snprintf(symboln, sizeof(symboln), "%sPointSizexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PointSizexOES) {
+ void ** procp = (void **) &disp->PointSizexOES;
+ snprintf(symboln, sizeof(symboln), "%sPointSizex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PolygonOffsetxOES) {
+ void ** procp = (void **) &disp->PolygonOffsetxOES;
+ snprintf(symboln, sizeof(symboln), "%sPolygonOffsetxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->PolygonOffsetxOES) {
+ void ** procp = (void **) &disp->PolygonOffsetxOES;
+ snprintf(symboln, sizeof(symboln), "%sPolygonOffsetx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->RotatexOES) {
+ void ** procp = (void **) &disp->RotatexOES;
+ snprintf(symboln, sizeof(symboln), "%sRotatexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->RotatexOES) {
+ void ** procp = (void **) &disp->RotatexOES;
+ snprintf(symboln, sizeof(symboln), "%sRotatex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->SampleCoveragexOES) {
+ void ** procp = (void **) &disp->SampleCoveragexOES;
+ snprintf(symboln, sizeof(symboln), "%sSampleCoveragexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->SampleCoveragexOES) {
+ void ** procp = (void **) &disp->SampleCoveragexOES;
+ snprintf(symboln, sizeof(symboln), "%sSampleCoveragex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ScalexOES) {
+ void ** procp = (void **) &disp->ScalexOES;
+ snprintf(symboln, sizeof(symboln), "%sScalexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ScalexOES) {
+ void ** procp = (void **) &disp->ScalexOES;
+ snprintf(symboln, sizeof(symboln), "%sScalex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexEnvxOES) {
+ void ** procp = (void **) &disp->TexEnvxOES;
+ snprintf(symboln, sizeof(symboln), "%sTexEnvxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexEnvxOES) {
+ void ** procp = (void **) &disp->TexEnvxOES;
+ snprintf(symboln, sizeof(symboln), "%sTexEnvx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexEnvxvOES) {
+ void ** procp = (void **) &disp->TexEnvxvOES;
+ snprintf(symboln, sizeof(symboln), "%sTexEnvxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexEnvxvOES) {
+ void ** procp = (void **) &disp->TexEnvxvOES;
+ snprintf(symboln, sizeof(symboln), "%sTexEnvxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexGenxOES) {
+ void ** procp = (void **) &disp->TexGenxOES;
+ snprintf(symboln, sizeof(symboln), "%sTexGenxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexGenxvOES) {
+ void ** procp = (void **) &disp->TexGenxvOES;
+ snprintf(symboln, sizeof(symboln), "%sTexGenxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexParameterxOES) {
+ void ** procp = (void **) &disp->TexParameterxOES;
+ snprintf(symboln, sizeof(symboln), "%sTexParameterxOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexParameterxOES) {
+ void ** procp = (void **) &disp->TexParameterxOES;
+ snprintf(symboln, sizeof(symboln), "%sTexParameterx", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexParameterxvOES) {
+ void ** procp = (void **) &disp->TexParameterxvOES;
+ snprintf(symboln, sizeof(symboln), "%sTexParameterxvOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TexParameterxvOES) {
+ void ** procp = (void **) &disp->TexParameterxvOES;
+ snprintf(symboln, sizeof(symboln), "%sTexParameterxv", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TranslatexOES) {
+ void ** procp = (void **) &disp->TranslatexOES;
+ snprintf(symboln, sizeof(symboln), "%sTranslatexOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->TranslatexOES) {
+ void ** procp = (void **) &disp->TranslatexOES;
+ snprintf(symboln, sizeof(symboln), "%sTranslatex", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClipPlanefOES) {
+ void ** procp = (void **) &disp->ClipPlanefOES;
+ snprintf(symboln, sizeof(symboln), "%sClipPlanefOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->ClipPlanefOES) {
+ void ** procp = (void **) &disp->ClipPlanefOES;
+ snprintf(symboln, sizeof(symboln), "%sClipPlanef", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FrustumfOES) {
+ void ** procp = (void **) &disp->FrustumfOES;
+ snprintf(symboln, sizeof(symboln), "%sFrustumfOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->FrustumfOES) {
+ void ** procp = (void **) &disp->FrustumfOES;
+ snprintf(symboln, sizeof(symboln), "%sFrustumf", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetClipPlanefOES) {
+ void ** procp = (void **) &disp->GetClipPlanefOES;
+ snprintf(symboln, sizeof(symboln), "%sGetClipPlanefOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->GetClipPlanefOES) {
+ void ** procp = (void **) &disp->GetClipPlanefOES;
+ snprintf(symboln, sizeof(symboln), "%sGetClipPlanef", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->OrthofOES) {
+ void ** procp = (void **) &disp->OrthofOES;
+ snprintf(symboln, sizeof(symboln), "%sOrthofOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
+ if(!disp->OrthofOES) {
+ void ** procp = (void **) &disp->OrthofOES;
+ snprintf(symboln, sizeof(symboln), "%sOrthof", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->DepthBoundsEXT) {
void ** procp = (void **) &disp->DepthBoundsEXT;
snprintf(symboln, sizeof(symboln), "%sDepthBoundsEXT", symbol_prefix);
@@ -8333,6 +9222,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->BlendEquationSeparateEXT) {
+ void ** procp = (void **) &disp->BlendEquationSeparateEXT;
+ snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->BindFramebufferEXT) {
void ** procp = (void **) &disp->BindFramebufferEXT;
snprintf(symboln, sizeof(symboln), "%sBindFramebuffer", symbol_prefix);
@@ -8347,6 +9243,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->BindFramebufferEXT) {
+ void ** procp = (void **) &disp->BindFramebufferEXT;
+ snprintf(symboln, sizeof(symboln), "%sBindFramebufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->BindRenderbufferEXT) {
void ** procp = (void **) &disp->BindRenderbufferEXT;
snprintf(symboln, sizeof(symboln), "%sBindRenderbuffer", symbol_prefix);
@@ -8361,6 +9264,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->BindRenderbufferEXT) {
+ void ** procp = (void **) &disp->BindRenderbufferEXT;
+ snprintf(symboln, sizeof(symboln), "%sBindRenderbufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->CheckFramebufferStatusEXT) {
void ** procp = (void **) &disp->CheckFramebufferStatusEXT;
snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatus", symbol_prefix);
@@ -8375,6 +9285,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->CheckFramebufferStatusEXT) {
+ void ** procp = (void **) &disp->CheckFramebufferStatusEXT;
+ snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatusOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->DeleteFramebuffersEXT) {
void ** procp = (void **) &disp->DeleteFramebuffersEXT;
snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffers", symbol_prefix);
@@ -8389,6 +9306,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->DeleteFramebuffersEXT) {
+ void ** procp = (void **) &disp->DeleteFramebuffersEXT;
+ snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffersOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->DeleteRenderbuffersEXT) {
void ** procp = (void **) &disp->DeleteRenderbuffersEXT;
snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffers", symbol_prefix);
@@ -8403,6 +9327,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->DeleteRenderbuffersEXT) {
+ void ** procp = (void **) &disp->DeleteRenderbuffersEXT;
+ snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffersOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->FramebufferRenderbufferEXT) {
void ** procp = (void **) &disp->FramebufferRenderbufferEXT;
snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbuffer", symbol_prefix);
@@ -8417,6 +9348,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->FramebufferRenderbufferEXT) {
+ void ** procp = (void **) &disp->FramebufferRenderbufferEXT;
+ snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->FramebufferTexture1DEXT) {
void ** procp = (void **) &disp->FramebufferTexture1DEXT;
snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1D", symbol_prefix);
@@ -8445,6 +9383,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->FramebufferTexture2DEXT) {
+ void ** procp = (void **) &disp->FramebufferTexture2DEXT;
+ snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->FramebufferTexture3DEXT) {
void ** procp = (void **) &disp->FramebufferTexture3DEXT;
snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3D", symbol_prefix);
@@ -8459,6 +9404,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->FramebufferTexture3DEXT) {
+ void ** procp = (void **) &disp->FramebufferTexture3DEXT;
+ snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3DOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GenFramebuffersEXT) {
void ** procp = (void **) &disp->GenFramebuffersEXT;
snprintf(symboln, sizeof(symboln), "%sGenFramebuffers", symbol_prefix);
@@ -8473,6 +9425,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GenFramebuffersEXT) {
+ void ** procp = (void **) &disp->GenFramebuffersEXT;
+ snprintf(symboln, sizeof(symboln), "%sGenFramebuffersOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GenRenderbuffersEXT) {
void ** procp = (void **) &disp->GenRenderbuffersEXT;
snprintf(symboln, sizeof(symboln), "%sGenRenderbuffers", symbol_prefix);
@@ -8487,6 +9446,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GenRenderbuffersEXT) {
+ void ** procp = (void **) &disp->GenRenderbuffersEXT;
+ snprintf(symboln, sizeof(symboln), "%sGenRenderbuffersOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GenerateMipmapEXT) {
void ** procp = (void **) &disp->GenerateMipmapEXT;
snprintf(symboln, sizeof(symboln), "%sGenerateMipmap", symbol_prefix);
@@ -8501,6 +9467,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GenerateMipmapEXT) {
+ void ** procp = (void **) &disp->GenerateMipmapEXT;
+ snprintf(symboln, sizeof(symboln), "%sGenerateMipmapOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetFramebufferAttachmentParameterivEXT) {
void ** procp = (void **) &disp->GetFramebufferAttachmentParameterivEXT;
snprintf(symboln, sizeof(symboln), "%sGetFramebufferAttachmentParameteriv", symbol_prefix);
@@ -8515,6 +9488,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GetFramebufferAttachmentParameterivEXT) {
+ void ** procp = (void **) &disp->GetFramebufferAttachmentParameterivEXT;
+ snprintf(symboln, sizeof(symboln), "%sGetFramebufferAttachmentParameterivOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->GetRenderbufferParameterivEXT) {
void ** procp = (void **) &disp->GetRenderbufferParameterivEXT;
snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameteriv", symbol_prefix);
@@ -8529,6 +9509,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->GetRenderbufferParameterivEXT) {
+ void ** procp = (void **) &disp->GetRenderbufferParameterivEXT;
+ snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameterivOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->IsFramebufferEXT) {
void ** procp = (void **) &disp->IsFramebufferEXT;
snprintf(symboln, sizeof(symboln), "%sIsFramebuffer", symbol_prefix);
@@ -8543,6 +9530,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->IsFramebufferEXT) {
+ void ** procp = (void **) &disp->IsFramebufferEXT;
+ snprintf(symboln, sizeof(symboln), "%sIsFramebufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->IsRenderbufferEXT) {
void ** procp = (void **) &disp->IsRenderbufferEXT;
snprintf(symboln, sizeof(symboln), "%sIsRenderbuffer", symbol_prefix);
@@ -8557,6 +9551,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->IsRenderbufferEXT) {
+ void ** procp = (void **) &disp->IsRenderbufferEXT;
+ snprintf(symboln, sizeof(symboln), "%sIsRenderbufferOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->RenderbufferStorageEXT) {
void ** procp = (void **) &disp->RenderbufferStorageEXT;
snprintf(symboln, sizeof(symboln), "%sRenderbufferStorage", symbol_prefix);
@@ -8571,6 +9572,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { }
+ if(!disp->RenderbufferStorageEXT) {
+ void ** procp = (void **) &disp->RenderbufferStorageEXT;
+ snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageOES", symbol_prefix);
+ *procp = dlsym(handle, symboln);
+ }
+
+
if(!disp->BlitFramebufferEXT) {
void ** procp = (void **) &disp->BlitFramebufferEXT;
snprintf(symboln, sizeof(symboln), "%sBlitFramebuffer", symbol_prefix);
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h index 70f3c83e5..d78b4b6b8 100644 --- a/xorg-server/glx/glapitable.h +++ b/xorg-server/glx/glapitable.h @@ -760,256 +760,312 @@ struct _glapi_table void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 716 */
void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 717 */
void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 718 */
- void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 719 */
- void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 720 */
- void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 721 */
- void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 722 */
- void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 723 */
- void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 724 */
- void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 725 */
- void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 726 */
- void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 727 */
- void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 728 */
- void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 729 */
- void (GLAPIENTRYP UnlockArraysEXT)(void); /* 730 */
- void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 731 */
- void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 732 */
- void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 733 */
- void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 734 */
- void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 735 */
- void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 736 */
- void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 737 */
- void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 738 */
- void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 739 */
- void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 740 */
- void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 741 */
- void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 742 */
- void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 743 */
- void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 744 */
- void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 745 */
- void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 746 */
- void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 747 */
- void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 748 */
- void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 749 */
- void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 750 */
- void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 751 */
- void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 752 */
- void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 753 */
- void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 754 */
- void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 755 */
- void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 756 */
- void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 757 */
- void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 758 */
- void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 759 */
- void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 760 */
- void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 761 */
- void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 762 */
- void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 763 */
- void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 764 */
- void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 765 */
- void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 766 */
- void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 767 */
- void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 768 */
- void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 769 */
- void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 770 */
- void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 771 */
- void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 772 */
- void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 773 */
- void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 774 */
- void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 775 */
- void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 776 */
- void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 777 */
- void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 778 */
- void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 779 */
- void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 780 */
- void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 781 */
- void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 782 */
- GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 783 */
- void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 784 */
- void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 785 */
- void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 786 */
- void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 787 */
- void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 788 */
- void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 789 */
- void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 790 */
- void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 791 */
- void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 792 */
- void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 793 */
- void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 794 */
- void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 795 */
- void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 796 */
- GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 797 */
- void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 798 */
- void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 799 */
- void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 800 */
- void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 801 */
- void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 802 */
- void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 803 */
- void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 804 */
- void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 805 */
- void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 806 */
- void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 807 */
- void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 808 */
- void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 809 */
- void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 810 */
- void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 811 */
- void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 812 */
- void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 813 */
- void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 814 */
- void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 815 */
- void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 816 */
- void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 817 */
- void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 818 */
- void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 819 */
- void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 820 */
- void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 821 */
- void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 822 */
- void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 823 */
- void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 824 */
- void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 825 */
- void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 826 */
- void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 827 */
- void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 828 */
- void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 829 */
- void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 830 */
- void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 831 */
- void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 832 */
- void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 833 */
- void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 834 */
- void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 835 */
- void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 836 */
- void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 837 */
- void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 838 */
- void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 839 */
- void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 840 */
- void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 841 */
- void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 842 */
- void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 843 */
- void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 844 */
- void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 845 */
- void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 846 */
- void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 847 */
- void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 848 */
- void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 849 */
- void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 850 */
- void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 851 */
- void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 852 */
- void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 853 */
- void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 854 */
- void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 855 */
- void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 856 */
- GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 857 */
- void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 858 */
- void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 859 */
- void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 860 */
- void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 861 */
- void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 862 */
- void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 863 */
- void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 864 */
- void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 865 */
- void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 866 */
- GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 867 */
- void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 868 */
- void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 869 */
- void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 870 */
- void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 871 */
- void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 872 */
- void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 873 */
- void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 874 */
- void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 875 */
- void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 876 */
- void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 877 */
- void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 878 */
- void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 879 */
- GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 880 */
- void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 881 */
- void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 882 */
- void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 883 */
- void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 884 */
- void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 885 */
- void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 886 */
- void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 887 */
- void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 888 */
- void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 889 */
- void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 890 */
- void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 891 */
- GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 892 */
- GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 893 */
- void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 894 */
- void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 895 */
- void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 896 */
- void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 897 */
- void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 898 */
- GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 899 */
- void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 900 */
- void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 901 */
- void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 902 */
- void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 903 */
- void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 904 */
- void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 905 */
- void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 906 */
- void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 907 */
- void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 908 */
- void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 909 */
- void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 910 */
- void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 911 */
- void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 912 */
- void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 913 */
- void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 914 */
- void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 915 */
- void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 916 */
- void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 917 */
- void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 918 */
- void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 919 */
- void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 920 */
- void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 921 */
- void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 922 */
- void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 923 */
- void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 924 */
- void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 925 */
- void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 926 */
- void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 927 */
- void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 928 */
- void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 929 */
- void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 930 */
- void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 931 */
- void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 932 */
- void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 933 */
- void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 934 */
- void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 935 */
- void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 936 */
- void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 937 */
- GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 938 */
- void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 939 */
- void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 940 */
- void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 941 */
- void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 942 */
- void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 943 */
- void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 944 */
- void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 945 */
- void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 946 */
- void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 947 */
- void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 948 */
- void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 949 */
- void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 950 */
- void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 951 */
- void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 952 */
- void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 953 */
- void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 954 */
- void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 955 */
- GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 956 */
- GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 957 */
- void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 958 */
- GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 959 */
- void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 960 */
- void (GLAPIENTRYP TextureBarrierNV)(void); /* 961 */
- void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 962 */
- void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 963 */
- void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 964 */
- void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 965 */
- void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 966 */
- void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 967 */
- void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 968 */
+ void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 719 */
+ void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 720 */
+ void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 721 */
+ void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 722 */
+ void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 723 */
+ void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 724 */
+ void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 725 */
+ void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 726 */
+ void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 727 */
+ GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 728 */
+ void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 729 */
+ void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 730 */
+ void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 731 */
+ void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 732 */
+ void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 733 */
+ void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 734 */
+ void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 735 */
+ void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 736 */
+ void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 737 */
+ void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 738 */
+ void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 739 */
+ void (GLAPIENTRYP UnlockArraysEXT)(void); /* 740 */
+ void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 741 */
+ void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 742 */
+ void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 743 */
+ void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 744 */
+ void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 745 */
+ void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 746 */
+ void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 747 */
+ void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 748 */
+ void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 749 */
+ void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 750 */
+ void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 751 */
+ void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 752 */
+ void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 753 */
+ void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 754 */
+ void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 755 */
+ void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 756 */
+ void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 757 */
+ void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 758 */
+ void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 759 */
+ void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 760 */
+ void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 761 */
+ void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 762 */
+ void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 763 */
+ void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 764 */
+ void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 765 */
+ void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 766 */
+ void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 767 */
+ void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 768 */
+ void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 769 */
+ void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 770 */
+ void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 771 */
+ void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 772 */
+ void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 773 */
+ void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 774 */
+ void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 775 */
+ void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 776 */
+ void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 777 */
+ void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 778 */
+ void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 779 */
+ void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 780 */
+ void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 781 */
+ void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 782 */
+ void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 783 */
+ void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 784 */
+ void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 785 */
+ void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 786 */
+ void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 787 */
+ void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 788 */
+ void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 789 */
+ void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 790 */
+ void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 791 */
+ void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 792 */
+ GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 793 */
+ void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 794 */
+ void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 795 */
+ void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 796 */
+ void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 797 */
+ void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 798 */
+ void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 799 */
+ void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 800 */
+ void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 801 */
+ void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 802 */
+ void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 803 */
+ void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 804 */
+ void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 805 */
+ void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 806 */
+ GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 807 */
+ void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 808 */
+ void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 809 */
+ void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 810 */
+ void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 811 */
+ void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 812 */
+ void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 813 */
+ void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 814 */
+ void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 815 */
+ void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 816 */
+ void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 817 */
+ void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 818 */
+ void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 819 */
+ void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 820 */
+ void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 821 */
+ void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 822 */
+ void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 823 */
+ void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 824 */
+ void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 825 */
+ void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 826 */
+ void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 827 */
+ void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 828 */
+ void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 829 */
+ void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 830 */
+ void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 831 */
+ void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 832 */
+ void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 833 */
+ void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 834 */
+ void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 835 */
+ void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 836 */
+ void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 837 */
+ void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 838 */
+ void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 839 */
+ void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 840 */
+ void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 841 */
+ void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 842 */
+ void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 843 */
+ void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 844 */
+ void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 845 */
+ void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 846 */
+ void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 847 */
+ void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 848 */
+ void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 849 */
+ void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 850 */
+ void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 851 */
+ void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 852 */
+ void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 853 */
+ void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 854 */
+ void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 855 */
+ void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 856 */
+ void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 857 */
+ void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 858 */
+ void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 859 */
+ void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 860 */
+ void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 861 */
+ void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 862 */
+ void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 863 */
+ void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 864 */
+ void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 865 */
+ void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 866 */
+ GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 867 */
+ void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 868 */
+ void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 869 */
+ void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 870 */
+ void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 871 */
+ void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 872 */
+ void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 873 */
+ void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 874 */
+ void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 875 */
+ void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 876 */
+ GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 877 */
+ void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 878 */
+ void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 879 */
+ void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 880 */
+ void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 881 */
+ void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 882 */
+ void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 883 */
+ void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 884 */
+ void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 885 */
+ void (GLAPIENTRYP AlphaFuncxOES)(GLenum func, GLclampx ref); /* 886 */
+ void (GLAPIENTRYP ClearColorxOES)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 887 */
+ void (GLAPIENTRYP ClearDepthxOES)(GLclampx depth); /* 888 */
+ void (GLAPIENTRYP ClipPlanexOES)(GLenum plane, const GLfixed * equation); /* 889 */
+ void (GLAPIENTRYP Color4xOES)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 890 */
+ void (GLAPIENTRYP DepthRangexOES)(GLclampx zNear, GLclampx zFar); /* 891 */
+ void (GLAPIENTRYP FogxOES)(GLenum pname, GLfixed param); /* 892 */
+ void (GLAPIENTRYP FogxvOES)(GLenum pname, const GLfixed * params); /* 893 */
+ void (GLAPIENTRYP FrustumxOES)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 894 */
+ void (GLAPIENTRYP GetClipPlanexOES)(GLenum plane, GLfixed * equation); /* 895 */
+ void (GLAPIENTRYP GetFixedvOES)(GLenum pname, GLfixed * params); /* 896 */
+ void (GLAPIENTRYP GetLightxvOES)(GLenum light, GLenum pname, GLfixed * params); /* 897 */
+ void (GLAPIENTRYP GetMaterialxvOES)(GLenum face, GLenum pname, GLfixed * params); /* 898 */
+ void (GLAPIENTRYP GetTexEnvxvOES)(GLenum target, GLenum pname, GLfixed * params); /* 899 */
+ void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 900 */
+ void (GLAPIENTRYP GetTexParameterxvOES)(GLenum target, GLenum pname, GLfixed * params); /* 901 */
+ void (GLAPIENTRYP LightModelxOES)(GLenum pname, GLfixed param); /* 902 */
+ void (GLAPIENTRYP LightModelxvOES)(GLenum pname, const GLfixed * params); /* 903 */
+ void (GLAPIENTRYP LightxOES)(GLenum light, GLenum pname, GLfixed param); /* 904 */
+ void (GLAPIENTRYP LightxvOES)(GLenum light, GLenum pname, const GLfixed * params); /* 905 */
+ void (GLAPIENTRYP LineWidthxOES)(GLfixed width); /* 906 */
+ void (GLAPIENTRYP LoadMatrixxOES)(const GLfixed * m); /* 907 */
+ void (GLAPIENTRYP MaterialxOES)(GLenum face, GLenum pname, GLfixed param); /* 908 */
+ void (GLAPIENTRYP MaterialxvOES)(GLenum face, GLenum pname, const GLfixed * params); /* 909 */
+ void (GLAPIENTRYP MultMatrixxOES)(const GLfixed * m); /* 910 */
+ void (GLAPIENTRYP MultiTexCoord4xOES)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 911 */
+ void (GLAPIENTRYP Normal3xOES)(GLfixed nx, GLfixed ny, GLfixed nz); /* 912 */
+ void (GLAPIENTRYP OrthoxOES)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 913 */
+ void (GLAPIENTRYP PointParameterxOES)(GLenum pname, GLfixed param); /* 914 */
+ void (GLAPIENTRYP PointParameterxvOES)(GLenum pname, const GLfixed * params); /* 915 */
+ void (GLAPIENTRYP PointSizexOES)(GLfixed size); /* 916 */
+ void (GLAPIENTRYP PolygonOffsetxOES)(GLfixed factor, GLfixed units); /* 917 */
+ void (GLAPIENTRYP RotatexOES)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 918 */
+ void (GLAPIENTRYP SampleCoveragexOES)(GLclampx value, GLboolean invert); /* 919 */
+ void (GLAPIENTRYP ScalexOES)(GLfixed x, GLfixed y, GLfixed z); /* 920 */
+ void (GLAPIENTRYP TexEnvxOES)(GLenum target, GLenum pname, GLfixed param); /* 921 */
+ void (GLAPIENTRYP TexEnvxvOES)(GLenum target, GLenum pname, const GLfixed * params); /* 922 */
+ void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 923 */
+ void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 924 */
+ void (GLAPIENTRYP TexParameterxOES)(GLenum target, GLenum pname, GLfixed param); /* 925 */
+ void (GLAPIENTRYP TexParameterxvOES)(GLenum target, GLenum pname, const GLfixed * params); /* 926 */
+ void (GLAPIENTRYP TranslatexOES)(GLfixed x, GLfixed y, GLfixed z); /* 927 */
+ void (GLAPIENTRYP ClipPlanefOES)(GLenum plane, const GLfloat * equation); /* 928 */
+ void (GLAPIENTRYP FrustumfOES)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 929 */
+ void (GLAPIENTRYP GetClipPlanefOES)(GLenum plane, GLfloat * equation); /* 930 */
+ void (GLAPIENTRYP OrthofOES)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 931 */
+ void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 932 */
+ void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 933 */
+ void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 934 */
+ void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 935 */
+ GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 936 */
+ void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 937 */
+ void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 938 */
+ void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 939 */
+ void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 940 */
+ void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 941 */
+ void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 942 */
+ void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 943 */
+ void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 944 */
+ void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 945 */
+ void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 946 */
+ void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 947 */
+ GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 948 */
+ GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 949 */
+ void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 950 */
+ void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 951 */
+ void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 952 */
+ void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 953 */
+ void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 954 */
+ GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 955 */
+ void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 956 */
+ void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 957 */
+ void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 958 */
+ void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 959 */
+ void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 960 */
+ void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 961 */
+ void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 962 */
+ void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 963 */
+ void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 964 */
+ void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 965 */
+ void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 966 */
+ void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 967 */
+ void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 968 */
+ void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 969 */
+ void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 970 */
+ void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 971 */
+ void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 972 */
+ void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 973 */
+ void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 974 */
+ void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 975 */
+ void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 976 */
+ void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 977 */
+ void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 978 */
+ void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 979 */
+ void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 980 */
+ void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 981 */
+ void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 982 */
+ void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 983 */
+ void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 984 */
+ void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 985 */
+ void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 986 */
+ void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 987 */
+ void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 988 */
+ void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 989 */
+ void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 990 */
+ void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 991 */
+ void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 992 */
+ void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 993 */
+ GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 994 */
+ void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 995 */
+ void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 996 */
+ void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 997 */
+ void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 998 */
+ void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 999 */
+ void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 1000 */
+ void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 1001 */
+ void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 1002 */
+ void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 1003 */
+ void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 1004 */
+ void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1005 */
+ void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 1006 */
+ void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 1007 */
+ void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 1008 */
+ void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 1009 */
+ void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 1010 */
+ void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1011 */
+ GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1012 */
+ GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1013 */
+ void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1014 */
+ GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1015 */
+ void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1016 */
+ void (GLAPIENTRYP TextureBarrierNV)(void); /* 1017 */
+ void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1018 */
+ void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1019 */
+ void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1020 */
+ void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 1021 */
+ void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 1022 */
+ void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1023 */
+ void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1024 */
#endif /* !defined HAVE_SHARED_GLAPI */
};
diff --git a/xorg-server/glx/glheader.h b/xorg-server/glx/glheader.h index 1c0ee2c9e..cb8d6922a 100644 --- a/xorg-server/glx/glheader.h +++ b/xorg-server/glx/glheader.h @@ -14,11 +14,25 @@ #define MINSHORT -32768
#define MAXSHORT 32767
+#ifndef PUBLIC
#define PUBLIC
+#endif
#define GL_GLEXT_PROTOTYPES
+#ifdef __cplusplus
+extern "C" {
+#endif
+
-#define DRI_DRIVER_PATH "/usr/lib/dri"
+/**
+ * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).
+ */
+typedef int GLfixed;
+typedef int GLclampx;
+
+#ifdef __cplusplus
+}
+#endif
#endif
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h index 33f5b1282..94fab6def 100644 --- a/xorg-server/glx/glprocs.h +++ b/xorg-server/glx/glprocs.h @@ -771,6 +771,16 @@ static const char gl_string_table[] = "glInvalidateTexImage\0"
"glInvalidateTexSubImage\0"
"glPolygonOffsetEXT\0"
+ "glDrawTexfOES\0"
+ "glDrawTexfvOES\0"
+ "glDrawTexiOES\0"
+ "glDrawTexivOES\0"
+ "glDrawTexsOES\0"
+ "glDrawTexsvOES\0"
+ "glDrawTexxOES\0"
+ "glDrawTexxvOES\0"
+ "glPointSizePointerOES\0"
+ "glQueryMatrixxOES\0"
"glSampleMaskSGIS\0"
"glSamplePatternSGIS\0"
"glColorPointerEXT\0"
@@ -928,6 +938,52 @@ static const char gl_string_table[] = "glProgramNamedParameter4fvNV\0"
"glPrimitiveRestartIndexNV\0"
"glPrimitiveRestartNV\0"
+ "glAlphaFuncxOES\0"
+ "glClearColorxOES\0"
+ "glClearDepthxOES\0"
+ "glClipPlanexOES\0"
+ "glColor4xOES\0"
+ "glDepthRangexOES\0"
+ "glFogxOES\0"
+ "glFogxvOES\0"
+ "glFrustumxOES\0"
+ "glGetClipPlanexOES\0"
+ "glGetFixedvOES\0"
+ "glGetLightxvOES\0"
+ "glGetMaterialxvOES\0"
+ "glGetTexEnvxvOES\0"
+ "glGetTexGenxvOES\0"
+ "glGetTexParameterxvOES\0"
+ "glLightModelxOES\0"
+ "glLightModelxvOES\0"
+ "glLightxOES\0"
+ "glLightxvOES\0"
+ "glLineWidthxOES\0"
+ "glLoadMatrixxOES\0"
+ "glMaterialxOES\0"
+ "glMaterialxvOES\0"
+ "glMultMatrixxOES\0"
+ "glMultiTexCoord4xOES\0"
+ "glNormal3xOES\0"
+ "glOrthoxOES\0"
+ "glPointParameterxOES\0"
+ "glPointParameterxvOES\0"
+ "glPointSizexOES\0"
+ "glPolygonOffsetxOES\0"
+ "glRotatexOES\0"
+ "glSampleCoveragexOES\0"
+ "glScalexOES\0"
+ "glTexEnvxOES\0"
+ "glTexEnvxvOES\0"
+ "glTexGenxOES\0"
+ "glTexGenxvOES\0"
+ "glTexParameterxOES\0"
+ "glTexParameterxvOES\0"
+ "glTranslatexOES\0"
+ "glClipPlanefOES\0"
+ "glFrustumfOES\0"
+ "glGetClipPlanefOES\0"
+ "glOrthofOES\0"
"glDepthBoundsEXT\0"
"glBlendEquationSeparateEXT\0"
"glBindFramebufferEXT\0"
@@ -1021,6 +1077,13 @@ static const char gl_string_table[] = "glGetQueryObjectui64vEXT\0"
"glEGLImageTargetRenderbufferStorageOES\0"
"glEGLImageTargetTexture2DOES\0"
+ "glTexGenfOES\0"
+ "glTexGenfvOES\0"
+ "glTexGeniOES\0"
+ "glTexGenivOES\0"
+ "glReadBufferNV\0"
+ "glGetTexGenfvOES\0"
+ "glGetTexGenivOES\0"
"glArrayElementEXT\0"
"glBindTextureEXT\0"
"glDrawArraysEXT\0"
@@ -1038,6 +1101,7 @@ static const char gl_string_table[] = "glTexSubImage2DEXT\0"
"glBlendColorEXT\0"
"glBlendEquationEXT\0"
+ "glBlendEquationOES\0"
"glDrawRangeElementsEXT\0"
"glColorTableSGI\0"
"glColorTableEXT\0"
@@ -1076,8 +1140,11 @@ static const char gl_string_table[] = "glResetHistogramEXT\0"
"glResetMinmaxEXT\0"
"glTexImage3DEXT\0"
+ "glTexImage3DOES\0"
"glTexSubImage3DEXT\0"
+ "glTexSubImage3DOES\0"
"glCopyTexSubImage3DEXT\0"
+ "glCopyTexSubImage3DOES\0"
"glActiveTexture\0"
"glClientActiveTexture\0"
"glMultiTexCoord1d\0"
@@ -1122,9 +1189,11 @@ static const char gl_string_table[] = "glCompressedTexImage1D\0"
"glCompressedTexImage2D\0"
"glCompressedTexImage3D\0"
+ "glCompressedTexImage3DOES\0"
"glCompressedTexSubImage1D\0"
"glCompressedTexSubImage2D\0"
"glCompressedTexSubImage3D\0"
+ "glCompressedTexSubImage3DOES\0"
"glGetCompressedTexImage\0"
"glDisableVertexAttribArray\0"
"glEnableVertexAttribArray\0"
@@ -1179,10 +1248,13 @@ static const char gl_string_table[] = "glGenBuffers\0"
"glGetBufferParameteriv\0"
"glGetBufferPointerv\0"
+ "glGetBufferPointervOES\0"
"glGetBufferSubData\0"
"glIsBuffer\0"
"glMapBuffer\0"
+ "glMapBufferOES\0"
"glUnmapBuffer\0"
+ "glUnmapBufferOES\0"
"glBeginQuery\0"
"glDeleteQueries\0"
"glEndQuery\0"
@@ -1225,6 +1297,7 @@ static const char gl_string_table[] = "glGetAttribLocation\0"
"glDrawBuffers\0"
"glDrawBuffersATI\0"
+ "glDrawBuffersNV\0"
"glClampColor\0"
"glDrawArraysInstancedEXT\0"
"glDrawArraysInstanced\0"
@@ -1232,11 +1305,19 @@ static const char gl_string_table[] = "glDrawElementsInstanced\0"
"glRenderbufferStorageMultisampleEXT\0"
"glVertexAttribDivisor\0"
+ "glFlushMappedBufferRangeEXT\0"
+ "glMapBufferRangeEXT\0"
"glTexBuffer\0"
+ "glBindVertexArrayOES\0"
+ "glGenVertexArraysOES\0"
"glBlendEquationSeparateIndexedAMD\0"
"glBlendEquationIndexedAMD\0"
"glBlendFuncSeparateIndexedAMD\0"
"glBlendFuncIndexedAMD\0"
+ "glClearDepthfOES\0"
+ "glDepthRangefOES\0"
+ "glGetProgramBinaryOES\0"
+ "glProgramBinaryOES\0"
"glProgramParameteriARB\0"
"glSampleMaskEXT\0"
"glSamplePatternEXT\0"
@@ -1272,6 +1353,7 @@ static const char gl_string_table[] = "glFogCoordfv\0"
"glBlendFuncSeparate\0"
"glBlendFuncSeparateINGR\0"
+ "glBlendFuncSeparateOES\0"
"glWindowPos2d\0"
"glWindowPos2dARB\0"
"glWindowPos2dv\0"
@@ -1313,27 +1395,89 @@ static const char gl_string_table[] = "glPointParameteri\0"
"glPointParameteriv\0"
"glDeleteVertexArrays\0"
+ "glDeleteVertexArraysOES\0"
"glIsVertexArray\0"
+ "glIsVertexArrayOES\0"
"glPrimitiveRestartIndex\0"
+ "glAlphaFuncx\0"
+ "glClearColorx\0"
+ "glClearDepthx\0"
+ "glClipPlanex\0"
+ "glColor4x\0"
+ "glDepthRangex\0"
+ "glFogx\0"
+ "glFogxv\0"
+ "glFrustumx\0"
+ "glGetClipPlanex\0"
+ "glGetFixedv\0"
+ "glGetLightxv\0"
+ "glGetMaterialxv\0"
+ "glGetTexEnvxv\0"
+ "glGetTexParameterxv\0"
+ "glLightModelx\0"
+ "glLightModelxv\0"
+ "glLightx\0"
+ "glLightxv\0"
+ "glLineWidthx\0"
+ "glLoadMatrixx\0"
+ "glMaterialx\0"
+ "glMaterialxv\0"
+ "glMultMatrixx\0"
+ "glMultiTexCoord4x\0"
+ "glNormal3x\0"
+ "glOrthox\0"
+ "glPointParameterx\0"
+ "glPointParameterxv\0"
+ "glPointSizex\0"
+ "glPolygonOffsetx\0"
+ "glRotatex\0"
+ "glSampleCoveragex\0"
+ "glScalex\0"
+ "glTexEnvx\0"
+ "glTexEnvxv\0"
+ "glTexParameterx\0"
+ "glTexParameterxv\0"
+ "glTranslatex\0"
+ "glClipPlanef\0"
+ "glFrustumf\0"
+ "glGetClipPlanef\0"
+ "glOrthof\0"
"glBlendEquationSeparate\0"
"glBlendEquationSeparateATI\0"
+ "glBlendEquationSeparateOES\0"
"glBindFramebuffer\0"
+ "glBindFramebufferOES\0"
"glBindRenderbuffer\0"
+ "glBindRenderbufferOES\0"
"glCheckFramebufferStatus\0"
+ "glCheckFramebufferStatusOES\0"
"glDeleteFramebuffers\0"
+ "glDeleteFramebuffersOES\0"
"glDeleteRenderbuffers\0"
+ "glDeleteRenderbuffersOES\0"
"glFramebufferRenderbuffer\0"
+ "glFramebufferRenderbufferOES\0"
"glFramebufferTexture1D\0"
"glFramebufferTexture2D\0"
+ "glFramebufferTexture2DOES\0"
"glFramebufferTexture3D\0"
+ "glFramebufferTexture3DOES\0"
"glGenFramebuffers\0"
+ "glGenFramebuffersOES\0"
"glGenRenderbuffers\0"
+ "glGenRenderbuffersOES\0"
"glGenerateMipmap\0"
+ "glGenerateMipmapOES\0"
"glGetFramebufferAttachmentParameteriv\0"
+ "glGetFramebufferAttachmentParameterivOES\0"
"glGetRenderbufferParameteriv\0"
+ "glGetRenderbufferParameterivOES\0"
"glIsFramebuffer\0"
+ "glIsFramebufferOES\0"
"glIsRenderbuffer\0"
+ "glIsRenderbufferOES\0"
"glRenderbufferStorage\0"
+ "glRenderbufferStorageOES\0"
"glBlitFramebuffer\0"
"glBindFragDataLocation\0"
"glGetFragDataLocation\0"
@@ -1415,23 +1559,79 @@ static const char gl_string_table[] = #define gl_dispatch_stub_676 mgl_dispatch_stub_676
#define gl_dispatch_stub_719 mgl_dispatch_stub_719
#define gl_dispatch_stub_720 mgl_dispatch_stub_720
-#define gl_dispatch_stub_781 mgl_dispatch_stub_781
-#define gl_dispatch_stub_782 mgl_dispatch_stub_782
-#define gl_dispatch_stub_863 mgl_dispatch_stub_863
-#define gl_dispatch_stub_864 mgl_dispatch_stub_864
-#define gl_dispatch_stub_865 mgl_dispatch_stub_865
-#define gl_dispatch_stub_866 mgl_dispatch_stub_866
-#define gl_dispatch_stub_867 mgl_dispatch_stub_867
+#define gl_dispatch_stub_721 mgl_dispatch_stub_721
+#define gl_dispatch_stub_722 mgl_dispatch_stub_722
+#define gl_dispatch_stub_723 mgl_dispatch_stub_723
+#define gl_dispatch_stub_724 mgl_dispatch_stub_724
+#define gl_dispatch_stub_725 mgl_dispatch_stub_725
+#define gl_dispatch_stub_726 mgl_dispatch_stub_726
+#define gl_dispatch_stub_727 mgl_dispatch_stub_727
+#define gl_dispatch_stub_728 mgl_dispatch_stub_728
+#define gl_dispatch_stub_729 mgl_dispatch_stub_729
+#define gl_dispatch_stub_730 mgl_dispatch_stub_730
+#define gl_dispatch_stub_791 mgl_dispatch_stub_791
+#define gl_dispatch_stub_792 mgl_dispatch_stub_792
+#define gl_dispatch_stub_873 mgl_dispatch_stub_873
+#define gl_dispatch_stub_874 mgl_dispatch_stub_874
+#define gl_dispatch_stub_875 mgl_dispatch_stub_875
#define gl_dispatch_stub_876 mgl_dispatch_stub_876
#define gl_dispatch_stub_877 mgl_dispatch_stub_877
+#define gl_dispatch_stub_886 mgl_dispatch_stub_886
+#define gl_dispatch_stub_887 mgl_dispatch_stub_887
+#define gl_dispatch_stub_888 mgl_dispatch_stub_888
+#define gl_dispatch_stub_889 mgl_dispatch_stub_889
+#define gl_dispatch_stub_890 mgl_dispatch_stub_890
+#define gl_dispatch_stub_891 mgl_dispatch_stub_891
+#define gl_dispatch_stub_892 mgl_dispatch_stub_892
+#define gl_dispatch_stub_893 mgl_dispatch_stub_893
+#define gl_dispatch_stub_894 mgl_dispatch_stub_894
#define gl_dispatch_stub_895 mgl_dispatch_stub_895
#define gl_dispatch_stub_896 mgl_dispatch_stub_896
#define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_962 mgl_dispatch_stub_962
-#define gl_dispatch_stub_963 mgl_dispatch_stub_963
-#define gl_dispatch_stub_964 mgl_dispatch_stub_964
-#define gl_dispatch_stub_965 mgl_dispatch_stub_965
-#define gl_dispatch_stub_966 mgl_dispatch_stub_966
+#define gl_dispatch_stub_898 mgl_dispatch_stub_898
+#define gl_dispatch_stub_899 mgl_dispatch_stub_899
+#define gl_dispatch_stub_900 mgl_dispatch_stub_900
+#define gl_dispatch_stub_901 mgl_dispatch_stub_901
+#define gl_dispatch_stub_902 mgl_dispatch_stub_902
+#define gl_dispatch_stub_903 mgl_dispatch_stub_903
+#define gl_dispatch_stub_904 mgl_dispatch_stub_904
+#define gl_dispatch_stub_905 mgl_dispatch_stub_905
+#define gl_dispatch_stub_906 mgl_dispatch_stub_906
+#define gl_dispatch_stub_907 mgl_dispatch_stub_907
+#define gl_dispatch_stub_908 mgl_dispatch_stub_908
+#define gl_dispatch_stub_909 mgl_dispatch_stub_909
+#define gl_dispatch_stub_910 mgl_dispatch_stub_910
+#define gl_dispatch_stub_911 mgl_dispatch_stub_911
+#define gl_dispatch_stub_912 mgl_dispatch_stub_912
+#define gl_dispatch_stub_913 mgl_dispatch_stub_913
+#define gl_dispatch_stub_914 mgl_dispatch_stub_914
+#define gl_dispatch_stub_915 mgl_dispatch_stub_915
+#define gl_dispatch_stub_916 mgl_dispatch_stub_916
+#define gl_dispatch_stub_917 mgl_dispatch_stub_917
+#define gl_dispatch_stub_918 mgl_dispatch_stub_918
+#define gl_dispatch_stub_919 mgl_dispatch_stub_919
+#define gl_dispatch_stub_920 mgl_dispatch_stub_920
+#define gl_dispatch_stub_921 mgl_dispatch_stub_921
+#define gl_dispatch_stub_922 mgl_dispatch_stub_922
+#define gl_dispatch_stub_923 mgl_dispatch_stub_923
+#define gl_dispatch_stub_924 mgl_dispatch_stub_924
+#define gl_dispatch_stub_925 mgl_dispatch_stub_925
+#define gl_dispatch_stub_926 mgl_dispatch_stub_926
+#define gl_dispatch_stub_927 mgl_dispatch_stub_927
+#define gl_dispatch_stub_928 mgl_dispatch_stub_928
+#define gl_dispatch_stub_929 mgl_dispatch_stub_929
+#define gl_dispatch_stub_930 mgl_dispatch_stub_930
+#define gl_dispatch_stub_931 mgl_dispatch_stub_931
+#define gl_dispatch_stub_932 mgl_dispatch_stub_932
+#define gl_dispatch_stub_933 mgl_dispatch_stub_933
+#define gl_dispatch_stub_951 mgl_dispatch_stub_951
+#define gl_dispatch_stub_952 mgl_dispatch_stub_952
+#define gl_dispatch_stub_953 mgl_dispatch_stub_953
+#define gl_dispatch_stub_1018 mgl_dispatch_stub_1018
+#define gl_dispatch_stub_1019 mgl_dispatch_stub_1019
+#define gl_dispatch_stub_1020 mgl_dispatch_stub_1020
+#define gl_dispatch_stub_1021 mgl_dispatch_stub_1021
+#define gl_dispatch_stub_1022 mgl_dispatch_stub_1022
#endif /* USE_MGL_NAMESPACE */
@@ -1453,25 +1653,81 @@ void GLAPIENTRY gl_dispatch_stub_619(GLuint id, GLenum target); void GLAPIENTRY gl_dispatch_stub_674(GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, GLvoid * binary);
void GLAPIENTRY gl_dispatch_stub_675(GLuint program, GLenum binaryFormat, const GLvoid * binary, GLsizei length);
void GLAPIENTRY gl_dispatch_stub_676(GLuint program, GLenum pname, GLint value);
-void GLAPIENTRY gl_dispatch_stub_719(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_720(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_781(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_782(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_863(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_864(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_865(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_866(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_867(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_876(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_877(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_895(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_896(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_897(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_962(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_963(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_964(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_965(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_966(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_719(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_720(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_721(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_722(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_723(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_724(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_725(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_726(const GLfixed * coords);
+void GLAPIENTRY gl_dispatch_stub_727(GLenum type, GLsizei stride, const GLvoid * pointer);
+GLbitfield GLAPIENTRY gl_dispatch_stub_728(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_729(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_730(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_791(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_792(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_873(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_874(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_875(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_876(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_877(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_886(GLenum func, GLclampx ref);
+void GLAPIENTRY gl_dispatch_stub_887(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void GLAPIENTRY gl_dispatch_stub_888(GLclampx depth);
+void GLAPIENTRY gl_dispatch_stub_889(GLenum plane, const GLfixed * equation);
+void GLAPIENTRY gl_dispatch_stub_890(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void GLAPIENTRY gl_dispatch_stub_891(GLclampx zNear, GLclampx zFar);
+void GLAPIENTRY gl_dispatch_stub_892(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_893(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_894(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void GLAPIENTRY gl_dispatch_stub_895(GLenum plane, GLfixed * equation);
+void GLAPIENTRY gl_dispatch_stub_896(GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_897(GLenum light, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_898(GLenum face, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_899(GLenum target, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_900(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_901(GLenum target, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_902(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_903(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_904(GLenum light, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_905(GLenum light, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_906(GLfixed width);
+void GLAPIENTRY gl_dispatch_stub_907(const GLfixed * m);
+void GLAPIENTRY gl_dispatch_stub_908(GLenum face, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_909(GLenum face, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_910(const GLfixed * m);
+void GLAPIENTRY gl_dispatch_stub_911(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void GLAPIENTRY gl_dispatch_stub_912(GLfixed nx, GLfixed ny, GLfixed nz);
+void GLAPIENTRY gl_dispatch_stub_913(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void GLAPIENTRY gl_dispatch_stub_914(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_915(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_916(GLfixed size);
+void GLAPIENTRY gl_dispatch_stub_917(GLfixed factor, GLfixed units);
+void GLAPIENTRY gl_dispatch_stub_918(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_919(GLclampx value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_920(GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_921(GLenum target, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_922(GLenum target, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_923(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_924(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_925(GLenum target, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_926(GLenum target, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_927(GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_928(GLenum plane, const GLfloat * equation);
+void GLAPIENTRY gl_dispatch_stub_929(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void GLAPIENTRY gl_dispatch_stub_930(GLenum plane, GLfloat * equation);
+void GLAPIENTRY gl_dispatch_stub_931(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void GLAPIENTRY gl_dispatch_stub_932(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_933(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_951(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_952(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_953(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_1018(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_1019(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1020(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1021(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_1022(GLuint id, GLenum pname, GLuint64EXT * params);
#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
static const glprocs_table_t static_functions[] = {
@@ -2195,626 +2451,770 @@ static const glprocs_table_t static_functions[] = { NAME_FUNC_OFFSET(12147, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 717),
NAME_FUNC_OFFSET(12171, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 718),
NAME_FUNC_OFFSET(12190, gl_dispatch_stub_719, gl_dispatch_stub_719, NULL, 719),
- NAME_FUNC_OFFSET(12207, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
- NAME_FUNC_OFFSET(12227, glColorPointerEXT, glColorPointerEXT, NULL, 721),
- NAME_FUNC_OFFSET(12245, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 722),
- NAME_FUNC_OFFSET(12266, glIndexPointerEXT, glIndexPointerEXT, NULL, 723),
- NAME_FUNC_OFFSET(12284, glNormalPointerEXT, glNormalPointerEXT, NULL, 724),
- NAME_FUNC_OFFSET(12303, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 725),
- NAME_FUNC_OFFSET(12324, glVertexPointerEXT, glVertexPointerEXT, NULL, 726),
- NAME_FUNC_OFFSET(12343, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
- NAME_FUNC_OFFSET(12364, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
- NAME_FUNC_OFFSET(12386, glLockArraysEXT, glLockArraysEXT, NULL, 729),
- NAME_FUNC_OFFSET(12402, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 730),
- NAME_FUNC_OFFSET(12420, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 731),
- NAME_FUNC_OFFSET(12442, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 732),
- NAME_FUNC_OFFSET(12465, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 733),
- NAME_FUNC_OFFSET(12487, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 734),
- NAME_FUNC_OFFSET(12510, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 735),
- NAME_FUNC_OFFSET(12532, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 736),
- NAME_FUNC_OFFSET(12555, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 737),
- NAME_FUNC_OFFSET(12577, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 738),
- NAME_FUNC_OFFSET(12600, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 739),
- NAME_FUNC_OFFSET(12622, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 740),
- NAME_FUNC_OFFSET(12645, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 741),
- NAME_FUNC_OFFSET(12668, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 742),
- NAME_FUNC_OFFSET(12692, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 743),
- NAME_FUNC_OFFSET(12715, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 744),
- NAME_FUNC_OFFSET(12739, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 745),
- NAME_FUNC_OFFSET(12762, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 746),
- NAME_FUNC_OFFSET(12786, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 747),
- NAME_FUNC_OFFSET(12813, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 748),
- NAME_FUNC_OFFSET(12834, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 749),
- NAME_FUNC_OFFSET(12857, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 750),
- NAME_FUNC_OFFSET(12878, glFogCoorddEXT, glFogCoorddEXT, NULL, 751),
- NAME_FUNC_OFFSET(12893, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 752),
- NAME_FUNC_OFFSET(12909, glFogCoordfEXT, glFogCoordfEXT, NULL, 753),
- NAME_FUNC_OFFSET(12924, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 754),
- NAME_FUNC_OFFSET(12940, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 755),
- NAME_FUNC_OFFSET(12963, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 756),
- NAME_FUNC_OFFSET(12983, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
- NAME_FUNC_OFFSET(13001, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
- NAME_FUNC_OFFSET(13020, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
- NAME_FUNC_OFFSET(13038, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
- NAME_FUNC_OFFSET(13057, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
- NAME_FUNC_OFFSET(13075, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
- NAME_FUNC_OFFSET(13094, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
- NAME_FUNC_OFFSET(13112, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
- NAME_FUNC_OFFSET(13131, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
- NAME_FUNC_OFFSET(13149, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
- NAME_FUNC_OFFSET(13168, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
- NAME_FUNC_OFFSET(13186, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
- NAME_FUNC_OFFSET(13205, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
- NAME_FUNC_OFFSET(13223, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
- NAME_FUNC_OFFSET(13242, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
- NAME_FUNC_OFFSET(13260, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
- NAME_FUNC_OFFSET(13279, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 773),
- NAME_FUNC_OFFSET(13297, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 774),
- NAME_FUNC_OFFSET(13316, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 775),
- NAME_FUNC_OFFSET(13334, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 776),
- NAME_FUNC_OFFSET(13353, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 777),
- NAME_FUNC_OFFSET(13371, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 778),
- NAME_FUNC_OFFSET(13390, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 779),
- NAME_FUNC_OFFSET(13408, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 780),
- NAME_FUNC_OFFSET(13427, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, 781),
- NAME_FUNC_OFFSET(13452, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
- NAME_FUNC_OFFSET(13479, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 783),
- NAME_FUNC_OFFSET(13503, glBindProgramNV, glBindProgramNV, NULL, 784),
- NAME_FUNC_OFFSET(13519, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 785),
- NAME_FUNC_OFFSET(13538, glExecuteProgramNV, glExecuteProgramNV, NULL, 786),
- NAME_FUNC_OFFSET(13557, glGenProgramsNV, glGenProgramsNV, NULL, 787),
- NAME_FUNC_OFFSET(13573, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 788),
- NAME_FUNC_OFFSET(13599, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 789),
- NAME_FUNC_OFFSET(13625, glGetProgramStringNV, glGetProgramStringNV, NULL, 790),
- NAME_FUNC_OFFSET(13646, glGetProgramivNV, glGetProgramivNV, NULL, 791),
- NAME_FUNC_OFFSET(13663, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 792),
- NAME_FUNC_OFFSET(13684, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 793),
- NAME_FUNC_OFFSET(13712, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 794),
- NAME_FUNC_OFFSET(13734, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 795),
- NAME_FUNC_OFFSET(13756, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 796),
- NAME_FUNC_OFFSET(13778, glIsProgramNV, glIsProgramNV, NULL, 797),
- NAME_FUNC_OFFSET(13792, glLoadProgramNV, glLoadProgramNV, NULL, 798),
- NAME_FUNC_OFFSET(13808, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 799),
- NAME_FUNC_OFFSET(13833, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 800),
- NAME_FUNC_OFFSET(13858, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 801),
- NAME_FUNC_OFFSET(13886, glTrackMatrixNV, glTrackMatrixNV, NULL, 802),
- NAME_FUNC_OFFSET(13902, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 803),
- NAME_FUNC_OFFSET(13921, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 804),
- NAME_FUNC_OFFSET(13941, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 805),
- NAME_FUNC_OFFSET(13960, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 806),
- NAME_FUNC_OFFSET(13980, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 807),
- NAME_FUNC_OFFSET(13999, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 808),
- NAME_FUNC_OFFSET(14019, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 809),
- NAME_FUNC_OFFSET(14038, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 810),
- NAME_FUNC_OFFSET(14058, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 811),
- NAME_FUNC_OFFSET(14077, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 812),
- NAME_FUNC_OFFSET(14097, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 813),
- NAME_FUNC_OFFSET(14116, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 814),
- NAME_FUNC_OFFSET(14136, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 815),
- NAME_FUNC_OFFSET(14155, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 816),
- NAME_FUNC_OFFSET(14175, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 817),
- NAME_FUNC_OFFSET(14194, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 818),
- NAME_FUNC_OFFSET(14214, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 819),
- NAME_FUNC_OFFSET(14233, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 820),
- NAME_FUNC_OFFSET(14253, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 821),
- NAME_FUNC_OFFSET(14272, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 822),
- NAME_FUNC_OFFSET(14292, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 823),
- NAME_FUNC_OFFSET(14311, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 824),
- NAME_FUNC_OFFSET(14331, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 825),
- NAME_FUNC_OFFSET(14350, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 826),
- NAME_FUNC_OFFSET(14370, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 827),
- NAME_FUNC_OFFSET(14390, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 828),
- NAME_FUNC_OFFSET(14411, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 829),
- NAME_FUNC_OFFSET(14435, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 830),
- NAME_FUNC_OFFSET(14456, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 831),
- NAME_FUNC_OFFSET(14477, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 832),
- NAME_FUNC_OFFSET(14498, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 833),
- NAME_FUNC_OFFSET(14519, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 834),
- NAME_FUNC_OFFSET(14540, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 835),
- NAME_FUNC_OFFSET(14561, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 836),
- NAME_FUNC_OFFSET(14582, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 837),
- NAME_FUNC_OFFSET(14603, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 838),
- NAME_FUNC_OFFSET(14624, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 839),
- NAME_FUNC_OFFSET(14645, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 840),
- NAME_FUNC_OFFSET(14666, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 841),
- NAME_FUNC_OFFSET(14687, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 842),
- NAME_FUNC_OFFSET(14709, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 843),
- NAME_FUNC_OFFSET(14736, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 844),
- NAME_FUNC_OFFSET(14763, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 845),
- NAME_FUNC_OFFSET(14787, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 846),
- NAME_FUNC_OFFSET(14811, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 847),
- NAME_FUNC_OFFSET(14833, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 848),
- NAME_FUNC_OFFSET(14855, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 849),
- NAME_FUNC_OFFSET(14877, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 850),
- NAME_FUNC_OFFSET(14902, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 851),
- NAME_FUNC_OFFSET(14926, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 852),
- NAME_FUNC_OFFSET(14948, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 853),
- NAME_FUNC_OFFSET(14970, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 854),
- NAME_FUNC_OFFSET(14992, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 855),
- NAME_FUNC_OFFSET(15018, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 856),
- NAME_FUNC_OFFSET(15041, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 857),
- NAME_FUNC_OFFSET(15065, glPassTexCoordATI, glPassTexCoordATI, NULL, 858),
- NAME_FUNC_OFFSET(15083, glSampleMapATI, glSampleMapATI, NULL, 859),
- NAME_FUNC_OFFSET(15098, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 860),
- NAME_FUNC_OFFSET(15129, glPointParameteriNV, glPointParameteriNV, NULL, 861),
- NAME_FUNC_OFFSET(15149, glPointParameterivNV, glPointParameterivNV, NULL, 862),
- NAME_FUNC_OFFSET(15170, gl_dispatch_stub_863, gl_dispatch_stub_863, NULL, 863),
- NAME_FUNC_OFFSET(15193, gl_dispatch_stub_864, gl_dispatch_stub_864, NULL, 864),
- NAME_FUNC_OFFSET(15216, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
- NAME_FUNC_OFFSET(15242, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
- NAME_FUNC_OFFSET(15265, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
- NAME_FUNC_OFFSET(15286, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 868),
- NAME_FUNC_OFFSET(15317, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 869),
- NAME_FUNC_OFFSET(15348, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 870),
- NAME_FUNC_OFFSET(15376, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 871),
- NAME_FUNC_OFFSET(15405, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 872),
- NAME_FUNC_OFFSET(15433, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 873),
- NAME_FUNC_OFFSET(15462, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 874),
- NAME_FUNC_OFFSET(15488, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 875),
- NAME_FUNC_OFFSET(15509, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
- NAME_FUNC_OFFSET(15526, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
- NAME_FUNC_OFFSET(15553, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 878),
- NAME_FUNC_OFFSET(15574, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 879),
- NAME_FUNC_OFFSET(15596, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 880),
- NAME_FUNC_OFFSET(15624, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 881),
- NAME_FUNC_OFFSET(15648, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 882),
- NAME_FUNC_OFFSET(15673, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 883),
- NAME_FUNC_OFFSET(15702, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 884),
- NAME_FUNC_OFFSET(15728, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 885),
- NAME_FUNC_OFFSET(15754, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 886),
- NAME_FUNC_OFFSET(15780, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 887),
- NAME_FUNC_OFFSET(15801, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 888),
- NAME_FUNC_OFFSET(15823, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 889),
- NAME_FUNC_OFFSET(15843, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 890),
- NAME_FUNC_OFFSET(15884, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 891),
- NAME_FUNC_OFFSET(15916, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 892),
- NAME_FUNC_OFFSET(15935, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 893),
- NAME_FUNC_OFFSET(15955, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 894),
- NAME_FUNC_OFFSET(15980, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
- NAME_FUNC_OFFSET(16001, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
- NAME_FUNC_OFFSET(16025, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
- NAME_FUNC_OFFSET(16055, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 898),
- NAME_FUNC_OFFSET(16081, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 899),
- NAME_FUNC_OFFSET(16106, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 900),
- NAME_FUNC_OFFSET(16125, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 901),
- NAME_FUNC_OFFSET(16149, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 902),
- NAME_FUNC_OFFSET(16174, glUniform1uiEXT, glUniform1uiEXT, NULL, 903),
- NAME_FUNC_OFFSET(16190, glUniform1uivEXT, glUniform1uivEXT, NULL, 904),
- NAME_FUNC_OFFSET(16207, glUniform2uiEXT, glUniform2uiEXT, NULL, 905),
- NAME_FUNC_OFFSET(16223, glUniform2uivEXT, glUniform2uivEXT, NULL, 906),
- NAME_FUNC_OFFSET(16240, glUniform3uiEXT, glUniform3uiEXT, NULL, 907),
- NAME_FUNC_OFFSET(16256, glUniform3uivEXT, glUniform3uivEXT, NULL, 908),
- NAME_FUNC_OFFSET(16273, glUniform4uiEXT, glUniform4uiEXT, NULL, 909),
- NAME_FUNC_OFFSET(16289, glUniform4uivEXT, glUniform4uivEXT, NULL, 910),
- NAME_FUNC_OFFSET(16306, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 911),
- NAME_FUNC_OFFSET(16327, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 912),
- NAME_FUNC_OFFSET(16349, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 913),
- NAME_FUNC_OFFSET(16371, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 914),
- NAME_FUNC_OFFSET(16394, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 915),
- NAME_FUNC_OFFSET(16415, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 916),
- NAME_FUNC_OFFSET(16437, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 917),
- NAME_FUNC_OFFSET(16459, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 918),
- NAME_FUNC_OFFSET(16482, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 919),
- NAME_FUNC_OFFSET(16503, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 920),
- NAME_FUNC_OFFSET(16525, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 921),
- NAME_FUNC_OFFSET(16547, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 922),
- NAME_FUNC_OFFSET(16570, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 923),
- NAME_FUNC_OFFSET(16592, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 924),
- NAME_FUNC_OFFSET(16613, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 925),
- NAME_FUNC_OFFSET(16635, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 926),
- NAME_FUNC_OFFSET(16657, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 927),
- NAME_FUNC_OFFSET(16680, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 928),
- NAME_FUNC_OFFSET(16702, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 929),
- NAME_FUNC_OFFSET(16725, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 930),
- NAME_FUNC_OFFSET(16748, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 931),
- NAME_FUNC_OFFSET(16774, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 932),
- NAME_FUNC_OFFSET(16803, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 933),
- NAME_FUNC_OFFSET(16825, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 934),
- NAME_FUNC_OFFSET(16845, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 935),
- NAME_FUNC_OFFSET(16864, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 936),
- NAME_FUNC_OFFSET(16888, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 937),
- NAME_FUNC_OFFSET(16912, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 938),
- NAME_FUNC_OFFSET(16934, glClearColorIiEXT, glClearColorIiEXT, NULL, 939),
- NAME_FUNC_OFFSET(16952, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 940),
- NAME_FUNC_OFFSET(16971, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 941),
- NAME_FUNC_OFFSET(16995, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 942),
- NAME_FUNC_OFFSET(17020, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 943),
- NAME_FUNC_OFFSET(17041, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 944),
- NAME_FUNC_OFFSET(17063, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 945),
- NAME_FUNC_OFFSET(17090, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 946),
- NAME_FUNC_OFFSET(17115, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 947),
- NAME_FUNC_OFFSET(17143, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 948),
- NAME_FUNC_OFFSET(17163, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 949),
- NAME_FUNC_OFFSET(17185, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 950),
- NAME_FUNC_OFFSET(17206, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 951),
- NAME_FUNC_OFFSET(17232, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 952),
- NAME_FUNC_OFFSET(17265, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 953),
- NAME_FUNC_OFFSET(17296, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 954),
- NAME_FUNC_OFFSET(17317, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 955),
- NAME_FUNC_OFFSET(17345, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 956),
- NAME_FUNC_OFFSET(17368, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 957),
- NAME_FUNC_OFFSET(17393, glActiveProgramEXT, glActiveProgramEXT, NULL, 958),
- NAME_FUNC_OFFSET(17412, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 959),
- NAME_FUNC_OFFSET(17437, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 960),
- NAME_FUNC_OFFSET(17459, glTextureBarrierNV, glTextureBarrierNV, NULL, 961),
- NAME_FUNC_OFFSET(17478, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
- NAME_FUNC_OFFSET(17503, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
- NAME_FUNC_OFFSET(17532, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
- NAME_FUNC_OFFSET(17563, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
- NAME_FUNC_OFFSET(17587, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
- NAME_FUNC_OFFSET(17612, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 967),
- NAME_FUNC_OFFSET(17651, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 968),
- NAME_FUNC_OFFSET(17680, glArrayElement, glArrayElement, NULL, 306),
- NAME_FUNC_OFFSET(17698, glBindTexture, glBindTexture, NULL, 307),
- NAME_FUNC_OFFSET(17715, glDrawArrays, glDrawArrays, NULL, 310),
- NAME_FUNC_OFFSET(17731, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
- NAME_FUNC_OFFSET(17756, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
- NAME_FUNC_OFFSET(17776, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
- NAME_FUNC_OFFSET(17796, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
- NAME_FUNC_OFFSET(17819, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
- NAME_FUNC_OFFSET(17842, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
- NAME_FUNC_OFFSET(17862, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
- NAME_FUNC_OFFSET(17879, glGetPointerv, glGetPointerv, NULL, 329),
- NAME_FUNC_OFFSET(17896, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
- NAME_FUNC_OFFSET(17911, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
- NAME_FUNC_OFFSET(17935, glTexSubImage1D, glTexSubImage1D, NULL, 332),
- NAME_FUNC_OFFSET(17954, glTexSubImage2D, glTexSubImage2D, NULL, 333),
- NAME_FUNC_OFFSET(17973, glBlendColor, glBlendColor, NULL, 336),
- NAME_FUNC_OFFSET(17989, glBlendEquation, glBlendEquation, NULL, 337),
- NAME_FUNC_OFFSET(18008, glDrawRangeElements, glDrawRangeElements, NULL, 338),
- NAME_FUNC_OFFSET(18031, glColorTable, glColorTable, NULL, 339),
- NAME_FUNC_OFFSET(18047, glColorTable, glColorTable, NULL, 339),
- NAME_FUNC_OFFSET(18063, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
- NAME_FUNC_OFFSET(18090, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
- NAME_FUNC_OFFSET(18117, glCopyColorTable, glCopyColorTable, NULL, 342),
- NAME_FUNC_OFFSET(18137, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
- NAME_FUNC_OFFSET(18156, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
- NAME_FUNC_OFFSET(18175, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
- NAME_FUNC_OFFSET(18205, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
- NAME_FUNC_OFFSET(18235, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
- NAME_FUNC_OFFSET(18265, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
- NAME_FUNC_OFFSET(18295, glColorSubTable, glColorSubTable, NULL, 346),
- NAME_FUNC_OFFSET(18314, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
- NAME_FUNC_OFFSET(18337, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
- NAME_FUNC_OFFSET(18362, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
- NAME_FUNC_OFFSET(18387, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
- NAME_FUNC_OFFSET(18414, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
- NAME_FUNC_OFFSET(18442, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
- NAME_FUNC_OFFSET(18469, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
- NAME_FUNC_OFFSET(18497, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
- NAME_FUNC_OFFSET(18526, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
- NAME_FUNC_OFFSET(18555, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
- NAME_FUNC_OFFSET(18581, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
- NAME_FUNC_OFFSET(18612, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
- NAME_FUNC_OFFSET(18643, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
- NAME_FUNC_OFFSET(18667, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
- NAME_FUNC_OFFSET(18690, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
- NAME_FUNC_OFFSET(18708, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
- NAME_FUNC_OFFSET(18737, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
- NAME_FUNC_OFFSET(18766, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
- NAME_FUNC_OFFSET(18781, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
- NAME_FUNC_OFFSET(18807, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
- NAME_FUNC_OFFSET(18833, glHistogram, glHistogram, NULL, 367),
- NAME_FUNC_OFFSET(18848, glMinmax, glMinmax, NULL, 368),
- NAME_FUNC_OFFSET(18860, glResetHistogram, glResetHistogram, NULL, 369),
- NAME_FUNC_OFFSET(18880, glResetMinmax, glResetMinmax, NULL, 370),
- NAME_FUNC_OFFSET(18897, glTexImage3D, glTexImage3D, NULL, 371),
- NAME_FUNC_OFFSET(18913, glTexSubImage3D, glTexSubImage3D, NULL, 372),
- NAME_FUNC_OFFSET(18932, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
- NAME_FUNC_OFFSET(18955, glActiveTextureARB, glActiveTextureARB, NULL, 374),
- NAME_FUNC_OFFSET(18971, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
- NAME_FUNC_OFFSET(18993, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
- NAME_FUNC_OFFSET(19011, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
- NAME_FUNC_OFFSET(19030, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
- NAME_FUNC_OFFSET(19048, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
- NAME_FUNC_OFFSET(19067, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
- NAME_FUNC_OFFSET(19085, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
- NAME_FUNC_OFFSET(19104, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
- NAME_FUNC_OFFSET(19122, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
- NAME_FUNC_OFFSET(19141, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
- NAME_FUNC_OFFSET(19159, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
- NAME_FUNC_OFFSET(19178, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
- NAME_FUNC_OFFSET(19196, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
- NAME_FUNC_OFFSET(19215, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
- NAME_FUNC_OFFSET(19233, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
- NAME_FUNC_OFFSET(19252, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
- NAME_FUNC_OFFSET(19270, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
- NAME_FUNC_OFFSET(19289, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
- NAME_FUNC_OFFSET(19307, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
- NAME_FUNC_OFFSET(19326, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
- NAME_FUNC_OFFSET(19344, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
- NAME_FUNC_OFFSET(19363, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
- NAME_FUNC_OFFSET(19381, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
- NAME_FUNC_OFFSET(19400, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
- NAME_FUNC_OFFSET(19418, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
- NAME_FUNC_OFFSET(19437, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
- NAME_FUNC_OFFSET(19455, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
- NAME_FUNC_OFFSET(19474, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
- NAME_FUNC_OFFSET(19492, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
- NAME_FUNC_OFFSET(19511, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
- NAME_FUNC_OFFSET(19529, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
- NAME_FUNC_OFFSET(19548, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
- NAME_FUNC_OFFSET(19566, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
- NAME_FUNC_OFFSET(19585, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
- NAME_FUNC_OFFSET(19608, glFramebufferTexture, glFramebufferTexture, NULL, 435),
- NAME_FUNC_OFFSET(19632, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 438),
- NAME_FUNC_OFFSET(19655, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 439),
- NAME_FUNC_OFFSET(19678, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 440),
- NAME_FUNC_OFFSET(19701, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 441),
- NAME_FUNC_OFFSET(19724, glSampleCoverageARB, glSampleCoverageARB, NULL, 442),
- NAME_FUNC_OFFSET(19741, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 443),
- NAME_FUNC_OFFSET(19764, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 444),
- NAME_FUNC_OFFSET(19787, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 445),
- NAME_FUNC_OFFSET(19810, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 446),
- NAME_FUNC_OFFSET(19836, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 447),
- NAME_FUNC_OFFSET(19862, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 448),
- NAME_FUNC_OFFSET(19888, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 449),
- NAME_FUNC_OFFSET(19912, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 450),
- NAME_FUNC_OFFSET(19939, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 451),
- NAME_FUNC_OFFSET(19965, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 458),
- NAME_FUNC_OFFSET(19985, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 459),
- NAME_FUNC_OFFSET(20005, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 460),
- NAME_FUNC_OFFSET(20025, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 461),
- NAME_FUNC_OFFSET(20048, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 462),
- NAME_FUNC_OFFSET(20072, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 463),
- NAME_FUNC_OFFSET(20095, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 464),
- NAME_FUNC_OFFSET(20119, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 470),
- NAME_FUNC_OFFSET(20136, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 471),
- NAME_FUNC_OFFSET(20154, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 472),
- NAME_FUNC_OFFSET(20171, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 473),
- NAME_FUNC_OFFSET(20189, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 474),
- NAME_FUNC_OFFSET(20206, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 475),
- NAME_FUNC_OFFSET(20224, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 476),
- NAME_FUNC_OFFSET(20241, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 477),
- NAME_FUNC_OFFSET(20259, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 478),
- NAME_FUNC_OFFSET(20276, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 479),
- NAME_FUNC_OFFSET(20294, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 480),
- NAME_FUNC_OFFSET(20311, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 481),
- NAME_FUNC_OFFSET(20329, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 482),
- NAME_FUNC_OFFSET(20346, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 483),
- NAME_FUNC_OFFSET(20364, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 484),
- NAME_FUNC_OFFSET(20381, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 485),
- NAME_FUNC_OFFSET(20399, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 486),
- NAME_FUNC_OFFSET(20416, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 487),
- NAME_FUNC_OFFSET(20434, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 488),
- NAME_FUNC_OFFSET(20453, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 489),
- NAME_FUNC_OFFSET(20472, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 490),
- NAME_FUNC_OFFSET(20491, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 491),
- NAME_FUNC_OFFSET(20510, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 492),
- NAME_FUNC_OFFSET(20530, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 493),
- NAME_FUNC_OFFSET(20550, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 494),
- NAME_FUNC_OFFSET(20570, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 495),
- NAME_FUNC_OFFSET(20588, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 496),
- NAME_FUNC_OFFSET(20605, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 497),
- NAME_FUNC_OFFSET(20623, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 498),
- NAME_FUNC_OFFSET(20640, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 499),
- NAME_FUNC_OFFSET(20658, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 500),
- NAME_FUNC_OFFSET(20676, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 501),
- NAME_FUNC_OFFSET(20693, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 502),
- NAME_FUNC_OFFSET(20711, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 503),
- NAME_FUNC_OFFSET(20730, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 504),
- NAME_FUNC_OFFSET(20749, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 505),
- NAME_FUNC_OFFSET(20768, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 506),
- NAME_FUNC_OFFSET(20790, glBindBufferARB, glBindBufferARB, NULL, 507),
- NAME_FUNC_OFFSET(20803, glBufferDataARB, glBufferDataARB, NULL, 508),
- NAME_FUNC_OFFSET(20816, glBufferSubDataARB, glBufferSubDataARB, NULL, 509),
- NAME_FUNC_OFFSET(20832, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 510),
- NAME_FUNC_OFFSET(20848, glGenBuffersARB, glGenBuffersARB, NULL, 511),
- NAME_FUNC_OFFSET(20861, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 512),
- NAME_FUNC_OFFSET(20884, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 513),
- NAME_FUNC_OFFSET(20904, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 514),
- NAME_FUNC_OFFSET(20923, glIsBufferARB, glIsBufferARB, NULL, 515),
- NAME_FUNC_OFFSET(20934, glMapBufferARB, glMapBufferARB, NULL, 516),
- NAME_FUNC_OFFSET(20946, glUnmapBufferARB, glUnmapBufferARB, NULL, 517),
- NAME_FUNC_OFFSET(20960, glBeginQueryARB, glBeginQueryARB, NULL, 518),
- NAME_FUNC_OFFSET(20973, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 519),
- NAME_FUNC_OFFSET(20989, glEndQueryARB, glEndQueryARB, NULL, 520),
- NAME_FUNC_OFFSET(21000, glGenQueriesARB, glGenQueriesARB, NULL, 521),
- NAME_FUNC_OFFSET(21013, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 522),
- NAME_FUNC_OFFSET(21032, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 523),
- NAME_FUNC_OFFSET(21052, glGetQueryivARB, glGetQueryivARB, NULL, 524),
- NAME_FUNC_OFFSET(21065, glIsQueryARB, glIsQueryARB, NULL, 525),
- NAME_FUNC_OFFSET(21075, glCompileShaderARB, glCompileShaderARB, NULL, 527),
- NAME_FUNC_OFFSET(21091, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 532),
- NAME_FUNC_OFFSET(21110, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 538),
- NAME_FUNC_OFFSET(21128, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 539),
- NAME_FUNC_OFFSET(21149, glGetUniformfvARB, glGetUniformfvARB, NULL, 540),
- NAME_FUNC_OFFSET(21164, glGetUniformivARB, glGetUniformivARB, NULL, 541),
- NAME_FUNC_OFFSET(21179, glLinkProgramARB, glLinkProgramARB, NULL, 542),
- NAME_FUNC_OFFSET(21193, glShaderSourceARB, glShaderSourceARB, NULL, 543),
- NAME_FUNC_OFFSET(21208, glUniform1fARB, glUniform1fARB, NULL, 544),
- NAME_FUNC_OFFSET(21220, glUniform1fvARB, glUniform1fvARB, NULL, 545),
- NAME_FUNC_OFFSET(21233, glUniform1iARB, glUniform1iARB, NULL, 546),
- NAME_FUNC_OFFSET(21245, glUniform1ivARB, glUniform1ivARB, NULL, 547),
- NAME_FUNC_OFFSET(21258, glUniform2fARB, glUniform2fARB, NULL, 548),
- NAME_FUNC_OFFSET(21270, glUniform2fvARB, glUniform2fvARB, NULL, 549),
- NAME_FUNC_OFFSET(21283, glUniform2iARB, glUniform2iARB, NULL, 550),
- NAME_FUNC_OFFSET(21295, glUniform2ivARB, glUniform2ivARB, NULL, 551),
- NAME_FUNC_OFFSET(21308, glUniform3fARB, glUniform3fARB, NULL, 552),
- NAME_FUNC_OFFSET(21320, glUniform3fvARB, glUniform3fvARB, NULL, 553),
- NAME_FUNC_OFFSET(21333, glUniform3iARB, glUniform3iARB, NULL, 554),
- NAME_FUNC_OFFSET(21345, glUniform3ivARB, glUniform3ivARB, NULL, 555),
- NAME_FUNC_OFFSET(21358, glUniform4fARB, glUniform4fARB, NULL, 556),
- NAME_FUNC_OFFSET(21370, glUniform4fvARB, glUniform4fvARB, NULL, 557),
- NAME_FUNC_OFFSET(21383, glUniform4iARB, glUniform4iARB, NULL, 558),
- NAME_FUNC_OFFSET(21395, glUniform4ivARB, glUniform4ivARB, NULL, 559),
- NAME_FUNC_OFFSET(21408, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 560),
- NAME_FUNC_OFFSET(21427, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 561),
- NAME_FUNC_OFFSET(21446, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 562),
- NAME_FUNC_OFFSET(21465, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 563),
- NAME_FUNC_OFFSET(21478, glValidateProgramARB, glValidateProgramARB, NULL, 564),
- NAME_FUNC_OFFSET(21496, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 565),
- NAME_FUNC_OFFSET(21517, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 566),
- NAME_FUNC_OFFSET(21535, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 567),
- NAME_FUNC_OFFSET(21555, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
- NAME_FUNC_OFFSET(21569, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
- NAME_FUNC_OFFSET(21586, glClampColorARB, glClampColorARB, NULL, 569),
- NAME_FUNC_OFFSET(21599, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
- NAME_FUNC_OFFSET(21624, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
- NAME_FUNC_OFFSET(21646, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
- NAME_FUNC_OFFSET(21673, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
- NAME_FUNC_OFFSET(21697, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 572),
- NAME_FUNC_OFFSET(21733, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 574),
- NAME_FUNC_OFFSET(21755, glTexBufferARB, glTexBufferARB, NULL, 577),
- NAME_FUNC_OFFSET(21767, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 599),
- NAME_FUNC_OFFSET(21801, glBlendEquationiARB, glBlendEquationiARB, NULL, 600),
- NAME_FUNC_OFFSET(21827, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 601),
- NAME_FUNC_OFFSET(21857, glBlendFunciARB, glBlendFunciARB, NULL, 602),
- NAME_FUNC_OFFSET(21879, gl_dispatch_stub_676, gl_dispatch_stub_676, NULL, 676),
- NAME_FUNC_OFFSET(21902, gl_dispatch_stub_719, gl_dispatch_stub_719, NULL, 719),
- NAME_FUNC_OFFSET(21918, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
- NAME_FUNC_OFFSET(21937, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
- NAME_FUNC_OFFSET(21955, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
- NAME_FUNC_OFFSET(21976, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
- NAME_FUNC_OFFSET(21998, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
- NAME_FUNC_OFFSET(22017, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
- NAME_FUNC_OFFSET(22039, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
- NAME_FUNC_OFFSET(22062, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 731),
- NAME_FUNC_OFFSET(22081, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 732),
- NAME_FUNC_OFFSET(22101, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 733),
- NAME_FUNC_OFFSET(22120, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 734),
- NAME_FUNC_OFFSET(22140, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 735),
- NAME_FUNC_OFFSET(22159, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 736),
- NAME_FUNC_OFFSET(22179, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 737),
- NAME_FUNC_OFFSET(22198, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 738),
- NAME_FUNC_OFFSET(22218, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 739),
- NAME_FUNC_OFFSET(22237, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 740),
- NAME_FUNC_OFFSET(22257, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 741),
- NAME_FUNC_OFFSET(22277, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 742),
- NAME_FUNC_OFFSET(22298, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 743),
- NAME_FUNC_OFFSET(22318, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 744),
- NAME_FUNC_OFFSET(22339, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 745),
- NAME_FUNC_OFFSET(22359, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 746),
- NAME_FUNC_OFFSET(22380, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 747),
- NAME_FUNC_OFFSET(22404, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 748),
- NAME_FUNC_OFFSET(22422, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 749),
- NAME_FUNC_OFFSET(22442, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 750),
- NAME_FUNC_OFFSET(22460, glFogCoorddEXT, glFogCoorddEXT, NULL, 751),
- NAME_FUNC_OFFSET(22472, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 752),
- NAME_FUNC_OFFSET(22485, glFogCoordfEXT, glFogCoordfEXT, NULL, 753),
- NAME_FUNC_OFFSET(22497, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 754),
- NAME_FUNC_OFFSET(22510, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 755),
- NAME_FUNC_OFFSET(22530, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 755),
- NAME_FUNC_OFFSET(22554, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
- NAME_FUNC_OFFSET(22568, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
- NAME_FUNC_OFFSET(22585, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
- NAME_FUNC_OFFSET(22600, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
- NAME_FUNC_OFFSET(22618, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
- NAME_FUNC_OFFSET(22632, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
- NAME_FUNC_OFFSET(22649, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
- NAME_FUNC_OFFSET(22664, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
- NAME_FUNC_OFFSET(22682, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
- NAME_FUNC_OFFSET(22696, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
- NAME_FUNC_OFFSET(22713, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
- NAME_FUNC_OFFSET(22728, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
- NAME_FUNC_OFFSET(22746, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
- NAME_FUNC_OFFSET(22760, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
- NAME_FUNC_OFFSET(22777, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
- NAME_FUNC_OFFSET(22792, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
- NAME_FUNC_OFFSET(22810, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
- NAME_FUNC_OFFSET(22824, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
- NAME_FUNC_OFFSET(22841, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
- NAME_FUNC_OFFSET(22856, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
- NAME_FUNC_OFFSET(22874, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
- NAME_FUNC_OFFSET(22888, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
- NAME_FUNC_OFFSET(22905, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
- NAME_FUNC_OFFSET(22920, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
- NAME_FUNC_OFFSET(22938, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
- NAME_FUNC_OFFSET(22952, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
- NAME_FUNC_OFFSET(22969, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
- NAME_FUNC_OFFSET(22984, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
- NAME_FUNC_OFFSET(23002, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
- NAME_FUNC_OFFSET(23016, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
- NAME_FUNC_OFFSET(23033, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
- NAME_FUNC_OFFSET(23048, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
- NAME_FUNC_OFFSET(23066, glBindProgramNV, glBindProgramNV, NULL, 784),
- NAME_FUNC_OFFSET(23083, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 785),
- NAME_FUNC_OFFSET(23103, glGenProgramsNV, glGenProgramsNV, NULL, 787),
- NAME_FUNC_OFFSET(23120, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 793),
- NAME_FUNC_OFFSET(23146, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 793),
- NAME_FUNC_OFFSET(23175, glIsProgramNV, glIsProgramNV, NULL, 797),
- NAME_FUNC_OFFSET(23190, glPointParameteriNV, glPointParameteriNV, NULL, 861),
- NAME_FUNC_OFFSET(23208, glPointParameterivNV, glPointParameterivNV, NULL, 862),
- NAME_FUNC_OFFSET(23227, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
- NAME_FUNC_OFFSET(23248, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
- NAME_FUNC_OFFSET(23264, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 874),
- NAME_FUNC_OFFSET(23288, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
- NAME_FUNC_OFFSET(23312, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
- NAME_FUNC_OFFSET(23339, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 878),
- NAME_FUNC_OFFSET(23357, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 879),
- NAME_FUNC_OFFSET(23376, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 880),
- NAME_FUNC_OFFSET(23401, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 881),
- NAME_FUNC_OFFSET(23422, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 882),
- NAME_FUNC_OFFSET(23444, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 883),
- NAME_FUNC_OFFSET(23470, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 884),
- NAME_FUNC_OFFSET(23493, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 885),
- NAME_FUNC_OFFSET(23516, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 886),
- NAME_FUNC_OFFSET(23539, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 887),
- NAME_FUNC_OFFSET(23557, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 888),
- NAME_FUNC_OFFSET(23576, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 889),
- NAME_FUNC_OFFSET(23593, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 890),
- NAME_FUNC_OFFSET(23631, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 891),
- NAME_FUNC_OFFSET(23660, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 892),
- NAME_FUNC_OFFSET(23676, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 893),
- NAME_FUNC_OFFSET(23693, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 894),
- NAME_FUNC_OFFSET(23715, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
- NAME_FUNC_OFFSET(23733, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 898),
- NAME_FUNC_OFFSET(23756, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 899),
- NAME_FUNC_OFFSET(23778, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 900),
- NAME_FUNC_OFFSET(23794, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 901),
- NAME_FUNC_OFFSET(23815, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 902),
- NAME_FUNC_OFFSET(23837, glUniform1uiEXT, glUniform1uiEXT, NULL, 903),
- NAME_FUNC_OFFSET(23850, glUniform1uivEXT, glUniform1uivEXT, NULL, 904),
- NAME_FUNC_OFFSET(23864, glUniform2uiEXT, glUniform2uiEXT, NULL, 905),
- NAME_FUNC_OFFSET(23877, glUniform2uivEXT, glUniform2uivEXT, NULL, 906),
- NAME_FUNC_OFFSET(23891, glUniform3uiEXT, glUniform3uiEXT, NULL, 907),
- NAME_FUNC_OFFSET(23904, glUniform3uivEXT, glUniform3uivEXT, NULL, 908),
- NAME_FUNC_OFFSET(23918, glUniform4uiEXT, glUniform4uiEXT, NULL, 909),
- NAME_FUNC_OFFSET(23931, glUniform4uivEXT, glUniform4uivEXT, NULL, 910),
- NAME_FUNC_OFFSET(23945, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 911),
- NAME_FUNC_OFFSET(23963, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 912),
- NAME_FUNC_OFFSET(23982, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 913),
- NAME_FUNC_OFFSET(24001, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 914),
- NAME_FUNC_OFFSET(24021, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 915),
- NAME_FUNC_OFFSET(24039, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 916),
- NAME_FUNC_OFFSET(24058, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 917),
- NAME_FUNC_OFFSET(24077, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 918),
- NAME_FUNC_OFFSET(24097, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 919),
- NAME_FUNC_OFFSET(24115, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 920),
- NAME_FUNC_OFFSET(24134, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 921),
- NAME_FUNC_OFFSET(24153, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 922),
- NAME_FUNC_OFFSET(24173, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 923),
- NAME_FUNC_OFFSET(24192, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 924),
- NAME_FUNC_OFFSET(24210, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 925),
- NAME_FUNC_OFFSET(24229, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 926),
- NAME_FUNC_OFFSET(24248, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 927),
- NAME_FUNC_OFFSET(24268, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 928),
- NAME_FUNC_OFFSET(24287, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 929),
- NAME_FUNC_OFFSET(24307, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 930),
- NAME_FUNC_OFFSET(24327, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 931),
- NAME_FUNC_OFFSET(24350, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 932),
- NAME_FUNC_OFFSET(24376, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 932),
- NAME_FUNC_OFFSET(24405, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 933),
- NAME_FUNC_OFFSET(24418, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 934),
- NAME_FUNC_OFFSET(24429, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 935),
- NAME_FUNC_OFFSET(24439, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 936),
- NAME_FUNC_OFFSET(24455, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 937),
- NAME_FUNC_OFFSET(24471, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 938),
- NAME_FUNC_OFFSET(24484, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 941),
- NAME_FUNC_OFFSET(24505, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 942),
- NAME_FUNC_OFFSET(24527, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 943),
- NAME_FUNC_OFFSET(24545, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 944),
- NAME_FUNC_OFFSET(24564, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 945),
- NAME_FUNC_OFFSET(24589, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 946),
- NAME_FUNC_OFFSET(24612, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 947),
- NAME_FUNC_OFFSET(24637, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 948),
- NAME_FUNC_OFFSET(24654, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 950),
- NAME_FUNC_OFFSET(24672, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 951),
- NAME_FUNC_OFFSET(24695, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 952),
- NAME_FUNC_OFFSET(24725, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 953),
- NAME_FUNC_OFFSET(24753, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 954),
- NAME_FUNC_OFFSET(24771, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
- NAME_FUNC_OFFSET(24792, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
+ NAME_FUNC_OFFSET(12204, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
+ NAME_FUNC_OFFSET(12219, gl_dispatch_stub_721, gl_dispatch_stub_721, NULL, 721),
+ NAME_FUNC_OFFSET(12233, gl_dispatch_stub_722, gl_dispatch_stub_722, NULL, 722),
+ NAME_FUNC_OFFSET(12248, gl_dispatch_stub_723, gl_dispatch_stub_723, NULL, 723),
+ NAME_FUNC_OFFSET(12262, gl_dispatch_stub_724, gl_dispatch_stub_724, NULL, 724),
+ NAME_FUNC_OFFSET(12277, gl_dispatch_stub_725, gl_dispatch_stub_725, NULL, 725),
+ NAME_FUNC_OFFSET(12291, gl_dispatch_stub_726, gl_dispatch_stub_726, NULL, 726),
+ NAME_FUNC_OFFSET(12306, gl_dispatch_stub_727, gl_dispatch_stub_727, NULL, 727),
+ NAME_FUNC_OFFSET(12328, gl_dispatch_stub_728, gl_dispatch_stub_728, NULL, 728),
+ NAME_FUNC_OFFSET(12346, gl_dispatch_stub_729, gl_dispatch_stub_729, NULL, 729),
+ NAME_FUNC_OFFSET(12363, gl_dispatch_stub_730, gl_dispatch_stub_730, NULL, 730),
+ NAME_FUNC_OFFSET(12383, glColorPointerEXT, glColorPointerEXT, NULL, 731),
+ NAME_FUNC_OFFSET(12401, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 732),
+ NAME_FUNC_OFFSET(12422, glIndexPointerEXT, glIndexPointerEXT, NULL, 733),
+ NAME_FUNC_OFFSET(12440, glNormalPointerEXT, glNormalPointerEXT, NULL, 734),
+ NAME_FUNC_OFFSET(12459, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 735),
+ NAME_FUNC_OFFSET(12480, glVertexPointerEXT, glVertexPointerEXT, NULL, 736),
+ NAME_FUNC_OFFSET(12499, glPointParameterfEXT, glPointParameterfEXT, NULL, 737),
+ NAME_FUNC_OFFSET(12520, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 738),
+ NAME_FUNC_OFFSET(12542, glLockArraysEXT, glLockArraysEXT, NULL, 739),
+ NAME_FUNC_OFFSET(12558, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 740),
+ NAME_FUNC_OFFSET(12576, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 741),
+ NAME_FUNC_OFFSET(12598, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 742),
+ NAME_FUNC_OFFSET(12621, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 743),
+ NAME_FUNC_OFFSET(12643, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 744),
+ NAME_FUNC_OFFSET(12666, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 745),
+ NAME_FUNC_OFFSET(12688, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 746),
+ NAME_FUNC_OFFSET(12711, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 747),
+ NAME_FUNC_OFFSET(12733, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 748),
+ NAME_FUNC_OFFSET(12756, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 749),
+ NAME_FUNC_OFFSET(12778, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 750),
+ NAME_FUNC_OFFSET(12801, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 751),
+ NAME_FUNC_OFFSET(12824, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 752),
+ NAME_FUNC_OFFSET(12848, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 753),
+ NAME_FUNC_OFFSET(12871, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 754),
+ NAME_FUNC_OFFSET(12895, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 755),
+ NAME_FUNC_OFFSET(12918, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 756),
+ NAME_FUNC_OFFSET(12942, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 757),
+ NAME_FUNC_OFFSET(12969, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 758),
+ NAME_FUNC_OFFSET(12990, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 759),
+ NAME_FUNC_OFFSET(13013, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 760),
+ NAME_FUNC_OFFSET(13034, glFogCoorddEXT, glFogCoorddEXT, NULL, 761),
+ NAME_FUNC_OFFSET(13049, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 762),
+ NAME_FUNC_OFFSET(13065, glFogCoordfEXT, glFogCoordfEXT, NULL, 763),
+ NAME_FUNC_OFFSET(13080, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 764),
+ NAME_FUNC_OFFSET(13096, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 765),
+ NAME_FUNC_OFFSET(13119, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 766),
+ NAME_FUNC_OFFSET(13139, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 767),
+ NAME_FUNC_OFFSET(13157, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 768),
+ NAME_FUNC_OFFSET(13176, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 769),
+ NAME_FUNC_OFFSET(13194, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 770),
+ NAME_FUNC_OFFSET(13213, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 771),
+ NAME_FUNC_OFFSET(13231, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 772),
+ NAME_FUNC_OFFSET(13250, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 773),
+ NAME_FUNC_OFFSET(13268, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 774),
+ NAME_FUNC_OFFSET(13287, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 775),
+ NAME_FUNC_OFFSET(13305, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 776),
+ NAME_FUNC_OFFSET(13324, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 777),
+ NAME_FUNC_OFFSET(13342, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 778),
+ NAME_FUNC_OFFSET(13361, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 779),
+ NAME_FUNC_OFFSET(13379, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 780),
+ NAME_FUNC_OFFSET(13398, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 781),
+ NAME_FUNC_OFFSET(13416, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 782),
+ NAME_FUNC_OFFSET(13435, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 783),
+ NAME_FUNC_OFFSET(13453, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 784),
+ NAME_FUNC_OFFSET(13472, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 785),
+ NAME_FUNC_OFFSET(13490, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 786),
+ NAME_FUNC_OFFSET(13509, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 787),
+ NAME_FUNC_OFFSET(13527, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 788),
+ NAME_FUNC_OFFSET(13546, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 789),
+ NAME_FUNC_OFFSET(13564, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 790),
+ NAME_FUNC_OFFSET(13583, gl_dispatch_stub_791, gl_dispatch_stub_791, NULL, 791),
+ NAME_FUNC_OFFSET(13608, gl_dispatch_stub_792, gl_dispatch_stub_792, NULL, 792),
+ NAME_FUNC_OFFSET(13635, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 793),
+ NAME_FUNC_OFFSET(13659, glBindProgramNV, glBindProgramNV, NULL, 794),
+ NAME_FUNC_OFFSET(13675, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 795),
+ NAME_FUNC_OFFSET(13694, glExecuteProgramNV, glExecuteProgramNV, NULL, 796),
+ NAME_FUNC_OFFSET(13713, glGenProgramsNV, glGenProgramsNV, NULL, 797),
+ NAME_FUNC_OFFSET(13729, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 798),
+ NAME_FUNC_OFFSET(13755, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 799),
+ NAME_FUNC_OFFSET(13781, glGetProgramStringNV, glGetProgramStringNV, NULL, 800),
+ NAME_FUNC_OFFSET(13802, glGetProgramivNV, glGetProgramivNV, NULL, 801),
+ NAME_FUNC_OFFSET(13819, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 802),
+ NAME_FUNC_OFFSET(13840, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 803),
+ NAME_FUNC_OFFSET(13868, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 804),
+ NAME_FUNC_OFFSET(13890, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 805),
+ NAME_FUNC_OFFSET(13912, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 806),
+ NAME_FUNC_OFFSET(13934, glIsProgramNV, glIsProgramNV, NULL, 807),
+ NAME_FUNC_OFFSET(13948, glLoadProgramNV, glLoadProgramNV, NULL, 808),
+ NAME_FUNC_OFFSET(13964, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 809),
+ NAME_FUNC_OFFSET(13989, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 810),
+ NAME_FUNC_OFFSET(14014, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 811),
+ NAME_FUNC_OFFSET(14042, glTrackMatrixNV, glTrackMatrixNV, NULL, 812),
+ NAME_FUNC_OFFSET(14058, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 813),
+ NAME_FUNC_OFFSET(14077, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 814),
+ NAME_FUNC_OFFSET(14097, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 815),
+ NAME_FUNC_OFFSET(14116, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 816),
+ NAME_FUNC_OFFSET(14136, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 817),
+ NAME_FUNC_OFFSET(14155, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 818),
+ NAME_FUNC_OFFSET(14175, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 819),
+ NAME_FUNC_OFFSET(14194, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 820),
+ NAME_FUNC_OFFSET(14214, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 821),
+ NAME_FUNC_OFFSET(14233, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 822),
+ NAME_FUNC_OFFSET(14253, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 823),
+ NAME_FUNC_OFFSET(14272, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 824),
+ NAME_FUNC_OFFSET(14292, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 825),
+ NAME_FUNC_OFFSET(14311, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 826),
+ NAME_FUNC_OFFSET(14331, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 827),
+ NAME_FUNC_OFFSET(14350, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 828),
+ NAME_FUNC_OFFSET(14370, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 829),
+ NAME_FUNC_OFFSET(14389, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 830),
+ NAME_FUNC_OFFSET(14409, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 831),
+ NAME_FUNC_OFFSET(14428, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 832),
+ NAME_FUNC_OFFSET(14448, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 833),
+ NAME_FUNC_OFFSET(14467, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 834),
+ NAME_FUNC_OFFSET(14487, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 835),
+ NAME_FUNC_OFFSET(14506, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 836),
+ NAME_FUNC_OFFSET(14526, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 837),
+ NAME_FUNC_OFFSET(14546, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 838),
+ NAME_FUNC_OFFSET(14567, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 839),
+ NAME_FUNC_OFFSET(14591, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 840),
+ NAME_FUNC_OFFSET(14612, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 841),
+ NAME_FUNC_OFFSET(14633, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 842),
+ NAME_FUNC_OFFSET(14654, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 843),
+ NAME_FUNC_OFFSET(14675, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 844),
+ NAME_FUNC_OFFSET(14696, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 845),
+ NAME_FUNC_OFFSET(14717, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 846),
+ NAME_FUNC_OFFSET(14738, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 847),
+ NAME_FUNC_OFFSET(14759, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 848),
+ NAME_FUNC_OFFSET(14780, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 849),
+ NAME_FUNC_OFFSET(14801, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 850),
+ NAME_FUNC_OFFSET(14822, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 851),
+ NAME_FUNC_OFFSET(14843, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 852),
+ NAME_FUNC_OFFSET(14865, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 853),
+ NAME_FUNC_OFFSET(14892, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 854),
+ NAME_FUNC_OFFSET(14919, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 855),
+ NAME_FUNC_OFFSET(14943, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 856),
+ NAME_FUNC_OFFSET(14967, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 857),
+ NAME_FUNC_OFFSET(14989, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 858),
+ NAME_FUNC_OFFSET(15011, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 859),
+ NAME_FUNC_OFFSET(15033, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 860),
+ NAME_FUNC_OFFSET(15058, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 861),
+ NAME_FUNC_OFFSET(15082, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 862),
+ NAME_FUNC_OFFSET(15104, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 863),
+ NAME_FUNC_OFFSET(15126, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 864),
+ NAME_FUNC_OFFSET(15148, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 865),
+ NAME_FUNC_OFFSET(15174, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 866),
+ NAME_FUNC_OFFSET(15197, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 867),
+ NAME_FUNC_OFFSET(15221, glPassTexCoordATI, glPassTexCoordATI, NULL, 868),
+ NAME_FUNC_OFFSET(15239, glSampleMapATI, glSampleMapATI, NULL, 869),
+ NAME_FUNC_OFFSET(15254, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 870),
+ NAME_FUNC_OFFSET(15285, glPointParameteriNV, glPointParameteriNV, NULL, 871),
+ NAME_FUNC_OFFSET(15305, glPointParameterivNV, glPointParameterivNV, NULL, 872),
+ NAME_FUNC_OFFSET(15326, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+ NAME_FUNC_OFFSET(15349, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
+ NAME_FUNC_OFFSET(15372, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
+ NAME_FUNC_OFFSET(15398, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
+ NAME_FUNC_OFFSET(15421, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+ NAME_FUNC_OFFSET(15442, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 878),
+ NAME_FUNC_OFFSET(15473, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 879),
+ NAME_FUNC_OFFSET(15504, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 880),
+ NAME_FUNC_OFFSET(15532, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 881),
+ NAME_FUNC_OFFSET(15561, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 882),
+ NAME_FUNC_OFFSET(15589, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 883),
+ NAME_FUNC_OFFSET(15618, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 884),
+ NAME_FUNC_OFFSET(15644, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 885),
+ NAME_FUNC_OFFSET(15665, gl_dispatch_stub_886, gl_dispatch_stub_886, NULL, 886),
+ NAME_FUNC_OFFSET(15681, gl_dispatch_stub_887, gl_dispatch_stub_887, NULL, 887),
+ NAME_FUNC_OFFSET(15698, gl_dispatch_stub_888, gl_dispatch_stub_888, NULL, 888),
+ NAME_FUNC_OFFSET(15715, gl_dispatch_stub_889, gl_dispatch_stub_889, NULL, 889),
+ NAME_FUNC_OFFSET(15731, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
+ NAME_FUNC_OFFSET(15744, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
+ NAME_FUNC_OFFSET(15761, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
+ NAME_FUNC_OFFSET(15771, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
+ NAME_FUNC_OFFSET(15782, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
+ NAME_FUNC_OFFSET(15796, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
+ NAME_FUNC_OFFSET(15815, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
+ NAME_FUNC_OFFSET(15830, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
+ NAME_FUNC_OFFSET(15846, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
+ NAME_FUNC_OFFSET(15865, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL, 899),
+ NAME_FUNC_OFFSET(15882, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
+ NAME_FUNC_OFFSET(15899, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+ NAME_FUNC_OFFSET(15922, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+ NAME_FUNC_OFFSET(15939, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+ NAME_FUNC_OFFSET(15957, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+ NAME_FUNC_OFFSET(15969, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
+ NAME_FUNC_OFFSET(15982, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
+ NAME_FUNC_OFFSET(15998, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
+ NAME_FUNC_OFFSET(16015, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
+ NAME_FUNC_OFFSET(16030, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
+ NAME_FUNC_OFFSET(16046, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
+ NAME_FUNC_OFFSET(16063, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
+ NAME_FUNC_OFFSET(16084, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
+ NAME_FUNC_OFFSET(16098, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
+ NAME_FUNC_OFFSET(16110, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
+ NAME_FUNC_OFFSET(16131, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
+ NAME_FUNC_OFFSET(16153, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
+ NAME_FUNC_OFFSET(16169, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
+ NAME_FUNC_OFFSET(16189, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
+ NAME_FUNC_OFFSET(16202, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
+ NAME_FUNC_OFFSET(16223, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
+ NAME_FUNC_OFFSET(16235, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
+ NAME_FUNC_OFFSET(16248, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
+ NAME_FUNC_OFFSET(16262, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
+ NAME_FUNC_OFFSET(16275, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
+ NAME_FUNC_OFFSET(16289, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
+ NAME_FUNC_OFFSET(16308, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
+ NAME_FUNC_OFFSET(16328, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
+ NAME_FUNC_OFFSET(16344, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
+ NAME_FUNC_OFFSET(16360, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
+ NAME_FUNC_OFFSET(16374, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
+ NAME_FUNC_OFFSET(16393, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
+ NAME_FUNC_OFFSET(16405, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
+ NAME_FUNC_OFFSET(16422, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
+ NAME_FUNC_OFFSET(16449, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 934),
+ NAME_FUNC_OFFSET(16470, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 935),
+ NAME_FUNC_OFFSET(16492, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 936),
+ NAME_FUNC_OFFSET(16520, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 937),
+ NAME_FUNC_OFFSET(16544, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 938),
+ NAME_FUNC_OFFSET(16569, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 939),
+ NAME_FUNC_OFFSET(16598, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 940),
+ NAME_FUNC_OFFSET(16624, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 941),
+ NAME_FUNC_OFFSET(16650, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 942),
+ NAME_FUNC_OFFSET(16676, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 943),
+ NAME_FUNC_OFFSET(16697, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 944),
+ NAME_FUNC_OFFSET(16719, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 945),
+ NAME_FUNC_OFFSET(16739, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 946),
+ NAME_FUNC_OFFSET(16780, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 947),
+ NAME_FUNC_OFFSET(16812, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 948),
+ NAME_FUNC_OFFSET(16831, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 949),
+ NAME_FUNC_OFFSET(16851, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 950),
+ NAME_FUNC_OFFSET(16876, gl_dispatch_stub_951, gl_dispatch_stub_951, NULL, 951),
+ NAME_FUNC_OFFSET(16897, gl_dispatch_stub_952, gl_dispatch_stub_952, NULL, 952),
+ NAME_FUNC_OFFSET(16921, gl_dispatch_stub_953, gl_dispatch_stub_953, NULL, 953),
+ NAME_FUNC_OFFSET(16951, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 954),
+ NAME_FUNC_OFFSET(16977, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 955),
+ NAME_FUNC_OFFSET(17002, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 956),
+ NAME_FUNC_OFFSET(17021, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 957),
+ NAME_FUNC_OFFSET(17045, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 958),
+ NAME_FUNC_OFFSET(17070, glUniform1uiEXT, glUniform1uiEXT, NULL, 959),
+ NAME_FUNC_OFFSET(17086, glUniform1uivEXT, glUniform1uivEXT, NULL, 960),
+ NAME_FUNC_OFFSET(17103, glUniform2uiEXT, glUniform2uiEXT, NULL, 961),
+ NAME_FUNC_OFFSET(17119, glUniform2uivEXT, glUniform2uivEXT, NULL, 962),
+ NAME_FUNC_OFFSET(17136, glUniform3uiEXT, glUniform3uiEXT, NULL, 963),
+ NAME_FUNC_OFFSET(17152, glUniform3uivEXT, glUniform3uivEXT, NULL, 964),
+ NAME_FUNC_OFFSET(17169, glUniform4uiEXT, glUniform4uiEXT, NULL, 965),
+ NAME_FUNC_OFFSET(17185, glUniform4uivEXT, glUniform4uivEXT, NULL, 966),
+ NAME_FUNC_OFFSET(17202, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 967),
+ NAME_FUNC_OFFSET(17223, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 968),
+ NAME_FUNC_OFFSET(17245, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 969),
+ NAME_FUNC_OFFSET(17267, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 970),
+ NAME_FUNC_OFFSET(17290, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 971),
+ NAME_FUNC_OFFSET(17311, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 972),
+ NAME_FUNC_OFFSET(17333, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 973),
+ NAME_FUNC_OFFSET(17355, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 974),
+ NAME_FUNC_OFFSET(17378, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 975),
+ NAME_FUNC_OFFSET(17399, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 976),
+ NAME_FUNC_OFFSET(17421, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 977),
+ NAME_FUNC_OFFSET(17443, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 978),
+ NAME_FUNC_OFFSET(17466, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 979),
+ NAME_FUNC_OFFSET(17488, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 980),
+ NAME_FUNC_OFFSET(17509, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 981),
+ NAME_FUNC_OFFSET(17531, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 982),
+ NAME_FUNC_OFFSET(17553, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 983),
+ NAME_FUNC_OFFSET(17576, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 984),
+ NAME_FUNC_OFFSET(17598, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 985),
+ NAME_FUNC_OFFSET(17621, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 986),
+ NAME_FUNC_OFFSET(17644, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 987),
+ NAME_FUNC_OFFSET(17670, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 988),
+ NAME_FUNC_OFFSET(17699, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 989),
+ NAME_FUNC_OFFSET(17721, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 990),
+ NAME_FUNC_OFFSET(17741, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 991),
+ NAME_FUNC_OFFSET(17760, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 992),
+ NAME_FUNC_OFFSET(17784, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 993),
+ NAME_FUNC_OFFSET(17808, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 994),
+ NAME_FUNC_OFFSET(17830, glClearColorIiEXT, glClearColorIiEXT, NULL, 995),
+ NAME_FUNC_OFFSET(17848, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 996),
+ NAME_FUNC_OFFSET(17867, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 997),
+ NAME_FUNC_OFFSET(17891, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 998),
+ NAME_FUNC_OFFSET(17916, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 999),
+ NAME_FUNC_OFFSET(17937, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 1000),
+ NAME_FUNC_OFFSET(17959, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 1001),
+ NAME_FUNC_OFFSET(17986, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 1002),
+ NAME_FUNC_OFFSET(18011, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 1003),
+ NAME_FUNC_OFFSET(18039, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 1004),
+ NAME_FUNC_OFFSET(18059, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1005),
+ NAME_FUNC_OFFSET(18081, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 1006),
+ NAME_FUNC_OFFSET(18102, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 1007),
+ NAME_FUNC_OFFSET(18128, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 1008),
+ NAME_FUNC_OFFSET(18161, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 1009),
+ NAME_FUNC_OFFSET(18192, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 1010),
+ NAME_FUNC_OFFSET(18213, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1011),
+ NAME_FUNC_OFFSET(18241, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1012),
+ NAME_FUNC_OFFSET(18264, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1013),
+ NAME_FUNC_OFFSET(18289, glActiveProgramEXT, glActiveProgramEXT, NULL, 1014),
+ NAME_FUNC_OFFSET(18308, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1015),
+ NAME_FUNC_OFFSET(18333, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1016),
+ NAME_FUNC_OFFSET(18355, glTextureBarrierNV, glTextureBarrierNV, NULL, 1017),
+ NAME_FUNC_OFFSET(18374, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+ NAME_FUNC_OFFSET(18399, gl_dispatch_stub_1019, gl_dispatch_stub_1019, NULL, 1019),
+ NAME_FUNC_OFFSET(18428, gl_dispatch_stub_1020, gl_dispatch_stub_1020, NULL, 1020),
+ NAME_FUNC_OFFSET(18459, gl_dispatch_stub_1021, gl_dispatch_stub_1021, NULL, 1021),
+ NAME_FUNC_OFFSET(18483, gl_dispatch_stub_1022, gl_dispatch_stub_1022, NULL, 1022),
+ NAME_FUNC_OFFSET(18508, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1023),
+ NAME_FUNC_OFFSET(18547, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1024),
+ NAME_FUNC_OFFSET(18576, glTexGenf, glTexGenf, NULL, 190),
+ NAME_FUNC_OFFSET(18589, glTexGenfv, glTexGenfv, NULL, 191),
+ NAME_FUNC_OFFSET(18603, glTexGeni, glTexGeni, NULL, 192),
+ NAME_FUNC_OFFSET(18616, glTexGeniv, glTexGeniv, NULL, 193),
+ NAME_FUNC_OFFSET(18630, glReadBuffer, glReadBuffer, NULL, 254),
+ NAME_FUNC_OFFSET(18645, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+ NAME_FUNC_OFFSET(18662, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+ NAME_FUNC_OFFSET(18679, glArrayElement, glArrayElement, NULL, 306),
+ NAME_FUNC_OFFSET(18697, glBindTexture, glBindTexture, NULL, 307),
+ NAME_FUNC_OFFSET(18714, glDrawArrays, glDrawArrays, NULL, 310),
+ NAME_FUNC_OFFSET(18730, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+ NAME_FUNC_OFFSET(18755, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+ NAME_FUNC_OFFSET(18775, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+ NAME_FUNC_OFFSET(18795, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+ NAME_FUNC_OFFSET(18818, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+ NAME_FUNC_OFFSET(18841, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+ NAME_FUNC_OFFSET(18861, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+ NAME_FUNC_OFFSET(18878, glGetPointerv, glGetPointerv, NULL, 329),
+ NAME_FUNC_OFFSET(18895, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+ NAME_FUNC_OFFSET(18910, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+ NAME_FUNC_OFFSET(18934, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+ NAME_FUNC_OFFSET(18953, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+ NAME_FUNC_OFFSET(18972, glBlendColor, glBlendColor, NULL, 336),
+ NAME_FUNC_OFFSET(18988, glBlendEquation, glBlendEquation, NULL, 337),
+ NAME_FUNC_OFFSET(19007, glBlendEquation, glBlendEquation, NULL, 337),
+ NAME_FUNC_OFFSET(19026, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+ NAME_FUNC_OFFSET(19049, glColorTable, glColorTable, NULL, 339),
+ NAME_FUNC_OFFSET(19065, glColorTable, glColorTable, NULL, 339),
+ NAME_FUNC_OFFSET(19081, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+ NAME_FUNC_OFFSET(19108, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+ NAME_FUNC_OFFSET(19135, glCopyColorTable, glCopyColorTable, NULL, 342),
+ NAME_FUNC_OFFSET(19155, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+ NAME_FUNC_OFFSET(19174, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+ NAME_FUNC_OFFSET(19193, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+ NAME_FUNC_OFFSET(19223, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+ NAME_FUNC_OFFSET(19253, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+ NAME_FUNC_OFFSET(19283, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+ NAME_FUNC_OFFSET(19313, glColorSubTable, glColorSubTable, NULL, 346),
+ NAME_FUNC_OFFSET(19332, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+ NAME_FUNC_OFFSET(19355, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+ NAME_FUNC_OFFSET(19380, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+ NAME_FUNC_OFFSET(19405, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+ NAME_FUNC_OFFSET(19432, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+ NAME_FUNC_OFFSET(19460, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+ NAME_FUNC_OFFSET(19487, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+ NAME_FUNC_OFFSET(19515, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+ NAME_FUNC_OFFSET(19544, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+ NAME_FUNC_OFFSET(19573, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+ NAME_FUNC_OFFSET(19599, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+ NAME_FUNC_OFFSET(19630, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+ NAME_FUNC_OFFSET(19661, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+ NAME_FUNC_OFFSET(19685, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+ NAME_FUNC_OFFSET(19708, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+ NAME_FUNC_OFFSET(19726, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+ NAME_FUNC_OFFSET(19755, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+ NAME_FUNC_OFFSET(19784, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+ NAME_FUNC_OFFSET(19799, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+ NAME_FUNC_OFFSET(19825, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+ NAME_FUNC_OFFSET(19851, glHistogram, glHistogram, NULL, 367),
+ NAME_FUNC_OFFSET(19866, glMinmax, glMinmax, NULL, 368),
+ NAME_FUNC_OFFSET(19878, glResetHistogram, glResetHistogram, NULL, 369),
+ NAME_FUNC_OFFSET(19898, glResetMinmax, glResetMinmax, NULL, 370),
+ NAME_FUNC_OFFSET(19915, glTexImage3D, glTexImage3D, NULL, 371),
+ NAME_FUNC_OFFSET(19931, glTexImage3D, glTexImage3D, NULL, 371),
+ NAME_FUNC_OFFSET(19947, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+ NAME_FUNC_OFFSET(19966, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+ NAME_FUNC_OFFSET(19985, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+ NAME_FUNC_OFFSET(20008, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+ NAME_FUNC_OFFSET(20031, glActiveTextureARB, glActiveTextureARB, NULL, 374),
+ NAME_FUNC_OFFSET(20047, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
+ NAME_FUNC_OFFSET(20069, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
+ NAME_FUNC_OFFSET(20087, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
+ NAME_FUNC_OFFSET(20106, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+ NAME_FUNC_OFFSET(20124, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+ NAME_FUNC_OFFSET(20143, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
+ NAME_FUNC_OFFSET(20161, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
+ NAME_FUNC_OFFSET(20180, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
+ NAME_FUNC_OFFSET(20198, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
+ NAME_FUNC_OFFSET(20217, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
+ NAME_FUNC_OFFSET(20235, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
+ NAME_FUNC_OFFSET(20254, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+ NAME_FUNC_OFFSET(20272, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+ NAME_FUNC_OFFSET(20291, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
+ NAME_FUNC_OFFSET(20309, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
+ NAME_FUNC_OFFSET(20328, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
+ NAME_FUNC_OFFSET(20346, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
+ NAME_FUNC_OFFSET(20365, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
+ NAME_FUNC_OFFSET(20383, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
+ NAME_FUNC_OFFSET(20402, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+ NAME_FUNC_OFFSET(20420, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+ NAME_FUNC_OFFSET(20439, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
+ NAME_FUNC_OFFSET(20457, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
+ NAME_FUNC_OFFSET(20476, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
+ NAME_FUNC_OFFSET(20494, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
+ NAME_FUNC_OFFSET(20513, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
+ NAME_FUNC_OFFSET(20531, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
+ NAME_FUNC_OFFSET(20550, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+ NAME_FUNC_OFFSET(20568, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+ NAME_FUNC_OFFSET(20587, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
+ NAME_FUNC_OFFSET(20605, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
+ NAME_FUNC_OFFSET(20624, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
+ NAME_FUNC_OFFSET(20642, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
+ NAME_FUNC_OFFSET(20661, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
+ NAME_FUNC_OFFSET(20684, glFramebufferTexture, glFramebufferTexture, NULL, 435),
+ NAME_FUNC_OFFSET(20708, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 438),
+ NAME_FUNC_OFFSET(20731, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 439),
+ NAME_FUNC_OFFSET(20754, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 440),
+ NAME_FUNC_OFFSET(20777, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 441),
+ NAME_FUNC_OFFSET(20800, glSampleCoverageARB, glSampleCoverageARB, NULL, 442),
+ NAME_FUNC_OFFSET(20817, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 443),
+ NAME_FUNC_OFFSET(20840, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 444),
+ NAME_FUNC_OFFSET(20863, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 445),
+ NAME_FUNC_OFFSET(20886, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 445),
+ NAME_FUNC_OFFSET(20912, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 446),
+ NAME_FUNC_OFFSET(20938, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 447),
+ NAME_FUNC_OFFSET(20964, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 448),
+ NAME_FUNC_OFFSET(20990, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 448),
+ NAME_FUNC_OFFSET(21019, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 449),
+ NAME_FUNC_OFFSET(21043, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 450),
+ NAME_FUNC_OFFSET(21070, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 451),
+ NAME_FUNC_OFFSET(21096, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 458),
+ NAME_FUNC_OFFSET(21116, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 459),
+ NAME_FUNC_OFFSET(21136, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 460),
+ NAME_FUNC_OFFSET(21156, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 461),
+ NAME_FUNC_OFFSET(21179, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 462),
+ NAME_FUNC_OFFSET(21203, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 463),
+ NAME_FUNC_OFFSET(21226, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 464),
+ NAME_FUNC_OFFSET(21250, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 470),
+ NAME_FUNC_OFFSET(21267, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 471),
+ NAME_FUNC_OFFSET(21285, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 472),
+ NAME_FUNC_OFFSET(21302, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 473),
+ NAME_FUNC_OFFSET(21320, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 474),
+ NAME_FUNC_OFFSET(21337, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 475),
+ NAME_FUNC_OFFSET(21355, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 476),
+ NAME_FUNC_OFFSET(21372, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 477),
+ NAME_FUNC_OFFSET(21390, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 478),
+ NAME_FUNC_OFFSET(21407, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 479),
+ NAME_FUNC_OFFSET(21425, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 480),
+ NAME_FUNC_OFFSET(21442, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 481),
+ NAME_FUNC_OFFSET(21460, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 482),
+ NAME_FUNC_OFFSET(21477, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 483),
+ NAME_FUNC_OFFSET(21495, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 484),
+ NAME_FUNC_OFFSET(21512, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 485),
+ NAME_FUNC_OFFSET(21530, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 486),
+ NAME_FUNC_OFFSET(21547, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 487),
+ NAME_FUNC_OFFSET(21565, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 488),
+ NAME_FUNC_OFFSET(21584, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 489),
+ NAME_FUNC_OFFSET(21603, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 490),
+ NAME_FUNC_OFFSET(21622, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 491),
+ NAME_FUNC_OFFSET(21641, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 492),
+ NAME_FUNC_OFFSET(21661, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 493),
+ NAME_FUNC_OFFSET(21681, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 494),
+ NAME_FUNC_OFFSET(21701, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 495),
+ NAME_FUNC_OFFSET(21719, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 496),
+ NAME_FUNC_OFFSET(21736, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 497),
+ NAME_FUNC_OFFSET(21754, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 498),
+ NAME_FUNC_OFFSET(21771, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 499),
+ NAME_FUNC_OFFSET(21789, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 500),
+ NAME_FUNC_OFFSET(21807, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 501),
+ NAME_FUNC_OFFSET(21824, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 502),
+ NAME_FUNC_OFFSET(21842, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 503),
+ NAME_FUNC_OFFSET(21861, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 504),
+ NAME_FUNC_OFFSET(21880, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 505),
+ NAME_FUNC_OFFSET(21899, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 506),
+ NAME_FUNC_OFFSET(21921, glBindBufferARB, glBindBufferARB, NULL, 507),
+ NAME_FUNC_OFFSET(21934, glBufferDataARB, glBufferDataARB, NULL, 508),
+ NAME_FUNC_OFFSET(21947, glBufferSubDataARB, glBufferSubDataARB, NULL, 509),
+ NAME_FUNC_OFFSET(21963, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 510),
+ NAME_FUNC_OFFSET(21979, glGenBuffersARB, glGenBuffersARB, NULL, 511),
+ NAME_FUNC_OFFSET(21992, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 512),
+ NAME_FUNC_OFFSET(22015, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 513),
+ NAME_FUNC_OFFSET(22035, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 513),
+ NAME_FUNC_OFFSET(22058, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 514),
+ NAME_FUNC_OFFSET(22077, glIsBufferARB, glIsBufferARB, NULL, 515),
+ NAME_FUNC_OFFSET(22088, glMapBufferARB, glMapBufferARB, NULL, 516),
+ NAME_FUNC_OFFSET(22100, glMapBufferARB, glMapBufferARB, NULL, 516),
+ NAME_FUNC_OFFSET(22115, glUnmapBufferARB, glUnmapBufferARB, NULL, 517),
+ NAME_FUNC_OFFSET(22129, glUnmapBufferARB, glUnmapBufferARB, NULL, 517),
+ NAME_FUNC_OFFSET(22146, glBeginQueryARB, glBeginQueryARB, NULL, 518),
+ NAME_FUNC_OFFSET(22159, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 519),
+ NAME_FUNC_OFFSET(22175, glEndQueryARB, glEndQueryARB, NULL, 520),
+ NAME_FUNC_OFFSET(22186, glGenQueriesARB, glGenQueriesARB, NULL, 521),
+ NAME_FUNC_OFFSET(22199, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 522),
+ NAME_FUNC_OFFSET(22218, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 523),
+ NAME_FUNC_OFFSET(22238, glGetQueryivARB, glGetQueryivARB, NULL, 524),
+ NAME_FUNC_OFFSET(22251, glIsQueryARB, glIsQueryARB, NULL, 525),
+ NAME_FUNC_OFFSET(22261, glCompileShaderARB, glCompileShaderARB, NULL, 527),
+ NAME_FUNC_OFFSET(22277, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 532),
+ NAME_FUNC_OFFSET(22296, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 538),
+ NAME_FUNC_OFFSET(22314, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 539),
+ NAME_FUNC_OFFSET(22335, glGetUniformfvARB, glGetUniformfvARB, NULL, 540),
+ NAME_FUNC_OFFSET(22350, glGetUniformivARB, glGetUniformivARB, NULL, 541),
+ NAME_FUNC_OFFSET(22365, glLinkProgramARB, glLinkProgramARB, NULL, 542),
+ NAME_FUNC_OFFSET(22379, glShaderSourceARB, glShaderSourceARB, NULL, 543),
+ NAME_FUNC_OFFSET(22394, glUniform1fARB, glUniform1fARB, NULL, 544),
+ NAME_FUNC_OFFSET(22406, glUniform1fvARB, glUniform1fvARB, NULL, 545),
+ NAME_FUNC_OFFSET(22419, glUniform1iARB, glUniform1iARB, NULL, 546),
+ NAME_FUNC_OFFSET(22431, glUniform1ivARB, glUniform1ivARB, NULL, 547),
+ NAME_FUNC_OFFSET(22444, glUniform2fARB, glUniform2fARB, NULL, 548),
+ NAME_FUNC_OFFSET(22456, glUniform2fvARB, glUniform2fvARB, NULL, 549),
+ NAME_FUNC_OFFSET(22469, glUniform2iARB, glUniform2iARB, NULL, 550),
+ NAME_FUNC_OFFSET(22481, glUniform2ivARB, glUniform2ivARB, NULL, 551),
+ NAME_FUNC_OFFSET(22494, glUniform3fARB, glUniform3fARB, NULL, 552),
+ NAME_FUNC_OFFSET(22506, glUniform3fvARB, glUniform3fvARB, NULL, 553),
+ NAME_FUNC_OFFSET(22519, glUniform3iARB, glUniform3iARB, NULL, 554),
+ NAME_FUNC_OFFSET(22531, glUniform3ivARB, glUniform3ivARB, NULL, 555),
+ NAME_FUNC_OFFSET(22544, glUniform4fARB, glUniform4fARB, NULL, 556),
+ NAME_FUNC_OFFSET(22556, glUniform4fvARB, glUniform4fvARB, NULL, 557),
+ NAME_FUNC_OFFSET(22569, glUniform4iARB, glUniform4iARB, NULL, 558),
+ NAME_FUNC_OFFSET(22581, glUniform4ivARB, glUniform4ivARB, NULL, 559),
+ NAME_FUNC_OFFSET(22594, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 560),
+ NAME_FUNC_OFFSET(22613, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 561),
+ NAME_FUNC_OFFSET(22632, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 562),
+ NAME_FUNC_OFFSET(22651, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 563),
+ NAME_FUNC_OFFSET(22664, glValidateProgramARB, glValidateProgramARB, NULL, 564),
+ NAME_FUNC_OFFSET(22682, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 565),
+ NAME_FUNC_OFFSET(22703, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 566),
+ NAME_FUNC_OFFSET(22721, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 567),
+ NAME_FUNC_OFFSET(22741, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
+ NAME_FUNC_OFFSET(22755, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
+ NAME_FUNC_OFFSET(22772, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
+ NAME_FUNC_OFFSET(22788, glClampColorARB, glClampColorARB, NULL, 569),
+ NAME_FUNC_OFFSET(22801, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
+ NAME_FUNC_OFFSET(22826, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
+ NAME_FUNC_OFFSET(22848, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
+ NAME_FUNC_OFFSET(22875, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
+ NAME_FUNC_OFFSET(22899, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 572),
+ NAME_FUNC_OFFSET(22935, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 574),
+ NAME_FUNC_OFFSET(22957, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 575),
+ NAME_FUNC_OFFSET(22985, glMapBufferRange, glMapBufferRange, NULL, 576),
+ NAME_FUNC_OFFSET(23005, glTexBufferARB, glTexBufferARB, NULL, 577),
+ NAME_FUNC_OFFSET(23017, glBindVertexArray, glBindVertexArray, NULL, 578),
+ NAME_FUNC_OFFSET(23038, glGenVertexArrays, glGenVertexArrays, NULL, 579),
+ NAME_FUNC_OFFSET(23059, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 599),
+ NAME_FUNC_OFFSET(23093, glBlendEquationiARB, glBlendEquationiARB, NULL, 600),
+ NAME_FUNC_OFFSET(23119, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 601),
+ NAME_FUNC_OFFSET(23149, glBlendFunciARB, glBlendFunciARB, NULL, 602),
+ NAME_FUNC_OFFSET(23171, glClearDepthf, glClearDepthf, NULL, 669),
+ NAME_FUNC_OFFSET(23188, glDepthRangef, glDepthRangef, NULL, 670),
+ NAME_FUNC_OFFSET(23205, gl_dispatch_stub_674, gl_dispatch_stub_674, NULL, 674),
+ NAME_FUNC_OFFSET(23227, gl_dispatch_stub_675, gl_dispatch_stub_675, NULL, 675),
+ NAME_FUNC_OFFSET(23246, gl_dispatch_stub_676, gl_dispatch_stub_676, NULL, 676),
+ NAME_FUNC_OFFSET(23269, gl_dispatch_stub_729, gl_dispatch_stub_729, NULL, 729),
+ NAME_FUNC_OFFSET(23285, gl_dispatch_stub_730, gl_dispatch_stub_730, NULL, 730),
+ NAME_FUNC_OFFSET(23304, glPointParameterfEXT, glPointParameterfEXT, NULL, 737),
+ NAME_FUNC_OFFSET(23322, glPointParameterfEXT, glPointParameterfEXT, NULL, 737),
+ NAME_FUNC_OFFSET(23343, glPointParameterfEXT, glPointParameterfEXT, NULL, 737),
+ NAME_FUNC_OFFSET(23365, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 738),
+ NAME_FUNC_OFFSET(23384, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 738),
+ NAME_FUNC_OFFSET(23406, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 738),
+ NAME_FUNC_OFFSET(23429, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 741),
+ NAME_FUNC_OFFSET(23448, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 742),
+ NAME_FUNC_OFFSET(23468, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 743),
+ NAME_FUNC_OFFSET(23487, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 744),
+ NAME_FUNC_OFFSET(23507, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 745),
+ NAME_FUNC_OFFSET(23526, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 746),
+ NAME_FUNC_OFFSET(23546, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 747),
+ NAME_FUNC_OFFSET(23565, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 748),
+ NAME_FUNC_OFFSET(23585, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 749),
+ NAME_FUNC_OFFSET(23604, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 750),
+ NAME_FUNC_OFFSET(23624, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 751),
+ NAME_FUNC_OFFSET(23644, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 752),
+ NAME_FUNC_OFFSET(23665, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 753),
+ NAME_FUNC_OFFSET(23685, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 754),
+ NAME_FUNC_OFFSET(23706, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 755),
+ NAME_FUNC_OFFSET(23726, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 756),
+ NAME_FUNC_OFFSET(23747, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 757),
+ NAME_FUNC_OFFSET(23771, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 758),
+ NAME_FUNC_OFFSET(23789, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 759),
+ NAME_FUNC_OFFSET(23809, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 760),
+ NAME_FUNC_OFFSET(23827, glFogCoorddEXT, glFogCoorddEXT, NULL, 761),
+ NAME_FUNC_OFFSET(23839, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 762),
+ NAME_FUNC_OFFSET(23852, glFogCoordfEXT, glFogCoordfEXT, NULL, 763),
+ NAME_FUNC_OFFSET(23864, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 764),
+ NAME_FUNC_OFFSET(23877, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 765),
+ NAME_FUNC_OFFSET(23897, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 765),
+ NAME_FUNC_OFFSET(23921, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 765),
+ NAME_FUNC_OFFSET(23944, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 767),
+ NAME_FUNC_OFFSET(23958, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 767),
+ NAME_FUNC_OFFSET(23975, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 768),
+ NAME_FUNC_OFFSET(23990, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 768),
+ NAME_FUNC_OFFSET(24008, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 769),
+ NAME_FUNC_OFFSET(24022, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 769),
+ NAME_FUNC_OFFSET(24039, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 770),
+ NAME_FUNC_OFFSET(24054, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 770),
+ NAME_FUNC_OFFSET(24072, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 771),
+ NAME_FUNC_OFFSET(24086, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 771),
+ NAME_FUNC_OFFSET(24103, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 772),
+ NAME_FUNC_OFFSET(24118, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 772),
+ NAME_FUNC_OFFSET(24136, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 773),
+ NAME_FUNC_OFFSET(24150, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 773),
+ NAME_FUNC_OFFSET(24167, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 774),
+ NAME_FUNC_OFFSET(24182, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 774),
+ NAME_FUNC_OFFSET(24200, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 775),
+ NAME_FUNC_OFFSET(24214, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 775),
+ NAME_FUNC_OFFSET(24231, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 776),
+ NAME_FUNC_OFFSET(24246, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 776),
+ NAME_FUNC_OFFSET(24264, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 777),
+ NAME_FUNC_OFFSET(24278, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 777),
+ NAME_FUNC_OFFSET(24295, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 778),
+ NAME_FUNC_OFFSET(24310, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 778),
+ NAME_FUNC_OFFSET(24328, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 779),
+ NAME_FUNC_OFFSET(24342, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 779),
+ NAME_FUNC_OFFSET(24359, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 780),
+ NAME_FUNC_OFFSET(24374, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 780),
+ NAME_FUNC_OFFSET(24392, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 781),
+ NAME_FUNC_OFFSET(24406, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 781),
+ NAME_FUNC_OFFSET(24423, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 782),
+ NAME_FUNC_OFFSET(24438, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 782),
+ NAME_FUNC_OFFSET(24456, glBindProgramNV, glBindProgramNV, NULL, 794),
+ NAME_FUNC_OFFSET(24473, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 795),
+ NAME_FUNC_OFFSET(24493, glGenProgramsNV, glGenProgramsNV, NULL, 797),
+ NAME_FUNC_OFFSET(24510, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 803),
+ NAME_FUNC_OFFSET(24536, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 803),
+ NAME_FUNC_OFFSET(24565, glIsProgramNV, glIsProgramNV, NULL, 807),
+ NAME_FUNC_OFFSET(24580, glPointParameteriNV, glPointParameteriNV, NULL, 871),
+ NAME_FUNC_OFFSET(24598, glPointParameterivNV, glPointParameterivNV, NULL, 872),
+ NAME_FUNC_OFFSET(24617, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
+ NAME_FUNC_OFFSET(24638, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
+ NAME_FUNC_OFFSET(24662, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+ NAME_FUNC_OFFSET(24678, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+ NAME_FUNC_OFFSET(24697, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 884),
+ NAME_FUNC_OFFSET(24721, gl_dispatch_stub_886, gl_dispatch_stub_886, NULL, 886),
+ NAME_FUNC_OFFSET(24734, gl_dispatch_stub_887, gl_dispatch_stub_887, NULL, 887),
+ NAME_FUNC_OFFSET(24748, gl_dispatch_stub_888, gl_dispatch_stub_888, NULL, 888),
+ NAME_FUNC_OFFSET(24762, gl_dispatch_stub_889, gl_dispatch_stub_889, NULL, 889),
+ NAME_FUNC_OFFSET(24775, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
+ NAME_FUNC_OFFSET(24785, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
+ NAME_FUNC_OFFSET(24799, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
+ NAME_FUNC_OFFSET(24806, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
+ NAME_FUNC_OFFSET(24814, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
+ NAME_FUNC_OFFSET(24825, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
+ NAME_FUNC_OFFSET(24841, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
+ NAME_FUNC_OFFSET(24853, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
+ NAME_FUNC_OFFSET(24866, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
+ NAME_FUNC_OFFSET(24882, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL, 899),
+ NAME_FUNC_OFFSET(24896, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+ NAME_FUNC_OFFSET(24916, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+ NAME_FUNC_OFFSET(24930, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+ NAME_FUNC_OFFSET(24945, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+ NAME_FUNC_OFFSET(24954, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
+ NAME_FUNC_OFFSET(24964, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
+ NAME_FUNC_OFFSET(24977, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
+ NAME_FUNC_OFFSET(24991, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
+ NAME_FUNC_OFFSET(25003, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
+ NAME_FUNC_OFFSET(25016, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
+ NAME_FUNC_OFFSET(25030, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
+ NAME_FUNC_OFFSET(25048, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
+ NAME_FUNC_OFFSET(25059, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
+ NAME_FUNC_OFFSET(25068, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
+ NAME_FUNC_OFFSET(25086, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
+ NAME_FUNC_OFFSET(25105, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
+ NAME_FUNC_OFFSET(25118, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
+ NAME_FUNC_OFFSET(25135, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
+ NAME_FUNC_OFFSET(25145, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
+ NAME_FUNC_OFFSET(25163, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
+ NAME_FUNC_OFFSET(25172, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
+ NAME_FUNC_OFFSET(25182, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
+ NAME_FUNC_OFFSET(25193, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
+ NAME_FUNC_OFFSET(25209, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
+ NAME_FUNC_OFFSET(25226, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
+ NAME_FUNC_OFFSET(25239, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
+ NAME_FUNC_OFFSET(25252, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
+ NAME_FUNC_OFFSET(25263, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
+ NAME_FUNC_OFFSET(25279, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
+ NAME_FUNC_OFFSET(25288, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
+ NAME_FUNC_OFFSET(25312, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
+ NAME_FUNC_OFFSET(25339, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
+ NAME_FUNC_OFFSET(25366, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 934),
+ NAME_FUNC_OFFSET(25384, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 934),
+ NAME_FUNC_OFFSET(25405, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 935),
+ NAME_FUNC_OFFSET(25424, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 935),
+ NAME_FUNC_OFFSET(25446, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 936),
+ NAME_FUNC_OFFSET(25471, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 936),
+ NAME_FUNC_OFFSET(25499, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 937),
+ NAME_FUNC_OFFSET(25520, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 937),
+ NAME_FUNC_OFFSET(25544, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 938),
+ NAME_FUNC_OFFSET(25566, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 938),
+ NAME_FUNC_OFFSET(25591, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 939),
+ NAME_FUNC_OFFSET(25617, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 939),
+ NAME_FUNC_OFFSET(25646, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 940),
+ NAME_FUNC_OFFSET(25669, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 941),
+ NAME_FUNC_OFFSET(25692, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 941),
+ NAME_FUNC_OFFSET(25718, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 942),
+ NAME_FUNC_OFFSET(25741, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 942),
+ NAME_FUNC_OFFSET(25767, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 943),
+ NAME_FUNC_OFFSET(25785, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 943),
+ NAME_FUNC_OFFSET(25806, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 944),
+ NAME_FUNC_OFFSET(25825, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 944),
+ NAME_FUNC_OFFSET(25847, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 945),
+ NAME_FUNC_OFFSET(25864, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 945),
+ NAME_FUNC_OFFSET(25884, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 946),
+ NAME_FUNC_OFFSET(25922, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 946),
+ NAME_FUNC_OFFSET(25963, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 947),
+ NAME_FUNC_OFFSET(25992, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 947),
+ NAME_FUNC_OFFSET(26024, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 948),
+ NAME_FUNC_OFFSET(26040, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 948),
+ NAME_FUNC_OFFSET(26059, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 949),
+ NAME_FUNC_OFFSET(26076, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 949),
+ NAME_FUNC_OFFSET(26096, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 950),
+ NAME_FUNC_OFFSET(26118, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 950),
+ NAME_FUNC_OFFSET(26143, gl_dispatch_stub_951, gl_dispatch_stub_951, NULL, 951),
+ NAME_FUNC_OFFSET(26161, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 954),
+ NAME_FUNC_OFFSET(26184, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 955),
+ NAME_FUNC_OFFSET(26206, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 956),
+ NAME_FUNC_OFFSET(26222, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 957),
+ NAME_FUNC_OFFSET(26243, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 958),
+ NAME_FUNC_OFFSET(26265, glUniform1uiEXT, glUniform1uiEXT, NULL, 959),
+ NAME_FUNC_OFFSET(26278, glUniform1uivEXT, glUniform1uivEXT, NULL, 960),
+ NAME_FUNC_OFFSET(26292, glUniform2uiEXT, glUniform2uiEXT, NULL, 961),
+ NAME_FUNC_OFFSET(26305, glUniform2uivEXT, glUniform2uivEXT, NULL, 962),
+ NAME_FUNC_OFFSET(26319, glUniform3uiEXT, glUniform3uiEXT, NULL, 963),
+ NAME_FUNC_OFFSET(26332, glUniform3uivEXT, glUniform3uivEXT, NULL, 964),
+ NAME_FUNC_OFFSET(26346, glUniform4uiEXT, glUniform4uiEXT, NULL, 965),
+ NAME_FUNC_OFFSET(26359, glUniform4uivEXT, glUniform4uivEXT, NULL, 966),
+ NAME_FUNC_OFFSET(26373, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 967),
+ NAME_FUNC_OFFSET(26391, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 968),
+ NAME_FUNC_OFFSET(26410, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 969),
+ NAME_FUNC_OFFSET(26429, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 970),
+ NAME_FUNC_OFFSET(26449, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 971),
+ NAME_FUNC_OFFSET(26467, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 972),
+ NAME_FUNC_OFFSET(26486, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 973),
+ NAME_FUNC_OFFSET(26505, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 974),
+ NAME_FUNC_OFFSET(26525, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 975),
+ NAME_FUNC_OFFSET(26543, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 976),
+ NAME_FUNC_OFFSET(26562, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 977),
+ NAME_FUNC_OFFSET(26581, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 978),
+ NAME_FUNC_OFFSET(26601, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 979),
+ NAME_FUNC_OFFSET(26620, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 980),
+ NAME_FUNC_OFFSET(26638, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 981),
+ NAME_FUNC_OFFSET(26657, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 982),
+ NAME_FUNC_OFFSET(26676, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 983),
+ NAME_FUNC_OFFSET(26696, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 984),
+ NAME_FUNC_OFFSET(26715, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 985),
+ NAME_FUNC_OFFSET(26735, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 986),
+ NAME_FUNC_OFFSET(26755, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 987),
+ NAME_FUNC_OFFSET(26778, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 988),
+ NAME_FUNC_OFFSET(26804, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 988),
+ NAME_FUNC_OFFSET(26833, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 989),
+ NAME_FUNC_OFFSET(26846, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 990),
+ NAME_FUNC_OFFSET(26857, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 991),
+ NAME_FUNC_OFFSET(26867, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 992),
+ NAME_FUNC_OFFSET(26883, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 993),
+ NAME_FUNC_OFFSET(26899, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 994),
+ NAME_FUNC_OFFSET(26912, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 997),
+ NAME_FUNC_OFFSET(26933, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 998),
+ NAME_FUNC_OFFSET(26955, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 999),
+ NAME_FUNC_OFFSET(26973, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 1000),
+ NAME_FUNC_OFFSET(26992, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 1001),
+ NAME_FUNC_OFFSET(27017, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 1002),
+ NAME_FUNC_OFFSET(27040, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 1003),
+ NAME_FUNC_OFFSET(27065, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 1004),
+ NAME_FUNC_OFFSET(27082, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 1006),
+ NAME_FUNC_OFFSET(27100, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 1007),
+ NAME_FUNC_OFFSET(27123, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 1008),
+ NAME_FUNC_OFFSET(27153, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 1009),
+ NAME_FUNC_OFFSET(27181, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 1010),
+ NAME_FUNC_OFFSET(27199, gl_dispatch_stub_1021, gl_dispatch_stub_1021, NULL, 1021),
+ NAME_FUNC_OFFSET(27220, gl_dispatch_stub_1022, gl_dispatch_stub_1022, NULL, 1022),
NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
};
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c index 684533127..900349a60 100644 --- a/xorg-server/glx/glxcmds.c +++ b/xorg-server/glx/glxcmds.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <string.h> #include <assert.h> diff --git a/xorg-server/glx/glxcmdsswap.c b/xorg-server/glx/glxcmdsswap.c index 57ba1638e..f4ee1cee5 100644 --- a/xorg-server/glx/glxcmdsswap.c +++ b/xorg-server/glx/glxcmdsswap.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <string.h> #include "glxserver.h" diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c index 28c381ab4..7b1c67732 100644 --- a/xorg-server/glx/glxdriswrast.c +++ b/xorg-server/glx/glxdriswrast.c @@ -26,11 +26,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <stdint.h> #include <stdio.h> diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c index d824957d3..c078cab4d 100644 --- a/xorg-server/glx/indirect_dispatch.c +++ b/xorg-server/glx/indirect_dispatch.c @@ -27,6 +27,7 @@ #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
+#include "glheader.h"
#else
#include "glheader.h"
diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c index 629d5085a..845710727 100644 --- a/xorg-server/glx/indirect_dispatch_swap.c +++ b/xorg-server/glx/indirect_dispatch_swap.c @@ -27,6 +27,7 @@ #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
+#include "glheader.h"
#else
#include "glheader.h"
diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c index 629fb7d3f..4d4c1a2f6 100644 --- a/xorg-server/glx/indirect_program.c +++ b/xorg-server/glx/indirect_program.c @@ -31,11 +31,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxbyteorder.h" diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index e1e666317..56e6ef84d 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -25,11 +25,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxbyteorder.h" diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c index 74fd349a3..8ab5afb16 100644 --- a/xorg-server/glx/indirect_util.c +++ b/xorg-server/glx/indirect_util.c @@ -25,11 +25,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <string.h> diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c index 9901943e5..4eef3d434 100644 --- a/xorg-server/glx/render2.c +++ b/xorg-server/glx/render2.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <glxserver.h> #include "unpack.h" diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c index dc5981376..f7525fad1 100644 --- a/xorg-server/glx/render2swap.c +++ b/xorg-server/glx/render2swap.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "unpack.h" diff --git a/xorg-server/glx/renderpix.c b/xorg-server/glx/renderpix.c index 10864326e..97c5b9c7f 100644 --- a/xorg-server/glx/renderpix.c +++ b/xorg-server/glx/renderpix.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "unpack.h" diff --git a/xorg-server/glx/renderpixswap.c b/xorg-server/glx/renderpixswap.c index 637385a65..9e6451065 100644 --- a/xorg-server/glx/renderpixswap.c +++ b/xorg-server/glx/renderpixswap.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "unpack.h" diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c index a73c18cd5..4bf65ed93 100644 --- a/xorg-server/glx/single2.c +++ b/xorg-server/glx/single2.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <string.h> #include <stdio.h> diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c index dc7d07eb6..47ff3e4c7 100644 --- a/xorg-server/glx/single2swap.c +++ b/xorg-server/glx/single2swap.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxutil.h" diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c index 876c97cbb..ec8887f53 100644 --- a/xorg-server/glx/singlepix.c +++ b/xorg-server/glx/singlepix.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxext.h" diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c index 50913cf5a..ac7de2ac3 100644 --- a/xorg-server/glx/singlepixswap.c +++ b/xorg-server/glx/singlepixswap.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxext.h" diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c index 4f564404a..5cfac92f8 100644 --- a/xorg-server/glx/singlesize.c +++ b/xorg-server/glx/singlesize.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include <GL/gl.h> #include "glxserver.h" diff --git a/xorg-server/glx/swap_interval.c b/xorg-server/glx/swap_interval.c index 9879a6cc8..4eb97a535 100644 --- a/xorg-server/glx/swap_interval.c +++ b/xorg-server/glx/swap_interval.c @@ -24,11 +24,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxutil.h" diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c index 47ddf8f7c..a4130928a 100644 --- a/xorg-server/glx/xfont.c +++ b/xorg-server/glx/xfont.c @@ -30,11 +30,8 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#else - -#include "glheader.h" - #endif +#include "glheader.h" #include "glxserver.h" #include "glxutil.h" diff --git a/xorg-server/hw/xfree86/os-support/bus/nobus.c b/xorg-server/hw/xfree86/os-support/bus/nobus.c index dca58fee2..dc36ecd0a 100644 --- a/xorg-server/hw/xfree86/os-support/bus/nobus.c +++ b/xorg-server/hw/xfree86/os-support/bus/nobus.c @@ -1,5 +1,5 @@ static void -__noop_to_appease_ar__() +__noop_to_appease_ar__(void) { return; } diff --git a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c index 9c6ed4b8d..da486c051 100644 --- a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c +++ b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c @@ -47,7 +47,7 @@ xf86GARTCloseScreen(int screenNum) } Bool -xf86AgpGARTSupported() +xf86AgpGARTSupported(void) { return FALSE; } diff --git a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c index 30688c0b5..eeacee9cc 100644 --- a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c @@ -36,13 +36,13 @@ #include "xf86_OSlib.h" Bool -xf86EnableIO() +xf86EnableIO(void) { return TRUE; } void -xf86DisableIO() +xf86DisableIO(void) { return; } diff --git a/xorg-server/hw/xfree86/os-support/stub/stub_init.c b/xorg-server/hw/xfree86/os-support/stub/stub_init.c index 629675d68..d3e0c3f29 100644 --- a/xorg-server/hw/xfree86/os-support/stub/stub_init.c +++ b/xorg-server/hw/xfree86/os-support/stub/stub_init.c @@ -5,12 +5,12 @@ #include "xf86_OSlib.h" void -xf86OpenConsole() +xf86OpenConsole(void) { } void -xf86CloseConsole() +xf86CloseConsole(void) { } @@ -21,6 +21,6 @@ xf86ProcessArgument(int argc, char *argv[], int i) } void -xf86UseMsg() +xf86UseMsg(void) { } diff --git a/xorg-server/hw/xfree86/sdksyms.sh b/xorg-server/hw/xfree86/sdksyms.sh index fa1989379..48b48b5db 100644 --- a/xorg-server/hw/xfree86/sdksyms.sh +++ b/xorg-server/hw/xfree86/sdksyms.sh @@ -259,6 +259,7 @@ cat > sdksyms.c << EOF #include "dixevents.h" #include "dixfont.h" #include "dixfontstr.h" +#include "dixfontstubs.h" #include "dixgrabs.h" #include "dixstruct.h" #include "exevents.h" diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index eaf475fff..af5bb9961 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am @@ -148,6 +148,8 @@ XWin_SOURCES = $(SRCS) INCLUDES = -I$(top_srcdir)/miext/rootless +XWIN_SYS_LIBS += -ldxguid + XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) XWin_LDFLAGS = -mwindows -static diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c index 18d3521e0..9733e7526 100644 --- a/xorg-server/hw/xwin/glx/glwrap.c +++ b/xorg-server/hw/xwin/glx/glwrap.c @@ -39,6 +39,7 @@ #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> #include <glx/glapi.h> diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c index c1eb254f2..f4eb595bb 100644 --- a/xorg-server/hw/xwin/glx/indirect.c +++ b/xorg-server/hw/xwin/glx/indirect.c @@ -79,6 +79,7 @@ #endif #include "glwindows.h" +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxutil.h> #include <glx/extension_string.h> diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c index d74addb69..6d794b671 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c @@ -39,6 +39,7 @@ #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> #include <glx/glapi.h> diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c index c5b799079..8597e5b4a 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c @@ -1,3 +1,6 @@ +#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
#include <X11/Xwindows.h>
#include <GL/gl.h>
#include <GL/glext.h>
@@ -5,6 +8,7 @@ #include <GL/internal/dri_interface.h>
#include <stdint.h>
+#include <glx/glheader.h>
#include <glx/glapi.h>
#include <glx/glapitable.h>
@@ -17,6 +21,7 @@ typedef int BOOL; #define PRINTF(...)
#endif
+#undef PUBLIC
#define PUBLIC __declspec(dllexport)
BOOL colorIndexMode = FALSE;
diff --git a/xorg-server/hw/xwin/winms.h b/xorg-server/hw/xwin/winms.h index 4355baeb8..5282fc982 100644 --- a/xorg-server/hw/xwin/winms.h +++ b/xorg-server/hw/xwin/winms.h @@ -42,7 +42,11 @@ #include <X11/Xwindows.h> #include <windowsx.h> +#pragma push_macro("Status") +#undef Status +#define Status wStatus #include "ddraw.h" +#pragma pop_macro("Status") #undef CreateWindow diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c index 5d547dbdd..961f2fd8d 100644 --- a/xorg-server/hw/xwin/winmultiwindowwm.c +++ b/xorg-server/hw/xwin/winmultiwindowwm.c @@ -57,8 +57,6 @@ typedef int pid_t; #include <X11/Xwindows.h> /* Local headers */ -#include "objbase.h" -#include "ddraw.h" #include "winwindow.h" #include "winprefs.h" #include "window.h" diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c index f6ba49a8a..709d07527 100644 --- a/xorg-server/hw/xwin/winshaddd.c +++ b/xorg-server/hw/xwin/winshaddd.c @@ -36,8 +36,6 @@ #endif #include "win.h" - - /* * Local prototypes */ diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c index 2a28d8717..2c80a6bf0 100644 --- a/xorg-server/hw/xwin/winshadddnl.c +++ b/xorg-server/hw/xwin/winshadddnl.c @@ -36,26 +36,6 @@ #endif #include "win.h" -/* - * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly, - * so we have to redefine it here. - */ -#ifndef _MSC_VER -#ifdef DEFINE_GUID -#undef DEFINE_GUID -#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif /* DEFINE_GUID */ -#endif - -/* - * FIXME: Headers are broken, IID_IDirectDraw4 has to be defined - * here manually. Should be handled by ddraw.h - */ -#ifndef IID_IDirectDraw4 -DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00, - 0xc0, 0x4f, 0xd9, 0x30, 0xc5); -#endif /* IID_IDirectDraw4 */ - #define FAIL_MSG_MAX_BLT 10 /* @@ -596,50 +576,6 @@ winFreeFBShadowDDNL(ScreenPtr pScreen) pScreenInfo->pfb = NULL; } -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) -/* - * Create a DirectDraw surface for the new multi-window window - */ - -static - Bool -winFinishCreateWindowsWindowDDNL(WindowPtr pWin) -{ - winWindowPriv(pWin); - winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv; - HRESULT ddrval = DD_OK; - DDSURFACEDESC2 ddsd; - int iWidth, iHeight; - int iX, iY; - - winDebug("winFinishCreateWindowsWindowDDNL!\n\n"); - - iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN); - iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN); - - iWidth = pWin->drawable.width; - iHeight = pWin->drawable.height; - - /* Describe the primary surface */ - ZeroMemory(&ddsd, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - ddsd.dwHeight = iHeight; - ddsd.dwWidth = iWidth; - - /* Create the primary surface */ - ddrval = IDirectDraw4_CreateSurface(pScreenPriv->pdd4, - &ddsd, &pWinPriv->pddsPrimary4, NULL); - if (FAILED(ddrval)) { - ErrorF("winFinishCreateWindowsWindowDDNL - Could not create primary " - "surface: %08x\n", (unsigned int) ddrval); - return FALSE; - } - return TRUE; -} -#endif - /* * Transfer the damaged regions of the shadow framebuffer to the display. */ @@ -1266,7 +1202,7 @@ winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen) pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL; #ifdef XWIN_MULTIWINDOW pScreenPriv->pwinFinishCreateWindowsWindow - = winFinishCreateWindowsWindowDDNL; + = (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA; #endif return TRUE; diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 8757f15e2..7d5a88a55 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -76,15 +76,6 @@ typedef struct { #ifdef XWIN_GLX_WINDOWS Bool fWglUsed; #endif - - /* Privates used by primary fb DirectDraw server */ - LPDDSURFACEDESC pddsdPrimary; - - /* Privates used by shadow fb DirectDraw Nonlocking server */ - LPDIRECTDRAWSURFACE4 pddsPrimary4; - - /* Privates used by both shadow fb DirectDraw servers */ - LPDIRECTDRAWCLIPPER pddcPrimary; } winPrivWinRec, *winPrivWinPtr; #ifdef XWIN_MULTIWINDOW diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am index 33116f284..5cdea1d15 100644 --- a/xorg-server/include/Makefile.am +++ b/xorg-server/include/Makefile.am @@ -69,6 +69,6 @@ AM_CFLAGS = $(DIX_CFLAGS) EXTRA_DIST = \ dix-config-apple-verbatim.h \ - eventconvert.h eventstr.h inpututils.h \ + dixfontstubs.h eventconvert.h eventstr.h inpututils.h \ protocol-versions.h \ xsha1.h diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index 578f249b3..b270a3238 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -157,6 +157,9 @@ /* Define to use libgcrypt SHA1 functions */ #undef HAVE_SHA1_IN_LIBGCRYPT +/* Define to use libnettle SHA1 functions */ +#undef HAVE_SHA1_IN_LIBNETTLE + /* Define to use libsha1 for SHA1 */ #undef HAVE_SHA1_IN_LIBSHA1 diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index 74123b51b..171e56e11 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -88,12 +88,12 @@ SOFTWARE. #define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)\ {\ - int rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode);\ - if (rc != Success)\ - return rc;\ - rc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);\ - if (rc != Success)\ - return rc;\ + int tmprc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode);\ + if (tmprc != Success)\ + return tmprc;\ + tmprc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);\ + if (tmprc != Success)\ + return tmprc;\ if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen))\ return BadMatch;\ }\ diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h index 3d09eb5ae..0a5f105c0 100644 --- a/xorg-server/include/dixfont.h +++ b/xorg-server/include/dixfont.h @@ -28,6 +28,7 @@ SOFTWARE. #include <X11/fonts/font.h> #include "closure.h" #include <X11/fonts/fontstruct.h> +#include <X11/fonts/fontproto.h> #define NullDIXFontProp ((DIXFontPropPtr)0) @@ -143,42 +144,4 @@ extern _X_EXPORT void SetGlyphCachingMode(int /*newmode */ ); extern _X_EXPORT void register_fpe_functions(void); -/* - * libXfont stubs. - */ -extern _X_EXPORT int client_auth_generation(ClientPtr client); - -extern _X_EXPORT void DeleteFontClientID(Font id); - -extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num); - -extern _X_EXPORT int GetDefaultPointSize(void); - -extern _X_EXPORT Font GetNewFontClientID(void); - -extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe, - BlockHandlerProcPtr block_handler); - -extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func, - InitFpeFunc init_func, - FreeFpeFunc free_func, - ResetFpeFunc reset_func, - OpenFontFunc open_func, - CloseFontFunc close_func, - ListFontsFunc list_func, - StartLfwiFunc start_lfwi_func, - NextLfwiFunc next_lfwi_func, - WakeupFpeFunc wakeup_func, - ClientDiedFunc client_died, - LoadGlyphsFunc load_glyphs, - StartLaFunc start_list_alias_func, - NextLaFunc next_list_alias_func, - SetPathFunc set_path_func); - -extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe, - BlockHandlerProcPtr blockHandler, - Bool all); - -extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id); - #endif /* DIXFONT_H */ diff --git a/xorg-server/include/dixfontstubs.h b/xorg-server/include/dixfontstubs.h new file mode 100644 index 000000000..0454ffa6c --- /dev/null +++ b/xorg-server/include/dixfontstubs.h @@ -0,0 +1,45 @@ +#ifndef DIXFONTSTUBS_H +#define DIXFONTSTUBS_H 1 + +/* + * libXfont stubs replacements + * This header exists solely for the purpose of sdksyms generation; + * source code should #include "dixfonts.h" instead, which pulls in these + * declarations from <X11/fonts/fontproto.h> + */ +extern _X_EXPORT int client_auth_generation(ClientPtr client); + +extern _X_EXPORT void DeleteFontClientID(Font id); + +extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num); + +extern _X_EXPORT int GetDefaultPointSize(void); + +extern _X_EXPORT Font GetNewFontClientID(void); + +extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe, + BlockHandlerProcPtr block_handler); + +extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func, + InitFpeFunc init_func, + FreeFpeFunc free_func, + ResetFpeFunc reset_func, + OpenFontFunc open_func, + CloseFontFunc close_func, + ListFontsFunc list_func, + StartLfwiFunc start_lfwi_func, + NextLfwiFunc next_lfwi_func, + WakeupFpeFunc wakeup_func, + ClientDiedFunc client_died, + LoadGlyphsFunc load_glyphs, + StartLaFunc start_list_alias_func, + NextLaFunc next_list_alias_func, + SetPathFunc set_path_func); + +extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe, + BlockHandlerProcPtr blockHandler, + Bool all); + +extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id); + +#endif diff --git a/xorg-server/mi/mibitblt.c b/xorg-server/mi/mibitblt.c index b9873c16d..b0d14ae55 100644 --- a/xorg-server/mi/mibitblt.c +++ b/xorg-server/mi/mibitblt.c @@ -614,7 +614,7 @@ miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h, if (format == ZPixmap) { if ((((1LL << depth) - 1) & planeMask) != (1LL << depth) - 1) { ChangeGCVal gcv; - xPoint pt; + xPoint xpt; pGC = GetScratchGC(depth, pDraw->pScreen); if (!pGC) @@ -629,9 +629,9 @@ miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h, * Clear the pixmap before doing anything else */ ValidateGC((DrawablePtr) pPixmap, pGC); - pt.x = pt.y = 0; + xpt.x = xpt.y = 0; width = w; - (*pGC->ops->FillSpans) ((DrawablePtr) pPixmap, pGC, 1, &pt, &width, + (*pGC->ops->FillSpans) ((DrawablePtr) pPixmap, pGC, 1, &xpt, &width, TRUE); /* alu is already GXCopy */ diff --git a/xorg-server/mi/mispans.c b/xorg-server/mi/mispans.c index 0f89880e2..11c8a43d0 100644 --- a/xorg-server/mi/mispans.c +++ b/xorg-server/mi/mispans.c @@ -453,8 +453,6 @@ miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup * spanGroup) (int *) realloc(newspans->widths, ysizes[index] * sizeof(int)); if (!newpoints || !newwidths) { - int i; - for (i = 0; i < ylength; i++) { free(yspans[i].points); free(yspans[i].widths); @@ -485,8 +483,6 @@ miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup * spanGroup) points = malloc(count * sizeof(DDXPointRec)); widths = malloc(count * sizeof(int)); if (!points || !widths) { - int i; - for (i = 0; i < ylength; i++) { free(yspans[i].points); free(yspans[i].widths); diff --git a/xorg-server/os/xsha1.c b/xorg-server/os/xsha1.c index fa66c7a06..24c0aa284 100644 --- a/xorg-server/os/xsha1.c +++ b/xorg-server/os/xsha1.c @@ -116,6 +116,36 @@ x_sha1_final(void *ctx, unsigned char result[20]) return 1; } +#elif defined(HAVE_SHA1_IN_LIBNETTLE) /* Use libnettle for SHA1 */ + +#include <nettle/sha.h> + +void * +x_sha1_init(void) +{ + struct sha1_ctx *ctx = malloc(sizeof(*ctx)); + + if (!ctx) + return NULL; + sha1_init(ctx); + return ctx; +} + +int +x_sha1_update(void *ctx, void *data, int size) +{ + sha1_update(ctx, size, data); + return 1; +} + +int +x_sha1_final(void *ctx, unsigned char result[20]) +{ + sha1_digest(ctx, 20, result); + free(ctx); + return 1; +} + #elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */ #include <gcrypt.h> diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h index 212b0a9be..a16302f4d 100644 --- a/xorg-server/randr/randrstr.h +++ b/xorg-server/randr/randrstr.h @@ -933,6 +933,14 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type, pointer value, Bool sendevent, Bool pending); extern _X_EXPORT int + RRConfigureProviderProperty(RRProviderPtr provider, Atom property, + Bool pending, Bool range, Bool immutable, + int num_values, INT32 *values); + +extern _X_EXPORT Bool + RRPostProviderPendingProperties(RRProviderPtr provider); + +extern _X_EXPORT int ProcRRGetProviderProperty(ClientPtr client); extern _X_EXPORT int diff --git a/xorg-server/render/picturestr.h b/xorg-server/render/picturestr.h index dc00f41ff..5644f28cf 100644 --- a/xorg-server/render/picturestr.h +++ b/xorg-server/render/picturestr.h @@ -363,10 +363,10 @@ extern _X_EXPORT RESTYPE GlyphSetType; #define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p) #define VERIFY_PICTURE(pPicture, pid, client, mode) {\ - int rc = dixLookupResourceByType((pointer)&(pPicture), pid,\ - PictureType, client, mode);\ - if (rc != Success)\ - return rc;\ + int tmprc = dixLookupResourceByType((pointer)&(pPicture), pid,\ + PictureType, client, mode);\ + if (tmprc != Success)\ + return tmprc;\ } #define VERIFY_ALPHA(pPicture, pid, client, mode) {\ diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index 8f55c291e..206505d34 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -58,6 +58,7 @@ #include "windowstr.h" #include "xace.h" #include "list.h" +#include "exglobals.h" static RESTYPE CursorClientType; static RESTYPE CursorHideCountType; @@ -120,6 +121,8 @@ struct PointerBarrierClient { ScreenPtr screen; struct PointerBarrier barrier; struct xorg_list entry; + int num_devices; + int *device_ids; /* num_devices */ }; /* @@ -197,7 +200,7 @@ CursorCloseScreen(ScreenPtr pScreen) Bool ret; _X_UNUSED CloseScreenProcPtr close_proc; _X_UNUSED DisplayCursorProcPtr display_proc; - ConstrainCursorHarderProcPtr constrain_proc; + _X_UNUSED ConstrainCursorHarderProcPtr constrain_proc; Unwrap(cs, pScreen, CloseScreen, close_proc); Unwrap(cs, pScreen, DisplayCursor, display_proc); @@ -1133,6 +1136,31 @@ barrier_is_blocking(const struct PointerBarrier * barrier, return rc; } +static BOOL +barrier_blocks_device(struct PointerBarrierClient *client, + DeviceIntPtr dev) +{ + int i; + int master_id; + + /* Clients with no devices are treated as + * if they specified XIAllDevices. */ + if (client->num_devices == 0) + return TRUE; + + master_id = GetMaster(dev, POINTER_OR_FLOAT)->id; + + for (i = 0; i < client->num_devices; i++) { + int device_id = client->device_ids[i]; + if (device_id == XIAllDevices || + device_id == XIAllMasterDevices || + device_id == master_id) + return TRUE; + } + + return FALSE; +} + /** * Find the nearest barrier that is blocking movement from x1/y1 to x2/y2. * @@ -1144,7 +1172,8 @@ barrier_is_blocking(const struct PointerBarrier * barrier, * @return The barrier nearest to the movement origin that blocks this movement. */ static struct PointerBarrier * -barrier_find_nearest(CursorScreenPtr cs, int dir, +barrier_find_nearest(CursorScreenPtr cs, DeviceIntPtr dev, + int dir, int x1, int y1, int x2, int y2) { struct PointerBarrierClient *c = NULL; @@ -1158,6 +1187,9 @@ barrier_find_nearest(CursorScreenPtr cs, int dir, if (!barrier_is_blocking_direction(b, dir)) continue; + if (!barrier_blocks_device(c, dev)) + continue; + if (barrier_is_blocking(b, x1, y1, x2, y2, &distance)) { if (min_distance > distance) { min_distance = distance; @@ -1205,6 +1237,7 @@ CursorConstrainCursorHarder(DeviceIntPtr dev, ScreenPtr screen, int mode, mode == Relative) { int ox, oy; int dir; + int i; struct PointerBarrier *nearest = NULL; /* where are we coming from */ @@ -1219,8 +1252,12 @@ CursorConstrainCursorHarder(DeviceIntPtr dev, ScreenPtr screen, int mode, */ dir = barrier_get_direction(ox, oy, *x, *y); - nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); - if (nearest) { +#define MAX_BARRIERS 2 + for (i = 0; i < MAX_BARRIERS; i++) { + nearest = barrier_find_nearest(cs, dev, dir, ox, oy, *x, *y); + if (!nearest) + break; + barrier_clamp_to_barrier(nearest, dir, x, y); if (barrier_is_vertical(nearest)) { @@ -1231,11 +1268,6 @@ CursorConstrainCursorHarder(DeviceIntPtr dev, ScreenPtr screen, int mode, dir &= ~(BarrierNegativeY | BarrierPositiveY); oy = *y; } - - nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); - if (nearest) { - barrier_clamp_to_barrier(nearest, dir, x, y); - } } } @@ -1246,28 +1278,67 @@ CursorConstrainCursorHarder(DeviceIntPtr dev, ScreenPtr screen, int mode, } } -static struct PointerBarrierClient * +static int CreatePointerBarrierClient(ScreenPtr screen, ClientPtr client, - xXFixesCreatePointerBarrierReq * stuff) + xXFixesCreatePointerBarrierReq * stuff, + PointerBarrierClientPtr *client_out) { CursorScreenPtr cs = GetCursorScreen(screen); - struct PointerBarrierClient *ret = malloc(sizeof(*ret)); - - if (ret) { - ret->screen = screen; - ret->barrier.x1 = min(stuff->x1, stuff->x2); - ret->barrier.x2 = max(stuff->x1, stuff->x2); - ret->barrier.y1 = min(stuff->y1, stuff->y2); - ret->barrier.y2 = max(stuff->y1, stuff->y2); - ret->barrier.directions = stuff->directions & 0x0f; - if (barrier_is_horizontal(&ret->barrier)) - ret->barrier.directions &= ~(BarrierPositiveX | BarrierNegativeX); - if (barrier_is_vertical(&ret->barrier)) - ret->barrier.directions &= ~(BarrierPositiveY | BarrierNegativeY); - xorg_list_add(&ret->entry, &cs->barriers); + int err; + int size; + int i; + CARD16 *in_devices; + struct PointerBarrierClient *ret; + + size = sizeof(*ret) + sizeof(int) * stuff->num_devices; + ret = malloc(size); + + *client_out = NULL; + + if (!ret) { + return BadAlloc; } - return ret; + ret->screen = screen; + ret->num_devices = stuff->num_devices; + + in_devices = (CARD16 *) &stuff[1]; + for (i = 0; i < stuff->num_devices; i++) { + int device_id = in_devices[i]; + DeviceIntPtr device; + + if ((err = dixLookupDevice (&device, device_id, + client, DixReadAccess))) { + client->errorValue = device_id; + goto error; + } + + if (!IsMaster (device)) { + client->errorValue = device_id; + err = BadDevice; + goto error; + } + + ret->device_ids[i] = device_id; + } + + ret->barrier.x1 = min(stuff->x1, stuff->x2); + ret->barrier.x2 = max(stuff->x1, stuff->x2); + ret->barrier.y1 = min(stuff->y1, stuff->y2); + ret->barrier.y2 = max(stuff->y1, stuff->y2); + ret->barrier.directions = stuff->directions & 0x0f; + if (barrier_is_horizontal(&ret->barrier)) + ret->barrier.directions &= ~(BarrierPositiveX | BarrierNegativeX); + if (barrier_is_vertical(&ret->barrier)) + ret->barrier.directions &= ~(BarrierPositiveY | BarrierNegativeY); + xorg_list_add(&ret->entry, &cs->barriers); + + *client_out = ret; + return Success; + + error: + free(ret); + return err; } int @@ -1280,7 +1351,7 @@ ProcXFixesCreatePointerBarrier(ClientPtr client) REQUEST(xXFixesCreatePointerBarrierReq); - REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); + REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); LEGAL_NEW_RESOURCE(stuff->barrier, client); err = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); @@ -1289,10 +1360,6 @@ ProcXFixesCreatePointerBarrier(ClientPtr client) return err; } - /* This sure does need fixing. */ - if (stuff->num_devices) - return BadImplementation; - b.x1 = stuff->x1; b.x2 = stuff->x2; b.y1 = stuff->y1; @@ -1305,9 +1372,9 @@ ProcXFixesCreatePointerBarrier(ClientPtr client) if (barrier_is_horizontal(&b) && barrier_is_vertical(&b)) return BadValue; - if (!(barrier = CreatePointerBarrierClient(pWin->drawable.pScreen, - client, stuff))) - return BadAlloc; + if ((err = CreatePointerBarrierClient(pWin->drawable.pScreen, + client, stuff, &barrier))) + return err; if (!AddResource(stuff->barrier, PointerBarrierType, &barrier->barrier)) return BadAlloc; @@ -1319,9 +1386,13 @@ int SProcXFixesCreatePointerBarrier(ClientPtr client) { REQUEST(xXFixesCreatePointerBarrierReq); + int i; + CARD16 *in_devices = (CARD16 *) &stuff[1]; swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); + swaps(&stuff->num_devices); + REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); + swapl(&stuff->barrier); swapl(&stuff->window); swaps(&stuff->x1); @@ -1329,6 +1400,10 @@ SProcXFixesCreatePointerBarrier(ClientPtr client) swaps(&stuff->x2); swaps(&stuff->y2); swapl(&stuff->directions); + for (i = 0; i < stuff->num_devices; i++) { + swaps(in_devices + i); + } + return ProcXFixesVector[stuff->xfixesReqType] (client); } diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c index 79f46379c..729c5aecf 100644 --- a/xorg-server/xkb/ddxList.c +++ b/xorg-server/xkb/ddxList.c @@ -131,8 +131,6 @@ XkbDDXListComponent(DeviceIntPtr dev, file = list->pattern[what]; map = strrchr(file, '('); if (map != NULL) { - char *tmp; - map++; tmp = strrchr(map, ')'); if ((tmp == NULL) || (tmp[1] != '\0')) { diff --git a/xorg-server/xkb/maprules.c b/xorg-server/xkb/maprules.c index c6900eccb..5462763d1 100644 --- a/xorg-server/xkb/maprules.c +++ b/xorg-server/xkb/maprules.c @@ -864,6 +864,7 @@ XkbRF_GetComponents(XkbRF_RulesPtr rules, XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Append); XkbRF_ApplyPartialMatches(rules, names); XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Option); + XkbRF_ApplyPartialMatches(rules, names); if (names->keycodes) names->keycodes = XkbRF_SubstituteVars(names->keycodes, &mdefs); diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index ffa7d5653..11660bf47 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -57,10 +57,10 @@ static RESTYPE RT_XKBCLIENT; #define CHK_DEVICE(dev, id, client, access_mode, lf) {\ int why;\ - int rc = lf(&(dev), id, client, access_mode, &why);\ - if (rc != Success) {\ + int tmprc = lf(&(dev), id, client, access_mode, &why);\ + if (tmprc != Success) {\ client->errorValue = _XkbErrCode2(why, id);\ - return rc;\ + return tmprc;\ }\ } @@ -1024,22 +1024,22 @@ XkbWriteKeyTypes(XkbDescPtr xkb, buf = (char *) &wire[1]; if (wire->nMapEntries > 0) { - xkbKTMapEntryWireDesc *wire; + xkbKTMapEntryWireDesc *ewire; XkbKTMapEntryPtr entry; - wire = (xkbKTMapEntryWireDesc *) buf; + ewire = (xkbKTMapEntryWireDesc *) buf; entry = type->map; - for (n = 0; n < type->map_count; n++, wire++, entry++) { - wire->active = entry->active; - wire->mask = entry->mods.mask; - wire->level = entry->level; - wire->realMods = entry->mods.real_mods; - wire->virtualMods = entry->mods.vmods; + for (n = 0; n < type->map_count; n++, ewire++, entry++) { + ewire->active = entry->active; + ewire->mask = entry->mods.mask; + ewire->level = entry->level; + ewire->realMods = entry->mods.real_mods; + ewire->virtualMods = entry->mods.vmods; if (client->swapped) { - swaps(&wire->virtualMods); + swaps(&ewire->virtualMods); } } - buf = (char *) wire; + buf = (char *) ewire; if (type->preserve != NULL) { xkbModsWireDesc *pwire; XkbModsPtr preserve; @@ -2899,7 +2899,6 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev, } if (req->groups != 0) { - unsigned i, bit; xkbModsWireDesc *wire = (xkbModsWireDesc *) data; for (i = 0, bit = 1; i < XkbNumKbdGroups; i++, bit <<= 1) { diff --git a/xorg-server/xkb/xkbPrKeyEv.c b/xorg-server/xkb/xkbPrKeyEv.c index 32411838d..b24fd6cb7 100644 --- a/xorg-server/xkb/xkbPrKeyEv.c +++ b/xorg-server/xkb/xkbPrKeyEv.c @@ -104,13 +104,13 @@ XkbProcessKeyboardEvent(DeviceEvent *event, DeviceIntPtr keybd) return; } if (rg->currentDown != 0) { - int key = event->detail.key; + int tmpkey = event->detail.key; event->type = ET_KeyRelease; event->detail.key = rg->currentDown; XkbHandleActions(keybd, keybd, event); event->type = ET_KeyPress; - event->detail.key = key; + event->detail.key = tmpkey; } rg->currentDown = key; } diff --git a/xorg-server/xkb/xkbtext.c b/xorg-server/xkb/xkbtext.c index f66a08f75..fdf1d1790 100644 --- a/xorg-server/xkb/xkbtext.c +++ b/xorg-server/xkb/xkbtext.c @@ -1266,7 +1266,6 @@ XkbBehaviorText(XkbDescPtr xkb, XkbBehavior * behavior, unsigned format) } else if (type == XkbKB_RadioGroup) { int g; - char *tmp; g = ((behavior->data) & (~XkbKB_RGAllowNone)) + 1; if (XkbKB_RGAllowNone & behavior->data) { diff --git a/xorg-server/xkb/xkmread.c b/xorg-server/xkb/xkmread.c index 45da965dc..258bb91b5 100644 --- a/xorg-server/xkb/xkmread.c +++ b/xorg-server/xkb/xkmread.c @@ -772,8 +772,6 @@ ReadXkmSymbols(FILE * file, XkbDescPtr xkb) memset((char *) typeName, 0, XkbNumKbdGroups * sizeof(Atom)); memset((char *) type, 0, XkbNumKbdGroups * sizeof(XkbKeyTypePtr)); if (wireMap.flags & XkmKeyHasTypes) { - register int g; - for (g = 0; g < XkbNumKbdGroups; g++) { if ((wireMap.flags & (1 << g)) && ((tmp = XkmGetCountedString(file, buf, 100)) > 0)) { diff --git a/xorg-server/xorg-server.m4 b/xorg-server/xorg-server.m4 index 80d6da01e..18255b91a 100644 --- a/xorg-server/xorg-server.m4 +++ b/xorg-server/xorg-server.m4 @@ -1,49 +1,49 @@ -dnl Copyright 2005 Red Hat, Inc
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
-
-# XORG_DRIVER_CHECK_EXT()
-# --------------------------
-# Checks for the $1 define in xorg-server.h (from the sdk). If it
-# is defined, then add $1 to $REQUIRED_MODULES.
-
-AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include "xorg-server.h"
-#if !defined $1
-#error $1 not defined
-#endif
- ]])],
- [_EXT_CHECK=yes],
- [_EXT_CHECK=no])
- CFLAGS="$SAVE_CFLAGS"
- AC_MSG_CHECKING([if $1 is defined])
- AC_MSG_RESULT([$_EXT_CHECK])
- if test "$_EXT_CHECK" != no; then
- REQUIRED_MODULES="$REQUIRED_MODULES $2"
- fi
-])
+dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_DRIVER_CHECK_EXT(MACRO, PROTO) +# -------------------------- +# Checks for the MACRO define in xorg-server.h (from the sdk). If it +# is defined, then add the given PROTO to $REQUIRED_MODULES. + +AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include "xorg-server.h" +#if !defined $1 +#error $1 not defined +#endif + ]])], + [_EXT_CHECK=yes], + [_EXT_CHECK=no]) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_CHECKING([if $1 is defined]) + AC_MSG_RESULT([$_EXT_CHECK]) + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES $2" + fi +]) |