From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Tue, 7 Mar 2006 00:56:30 +0000 (+0000)
Subject: Added a missing field
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2560e65a9aa0479ebb564a2ac5161a1c47507ce0;p=mesa.git

Added a missing field
---

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;