Updates for OpenVMS : New makefiles

                       added some type-casts

 Modified Files:
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/shader/program.c
 	Mesa/src/mesa/shader/slang/slang_compile.c
 	Mesa/src/mesa/shader/slang/slang_preprocess.c
 Added Files:
 	Mesa/src/mesa/shader/slang/descrip.mms
 ----------------------------------------------------------------------

diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
index ab0553fa53cbdff89363c432a05a4b0ebd15bb24..99fd4fc083ad7d00c34c955f5a421e056bdb0c4c 100644 (file)
--- a/src/mesa/shader/descrip.mms
+++ b/src/mesa/shader/descrip.mms
@@ -1,6 +1,6 @@
 # Makefile for core library for VMS
 # contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 23 March 2004
+# Last revision : 15 April 2005
 
 .first
        define gl [---.include.gl]
@@ -54,6 +54,12 @@ OBJECTS = \
 VERSION=Mesa V3.4
 
 ##### TARGETS #####
+all : 
+       $(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
+       set def [.slang]
+       $(MMS)$(MMSQUALIFIERS)
+       set def [-]
+
 # Make the library
 $(LIBDIR)$(GL_LIB) : $(OBJECTS)
   @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
@@ -74,4 +80,5 @@ nvvertexec.obj : nvvertexec.c
 nvvertparse.obj : nvvertparse.c
 program.obj : program.c
 shaderobjects.obj : shaderobjects.c
+       cc$(CFLAGS)/nowarn shaderobjects.c
 shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index e406e1090c5b694bbdfe624443d69dffbc54c60a..63d28083cc859db8fcd4d5ff1042baa90b37cf78 100644 (file)
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -810,7 +810,7 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
              modifier == STATE_MATRIX_INVTRANS) {
             /* Be sure inverse is up to date:
             */
-           _math_matrix_analyse( matrix );
+           _math_matrix_analyse( (GLmatrix*) matrix );
             m = matrix->inv;
          }
          else {

diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
new file mode 100644 (file)
index 0000000..2ae622a
--- /dev/null
+++ b/src/mesa/shader/slang/descrip.mms
@@ -0,0 +1,41 @@
+# Makefile for core library for VMS
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
+# Last revision : 18 April 2005
+
+.first
+       define gl [----.include.gl]
+       define math [--.math]
+       define swrast [--.swrast]
+       define array_cache [--.array_cache]
+
+.include [----]mms-config.
+
+##### MACROS #####
+
+VPATH = RCS
+
+INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-]
+LIBDIR = [----.lib]
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+
+SOURCES = \
+       slang_compile.c,slang_preprocess.c
+
+OBJECTS = \
+       slang_compile.obj,slang_preprocess.obj
+
+##### RULES #####
+
+VERSION=Mesa V3.4
+
+##### TARGETS #####
+# Make the library
+$(LIBDIR)$(GL_LIB) : $(OBJECTS)
+  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
+
+clean :
+       purge
+       delete *.obj;*
+
+slang_compile.obj : slang_compile.c
+slang_preprocess.obj : slang_preprocess.c

diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 1fed790bdf78fb6664fc0ea8f13b759e1c310894..5ecef00c1d077273e1b43aadfa2ddcedf670ce70 100644 (file)
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -1978,7 +1978,7 @@ static int compile_with_grammar (grammar id, const char *source, slang_translati
        {
                char buf[1024];
                unsigned int pos;
-               grammar_get_last_error (buf, 1024, &pos);
+               grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
                slang_info_log_error (log, buf);
                return 0;
        }
@@ -2013,7 +2013,7 @@ int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit
        {
                char buf[1024];
                unsigned int pos;
-               grammar_get_last_error (buf, 1024, &pos);
+               grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
                slang_info_log_error (log, buf);
                return 0;
        }

diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index b9c7a9efceb0401febba446b417667243197e0c9..7159db7e1e2886f7ded3c82742ec126db67bd534 100644 (file)
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -49,7 +49,7 @@ int _slang_preprocess_version (const char *text, unsigned int *version, unsigned
        {\r
                char buf[1024];\r
                unsigned int pos;\r
-               grammar_get_last_error (buf, 1024, &pos);\r
+               grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);\r
                slang_info_log_error (log, buf);\r
                return 0;\r
        }\r
@@ -58,7 +58,7 @@ int _slang_preprocess_version (const char *text, unsigned int *version, unsigned
        {\r
                char buf[1024];\r
                unsigned int pos;\r
-               grammar_get_last_error (buf, 1024, &pos);\r
+               grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);\r
                slang_info_log_error (log, buf);\r
                grammar_destroy (id);\r
                return 0;\r