aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorStephane Marchesin <[email protected]>2006-03-07 00:56:30 +0000
committerStephane Marchesin <[email protected]>2006-03-07 00:56:30 +0000
commit2560e65a9aa0479ebb564a2ac5161a1c47507ce0 (patch)
tree6ae55b09d89decb07d19ea6c1b8c264db57e5fdf /src/mesa/drivers/dri
parent5569c2dfaee4a93a835a14178a7baca865614c5c (diff)
Added a missing field
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_context.c6
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_screen.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index e42aecefe8a..3558b25857e 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -44,7 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
//#include "nouveau_state.h"
#include "nouveau_span.h"
#include "nouveau_tex.h"
-#include "nv30_tris.h"
+#include "nv20_swtcl.h"
#include "vblank.h"
#include "utils.h"
@@ -132,13 +132,13 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
case NV_04:
case NV_05:
case NV_10:
- case NV_20:
default:
break;
+ case NV_20:
case NV_30:
case NV_40:
case G_70:
- nv30TriInitFunctions( ctx );
+ nv20TriInitFunctions( ctx );
break;
}
nouveauDDInitStateFuncs( ctx );
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.h b/src/mesa/drivers/dri/nouveau/nouveau_screen.h
index b8e8bfc22ab..997b05fecd1 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.h
@@ -45,6 +45,7 @@ typedef struct {
GLuint spanOffset;
__DRIscreenPrivate *driScreen;
+ unsigned int sarea_priv_offset;
/* Configuration cache with default values for all contexts */
driOptionCache optionCache;