diff options
author | Luc Verhaegen <libv@skynet.be> | 2010-03-11 14:00:56 +0100 |
---|---|---|
committer | Luc Verhaegen <libv@skynet.be> | 2010-03-11 14:00:56 +0100 |
commit | 034db3909b933f2cf14d756e043faf54f27a4dfd (patch) | |
tree | ae06095f8fa869f9a1779ebd4f9d4a030c328880 | |
parent | ab9f392e9bc2dcdcd09cc216c0cb4cb5aa855633 (diff) |
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | src/X86/fx_3dnow_fastpath.S | 1 | ||||
-rw-r--r-- | src/X86/fx_3dnow_fasttmp.h | 1 | ||||
-rw-r--r-- | src/dri_glide.h | 1 | ||||
-rw-r--r-- | src/server/tdfx_dri.h | 1 | ||||
-rw-r--r-- | src/tdfx_context.c | 6 | ||||
-rw-r--r-- | src/tdfx_context.h | 15 | ||||
-rw-r--r-- | src/tdfx_dd.c | 14 | ||||
-rw-r--r-- | src/tdfx_dd.h | 3 | ||||
-rw-r--r-- | src/tdfx_glide.h | 1 | ||||
-rw-r--r-- | src/tdfx_lock.c | 1 | ||||
-rw-r--r-- | src/tdfx_lock.h | 1 | ||||
-rw-r--r-- | src/tdfx_pixels.c | 3 | ||||
-rw-r--r-- | src/tdfx_pixels.h | 3 | ||||
-rw-r--r-- | src/tdfx_render.c | 1 | ||||
-rw-r--r-- | src/tdfx_render.h | 1 | ||||
-rw-r--r-- | src/tdfx_screen.c | 5 | ||||
-rw-r--r-- | src/tdfx_screen.h | 1 | ||||
-rw-r--r-- | src/tdfx_span.c | 1 | ||||
-rw-r--r-- | src/tdfx_span.h | 3 | ||||
-rw-r--r-- | src/tdfx_state.c | 11 | ||||
-rw-r--r-- | src/tdfx_state.h | 3 | ||||
-rw-r--r-- | src/tdfx_tex.c | 17 | ||||
-rw-r--r-- | src/tdfx_tex.h | 1 | ||||
-rw-r--r-- | src/tdfx_texman.c | 5 | ||||
-rw-r--r-- | src/tdfx_texman.h | 1 | ||||
-rw-r--r-- | src/tdfx_texstate.c | 1 | ||||
-rw-r--r-- | src/tdfx_texstate.h | 1 | ||||
-rw-r--r-- | src/tdfx_tris.c | 9 | ||||
-rw-r--r-- | src/tdfx_tris.h | 3 | ||||
-rw-r--r-- | src/tdfx_vb.c | 11 | ||||
-rw-r--r-- | src/tdfx_vb.h | 3 |
32 files changed, 53 insertions, 82 deletions
diff --git a/configure.ac b/configure.ac index 18eb702..1799951 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.57) -AC_INIT([mesa-dri-tdfx], 7.2.0, [], mesa-dri-tdfx) +AC_INIT([mesa-dri-tdfx], 7.4.0, [], mesa-dri-tdfx) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -16,8 +16,8 @@ AC_PROG_CC AC_HEADER_STDC PKG_CHECK_MODULES([DRM], [libdrm >= 2.3.0]) -PKG_CHECK_MODULES([DRI], [libmesadri >= 7.1.0 libmesadri < 7.3.0 - libmesadricommon >= 7.1.0 libmesadricommon < 7.3.0]) +PKG_CHECK_MODULES([DRI], [libmesadri >= 7.3.0 libmesadri < 7.5.0 + libmesadricommon >= 7.3.0 libmesadricommon < 7.5.0]) AC_OUTPUT([ Makefile diff --git a/src/X86/fx_3dnow_fastpath.S b/src/X86/fx_3dnow_fastpath.S index 0f4cc45..500c97c 100644 --- a/src/X86/fx_3dnow_fastpath.S +++ b/src/X86/fx_3dnow_fastpath.S @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ #include "../../X86/assyntax.h" diff --git a/src/X86/fx_3dnow_fasttmp.h b/src/X86/fx_3dnow_fasttmp.h index 9ec4935..78c5fef 100644 --- a/src/X86/fx_3dnow_fasttmp.h +++ b/src/X86/fx_3dnow_fasttmp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ #if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) #define TAGLLBL(a) TAG(.L##a) diff --git a/src/dri_glide.h b/src/dri_glide.h index 52a53f7..3ad2bf6 100644 --- a/src/dri_glide.h +++ b/src/dri_glide.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/dri_glide.h,v 1.1 2001/03/21 16:14:26 dawes Exp $ */ /* * Original rewrite: diff --git a/src/server/tdfx_dri.h b/src/server/tdfx_dri.h index acd0b9a..dc29984 100644 --- a/src/server/tdfx_dri.h +++ b/src/server/tdfx_dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h,v 1.5 2001/03/21 17:02:26 dawes Exp $ */ #ifndef _TDFX_DRI_ #define _TDFX_DRI_ diff --git a/src/tdfx_context.c b/src/tdfx_context.c index b4eea25..ef688d1 100644 --- a/src/tdfx_context.c +++ b/src/tdfx_context.c @@ -43,9 +43,9 @@ #include "tdfx_render.h" #include "tdfx_span.h" #include "tdfx_texman.h" -#include "extensions.h" -#include "hash.h" -#include "texobj.h" +#include "main/extensions.h" +#include "main/hash.h" +#include "main/texobj.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" diff --git a/src/tdfx_context.h b/src/tdfx_context.h index dc8ece5..3bcb545 100644 --- a/src/tdfx_context.h +++ b/src/tdfx_context.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h,v 1.5 2002/02/24 21:51:10 dawes Exp $ */ /* * New fixes: @@ -45,7 +44,7 @@ #ifdef XFree86Server #include "GL/xf86glx.h" #else -#include "glheader.h" +#include "main/glheader.h" #endif #if defined(__linux__) #include <signal.h> @@ -56,12 +55,12 @@ #include "tdfx_glide.h" #include "xmlconfig.h" -#include "clip.h" -#include "context.h" -#include "macros.h" -#include "matrix.h" -#include "imports.h" -#include "mtypes.h" +#include "main/clip.h" +#include "main/context.h" +#include "main/macros.h" +#include "main/matrix.h" +#include "main/imports.h" +#include "main/mtypes.h" #include "tdfx_screen.h" diff --git a/src/tdfx_dd.c b/src/tdfx_dd.c index adbe0c0..8472df6 100644 --- a/src/tdfx_dd.c +++ b/src/tdfx_dd.c @@ -39,9 +39,9 @@ #include "tdfx_pixels.h" #include "utils.h" -#include "context.h" -#include "enums.h" -#include "framebuffer.h" +#include "main/context.h" +#include "main/enums.h" +#include "main/framebuffer.h" #include "swrast/swrast.h" #if defined(USE_X86_ASM) #include "x86/common_x86_asm.h" @@ -110,13 +110,13 @@ static const GLubyte *tdfxDDGetString( GLcontext *ctx, GLenum name ) static void -tdfxBeginQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q) +tdfxBeginQuery(GLcontext *ctx, struct gl_query_object *q) { tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx); (void) q; - if (target == GL_SAMPLES_PASSED_ARB) { + if (q->Target == GL_SAMPLES_PASSED_ARB) { LOCK_HARDWARE(fxMesa); fxMesa->Glide.grFinish(); fxMesa->Glide.grReset(GR_STATS_PIXELS); @@ -126,14 +126,14 @@ tdfxBeginQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q) static void -tdfxEndQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q) +tdfxEndQuery(GLcontext *ctx, struct gl_query_object *q) { tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx); FxI32 total_pixels; FxI32 z_fail_pixels; - if (target == GL_SAMPLES_PASSED_ARB) { + if (q->Target == GL_SAMPLES_PASSED_ARB) { LOCK_HARDWARE(fxMesa); fxMesa->Glide.grFinish(); diff --git a/src/tdfx_dd.h b/src/tdfx_dd.h index 5ceba9d..f419c84 100644 --- a/src/tdfx_dd.h +++ b/src/tdfx_dd.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.h,v 1.1 2001/03/21 16:14:27 dawes Exp $ */ /* * Original rewrite: @@ -37,7 +36,7 @@ #ifndef __TDFX_DD_H__ #define __TDFX_DD_H__ -#include "context.h" +#include "main/context.h" extern void tdfxDDInitDriverFuncs( const __GLcontextModes *visual, struct dd_function_table *functions ); diff --git a/src/tdfx_glide.h b/src/tdfx_glide.h index f077aa6..69e5399 100644 --- a/src/tdfx_glide.h +++ b/src/tdfx_glide.h @@ -2,7 +2,6 @@ * This file defines macros and types necessary for accessing glide3. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_glide.h,v 1.1 2002/02/22 21:45:03 dawes Exp $ */ #ifndef NEWGLIDE_H #define NEWGLIDE_H diff --git a/src/tdfx_lock.c b/src/tdfx_lock.c index a20c91d..17cdc51 100644 --- a/src/tdfx_lock.c +++ b/src/tdfx_lock.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c,v 1.5 2002/12/16 16:19:00 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_lock.h b/src/tdfx_lock.h index 616e65b..74e3f5c 100644 --- a/src/tdfx_lock.h +++ b/src/tdfx_lock.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.h,v 1.3 2002/02/22 21:45:03 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_pixels.c b/src/tdfx_pixels.c index 732270b..9ab9c05 100644 --- a/src/tdfx_pixels.c +++ b/src/tdfx_pixels.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.c,v 1.4 2002/02/22 21:45:03 dawes Exp $ */ /* * Original rewrite: @@ -45,7 +44,7 @@ #include "swrast/swrast.h" -#include "image.h" +#include "main/image.h" #define FX_grLfbWriteRegion(fxMesa,dst_buffer,dst_x,dst_y,src_format,src_width,src_height,src_stride,src_data) \ diff --git a/src/tdfx_pixels.h b/src/tdfx_pixels.h index c38ce07..f5e5427 100644 --- a/src/tdfx_pixels.h +++ b/src/tdfx_pixels.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.h,v 1.2 2002/02/22 21:45:03 dawes Exp $ */ /* * Original rewrite: @@ -39,7 +38,7 @@ #ifndef __TDFX_PIXELS_H__ #define __TDFX_PIXELS_H__ -#include "context.h" +#include "main/context.h" extern void tdfx_bitmap_R5G6B5( GLcontext *ctx, GLint px, GLint py, diff --git a/src/tdfx_render.c b/src/tdfx_render.c index 7b3ce36..cf840c5 100644 --- a/src/tdfx_render.c +++ b/src/tdfx_render.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c,v 1.4 2002/02/22 21:45:03 dawes Exp $ */ /* * New fixes: diff --git a/src/tdfx_render.h b/src/tdfx_render.h index 09d0d90..18c6168 100644 --- a/src/tdfx_render.h +++ b/src/tdfx_render.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.h,v 1.1 2001/03/21 16:14:28 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_screen.c b/src/tdfx_screen.c index bb1f362..cd22b84 100644 --- a/src/tdfx_screen.c +++ b/src/tdfx_screen.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c,v 1.3 2002/02/22 21:45:03 dawes Exp $ */ /* * Original rewrite: @@ -41,8 +40,8 @@ #include "tdfx_span.h" #include "tdfx_tris.h" -#include "framebuffer.h" -#include "renderbuffer.h" +#include "main/framebuffer.h" +#include "main/renderbuffer.h" #include "xmlpool.h" #include "utils.h" diff --git a/src/tdfx_screen.h b/src/tdfx_screen.h index 90be89a..5a68898 100644 --- a/src/tdfx_screen.h +++ b/src/tdfx_screen.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.h,v 1.2 2002/02/22 21:45:03 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_span.c b/src/tdfx_span.c index d9d52d2..6b38fa5 100644 --- a/src/tdfx_span.c +++ b/src/tdfx_span.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.c,v 1.7 2002/10/30 12:52:00 alanh Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_span.h b/src/tdfx_span.h index 6204414..6973f8d 100644 --- a/src/tdfx_span.h +++ b/src/tdfx_span.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.h,v 1.1 2001/03/21 16:14:28 dawes Exp $ */ /* * Original rewrite: @@ -38,7 +37,7 @@ #ifndef __TDFX_SPAN_H__ #define __TDFX_SPAN_H__ -#include "context.h" +#include "main/context.h" #include "drirenderbuffer.h" extern void tdfxDDInitSpanFuncs( GLcontext *ctx ); diff --git a/src/tdfx_state.c b/src/tdfx_state.c index e4d77e6..a2d7bcd 100644 --- a/src/tdfx_state.c +++ b/src/tdfx_state.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c,v 1.7 2002/10/30 12:52:00 alanh Exp $ */ /* * New fixes: @@ -39,11 +38,11 @@ * */ -#include "mtypes.h" -#include "colormac.h" -#include "texformat.h" -#include "texstore.h" -#include "teximage.h" +#include "main/mtypes.h" +#include "main/colormac.h" +#include "main/texformat.h" +#include "main/texstore.h" +#include "main/teximage.h" #include "swrast/swrast.h" #include "vbo/vbo.h" diff --git a/src/tdfx_state.h b/src/tdfx_state.h index b10c38f..4880b99 100644 --- a/src/tdfx_state.h +++ b/src/tdfx_state.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.h,v 1.2 2002/02/22 21:45:04 dawes Exp $ */ /* * Original rewrite: @@ -38,7 +37,7 @@ #ifndef __TDFX_STATE_H__ #define __TDFX_STATE_H__ -#include "context.h" +#include "main/context.h" #include "tdfx_context.h" extern void tdfxDDInitStateFuncs( GLcontext *ctx ); diff --git a/src/tdfx_tex.c b/src/tdfx_tex.c index 6494638..1f7257e 100644 --- a/src/tdfx_tex.c +++ b/src/tdfx_tex.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c,v 1.7 2002/11/05 17:46:10 tsi Exp $ */ /* * New fixes: @@ -39,14 +38,14 @@ */ -#include "enums.h" -#include "image.h" -#include "mipmap.h" -#include "texcompress.h" -#include "texformat.h" -#include "teximage.h" -#include "texstore.h" -#include "texobj.h" +#include "main/enums.h" +#include "main/image.h" +#include "main/mipmap.h" +#include "main/texcompress.h" +#include "main/texformat.h" +#include "main/teximage.h" +#include "main/texstore.h" +#include "main/texobj.h" #include "tdfx_context.h" #include "tdfx_tex.h" #include "tdfx_texman.h" diff --git a/src/tdfx_tex.h b/src/tdfx_tex.h index f536c25..a445935 100644 --- a/src/tdfx_tex.h +++ b/src/tdfx_tex.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.h,v 1.2 2002/02/22 21:45:04 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_texman.c b/src/tdfx_texman.c index 6f782f6..35636ee 100644 --- a/src/tdfx_texman.c +++ b/src/tdfx_texman.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c,v 1.5 2002/02/22 21:45:04 dawes Exp $ */ /* * Original rewrite: @@ -38,8 +37,8 @@ #include "tdfx_context.h" #include "tdfx_tex.h" #include "tdfx_texman.h" -#include "texobj.h" -#include "hash.h" +#include "main/texobj.h" +#include "main/hash.h" #define BAD_ADDRESS ((FxU32) -1) diff --git a/src/tdfx_texman.h b/src/tdfx_texman.h index 739d4e1..a9af4cb 100644 --- a/src/tdfx_texman.h +++ b/src/tdfx_texman.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.h,v 1.2 2002/02/22 21:45:04 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_texstate.c b/src/tdfx_texstate.c index fda9ce5..bbd2c8c 100644 --- a/src/tdfx_texstate.c +++ b/src/tdfx_texstate.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c,v 1.2 2002/02/22 21:45:04 dawes Exp $ */ /* * New fixes: diff --git a/src/tdfx_texstate.h b/src/tdfx_texstate.h index 234ed44..0c5c410 100644 --- a/src/tdfx_texstate.h +++ b/src/tdfx_texstate.h @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.h,v 1.1 2002/02/22 21:45:04 dawes Exp $ */ /* * Original rewrite: diff --git a/src/tdfx_tris.c b/src/tdfx_tris.c index 7252a7e..8824988 100644 --- a/src/tdfx_tris.c +++ b/src/tdfx_tris.c @@ -23,7 +23,6 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c,v 1.4 2002/10/30 12:52:01 alanh Exp $ */ /* New fixes: * Daniel Borca <dborca@users.sourceforge.net>, 19 Jul 2004 @@ -32,10 +31,10 @@ * Keith Whitwell <keith@tungstengraphics.com> */ -#include "glheader.h" -#include "mtypes.h" -#include "macros.h" -#include "colormac.h" +#include "main/glheader.h" +#include "main/mtypes.h" +#include "main/macros.h" +#include "main/colormac.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" diff --git a/src/tdfx_tris.h b/src/tdfx_tris.h index 57e5d9b..ec48a48 100644 --- a/src/tdfx_tris.h +++ b/src/tdfx_tris.h @@ -29,12 +29,11 @@ * Keith Whitwell <keith@tungstengraphics.com> * */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.h,v 1.5 2002/10/30 12:52:01 alanh Exp $ */ #ifndef TDFX_TRIS_INC #define TDFX_TRIS_INC -#include "mtypes.h" +#include "main/mtypes.h" extern void tdfxDDInitTriFuncs( GLcontext *ctx ); diff --git a/src/tdfx_vb.c b/src/tdfx_vb.c index 0580135..4928802 100644 --- a/src/tdfx_vb.c +++ b/src/tdfx_vb.c @@ -22,13 +22,12 @@ * * */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.c,v 1.3 2002/10/30 12:52:01 alanh Exp $ */ -#include "glheader.h" -#include "mtypes.h" -#include "imports.h" -#include "macros.h" -#include "colormac.h" +#include "main/glheader.h" +#include "main/mtypes.h" +#include "main/imports.h" +#include "main/macros.h" +#include "main/colormac.h" #include "math/m_translate.h" #include "swrast_setup/swrast_setup.h" diff --git a/src/tdfx_vb.h b/src/tdfx_vb.h index 7b7cd90..1e190e8 100644 --- a/src/tdfx_vb.h +++ b/src/tdfx_vb.h @@ -22,12 +22,11 @@ * * */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.h,v 1.2 2002/02/22 21:45:04 dawes Exp $ */ #ifndef TDFXVB_INC #define TDFXVB_INC -#include "mtypes.h" +#include "main/mtypes.h" #include "tnl/tnl.h" #include "tnl/t_context.h" |