Attachment 3775 Details for Bug 5015 – move DRI code to dri_glx.c

[patch] move DRI code to dri_glx.c

glx-a.patch (text/plain), 25.77 KB, created by George - on 2005-11-11 10:48:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-11-11 10:48:43 UTC

Size: 25.77 KB

patch

obsolete

>diff -u -x CVS -x '*.o' -x Makefile -x 'depend*' x11/dri_glx.c a/dri_glx.c
>--- x11/dri_glx.c	2005-08-11 22:13:50.000000000 +0300
>+++ a/dri_glx.c	2005-10-01 13:45:53.000000000 +0300
>@@ -37,15 +37,14 @@
> 
> #include <unistd.h>
> #include <X11/Xlibint.h>
>-#include <X11/extensions/Xext.h>
>-#include <X11/extensions/extutil.h>
> #include "glxclient.h"
> #include "xf86dri.h"
> #include "sarea.h"
>-#include <stdio.h>
> #include <dlfcn.h>
> #include "dri_glx.h"
> #include <sys/types.h>
>+#include "glcontextmodes.h"
>+#include <sys/mman.h>
> #include <stdarg.h>
> 
> #ifndef RTLD_NOW
>@@ -458,4 +457,388 @@
>     return (void *)pdpyp;
> }
> 
>+
>+/**
>+ * 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.
>+ */
>+static 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.
>+     */
>+    return 20050727;
>+}
>+
>+
>+
>+static Bool windowExistsFlag;
>+
>+static int windowExistsErrorHandler(Display *dpy, XErrorEvent *xerr)
>+{
>+    if (xerr->error_code == BadWindow) {
>+        windowExistsFlag = GL_FALSE;
>+    }
>+    return 0;
>+}
>+
>+/**
>+ * Determine if a window associated with a \c GLXDrawable exists on the
>+ * X-server.  This function is not used internally by libGL.  It is provided
>+ * as a utility function for DRI drivers.
>+ * Drivers should not call this function directly.  They should instead use
>+ * \c glXGetProcAddress to obtain a pointer to the function.
>+ *
>+ * \param dpy  Display associated with the drawable to be queried.
>+ * \param draw \c GLXDrawable to test.
>+ * 
>+ * \returns \c GL_TRUE if a window exists that is associated with \c draw,
>+ *          otherwise \c GL_FALSE is returned.
>+ * 
>+ * \warning This function is not currently thread-safe.
>+ *
>+ * \sa glXGetProcAddress
>+ *
>+ * \since Internal API version 20021128.
>+ */
>+static Bool __glXWindowExists(Display *dpy, GLXDrawable draw)
>+{
>+    XWindowAttributes xwa;
>+    int (*oldXErrorHandler)(Display *, XErrorEvent *);
>+
>+    XSync(dpy, GL_FALSE);
>+    windowExistsFlag = GL_TRUE;
>+    oldXErrorHandler = XSetErrorHandler(windowExistsErrorHandler);
>+    XGetWindowAttributes(dpy, draw, &xwa); /* dummy request */
>+    XSetErrorHandler(oldXErrorHandler);
>+    return windowExistsFlag;
>+}
>+
>+
>+/**
>+ * Implement \c __DRIinterfaceMethods::getProcAddress.
>+ */
>+static __DRIfuncPtr get_proc_address( const char * proc_name )
>+{
>+    if (strcmp( proc_name, "glxEnableExtension" ) == 0) {
>+	return (__DRIfuncPtr) __glXScrEnableExtension;
>+    }
>+    
>+    return NULL;
>+}
>+
>+
>+/**
>+ * Table of functions exported by the loader to the driver.
>+ */
>+static const __DRIinterfaceMethods interface_methods = {
>+    get_proc_address,
>+
>+    _gl_context_modes_create,
>+    _gl_context_modes_destroy,
>+      
>+    __glXFindDRIScreen,
>+    __glXWindowExists,
>+      
>+    XF86DRICreateContextWithConfig,
>+    XF86DRIDestroyContext,
>+
>+    XF86DRICreateDrawable,
>+    XF86DRIDestroyDrawable,
>+    XF86DRIGetDrawableInfo,
>+
>+    __glXGetUST,
>+    glXGetMscRateOML,
>+};
>+
>+
>+static unsigned
>+filter_modes( __GLcontextModes ** server_modes,
>+	      const __GLcontextModes * driver_modes )
>+{
>+    __GLcontextModes * m;
>+    __GLcontextModes ** prev_next;
>+    const __GLcontextModes * check;
>+    unsigned modes_count = 0;
>+
>+    if ( driver_modes == NULL ) {
>+	fprintf(stderr, "libGL warning: 3D driver returned no fbconfigs.\n");
>+	return 0;
>+    }
>+
>+    /* For each mode in server_modes, check to see if a matching mode exists
>+     * in driver_modes.  If not, then the mode is not available.
>+     */
>+
>+    prev_next = server_modes;
>+    for ( m = *prev_next ; m != NULL ; m = *prev_next ) {
>+	GLboolean do_delete = GL_TRUE;
>+
>+	for ( check = driver_modes ; check != NULL ; check = check->next ) {
>+	    if ( _gl_context_modes_are_same( m, check ) ) {
>+		do_delete = GL_FALSE;
>+		break;
>+	    }
>+	}
>+
>+	/* The 3D has to support all the modes that match the GLX visuals
>+	 * sent from the X server.
>+	 */
>+	if ( do_delete && (m->visualID != 0) ) {
>+	    do_delete = GL_FALSE;
>+
>+	    fprintf(stderr, "libGL warning: 3D driver claims to not support "
>+		    "visual 0x%02x\n", m->visualID);
>+	}
>+
>+	if ( do_delete ) {
>+	    *prev_next = m->next;
>+
>+	    m->next = NULL;
>+	    _gl_context_modes_destroy( m );
>+	}
>+	else {
>+	    modes_count++;
>+	    prev_next = & m->next;
>+	}
>+    }
>+
>+    return modes_count;
>+}
>+
>+
>+/**
>+ * Perform the required libGL-side initialization and call the client-side
>+ * driver's \c __driCreateNewScreen function.
>+ * 
>+ * \param dpy    Display pointer.
>+ * \param scrn   Screen number on the display.
>+ * \param psc    DRI screen information.
>+ * \param driDpy DRI display information.
>+ * \param createNewScreen  Pointer to the client-side driver's
>+ *               \c __driCreateNewScreen function.
>+ * \returns A pointer to the \c __DRIscreenPrivate structure returned by
>+ *          the client-side driver on success, or \c NULL on failure.
>+ * 
>+ * \todo This function needs to be modified to remove context-modes from the
>+ *       list stored in the \c __GLXscreenConfigsRec to match the list
>+ *       returned by the client-side driver.
>+ */
>+void *
>+CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
>+		    __DRIdisplay * driDpy,
>+		    PFNCREATENEWSCREENFUNC createNewScreen)
>+{
>+    __DRIscreenPrivate *psp = NULL;
>+#ifndef GLX_USE_APPLEGL
>+    drm_handle_t hSAREA;
>+    drmAddress pSAREA = MAP_FAILED;
>+    char *BusID;
>+    __DRIversion   ddx_version;
>+    __DRIversion   dri_version;
>+    __DRIversion   drm_version;
>+    __DRIframebuffer  framebuffer;
>+    int   fd = -1;
>+    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;
>+    dri_version.patch = driDpy->private->driPatch;
>+
>+
>+    err_msg = "XF86DRIOpenConnection";
>+    err_extra = NULL;
>+
>+    framebuffer.base = MAP_FAILED;
>+    framebuffer.dev_priv = NULL;
>+
>+    if (XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
>+	fd = drmOpen(NULL,BusID);
>+	Xfree(BusID); /* No longer needed */
>+
>+	err_msg = "open DRM";
>+	err_extra = strerror( -fd );
>+
>+	if (fd >= 0) {
>+	    drm_magic_t magic;
>+
>+	    err_msg = "drmGetMagic";
>+	    err_extra = NULL;
>+
>+	    if (!drmGetMagic(fd, &magic)) {
>+		drmVersionPtr version = drmGetVersion(fd);
>+		if (version) {
>+		    drm_version.major = version->version_major;
>+		    drm_version.minor = version->version_minor;
>+		    drm_version.patch = version->version_patchlevel;
>+		    drmFreeVersion(version);
>+		}
>+		else {
>+		    drm_version.major = -1;
>+		    drm_version.minor = -1;
>+		    drm_version.patch = -1;
>+		}
>+
>+		err_msg = "XF86DRIAuthConnection";
>+		if (XF86DRIAuthConnection(dpy, scrn, magic)) {
>+		    char *driverName;
>+
>+		    /*
>+		     * Get device name (like "tdfx") and the ddx version
>+		     * numbers.  We'll check the version in each DRI driver's
>+		     * "createNewScreen" function.
>+		     */
>+		    err_msg = "XF86DRIGetClientDriverName";
>+		    if (XF86DRIGetClientDriverName(dpy, scrn,
>+						   &ddx_version.major,
>+						   &ddx_version.minor,
>+						   &ddx_version.patch,
>+						   &driverName)) {
>+			drm_handle_t  hFB;
>+			int        junk;
>+
>+			/* No longer needed. */
>+			Xfree( driverName );
>+
>+
>+			/*
>+			 * Get device-specific info.  pDevPriv will point to a struct
>+			 * (such as DRIRADEONRec in xfree86/driver/ati/radeon_dri.h)
>+			 * that has information about the screen size, depth, pitch,
>+			 * ancilliary buffers, DRM mmap handles, etc.
>+			 */
>+			err_msg = "XF86DRIGetDeviceInfo";
>+			if (XF86DRIGetDeviceInfo(dpy, scrn,
>+						 &hFB,
>+						 &junk,
>+						 &framebuffer.size,
>+						 &framebuffer.stride,
>+						 &framebuffer.dev_priv_size,
>+						 &framebuffer.dev_priv)) {
>+			    framebuffer.width = DisplayWidth(dpy, scrn);
>+			    framebuffer.height = DisplayHeight(dpy, scrn);
>+
>+			    /*
>+			     * Map the framebuffer region.
>+			     */
>+			    status = drmMap(fd, hFB, framebuffer.size, 
>+					    (drmAddressPtr)&framebuffer.base);
>+
>+			    err_msg = "drmMap of framebuffer";
>+			    err_extra = strerror( -status );
>+
>+			    if ( status == 0 ) {
>+				/*
>+				 * Map the SAREA region.  Further mmap regions
>+				 * may be setup in each DRI driver's
>+				 * "createNewScreen" function.
>+				 */
>+				status = drmMap(fd, hSAREA, SAREA_MAX, 
>+						&pSAREA);
>+
>+				err_msg = "drmMap of sarea";
>+				err_extra = strerror( -status );
>+
>+				if ( status == 0 ) {
>+				    __GLcontextModes * driver_modes = NULL;
>+				    __GLXscreenConfigs *configs = psc->screenConfigs;
>+
>+				    err_msg = "InitDriver";
>+				    err_extra = NULL;
>+				    psp = (*createNewScreen)(dpy, scrn,
>+							     psc,
>+							     configs->configs,
>+							     & ddx_version,
>+							     & dri_version,
>+							     & drm_version,
>+							     & framebuffer,
>+							     pSAREA,
>+							     fd,
>+							     api_ver,
>+							     & interface_methods,
>+							     & driver_modes );
>+
>+				    filter_modes( & configs->configs,
>+						  driver_modes );
>+				    _gl_context_modes_destroy( driver_modes );
>+				}
>+			    }
>+			}
>+		    }
>+		}
>+	    }
>+	}
>+    }
>+
>+    if ( psp == NULL ) {
>+	if ( pSAREA != MAP_FAILED ) {
>+	    (void)drmUnmap(pSAREA, SAREA_MAX);
>+	}
>+
>+	if ( framebuffer.base != MAP_FAILED ) {
>+	    (void)drmUnmap((drmAddress)framebuffer.base, framebuffer.size);
>+	}
>+
>+	if ( framebuffer.dev_priv != NULL ) {
>+	    Xfree(framebuffer.dev_priv);
>+	}
>+
>+	if ( fd >= 0 ) {
>+	    (void)drmClose(fd);
>+	}
>+
>+	(void)XF86DRICloseConnection(dpy, scrn);
>+
>+	if ( err_extra != NULL ) {
>+	    fprintf(stderr, "libGL error: %s failed (%s)\n", err_msg,
>+		    err_extra);
>+	}
>+	else {
>+	    fprintf(stderr, "libGL error: %s failed\n", err_msg );
>+	}
>+
>+        fprintf(stderr, "libGL error: reverting to (slow) indirect rendering\n");
>+    }
>+#endif /* !GLX_USE_APPLEGL */
>+
>+    return psp;
>+}
>+
> #endif /* GLX_DIRECT_RENDERING */
>diff -u -x CVS -x '*.o' -x Makefile -x 'depend*' x11/glxclient.h a/glxclient.h
>--- x11/glxclient.h	2005-08-04 05:49:04.000000000 +0300
>+++ a/glxclient.h	2005-10-01 13:42:36.000000000 +0300
>@@ -134,8 +134,12 @@
> 
> extern const char *glXGetDriverConfig (const char *driverName);
> 
>-extern Bool __glXWindowExists(Display *dpy, GLXDrawable draw);
>-
>+/*
>+** Function to call driver's new screen function
>+*/
>+extern void *CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
>+		    __DRIdisplay * driDpy,
>+		    PFNCREATENEWSCREENFUNC createNewScreen);
> #endif
> 
> /************************************************************************/
>@@ -681,8 +685,8 @@
> extern const char __glXGLClientVersion[];
> extern const char __glXGLClientExtensions[];
> 
>-/* Determine the internal API version */
>-extern int __glXGetInternalVersion(void);
>+/* Return the DRI per screen structure */
>+extern __DRIscreen *__glXFindDRIScreen(__DRInativeDisplay *dpy, int scrn);
> 
> /* Get the unadjusted system time */
> extern int __glXGetUST( int64_t * ust );
>diff -u -x CVS -x '*.o' -x Makefile -x 'depend*' x11/glxcmds.c a/glxcmds.c
>--- x11/glxcmds.c	2005-09-24 02:05:36.000000000 +0300
>+++ a/glxcmds.c	2005-10-01 13:47:30.000000000 +0300
>@@ -39,22 +39,16 @@
>  * Client-side GLX interface.
>  */
> 
>-#include <inttypes.h>
> #include "glxclient.h"
>-#include <X11/extensions/extutil.h>
>-#include <X11/extensions/Xext.h>
>-#include <assert.h>
>-#include <string.h>
> #include "glapi.h"
>-#ifdef GLX_DIRECT_RENDERING
>-#include "indirect_init.h"
>-#include <X11/extensions/xf86vmode.h>
>-#include "xf86dri.h"
>-#endif
> #include "glxextensions.h"
> #include "glcontextmodes.h"
> #include "glheader.h"
>+
>+#ifdef GLX_DIRECT_RENDERING
>+#include <X11/extensions/xf86vmode.h>
> #include <sys/time.h>
>+#endif
> 
> static const char __glXGLXClientVendorName[] = "SGI";
> static const char __glXGLXClientVersion[] = "1.4";
>@@ -2848,96 +2842,6 @@
> 
> #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.
>-     */
>-    return 20050727;
>-}
>-
>-
>-
>-static Bool windowExistsFlag;
>-
>-static int windowExistsErrorHandler(Display *dpy, XErrorEvent *xerr)
>-{
>-    if (xerr->error_code == BadWindow) {
>-        windowExistsFlag = GL_FALSE;
>-    }
>-    return 0;
>-}
>-
>-/**
>- * Determine if a window associated with a \c GLXDrawable exists on the
>- * X-server.  This function is not used internally by libGL.  It is provided
>- * as a utility function for DRI drivers.
>- * Drivers should not call this function directly.  They should instead use
>- * \c glXGetProcAddress to obtain a pointer to the function.
>- *
>- * \param dpy  Display associated with the drawable to be queried.
>- * \param draw \c GLXDrawable to test.
>- * 
>- * \returns \c GL_TRUE if a window exists that is associated with \c draw,
>- *          otherwise \c GL_FALSE is returned.
>- * 
>- * \warning This function is not currently thread-safe.
>- *
>- * \sa glXGetProcAddress
>- *
>- * \since Internal API version 20021128.
>- */
>-Bool __glXWindowExists(Display *dpy, GLXDrawable draw)
>-{
>-    XWindowAttributes xwa;
>-    int (*oldXErrorHandler)(Display *, XErrorEvent *);
>-
>-    XSync(dpy, GL_FALSE);
>-    windowExistsFlag = GL_TRUE;
>-    oldXErrorHandler = XSetErrorHandler(windowExistsErrorHandler);
>-    XGetWindowAttributes(dpy, draw, &xwa); /* dummy request */
>-    XSetErrorHandler(oldXErrorHandler);
>-    return windowExistsFlag;
>-}
>-
>-
>-/**
>  * Get the unadjusted system time (UST).  Currently, the UST is measured in
>  * microseconds since Epoc.  The actual resolution of the UST may vary from
>  * system to system, and the units may vary from release to release.
>diff -u -x CVS -x '*.o' -x Makefile -x 'depend*' x11/glxext.c a/glxext.c
>--- x11/glxext.c	2005-08-11 22:13:50.000000000 +0300
>+++ a/glxext.c	2005-10-01 13:47:14.000000000 +0300
>@@ -45,24 +45,14 @@
>  */     
> 
> #include "glxclient.h"
>-#include <stdio.h>
> #include <X11/extensions/Xext.h>
> #include <X11/extensions/extutil.h>
>-#include <assert.h>
> #include "indirect_init.h"
> #include "glapi.h"
> #include "glxextensions.h"
> #include "glcontextmodes.h"
> #include "glheader.h"
> 
>-#ifdef GLX_DIRECT_RENDERING
>-#include <inttypes.h>
>-#include <sys/mman.h>
>-#include "xf86dri.h"
>-#include "sarea.h"
>-#include "dri_glx.h"
>-#endif
>-
> #ifdef USE_XCB
> #include <X11/xcl.h>
> #include <X11/XCB/xcb.h>
>@@ -106,10 +96,6 @@
> #define INIT_MESA_SPARC
> #endif
> 
>-#ifdef GLX_DIRECT_RENDERING
>-static __DRIscreen *__glXFindDRIScreen(__DRInativeDisplay *dpy, int scrn);
>-#endif /* GLX_DIRECT_RENDERING */
>-
> static Bool MakeContextCurrent(Display *dpy, GLXDrawable draw,
>     GLXDrawable read, GLXContext gc);
> 
>@@ -610,302 +596,6 @@
> }
> 
> 
>-#ifdef GLX_DIRECT_RENDERING
>-static unsigned
>-filter_modes( __GLcontextModes ** server_modes,
>-	      const __GLcontextModes * driver_modes )
>-{
>-    __GLcontextModes * m;
>-    __GLcontextModes ** prev_next;
>-    const __GLcontextModes * check;
>-    unsigned modes_count = 0;
>-
>-    if ( driver_modes == NULL ) {
>-	fprintf(stderr, "libGL warning: 3D driver returned no fbconfigs.\n");
>-	return 0;
>-    }
>-
>-    /* For each mode in server_modes, check to see if a matching mode exists
>-     * in driver_modes.  If not, then the mode is not available.
>-     */
>-
>-    prev_next = server_modes;
>-    for ( m = *prev_next ; m != NULL ; m = *prev_next ) {
>-	GLboolean do_delete = GL_TRUE;
>-
>-	for ( check = driver_modes ; check != NULL ; check = check->next ) {
>-	    if ( _gl_context_modes_are_same( m, check ) ) {
>-		do_delete = GL_FALSE;
>-		break;
>-	    }
>-	}
>-
>-	/* The 3D has to support all the modes that match the GLX visuals
>-	 * sent from the X server.
>-	 */
>-	if ( do_delete && (m->visualID != 0) ) {
>-	    do_delete = GL_FALSE;
>-
>-	    fprintf(stderr, "libGL warning: 3D driver claims to not support "
>-		    "visual 0x%02x\n", m->visualID);
>-	}
>-
>-	if ( do_delete ) {
>-	    *prev_next = m->next;
>-
>-	    m->next = NULL;
>-	    _gl_context_modes_destroy( m );
>-	}
>-	else {
>-	    modes_count++;
>-	    prev_next = & m->next;
>-	}
>-    }
>-
>-    return modes_count;
>-}
>-
>-
>-/**
>- * Implement \c __DRIinterfaceMethods::getProcAddress.
>- */
>-static __DRIfuncPtr get_proc_address( const char * proc_name )
>-{
>-    if (strcmp( proc_name, "glxEnableExtension" ) == 0) {
>-	return (__DRIfuncPtr) __glXScrEnableExtension;
>-    }
>-    
>-    return NULL;
>-}
>-
>-
>-/**
>- * Table of functions exported by the loader to the driver.
>- */
>-static const __DRIinterfaceMethods interface_methods = {
>-    get_proc_address,
>-
>-    _gl_context_modes_create,
>-    _gl_context_modes_destroy,
>-      
>-    __glXFindDRIScreen,
>-    __glXWindowExists,
>-      
>-    XF86DRICreateContextWithConfig,
>-    XF86DRIDestroyContext,
>-
>-    XF86DRICreateDrawable,
>-    XF86DRIDestroyDrawable,
>-    XF86DRIGetDrawableInfo,
>-
>-    __glXGetUST,
>-    glXGetMscRateOML,
>-};
>-
>-
>-/**
>- * Perform the required libGL-side initialization and call the client-side
>- * driver's \c __driCreateNewScreen function.
>- * 
>- * \param dpy    Display pointer.
>- * \param scrn   Screen number on the display.
>- * \param psc    DRI screen information.
>- * \param driDpy DRI display information.
>- * \param createNewScreen  Pointer to the client-side driver's
>- *               \c __driCreateNewScreen function.
>- * \returns A pointer to the \c __DRIscreenPrivate structure returned by
>- *          the client-side driver on success, or \c NULL on failure.
>- * 
>- * \todo This function needs to be modified to remove context-modes from the
>- *       list stored in the \c __GLXscreenConfigsRec to match the list
>- *       returned by the client-side driver.
>- */
>-static void *
>-CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
>-		    __DRIdisplay * driDpy,
>-		    PFNCREATENEWSCREENFUNC createNewScreen)
>-{
>-    __DRIscreenPrivate *psp = NULL;
>-#ifndef GLX_USE_APPLEGL
>-    drm_handle_t hSAREA;
>-    drmAddress pSAREA = MAP_FAILED;
>-    char *BusID;
>-    __DRIversion   ddx_version;
>-    __DRIversion   dri_version;
>-    __DRIversion   drm_version;
>-    __DRIframebuffer  framebuffer;
>-    int   fd = -1;
>-    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;
>-    dri_version.patch = driDpy->private->driPatch;
>-
>-
>-    err_msg = "XF86DRIOpenConnection";
>-    err_extra = NULL;
>-
>-    framebuffer.base = MAP_FAILED;
>-    framebuffer.dev_priv = NULL;
>-
>-    if (XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
>-	fd = drmOpen(NULL,BusID);
>-	Xfree(BusID); /* No longer needed */
>-
>-	err_msg = "open DRM";
>-	err_extra = strerror( -fd );
>-
>-	if (fd >= 0) {
>-	    drm_magic_t magic;
>-
>-	    err_msg = "drmGetMagic";
>-	    err_extra = NULL;
>-
>-	    if (!drmGetMagic(fd, &magic)) {
>-		drmVersionPtr version = drmGetVersion(fd);
>-		if (version) {
>-		    drm_version.major = version->version_major;
>-		    drm_version.minor = version->version_minor;
>-		    drm_version.patch = version->version_patchlevel;
>-		    drmFreeVersion(version);
>-		}
>-		else {
>-		    drm_version.major = -1;
>-		    drm_version.minor = -1;
>-		    drm_version.patch = -1;
>-		}
>-
>-		err_msg = "XF86DRIAuthConnection";
>-		if (XF86DRIAuthConnection(dpy, scrn, magic)) {
>-		    char *driverName;
>-
>-		    /*
>-		     * Get device name (like "tdfx") and the ddx version
>-		     * numbers.  We'll check the version in each DRI driver's
>-		     * "createNewScreen" function.
>-		     */
>-		    err_msg = "XF86DRIGetClientDriverName";
>-		    if (XF86DRIGetClientDriverName(dpy, scrn,
>-						   &ddx_version.major,
>-						   &ddx_version.minor,
>-						   &ddx_version.patch,
>-						   &driverName)) {
>-			drm_handle_t  hFB;
>-			int        junk;
>-
>-			/* No longer needed. */
>-			Xfree( driverName );
>-
>-
>-			/*
>-			 * Get device-specific info.  pDevPriv will point to a struct
>-			 * (such as DRIRADEONRec in xfree86/driver/ati/radeon_dri.h)
>-			 * that has information about the screen size, depth, pitch,
>-			 * ancilliary buffers, DRM mmap handles, etc.
>-			 */
>-			err_msg = "XF86DRIGetDeviceInfo";
>-			if (XF86DRIGetDeviceInfo(dpy, scrn,
>-						 &hFB,
>-						 &junk,
>-						 &framebuffer.size,
>-						 &framebuffer.stride,
>-						 &framebuffer.dev_priv_size,
>-						 &framebuffer.dev_priv)) {
>-			    framebuffer.width = DisplayWidth(dpy, scrn);
>-			    framebuffer.height = DisplayHeight(dpy, scrn);
>-
>-			    /*
>-			     * Map the framebuffer region.
>-			     */
>-			    status = drmMap(fd, hFB, framebuffer.size, 
>-					    (drmAddressPtr)&framebuffer.base);
>-
>-			    err_msg = "drmMap of framebuffer";
>-			    err_extra = strerror( -status );
>-
>-			    if ( status == 0 ) {
>-				/*
>-				 * Map the SAREA region.  Further mmap regions
>-				 * may be setup in each DRI driver's
>-				 * "createNewScreen" function.
>-				 */
>-				status = drmMap(fd, hSAREA, SAREA_MAX, 
>-						&pSAREA);
>-
>-				err_msg = "drmMap of sarea";
>-				err_extra = strerror( -status );
>-
>-				if ( status == 0 ) {
>-				    __GLcontextModes * driver_modes = NULL;
>-				    __GLXscreenConfigs *configs = psc->screenConfigs;
>-
>-				    err_msg = "InitDriver";
>-				    err_extra = NULL;
>-				    psp = (*createNewScreen)(dpy, scrn,
>-							     psc,
>-							     configs->configs,
>-							     & ddx_version,
>-							     & dri_version,
>-							     & drm_version,
>-							     & framebuffer,
>-							     pSAREA,
>-							     fd,
>-							     api_ver,
>-							     & interface_methods,
>-							     & driver_modes );
>-
>-				    filter_modes( & configs->configs,
>-						  driver_modes );
>-				    _gl_context_modes_destroy( driver_modes );
>-				}
>-			    }
>-			}
>-		    }
>-		}
>-	    }
>-	}
>-    }
>-
>-    if ( psp == NULL ) {
>-	if ( pSAREA != MAP_FAILED ) {
>-	    (void)drmUnmap(pSAREA, SAREA_MAX);
>-	}
>-
>-	if ( framebuffer.base != MAP_FAILED ) {
>-	    (void)drmUnmap((drmAddress)framebuffer.base, framebuffer.size);
>-	}
>-
>-	if ( framebuffer.dev_priv != NULL ) {
>-	    Xfree(framebuffer.dev_priv);
>-	}
>-
>-	if ( fd >= 0 ) {
>-	    (void)drmClose(fd);
>-	}
>-
>-	(void)XF86DRICloseConnection(dpy, scrn);
>-
>-	if ( err_extra != NULL ) {
>-	    fprintf(stderr, "libGL error: %s failed (%s)\n", err_msg,
>-		    err_extra);
>-	}
>-	else {
>-	    fprintf(stderr, "libGL error: %s failed\n", err_msg );
>-	}
>-
>-        fprintf(stderr, "libGL error: reverting to (slow) indirect rendering\n");
>-    }
>-#endif /* !GLX_USE_APPLEGL */
>-
>-    return psp;
>-}
>-#endif /* GLX_DIRECT_RENDERING */
>-
>-
> /*
> ** Allocate the memory for the per screen configs for each screen.
> ** If that works then fetch the per screen configs data.

Actions: View | Splinter Review

Attachments on bug 5015: 3775 | 3776 | 3777 | 3778

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.