From 08836341788a9f9d638d9dc8328510ccd18ddeb5 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 3 Mar 2001 20:33:27 +0000 Subject: lots of gl_*() to _mesa_*() namespace clean-up --- src/mesa/x86/3dnow.c | 20 ++++++++++---------- src/mesa/x86/3dnow.h | 6 +++--- src/mesa/x86/common_x86.c | 20 ++++++++++---------- src/mesa/x86/common_x86_asm.h | 6 +++--- src/mesa/x86/x86.c | 20 ++++++++++---------- src/mesa/x86/x86.h | 6 +++--- 6 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/mesa/x86') diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c index b81c0eef0f..2d67d9512d 100644 --- a/src/mesa/x86/3dnow.c +++ b/src/mesa/x86/3dnow.c @@ -1,4 +1,4 @@ -/* $Id: 3dnow.c,v 1.14 2001/02/03 08:41:03 gareth Exp $ */ +/* $Id: 3dnow.c,v 1.15 2001/03/03 20:33:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -62,19 +62,19 @@ #define ASSIGN_XFORM_GROUP( pfx, cma, sz, masked ) \ - gl_transform_tab[cma][sz][MATRIX_GENERAL] = \ + _mesa_transform_tab[cma][sz][MATRIX_GENERAL] = \ gl_##pfx##_transform_points##sz##_general_##masked; \ - gl_transform_tab[cma][sz][MATRIX_IDENTITY] = \ + _mesa_transform_tab[cma][sz][MATRIX_IDENTITY] = \ gl_##pfx##_transform_points##sz##_identity_##masked; \ - gl_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \ + _mesa_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \ gl_##pfx##_transform_points##sz##_3d_no_rot_##masked; \ - gl_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \ + _mesa_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \ gl_##pfx##_transform_points##sz##_perspective_##masked; \ - gl_transform_tab[cma][sz][MATRIX_2D] = \ + _mesa_transform_tab[cma][sz][MATRIX_2D] = \ gl_##pfx##_transform_points##sz##_2d_##masked; \ - gl_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \ + _mesa_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \ gl_##pfx##_transform_points##sz##_2d_no_rot_##masked; \ - gl_transform_tab[cma][sz][MATRIX_3D] = \ + _mesa_transform_tab[cma][sz][MATRIX_3D] = \ gl_##pfx##_transform_points##sz##_3d_##masked; @@ -151,7 +151,7 @@ extern void _ASMAPI gl_3dnow_project_clipped_vertices( GLfloat *first, #endif -void gl_init_3dnow_transform_asm( void ) +void _mesa_init_3dnow_transform_asm( void ) { #ifdef USE_3DNOW_ASM ASSIGN_XFORM_GROUP( 3dnow, 0, 1, raw ); @@ -174,7 +174,7 @@ void gl_init_3dnow_transform_asm( void ) #endif } -void gl_init_3dnow_vertex_asm( void ) +void _mesa_init_3dnow_vertex_asm( void ) { #ifdef USE_3DNOW_ASM gl_xform_points3_v16_general = gl_v16_3dnow_general_xform; diff --git a/src/mesa/x86/3dnow.h b/src/mesa/x86/3dnow.h index ee87c5af3d..c26005d224 100644 --- a/src/mesa/x86/3dnow.h +++ b/src/mesa/x86/3dnow.h @@ -1,4 +1,4 @@ -/* $Id: 3dnow.h,v 1.3 2000/11/16 21:05:41 keithw Exp $ */ +/* $Id: 3dnow.h,v 1.4 2001/03/03 20:33:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -34,7 +34,7 @@ #include "math/m_xform.h" -void gl_init_3dnow_transform_asm( void ); -void gl_init_3dnow_vertex_asm( void ); +void _mesa_init_3dnow_transform_asm( void ); +void _mesa_init_3dnow_vertex_asm( void ); #endif diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c index c6b307e640..a630fa60b1 100644 --- a/src/mesa/x86/common_x86.c +++ b/src/mesa/x86/common_x86.c @@ -1,4 +1,4 @@ -/* $Id: common_x86.c,v 1.9 2000/12/07 02:36:38 gareth Exp $ */ +/* $Id: common_x86.c,v 1.10 2001/03/03 20:33:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -123,7 +123,7 @@ static void sigfpe_handler( int signal, struct sigcontext sc ) /* If we ever get here, we're completely hosed. */ message( "\n\n" ); - gl_problem( NULL, "SSE enabling test failed badly!" ); + _mesa_problem( NULL, "SSE enabling test failed badly!" ); } } #endif /* __linux__ && _POSIX_SOURCE */ @@ -224,7 +224,7 @@ static void check_os_katmai_support( void ) #endif /* USE_KATMAI_ASM */ -void gl_init_all_x86_transform_asm( void ) +void _mesa_init_all_x86_transform_asm( void ) { #ifdef USE_X86_ASM gl_x86_cpu_features = gl_identify_x86_cpu_features(); @@ -234,7 +234,7 @@ void gl_init_all_x86_transform_asm( void ) } if ( gl_x86_cpu_features ) { - gl_init_x86_transform_asm(); + _mesa_init_x86_transform_asm(); } #ifdef USE_MMX_ASM @@ -251,7 +251,7 @@ void gl_init_all_x86_transform_asm( void ) if ( cpu_has_3dnow ) { if ( getenv( "MESA_NO_3DNOW" ) == 0 ) { message( "3DNow! cpu detected.\n" ); - gl_init_3dnow_transform_asm(); + _mesa_init_3dnow_transform_asm(); } else { gl_x86_cpu_features &= ~(X86_FEATURE_3DNOW); } @@ -265,7 +265,7 @@ void gl_init_all_x86_transform_asm( void ) if ( cpu_has_xmm ) { if ( getenv( "MESA_NO_KATMAI" ) == 0 ) { message( "Katmai cpu detected.\n" ); - gl_init_katmai_transform_asm(); + _mesa_init_katmai_transform_asm(); } else { gl_x86_cpu_features &= ~(X86_FEATURE_XMM); } @@ -277,22 +277,22 @@ void gl_init_all_x86_transform_asm( void ) /* Note: the above function must be called before this one, so that * gl_x86_cpu_features gets correctly initialized. */ -void gl_init_all_x86_vertex_asm( void ) +void _mesa_init_all_x86_vertex_asm( void ) { #ifdef USE_X86_ASM if ( gl_x86_cpu_features ) { - gl_init_x86_vertex_asm(); + _mesa_init_x86_vertex_asm(); } #ifdef USE_3DNOW_ASM if ( cpu_has_3dnow && getenv( "MESA_NO_3DNOW" ) == 0 ) { - gl_init_3dnow_vertex_asm(); + _mesa_init_3dnow_vertex_asm(); } #endif #ifdef USE_KATMAI_ASM if ( cpu_has_xmm && getenv( "MESA_NO_KATMAI" ) == 0 ) { - gl_init_katmai_vertex_asm(); + _mesa_init_katmai_vertex_asm(); } #endif #endif diff --git a/src/mesa/x86/common_x86_asm.h b/src/mesa/x86/common_x86_asm.h index 517e668ddb..985155781d 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.4 2000/11/24 10:25:10 keithw Exp $ */ +/* $Id: common_x86_asm.h,v 1.5 2001/03/03 20:33:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -59,7 +59,7 @@ extern int gl_x86_cpu_features; -extern void gl_init_all_x86_transform_asm( void ); -extern void gl_init_all_x86_vertex_asm( void ); +extern void _mesa_init_all_x86_transform_asm( void ); +extern void _mesa_init_all_x86_vertex_asm( void ); #endif diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c index 1c2539d959..b7600439a6 100644 --- a/src/mesa/x86/x86.c +++ b/src/mesa/x86/x86.c @@ -1,4 +1,4 @@ -/* $Id: x86.c,v 1.16 2001/02/03 08:41:03 gareth Exp $ */ +/* $Id: x86.c,v 1.17 2001/03/03 20:33:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -61,19 +61,19 @@ #define ASSIGN_XFORM_GROUP( pfx, cma, sz, masked ) \ - gl_transform_tab[cma][sz][MATRIX_GENERAL] = \ + _mesa_transform_tab[cma][sz][MATRIX_GENERAL] = \ gl_##pfx##_transform_points##sz##_general_##masked; \ - gl_transform_tab[cma][sz][MATRIX_IDENTITY] = \ + _mesa_transform_tab[cma][sz][MATRIX_IDENTITY] = \ gl_##pfx##_transform_points##sz##_identity_##masked; \ - gl_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \ + _mesa_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \ gl_##pfx##_transform_points##sz##_3d_no_rot_##masked; \ - gl_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \ + _mesa_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \ gl_##pfx##_transform_points##sz##_perspective_##masked; \ - gl_transform_tab[cma][sz][MATRIX_2D] = \ + _mesa_transform_tab[cma][sz][MATRIX_2D] = \ gl_##pfx##_transform_points##sz##_2d_##masked; \ - gl_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \ + _mesa_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \ gl_##pfx##_transform_points##sz##_2d_no_rot_##masked; \ - gl_transform_tab[cma][sz][MATRIX_3D] = \ + _mesa_transform_tab[cma][sz][MATRIX_3D] = \ gl_##pfx##_transform_points##sz##_3d_##masked; @@ -115,7 +115,7 @@ extern void _ASMAPI gl_v16_x86_general_xform( GLfloat *dest, #endif -void gl_init_x86_transform_asm( void ) +void _mesa_init_x86_transform_asm( void ) { #ifdef USE_X86_ASM ASSIGN_XFORM_GROUP( x86, 0, 2, raw ); @@ -136,7 +136,7 @@ void gl_init_x86_transform_asm( void ) #endif } -void gl_init_x86_vertex_asm( void ) +void _mesa_init_x86_vertex_asm( void ) { #ifdef USE_X86_ASM gl_xform_points3_v16_general = gl_v16_x86_general_xform; diff --git a/src/mesa/x86/x86.h b/src/mesa/x86/x86.h index 88afd18737..44908a851a 100644 --- a/src/mesa/x86/x86.h +++ b/src/mesa/x86/x86.h @@ -1,4 +1,4 @@ -/* $Id: x86.h,v 1.2 2000/10/23 00:16:28 gareth Exp $ */ +/* $Id: x86.h,v 1.3 2001/03/03 20:33:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -31,7 +31,7 @@ #ifndef __X86_H__ #define __X86_H__ -extern void gl_init_x86_transform_asm( void ); -extern void gl_init_x86_vertex_asm( void ); +extern void _mesa_init_x86_transform_asm( void ); +extern void _mesa_init_x86_vertex_asm( void ); #endif -- cgit v1.2.3