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 e42aecefe8aaf17ba0673b7ed248ddebdfe3cd3f..3558b25857e8300d5e9fff1c105e43b9667f7085 100644 (file)
--- 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 b8e8bfc22ab409ec62f8363a717a1c01d7f1fa44..997b05fecd1f1ee3b0a85a4f50eab5b811a4afda 100644 (file)
--- 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;