hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-10 23:33:46 +00:00
Code Issues Projects Releases Wiki Activity

Move DRI2 from external module to built-in

Browse source 
Instead of keeping a tiny amount of code in an external module, just man
up and build it into the core server.

v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:03:18 +01:00 • committed by Keith Packard
commit 9a953e0e9d
14 changed files with 66 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hw/xfree86/dri2/dri2ext.c
View file

@ -44,13 +44,15 @@
#include "extnsionst.h"
#include "xfixes.h"
#include "dri2.h"
#include "dri2int.h"
#include "protocol-versions.h"
/* The only xf86 include */
/* The only xf86 includes */
#include "xf86Module.h"
#include "xf86Extensions.h"
static int DRI2EventBase;
static ExtensionEntry *dri2Extension;
extern Bool DRI2ModuleSetup(void);
static Bool
validDrawable(ClientPtr client, XID drawable, Mask access_mode,
@ -664,11 +666,11 @@ SProcDRI2Dispatch(ClientPtr client)
}
}
int DRI2EventBase;
static void
void
DRI2ExtensionInit(void)
{
ExtensionEntry *dri2Extension;
dri2Extension = AddExtension(DRI2_NAME,
DRI2NumberEvents,
DRI2NumberErrors,
@ -679,13 +681,3 @@ DRI2ExtensionInit(void)
DRI2ModuleSetup();
}
extern Bool noDRI2Extension;
_X_HIDDEN ExtensionModule dri2ExtensionModule = {
DRI2ExtensionInit,
DRI2_NAME,
&noDRI2Extension,
NULL,
NULL
};