diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-02-25 23:37:23 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-02-29 15:05:39 -0500 |
| commit | 16242a8007f41ab63f9a28bb9a750857c8cdb8af (patch) | |
| tree | ef4dc590c76a1bb22bc99eae6da5910d9a20d1fb /include/GL | |
| parent | 5197a31b8e64a047d058c4cb174efb9c8b816652 (diff) | |
Reduce the versioning madness required to create a DRI2 screen.
Right now the DRI2 screen constructor takes 3 different versions:
DRI, DDX and DRM. This is mostly useless, though:
DRI: The DRI driver doesn't actually care about the DRI protocol,
it only talks to the loader, which in turn speaks DRI protocol. Thus,
the DRI protocol version is of not interest to the DRI driver, but it
needs to know what functionality the loader provides. At this point
that's reflected in the __DRIinterfaceMethods struct and the
internal_version integer.
DDX: The DDX version number is essentially used to track extensions
to the SAREA. With DRI2 the SAREA consists of a number of versioned,
self-describing blocks, so the DDX version is no longer interesting.
DRM: We have the fd, lets just ask the kernel ourselves.
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/internal/dri_interface.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 888b91df58..ed71e5698b 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -266,11 +266,8 @@ extern CREATENEWSCREENFUNC __DRI_CREATE_NEW_SCREEN; /* DRI2 Entry point */ typedef void *(__DRI2_CREATE_NEW_SCREEN_FUNC)(int scr, __DRIscreen *psc, - const __DRIversion * ddx_version, const __DRIversion * dri_version, - const __DRIversion * drm_version, int fd, - unsigned int sarea_handle, - const __DRIinterfaceMethods * interface, - __GLcontextModes ** driver_modes); + int fd, unsigned int sarea_handle, + const __DRIinterfaceMethods * interface, __GLcontextModes ** driver_modes); #define __DRI2_CREATE_NEW_SCREEN \ __DRI_MAKE_VERSION(__dri2CreateNewScreen, __DRI_INTERFACE_VERSION) |