summaryrefslogtreecommitdiff
path: root/src/mesa/x86
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2000-11-16 21:05:34 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2000-11-16 21:05:34 +0000
commit23caf20169ac38436ee9c13914f1d6aa7cf6bb5e (patch)
tree21307f7bbcaf9ee1e841d7e7bee130570a7b5b95 /src/mesa/x86
parent179516673211a2350e479d5321840291f339f5dd (diff)
Move the transform and lighting code to two new directories
math: Provides basic matrix and vector functionality that might be useful to multiple software t&l implementations, and is used by core mesa to manage the Model, Project, etc matrices. tnl: The real transform & lighting code from core mesa, including everything from glVertex3f through vertex buffer handling, transformation, clipping, lighting and handoff to a driver for rasterization. The interfaces of these can be further tightened up, but the basic splitting up of state and code move is done.
Diffstat (limited to 'src/mesa/x86')
-rw-r--r--src/mesa/x86/3dnow.c9
-rw-r--r--src/mesa/x86/3dnow.h4
-rw-r--r--src/mesa/x86/common_x86_asm.h4
-rw-r--r--src/mesa/x86/x86.c8
4 files changed, 14 insertions, 11 deletions
diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index 3becc8cc58..f0e5e3af1c 100644
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.c,v 1.8 2000/10/23 00:16:28 gareth Exp $ */
+/* $Id: 3dnow.c,v 1.9 2000/11/16 21:05:41 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -32,12 +32,13 @@
#include "glheader.h"
#include "context.h"
#include "types.h"
-#include "vertices.h"
-#include "xform.h"
#include "3dnow.h"
+#include "math/m_vertices.h"
+#include "math/m_xform.h"
+
#ifdef DEBUG
-#include "debug_xform.h"
+#include "math/m_debug_xform.h"
#endif
diff --git a/src/mesa/x86/3dnow.h b/src/mesa/x86/3dnow.h
index 1e17cc4bb4..ee87c5af3d 100644
--- a/src/mesa/x86/3dnow.h
+++ b/src/mesa/x86/3dnow.h
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.h,v 1.2 2000/10/23 00:16:28 gareth Exp $ */
+/* $Id: 3dnow.h,v 1.3 2000/11/16 21:05:41 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -32,7 +32,7 @@
#ifndef __3DNOW_H__
#define __3DNOW_H__
-#include "xform.h"
+#include "math/m_xform.h"
void gl_init_3dnow_transform_asm( void );
void gl_init_3dnow_vertex_asm( void );
diff --git a/src/mesa/x86/common_x86_asm.h b/src/mesa/x86/common_x86_asm.h
index 880be22e8f..f52f56da68 100644
--- a/src/mesa/x86/common_x86_asm.h
+++ b/src/mesa/x86/common_x86_asm.h
@@ -1,4 +1,4 @@
-/* $Id: common_x86_asm.h,v 1.2 2000/10/23 00:16:28 gareth Exp $ */
+/* $Id: common_x86_asm.h,v 1.3 2000/11/16 21:05:41 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -39,6 +39,8 @@
#ifndef __COMMON_X86_ASM_H__
#define __COMMON_X86_ASM_H__
+/* Do not reference types.h from this file.
+ */
#include "common_x86_features.h"
#ifdef HAVE_CONFIG_H
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index fcd097867c..fe750ad765 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.9 2000/10/23 00:16:28 gareth Exp $ */
+/* $Id: x86.c,v 1.10 2000/11/16 21:05:41 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -31,12 +31,12 @@
#include "glheader.h"
#include "context.h"
#include "types.h"
-#include "vertices.h"
-#include "xform.h"
+#include "math/m_vertices.h"
+#include "math/m_xform.h"
#include "x86.h"
#ifdef DEBUG
-#include "debug_xform.h"
+#include "math/m_debug_xform.h"
#endif