Changeset 3598 for trunk/src/opengl/mesa/vb.c

Timestamp:

May 23, 2000, 10:41:28 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/vb.c (modified) (7 diffs)

trunk/src/opengl/mesa/vb.c

@@ -1 @@
-/* $Id: vb.c,v 1.1 2000-02-29 00:50:13 sandervl Exp $ */
+/* $Id: vb.c,v 1.2 2000-05-23 20:41:00 jeroen Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
@@ -32 +32 @@
 #include "all.h"
 #else
-#ifndef XFree86Server
-#include <stdlib.h>
-#include <stdio.h>
-#else
-#include "GL/xf86glx.h"
-#endif
+#include "glheader.h"
 #include "types.h"
 #include "vb.h"
 #include "vbxform.h"
 #include "xform.h"
+#include "mem.h"
 #endif
 
@@ -83 +79 @@
    VB->store.Obj = &IM->v.Obj;
    VB->store.Normal = &IM->v.Normal;
-   VB->store.Color = 0;         /* not used */
-   VB->store.Index = 0;         /* not used */
+   VB->store.Color = 0;         /* not used */
+   VB->store.Index = 0;         /* not used */
    VB->store.EdgeFlag = &IM->v.EdgeFlag;
    VB->store.TexCoord[0] = &IM->v.TexCoord[0];
@@ -208 +204 @@
    if (VB->IM) {
       if ( ! --VB->IM->ref_count )
-         gl_immediate_free( VB->IM );
+         gl_immediate_free( VB->IM );
 
       FREE( VB->CullMask );
@@ -275 +271 @@
    IM->FlushElt = 0;
    IM->LastPrimitive = VB_START;
-   IM->Count = VB_MAX;          /* force clear of Flag. */
-   IM->Start = VB_START;        
+   IM->Count = VB_MAX;          /* force clear of Flag. */
+   IM->Start = VB_START;
    IM->Material = 0;
    IM->MaterialMask = 0;
@@ -325 +321 @@
    if (ctx->nr_im_queued > 5) {
       if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
-         fprintf(stderr, "really free immediate %d\n", IM->id);
+         fprintf(stderr, "really free immediate %d\n", IM->id);
 
       FREE( IM );
@@ -331 +327 @@
    else {
       if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
-         fprintf(stderr, "requeue immediate %d\n", IM->id);
+         fprintf(stderr, "requeue immediate %d\n", IM->id);
 
       IM->next = ctx->freed_im_queue;