summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-01-16 15:25:11 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-01-16 15:25:11 +0000
commitd292b83d1a98bffe3ad23d4468c3fd18bc892592 (patch)
tree7f498428caca012137a48f6ea4b7180bc39e614b /src
parentd43a5943d8952367d9292653800b47a85f905343 (diff)
fixed a small error in import_color(), include m_translate.h
Diffstat (limited to 'src')
-rw-r--r--src/mesa/array_cache/ac_import.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/array_cache/ac_import.c b/src/mesa/array_cache/ac_import.c
index e7fb795ef5..e6d7651170 100644
--- a/src/mesa/array_cache/ac_import.c
+++ b/src/mesa/array_cache/ac_import.c
@@ -1,10 +1,10 @@
-/* $Id: ac_import.c,v 1.2 2000/12/28 22:11:05 keithw Exp $ */
+/* $Id: ac_import.c,v 1.3 2001/01/16 15:25:11 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
- * Copyright (C) 1999 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -34,6 +34,7 @@
#include "mtypes.h"
#include "array_cache/ac_context.h"
+#include "math/m_translate.h"
@@ -282,7 +283,7 @@ static void import_color( GLcontext *ctx,
to->Size = from->Size;
to->StrideB = 4 * sizeof(GLubyte);
- to->Type = GL_FLOAT;
+ to->Type = GL_UNSIGNED_BYTE;
ac->Current.Color = to;
ac->Writeable.Color = GL_TRUE;
}