diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2006-03-13 11:30:41 +0000 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2006-03-13 11:30:41 +0000 |
| commit | 1c0230b39600de56b555b757272dfc0694da2d0f (patch) | |
| tree | 964f02ab498b00f1e92afd0e66322f56a4758c7e /src/mesa/drivers/dri/nouveau/nouveau_driver.c | |
| parent | 9ebde216cc3e7a9dbe8090abe976db38f63d4717 (diff) | |
Cleaned up some code, made more files compile. Renamed nv20_swtcl.* to
nv10_swtcl.*, hopefully this is the last rename (this should be, as
NV05 really behaves differently).
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_driver.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_driver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c index 165fc4929f..cb996acd89 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c @@ -27,6 +27,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "nouveau_context.h" #include "nouveau_ioctl.h" //#include "nouveau_state.h" +#include "nouveau_lock.h" +#include "nouveau_fifo.h" #include "nouveau_driver.h" #include "swrast/swrast.h" @@ -100,7 +102,7 @@ static const GLubyte *nouveauGetString( GLcontext *ctx, GLenum name ) agp_mode=0; break; case NV_AGP: - nmesa->screen->agp_mode; + agp_mode=nmesa->screen->agp_mode; break; } driGetRendererString( buffer, card_name, DRIVER_DATE, @@ -115,7 +117,7 @@ static const GLubyte *nouveauGetString( GLcontext *ctx, GLenum name ) static void nouveauFlush( GLcontext *ctx ) { nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx); - FIRE_RING( nmesa ); + FIRE_RING(); } /* glFinish */ |