From cebad151a11ea2f189d40a2a4c51e8469eed6267 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 22 Feb 2006 16:43:26 +0000 Subject: add missing prototypes, use _slang_ prefix on non-static functions --- src/mesa/shader/shaderobjects_3dlabs.c | 4 ++-- src/mesa/shader/shaderobjects_3dlabs.h | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/shader/shaderobjects_3dlabs.c b/src/mesa/shader/shaderobjects_3dlabs.c index 6af33226dc..0cfe275633 100755 --- a/src/mesa/shader/shaderobjects_3dlabs.c +++ b/src/mesa/shader/shaderobjects_3dlabs.c @@ -1183,7 +1183,7 @@ int _slang_fetch_discard (struct gl2_fragment_shader_intf **fs, GLboolean *val) return 1; } -void exec_vertex_shader (struct gl2_vertex_shader_intf **vs) +void _slang_exec_vertex_shader (struct gl2_vertex_shader_intf **vs) { struct gl2_vertex_shader_impl *impl; slang_translation_unit *unit; @@ -1225,7 +1225,7 @@ void exec_vertex_shader (struct gl2_vertex_shader_intf **vs) } } -void exec_fragment_shader (struct gl2_fragment_shader_intf **fs) +void _slang_exec_fragment_shader (struct gl2_fragment_shader_intf **fs) { struct gl2_fragment_shader_impl *impl; slang_translation_unit *unit; diff --git a/src/mesa/shader/shaderobjects_3dlabs.h b/src/mesa/shader/shaderobjects_3dlabs.h index 4cb8cf4540..c18c7ffe94 100755 --- a/src/mesa/shader/shaderobjects_3dlabs.h +++ b/src/mesa/shader/shaderobjects_3dlabs.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) 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"), @@ -27,6 +27,30 @@ #include "mtypes.h" + +extern int _slang_fetch_float(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, int write); + +extern int _slang_fetch_vec3(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, int write); + +extern int _slang_fetch_vec4(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, GLuint index, int write); + +extern int _slang_fetch_vec4_f(struct gl2_fragment_shader_intf **fs, const char *name, GLfloat *val, GLuint index, int write); + +extern int _slang_fetch_mat3(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, GLuint index, int write); + +extern int _slang_fetch_mat4(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, GLuint index, int write); + +extern int _slang_fetch_discard(struct gl2_fragment_shader_intf **fs, GLboolean *val); + +extern GLint _slang_get_uniform_location(struct gl2_program_intf **pro, const char *name); + +extern GLboolean _slang_write_uniform(struct gl2_program_intf **pro, GLint loc, GLsizei count, const GLvoid *data, GLenum type); + +extern void _slang_exec_vertex_shader(struct gl2_vertex_shader_intf **vs); + +extern void _slang_exec_fragment_shader(struct gl2_fragment_shader_intf **fs); + + extern GLhandleARB _mesa_3dlabs_create_shader_object (GLenum); -- cgit v1.2.3