Committing in .

Mesa/src/mesa/main/imports.h : removed <CR>
 Mesa/src/mesa/shader/slang/descrip.mms : added new sources

 Modified Files:
 	Mesa/src/mesa/main/imports.h
 	Mesa/src/mesa/shader/slang/descrip.mms
 ----------------------------------------------------------------------
This commit is contained in:
Jouk Jansen 2006-03-17 14:38:41 +00:00
parent eec33cc310
commit 2d2af2dcf7
2 changed files with 30 additions and 27 deletions

View file

@ -572,28 +572,28 @@ do { \
_watcom_start_fast_math(&x,&mask); \
} while (0)
#endif
#define END_FAST_MATH(x) _watcom_end_fast_math(&x)
#elif defined(_MSC_VER) && defined(_M_IX86)
#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */
#define FAST_X86_FPU 0x003f /* See GCC comments above */
#if defined(NO_FAST_MATH)
#define START_FAST_MATH(x) do {\
static GLuint mask = DEFAULT_X86_FPU;\
__asm fnstcw word ptr [x]\
__asm fldcw word ptr [mask]\
} while(0)
#else
#define START_FAST_MATH(x) do {\
static GLuint mask = FAST_X86_FPU;\
__asm fnstcw word ptr [x]\
__asm fldcw word ptr [mask]\
} while(0)
#endif
#define END_FAST_MATH(x) do {\
__asm fnclex\
__asm fldcw word ptr [x]\
} while(0)
#define END_FAST_MATH(x) _watcom_end_fast_math(&x)
#elif defined(_MSC_VER) && defined(_M_IX86)
#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */
#define FAST_X86_FPU 0x003f /* See GCC comments above */
#if defined(NO_FAST_MATH)
#define START_FAST_MATH(x) do {\
static GLuint mask = DEFAULT_X86_FPU;\
__asm fnstcw word ptr [x]\
__asm fldcw word ptr [mask]\
} while(0)
#else
#define START_FAST_MATH(x) do {\
static GLuint mask = FAST_X86_FPU;\
__asm fnstcw word ptr [x]\
__asm fldcw word ptr [mask]\
} while(0)
#endif
#define END_FAST_MATH(x) do {\
__asm fnclex\
__asm fldcw word ptr [x]\
} while(0)
#else
#define START_FAST_MATH(x) x = 0
@ -649,9 +649,9 @@ extern int
_mesa_memcmp( const void *s1, const void *s2, size_t n );
extern double
_mesa_sin(double a);
extern float
_mesa_sin(double a);
extern float
_mesa_sinf(float a);
extern double

View file

@ -1,6 +1,6 @@
# Makefile for core library for VMS
# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
# Last revision : 21 February 2006
# Last revision : 17 March 2006
.first
define gl [----.include.gl]
@ -28,7 +28,8 @@ OBJECTS = \
slang_storage.obj,slang_assemble_assignment.obj,\
slang_compile_function.obj,slang_compile_struct.obj,\
slang_compile_variable.obj,slang_compile_operation.obj,\
slang_library_noise.obj,slang_link.obj,slang_export.obj
slang_library_noise.obj,slang_link.obj,slang_export.obj,\
slang_analyse.obj,slang_library_texsample.obj
##### RULES #####
@ -60,3 +61,5 @@ slang_compile_operation.obj : slang_compile_operation.c
slang_library_noise.obj : slang_library_noise.c
slang_link.obj : slang_link.c
slang_export.obj : slang_export.c
slang_analyse.obj : slang_analyse.c
slang_library_texsample.obj : slang_library_texsample.c