From 71270195d5f48726d22e8371d0119806d9dcb8e0 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sun, 4 Feb 2001 00:47:28 +0000
Subject: rework to correctly respect _ac_import_range()

---
 src/mesa/array_cache/ac_context.c | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/mesa/array_cache/ac_context.c')

diff --git a/src/mesa/array_cache/ac_context.c b/src/mesa/array_cache/ac_context.c
index f3609ebe8c..5f3115baef 100644
--- a/src/mesa/array_cache/ac_context.c
+++ b/src/mesa/array_cache/ac_context.c
@@ -1,4 +1,4 @@
-/* $Id: ac_context.c,v 1.1 2000/12/26 15:14:04 keithw Exp $ */
+/* $Id: ac_context.c,v 1.2 2001/02/04 00:47:28 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -188,30 +188,30 @@ static void _ac_elts_init( GLcontext *ctx )
    ac->elt_size = size;
 }
 
-static void _ac_current_init( GLcontext *ctx )
+static void _ac_raw_init( GLcontext *ctx )
 {
    ACcontext *ac = AC_CONTEXT(ctx);
    GLuint i;
 
-   ac->Current.Color = &ac->Fallback.Color;
-   ac->Current.EdgeFlag = &ac->Fallback.EdgeFlag;
-   ac->Current.FogCoord = &ac->Fallback.FogCoord;
-   ac->Current.Index = &ac->Fallback.Index;
-   ac->Current.Normal = &ac->Fallback.Normal;
-   ac->Current.SecondaryColor = &ac->Fallback.SecondaryColor;
-   ac->Current.Vertex = &ctx->Array.Vertex;
-
-   ac->Writeable.Color = GL_FALSE;
-   ac->Writeable.EdgeFlag = GL_FALSE;
-   ac->Writeable.FogCoord = GL_FALSE;
-   ac->Writeable.Index = GL_FALSE;
-   ac->Writeable.Normal = GL_FALSE;
-   ac->Writeable.SecondaryColor = GL_FALSE;
-   ac->Writeable.Vertex = GL_FALSE;
+   ac->Raw.Color = ac->Fallback.Color;
+   ac->Raw.EdgeFlag = ac->Fallback.EdgeFlag;
+   ac->Raw.FogCoord = ac->Fallback.FogCoord;
+   ac->Raw.Index = ac->Fallback.Index;
+   ac->Raw.Normal = ac->Fallback.Normal;
+   ac->Raw.SecondaryColor = ac->Fallback.SecondaryColor;
+   ac->Raw.Vertex = ctx->Array.Vertex;
+
+   ac->IsCached.Color = GL_FALSE;
+   ac->IsCached.EdgeFlag = GL_FALSE;
+   ac->IsCached.FogCoord = GL_FALSE;
+   ac->IsCached.Index = GL_FALSE;
+   ac->IsCached.Normal = GL_FALSE;
+   ac->IsCached.SecondaryColor = GL_FALSE;
+   ac->IsCached.Vertex = GL_FALSE;
 
    for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++) {
-      ac->Current.TexCoord[i] = &ac->Fallback.TexCoord[i];
-      ac->Writeable.TexCoord[i] = GL_FALSE;
+      ac->Raw.TexCoord[i] = ac->Fallback.TexCoord[i];
+      ac->IsCached.TexCoord[i] = GL_FALSE;
    }
 
 }
@@ -222,7 +222,7 @@ GLboolean _ac_CreateContext( GLcontext *ctx )
    if (ctx->acache_context) {
       _ac_cache_init( ctx );
       _ac_fallbacks_init( ctx );
-      _ac_current_init( ctx );
+      _ac_raw_init( ctx );
       _ac_elts_init( ctx );
       return GL_TRUE;
    }
-- 
cgit v1.2.3