Mesa (master): radeon/r100/r200: actually init the OQ support properly

Dave Airlie airlied at kemper.freedesktop.org
Wed Aug 26 04:31:20 UTC 2009


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

Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Aug 26 14:16:54 2009 +1000

radeon/r100/r200: actually init the OQ support properly

---

 src/mesa/drivers/dri/r200/r200_context.c        |    1 +
 src/mesa/drivers/dri/radeon/radeon_context.c    |    1 +
 src/mesa/drivers/dri/radeon/radeon_state_init.c |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 74564d6..e402b92 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -347,6 +347,7 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
    r200InitStateFuncs(&functions);
    r200InitTextureFuncs(&functions);
    r200InitShaderFuncs(&functions); 
+   radeonInitQueryObjFunctions(&functions);
 
    if (!radeonInitContext(&rmesa->radeon, &functions,
 			  glVisual, driContextPriv,
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 247e65b..cbe3416 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -277,6 +277,7 @@ r100CreateContext( const __GLcontextModes *glVisual,
     */
    _mesa_init_driver_functions( &functions );
    radeonInitTextureFuncs( &functions );
+   radeonInitQueryObjFunctions(&functions);
 
    if (!radeonInitContext(&rmesa->radeon, &functions,
 			  glVisual, driContextPriv,
diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c
index 60fdc21..d014fb5 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state_init.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c
@@ -44,6 +44,7 @@
 #include "radeon_tcl.h"
 #include "radeon_tex.h"
 #include "radeon_swtcl.h"
+#include "radeon_queryobj.h"
 
 #include "../r200/r200_reg.h"
 




More information about the mesa-commit mailing list