From 7a086dc05e665a78f7e9d069aa4fc70e844b8988 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 30 Sep 2004 00:08:05 +0000 Subject: OK, one more time. Simplify the state-backup system by just storing the full state in a ready-to-emit cmdbuf, which avoids the issue Nicolai Haehnle reported where the check() could return differently during backup-and-emit than it should have if it were called at the right time. Move the lit emission before most of the TCL state emission on r200, which fixes neverball issues. Tested with: r100/r200 with neverball, tuxracer, chromium, quake3, ipers --- src/mesa/drivers/dri/radeon/radeon_state_init.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/mesa/drivers/dri/radeon/radeon_state_init.c') diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c index 4df76603bb..0945fa803f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state_init.c +++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c @@ -205,7 +205,6 @@ void radeonInitState( radeonContextPtr rmesa ) rmesa->hw.ATOM.cmd_size = SZ; \ rmesa->hw.ATOM.cmd = (int *)CALLOC(SZ * sizeof(int)); \ rmesa->hw.ATOM.lastcmd = (int *)CALLOC(SZ * sizeof(int)); \ - rmesa->hw.ATOM.savedcmd = (int *)CALLOC(SZ * sizeof(int)); \ rmesa->hw.ATOM.name = NM; \ rmesa->hw.ATOM.is_tcl = FLAG; \ rmesa->hw.ATOM.check = check_##CHK; \ @@ -551,6 +550,5 @@ void radeonInitState( radeonContextPtr rmesa ) rmesa->hw.eye.cmd[EYE_Z] = IEEE_ONE; rmesa->hw.eye.cmd[EYE_RESCALE_FACTOR] = IEEE_ONE; - radeonSaveHwState( rmesa ); rmesa->hw.all_dirty = GL_TRUE; } -- cgit v1.2.3