commit 6ca948a303e1af7ae66ea7082af741f6880887f2
author Brian Paul <brian.paul@tungstengraphics.com> Wed May 14 12:53:03 2008 -0600
committer Brian Paul <brian.paul@tungstengraphics.com> Wed May 14 12:53:03 2008 -0600
tree a497895b6edac79d78853913ddd91080f05e18ac
parent 19ad9cf7741c641bd83d20485b32d11fe27ca8df

added _mesa_combine_parameter_lists()

cherry-picked from gallium-0.1

src/mesa/shader/prog_parameter.h

diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h
index 09ff851..105f6f2 100644
--- a/src/mesa/shader/prog_parameter.h
+++ b/src/mesa/shader/prog_parameter.h
@@ -78,6 +78,16 @@
 extern struct gl_program_parameter_list *
 _mesa_clone_parameter_list(const struct gl_program_parameter_list *list);
 
+extern struct gl_program_parameter_list *
+_mesa_combine_parameter_lists(const struct gl_program_parameter_list *a,
+                              const struct gl_program_parameter_list *b);
+
+static INLINE GLuint
+_mesa_num_parameters(const struct gl_program_parameter_list *list)
+{
+   return list ? list->NumParameters : 0;
+}
+
 extern GLint
 _mesa_add_parameter(struct gl_program_parameter_list *paramList,
                     enum register_file type, const char *name,