Get it running for ARB_vertex_shader.

Add experimental print functions to builtin library.
Some functionality missing:
- automatic arrays;
- general constructors;
- local variable initialization;
- texture sampling and noise;
- semantic error checking;
- function prototypes.

1 files changed, 32 insertions, 9 deletions

diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 2b040a4446..2d2ac8e42e 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -1,8 +1,8 @@
 /*

  * Mesa 3-D graphics library

- * Version:  6.3

+ * Version:  6.5

  *

- * Copyright (C) 2005  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a

  * copy of this software and associated documentation files (the "Software"),

@@ -34,14 +34,37 @@ extern "C" {
  */

 #define static_assert(expr) do { int _array[(expr) ? 1 : -1]; _array[0]; } while (0)

 

-void slang_alloc_free (void *);

-void *slang_alloc_malloc (unsigned int);

-void *slang_alloc_realloc (void *, unsigned int, unsigned int);

-int slang_string_compare (const char *, const char *);

-char *slang_string_copy (char *, const char *);

+#define slang_alloc_free(ptr) _mesa_free (ptr)

+#define slang_alloc_malloc(size) _mesa_malloc (size)

+#define slang_alloc_realloc(ptr, old_size, size) _mesa_realloc (ptr, old_size, size)

+#define slang_string_compare(str1, str2) _mesa_strcmp (str1, str2)

+#define slang_string_copy(dst, src) _mesa_strcpy (dst, src)

+#define slang_string_duplicate(src) _mesa_strdup (src)

+#define slang_string_length(str) _mesa_strlen (str)

+

 char *slang_string_concat (char *, const char *);

-char *slang_string_duplicate (const char *);

-unsigned int slang_string_length (const char *);

+

+typedef GLvoid *slang_atom;

+

+#define SLANG_ATOM_NULL ((slang_atom) 0)

+

+typedef struct slang_atom_entry_

+{

+	char *id;

+	struct slang_atom_entry_ *next;

+} slang_atom_entry;

+

+#define SLANG_ATOM_POOL_SIZE 1023

+

+typedef struct slang_atom_pool_

+{

+	slang_atom_entry *entries[SLANG_ATOM_POOL_SIZE];

+} slang_atom_pool;

+

+void slang_atom_pool_construct (slang_atom_pool *);

+void slang_atom_pool_destruct (slang_atom_pool *);

+slang_atom slang_atom_pool_atom (slang_atom_pool *, const char *);

+const char *slang_atom_pool_id (slang_atom_pool *, slang_atom);

 

 #ifdef __cplusplus

 }