Fix 'make check' in src/mapi/glapi/tests when builddir != srcdir

[mesa.git] / src / glsl / program.h

diff --git a/src/glsl/program.h b/src/glsl/program.h
index ea2c4ab0ddaa99c59039faa3dc55e296fbb2793d..f15113a08d2050d66f0a3a8fbbf7f85229090f90 100644 (file)
--- a/src/glsl/program.h
+++ b/src/glsl/program.h
@@ -16,18 +16,37 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <GL/gl.h>
-#include "main/mtypes.h"
+#include "main/core.h"
 
+#ifdef __cplusplus
 extern "C" {
-#include "program/prog_parameter.h"
-#include "program/prog_uniform.h"
-}
+#endif
 
 extern void
-link_shaders(GLcontext *ctx, struct gl_shader_program *prog);
+_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
+                         bool dump_ast, bool dump_hir);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+extern void
+link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);
+
+extern void
+linker_error(struct gl_shader_program *prog, const char *fmt, ...)
+   PRINTFLIKE(2, 3);
+
+extern void
+linker_warning(struct gl_shader_program *prog, const char *fmt, ...)
+   PRINTFLIKE(2, 3);
+
+extern long
+parse_program_resource_name(const GLchar *name,
+                            const GLchar **out_base_name_end);