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
 ----------------------------------------------------------------------

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 425ef825d1c7371dbb68ab5b6520339438d45bf1..2827264a3ac7219d8b2e11366c44fcf80eec2531 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -572,28 +572,28 @@ do {                                                                    \
    _watcom_start_fast_math(&x,&mask);                                   \
 } while (0)
 #endif
-#define END_FAST_MATH(x)  _watcom_end_fast_math(&x)\r
-\r
-#elif defined(_MSC_VER) && defined(_M_IX86)\r
-#define DEFAULT_X86_FPU                0x037f /* See GCC comments above */\r
-#define FAST_X86_FPU           0x003f /* See GCC comments above */\r
-#if defined(NO_FAST_MATH)\r
-#define START_FAST_MATH(x) do {\\r
-       static GLuint mask = DEFAULT_X86_FPU;\\r
-       __asm fnstcw word ptr [x]\\r
-       __asm fldcw word ptr [mask]\\r
-} while(0)\r
-#else\r
-#define START_FAST_MATH(x) do {\\r
-       static GLuint mask = FAST_X86_FPU;\\r
-       __asm fnstcw word ptr [x]\\r
-       __asm fldcw word ptr [mask]\\r
-} while(0)\r
-#endif\r
-#define END_FAST_MATH(x) do {\\r
-       __asm fnclex\\r
-       __asm fldcw word ptr [x]\\r
-} while(0)\r
+#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);\r
-\r
-extern float\r
+_mesa_sin(double a);
+
+extern float
 _mesa_sinf(float a);
 
 extern double

diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
index e1467db5a577bf1fa6970828d0e2a0f0cc088b57..c86763718ac7660bf607ee33e78760eaf1af7d01 100644 (file)
--- a/src/mesa/shader/slang/descrip.mms
+++ b/src/mesa/shader/slang/descrip.mms
@@ -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