Mesa (master): r300: enable accelerated support for glCopyTexImage only under KMS

Maciej Cencora osiris at kemper.freedesktop.org
Sun Dec 13 08:24:44 PST 2009


Module: Mesa
Branch: master
Commit: e76bb2f337bc71929578f1a424c74232c48c2d9c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e76bb2f337bc71929578f1a424c74232c48c2d9c

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Sun Dec 13 17:22:33 2009 +0100

r300: enable accelerated support for glCopyTexImage only under KMS

---

 src/mesa/drivers/dri/r300/r300_context.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 05005f6..3c6ec2a 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -486,7 +486,6 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 	r300_init_vtbl(&r300->radeon);
 
 	_mesa_init_driver_functions(&functions);
-	r300_init_texcopy_functions(&functions);
 	r300InitIoctlFuncs(&functions);
 	r300InitStateFuncs(&functions);
 	r300InitTextureFuncs(&functions);
@@ -494,6 +493,10 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 	radeonInitQueryObjFunctions(&functions);
 	radeonInitBufferObjectFuncs(&functions);
 
+	if (r300->radeon.radeonScreen->kernel_mm) {
+		r300_init_texcopy_functions(&functions);
+	}
+
 	if (!radeonInitContext(&r300->radeon, &functions,
 			       glVisual, driContextPriv,
 			       sharedContextPrivate)) {



More information about the mesa-commit mailing list