diff options
| author | Kevin E Martin <kem@kem.org> | 2004-08-09 22:37:22 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-08-09 22:37:22 +0000 |
| commit | a2da1caf5848a78b10afd99811fd1a5677af6786 (patch) | |
| tree | ca0f34d8044b70800fe6666a4a72e3520b000f3f /src/radeon_accelfuncs.c | |
| parent | 3171664c6a02424736864204b731249097fa7aae (diff) | |
Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,
Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
Harris).
Clarify xset man page description of how to use the keyboard repeat rate
settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).
Diffstat (limited to 'src/radeon_accelfuncs.c')
| -rw-r--r-- | src/radeon_accelfuncs.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c index 3d69b3f8..0fd9fa10 100644 --- a/src/radeon_accelfuncs.c +++ b/src/radeon_accelfuncs.c @@ -1349,10 +1349,8 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a) #endif #if defined(RENDER) -#if defined(XF86DRI) - if (info->RenderAccel && info->directRenderingEnabled && + if (info->RenderAccel && info->xaaReq.minorversion >= 2) { - /* XXX: The non-CP vertex dispatch doesn't seem to work. */ a->CPUToScreenAlphaTextureFlags = XAA_RENDER_POWER_OF_2_TILE_ONLY; a->CPUToScreenAlphaTextureFormats = RADEONTextureFormats; @@ -1388,12 +1386,9 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a) a->SubsequentCPUToScreenTexture = FUNC_NAME(R100SubsequentCPUToScreenTexture); } - } else -#endif /* XF86DRI */ - if (info->RenderAccel) - { + } else if (info->RenderAccel) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration currently " - "requires the DRI.\n"); + "requires XAA v1.2 or newer.\n"); } if (!a->SetupForCPUToScreenAlphaTexture2 && !a->SetupForCPUToScreenTexture2) |