summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/ggi/default/linear.c18
-rw-r--r--src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h1
-rw-r--r--src/mesa/math/m_matrix.c5
-rw-r--r--src/mesa/math/m_xform.c3
-rw-r--r--src/mesa/tnl/t_context.c2
-rw-r--r--src/mesa/x86/3dnow.c4
-rw-r--r--src/mesa/x86/x86.c3
7 files changed, 20 insertions, 16 deletions
diff --git a/src/mesa/drivers/ggi/default/linear.c b/src/mesa/drivers/ggi/default/linear.c
index e15a0db050..e105cd0e59 100644
--- a/src/mesa/drivers/ggi/default/linear.c
+++ b/src/mesa/drivers/ggi/default/linear.c
@@ -292,30 +292,30 @@ void GGIread_rgba_pixels(const GLcontext *ctx,
}
}
-int GGIsetup_driver(GGIMesaContext ggictx,struct ggi_mesa_info *info)
+int GGIsetup_driver(GGIMesaContext ggictx, struct ggi_mesa_info *info)
{
- GLcontext *ctx=ggictx->gl_ctx;
+ GLcontext *ctx = ggictx->gl_ctx;
ctx->Driver.WriteRGBASpan = GGIwrite_rgba_span;
ctx->Driver.WriteRGBSpan = GGIwrite_rgb_span;
- ctx->Driver.WriteMonoRGBASpan = GGIwrite_mono_span;
+// ctx->Driver.WriteMonoRGBASpan = GGIwrite_mono_span;
ctx->Driver.WriteRGBAPixels = GGIwrite_rgba_pixels;
- ctx->Driver.WriteMonoRGBAPixels = GGIwrite_mono_pixels;
+// ctx->Driver.WriteMonoRGBAPixels = GGIwrite_mono_pixels;
ctx->Driver.WriteCI32Span = GGIwrite_ci32_span;
ctx->Driver.WriteCI8Span = GGIwrite_ci8_span;
- ctx->Driver.WriteMonoCISpan = GGIwrite_mono_span;
+// ctx->Driver.WriteMonoCISpan = GGIwrite_mono_span;
ctx->Driver.WriteCI32Pixels = GGIwrite_ci32_pixels;
- ctx->Driver.WriteMonoCIPixels = GGIwrite_mono_pixels;
+// ctx->Driver.WriteMonoCIPixels = GGIwrite_mono_pixels;
ctx->Driver.ReadCI32Span = GGIread_ci32_span;
ctx->Driver.ReadRGBASpan = GGIread_rgba_span;
ctx->Driver.ReadCI32Pixels = GGIread_ci32_pixels;
ctx->Driver.ReadRGBAPixels = GGIread_rgba_pixels;
- info->red_bits=R;
- info->green_bits=G;
- info->blue_bits=B;
+ info->red_bits = R;
+ info->green_bits =G;
+ info->blue_bits = B;
return 0;
}
diff --git a/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h b/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h
index 59a162524f..40bf15d037 100644
--- a/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h
+++ b/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h
@@ -32,7 +32,6 @@
#include "context.h"
#include "matrix.h"
#include "types.h"
-#include "vb.h"
#include "macros.h"
#include "depth.h"
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index ae55c946d9..94809781d9 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -1,4 +1,4 @@
-/* $Id: m_matrix.c,v 1.1 2000/11/16 21:05:41 keithw Exp $ */
+/* $Id: m_matrix.c,v 1.2 2000/11/18 08:10:24 jtaylor Exp $ */
/*
* Mesa 3-D graphics library
@@ -34,6 +34,8 @@
* 3. Transformation of a point p by a matrix M is: p' = M * p
*/
+#include <math.h>
+#include <tgmath.h>
#include "glheader.h"
#include "macros.h"
@@ -42,7 +44,6 @@
#include "m_matrix.h"
-
static const char *types[] = {
"MATRIX_GENERAL",
"MATRIX_IDENTITY",
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 7509a350d8..8257d80647 100644
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -1,4 +1,4 @@
-/* $Id: m_xform.c,v 1.2 2000/11/17 21:01:49 brianp Exp $ */
+/* $Id: m_xform.c,v 1.3 2000/11/18 08:10:24 jtaylor Exp $ */
/*
* Mesa 3-D graphics library
@@ -35,6 +35,7 @@
* 3. Transformation of a point p by a matrix M is: p' = M * p
*/
+#include <math.h>
#include "glheader.h"
#include "macros.h"
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index bab6326eba..bef6f7f3bb 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -196,6 +196,6 @@ _tnl_MakeCurrent( GLcontext *ctx,
GLframebuffer *readBuffer )
{
#ifndef THREADS
- SET_IMMEDIATE(newCtx, newCtx->input);
+ SET_IMMEDIATE( ctx, TNL_VB(ctx)->IM );
#endif
}
diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index f0e5e3af1c..65f1753a46 100644
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.c,v 1.9 2000/11/16 21:05:41 keithw Exp $ */
+/* $Id: 3dnow.c,v 1.10 2000/11/18 08:10:23 jtaylor Exp $ */
/*
* Mesa 3-D graphics library
@@ -34,6 +34,8 @@
#include "types.h"
#include "3dnow.h"
+#include "../tnl/t_context.h"
+
#include "math/m_vertices.h"
#include "math/m_xform.h"
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index fe750ad765..e71d752990 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.10 2000/11/16 21:05:41 keithw Exp $ */
+/* $Id: x86.c,v 1.11 2000/11/18 08:10:23 jtaylor Exp $ */
/*
* Mesa 3-D graphics library
@@ -33,6 +33,7 @@
#include "types.h"
#include "math/m_vertices.h"
#include "math/m_xform.h"
+#include "../tnl/t_context.h"
#include "x86.h"
#ifdef DEBUG