diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-03-23 19:26:55 -0400 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-03-23 19:26:55 -0400 |
| commit | dd7566f77e4f56bd4fdf137516d7771968cba5f8 (patch) | |
| tree | 3db4b4ceedce3081ac2d6f69ff232cdd4a7f31d7 | |
| parent | 3f38f96039172ec2ce910e36342c742ff06247e2 (diff) | |
Death to the xaa layer completely
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/via_driver.c | 4 | ||||
| -rw-r--r-- | src/via_exa.c | 9 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3059a36..083579d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,7 @@ openchrome_drv_la_SOURCES = \ via_3d.c \ via_3d.h \ via_3d_reg.h \ + via_rop.h \ via_exa.c \ via_bandwidth.c \ via_ums.h \ diff --git a/src/via_driver.c b/src/via_driver.c index b73cba2..9280e9e 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -1492,10 +1492,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) VIAFreeRec(pScrn); return FALSE; } - if (!xf86LoadSubModule(pScrn, "xaa")) { - VIAFreeRec(pScrn); - return FALSE; - } } if (pVia->shadowFB) { diff --git a/src/via_exa.c b/src/via_exa.c index af48f4b..a372c4e 100644 --- a/src/via_exa.c +++ b/src/via_exa.c @@ -39,14 +39,7 @@ #include "via_driver.h" #include "via_regs.h" #include "via_dmabuffer.h" - -#ifdef X_HAVE_XAAGETROP -#define VIAACCELPATTERNROP(vRop) (XAAGetPatternROP(vRop) << 24) -#define VIAACCELCOPYROP(vRop) (XAAGetCopyROP(vRop) << 24) -#else -#define VIAACCELPATTERNROP(vRop) (XAAPatternROP[vRop] << 24) -#define VIAACCELCOPYROP(vRop) (XAACopyROP[vRop] << 24) -#endif +#include "via_rop.h" enum VIA_2D_Regs { GECMD, |