Update libGL DRI loader to latest DRI interface changes.
This commit is contained in:
parent
51cd168da4
commit
3c5a1e4c2d
|
@ -714,9 +714,6 @@ extern char *__glXstrdup(const char *str);
|
|||
extern const char __glXGLClientVersion[];
|
||||
extern const char __glXGLClientExtensions[];
|
||||
|
||||
/* Determine the internal API version */
|
||||
extern int __glXGetInternalVersion(void);
|
||||
|
||||
/* Get the unadjusted system time */
|
||||
extern int __glXGetUST( int64_t * ust );
|
||||
|
||||
|
|
|
@ -2893,54 +2893,6 @@ PUBLIC void (*glXGetProcAddress(const GLubyte *procName))( void )
|
|||
|
||||
|
||||
#ifdef GLX_DIRECT_RENDERING
|
||||
/**
|
||||
* Retrieves the verion of the internal libGL API in YYYYMMDD format. This
|
||||
* might be used by the DRI drivers to determine how new libGL is at runtime.
|
||||
* Drivers should not call this function directly. They should instead use
|
||||
* \c glXGetProcAddress to obtain a pointer to the function.
|
||||
*
|
||||
* \returns An 8-digit decimal number representing the internal libGL API in
|
||||
* YYYYMMDD format.
|
||||
*
|
||||
* \sa glXGetProcAddress, PFNGLXGETINTERNALVERSIONPROC
|
||||
*
|
||||
* \since Internal API version 20021121.
|
||||
*/
|
||||
int __glXGetInternalVersion(void)
|
||||
{
|
||||
/* History:
|
||||
* 20021121 - Initial version
|
||||
* 20021128 - Added __glXWindowExists() function
|
||||
* 20021207 - Added support for dynamic GLX extensions,
|
||||
* GLX_SGI_swap_control, GLX_SGI_video_sync,
|
||||
* GLX_OML_sync_control, and GLX_MESA_swap_control.
|
||||
* Never officially released. Do NOT test against
|
||||
* this version. Use 20030317 instead.
|
||||
* 20030317 - Added support GLX_SGIX_fbconfig,
|
||||
* GLX_MESA_swap_frame_usage, GLX_OML_swap_method,
|
||||
* GLX_{ARB,SGIS}_multisample, and
|
||||
* GLX_SGIX_visual_select_group.
|
||||
* 20030606 - Added support for GLX_SGI_make_current_read.
|
||||
* 20030813 - Made support for dynamic extensions multi-head aware.
|
||||
* 20030818 - Added support for GLX_MESA_allocate_memory in place of the
|
||||
* deprecated GLX_NV_vertex_array_range & GLX_MESA_agp_offset
|
||||
* interfaces.
|
||||
* 20031201 - Added support for the first round of DRI interface changes.
|
||||
* Do NOT test against this version! It has binary
|
||||
* compatibility bugs, use 20040317 instead.
|
||||
* 20040317 - Added the 'mode' field to __DRIcontextRec.
|
||||
* 20040415 - Added support for bindContext3 and unbindContext3.
|
||||
* 20040602 - Add __glXGetDrawableInfo. I though that was there
|
||||
* months ago. :(
|
||||
* 20050727 - Gut all the old interfaces. This breaks compatability with
|
||||
* any DRI driver built to any previous version.
|
||||
* 20060314 - Added support for GLX_MESA_copy_sub_buffer.
|
||||
* 20070105 - Added support for damage reporting.
|
||||
*/
|
||||
return 20070105;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the unadjusted system time (UST). Currently, the UST is measured in
|
||||
* microseconds since Epoc. The actual resolution of the UST may vary from
|
||||
|
|
|
@ -781,18 +781,36 @@ __glXDRIGetDrawableInfo(__DRIdrawable *drawable,
|
|||
/**
|
||||
* Table of functions exported by the loader to the driver.
|
||||
*/
|
||||
static const __DRIinterfaceMethods interface_methods = {
|
||||
static const __DRIcontextModesExtension contextModesExtension = {
|
||||
{ __DRI_CONTEXT_MODES, __DRI_CONTEXT_MODES_VERSION },
|
||||
_gl_context_modes_create,
|
||||
_gl_context_modes_destroy,
|
||||
};
|
||||
|
||||
__glXDRIGetDrawableInfo,
|
||||
|
||||
static const __DRIsystemTimeExtension systemTimeExtension = {
|
||||
{ __DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION },
|
||||
__glXGetUST,
|
||||
__driGetMscRateOML,
|
||||
};
|
||||
|
||||
static const __DRIgetDrawableInfoExtension getDrawableInfoExtension = {
|
||||
{ __DRI_GET_DRAWABLE_INFO, __DRI_GET_DRAWABLE_INFO_VERSION },
|
||||
__glXDRIGetDrawableInfo
|
||||
};
|
||||
|
||||
static const __DRIdamageExtension damageExtension = {
|
||||
{ __DRI_DAMAGE, __DRI_DAMAGE_VERSION },
|
||||
__glXReportDamage,
|
||||
};
|
||||
|
||||
static const __DRIextension *loader_extensions[] = {
|
||||
&contextModesExtension.base,
|
||||
&systemTimeExtension.base,
|
||||
&getDrawableInfoExtension.base,
|
||||
&damageExtension.base,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
@ -830,8 +848,6 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
int status;
|
||||
const char * err_msg;
|
||||
const char * err_extra;
|
||||
int api_ver = __glXGetInternalVersion();
|
||||
|
||||
|
||||
dri_version.major = driDpy->private->driMajor;
|
||||
dri_version.minor = driDpy->private->driMinor;
|
||||
|
@ -945,8 +961,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
& framebuffer,
|
||||
pSAREA,
|
||||
fd,
|
||||
api_ver,
|
||||
& interface_methods,
|
||||
loader_extensions,
|
||||
& driver_modes );
|
||||
|
||||
filter_modes(&psc->configs, driver_modes);
|
||||
|
|
Loading…
Reference in New Issue