diff options
| author | José Fonseca <[email protected]> | 2011-11-09 10:20:51 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-11-09 10:24:37 +0000 |
| commit | 63e7a4c6e5bf51d8090046ebc5adcb4207448565 (patch) | |
| tree | b701753960e53fe36889273def9d28e0059445d6 /src/mesa/program/ir_to_mesa.h | |
| parent | f4b42aa5b7a3d11f839d5576b4c42406529131be (diff) | |
mesa,glsl,mapi: Put extern "C" { ... } where appropriate.
Probably a several places missing, but enough to cover all headers
(in)directly included by uniform_query.cpp, and fix the MSVC build.
Diffstat (limited to 'src/mesa/program/ir_to_mesa.h')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h index 2891682ba7a..aa053d9c8e3 100644 --- a/src/mesa/program/ir_to_mesa.h +++ b/src/mesa/program/ir_to_mesa.h @@ -21,24 +21,23 @@ * DEALINGS IN THE SOFTWARE. */ -#include "main/glheader.h" +#pragma once -struct gl_context; -struct gl_shader; -struct gl_shader_program; +#include "main/glheader.h" #ifdef __cplusplus extern "C" { #endif +struct gl_context; +struct gl_shader; +struct gl_shader_program; + void _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *sh); void _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog); GLboolean _mesa_ir_compile_shader(struct gl_context *ctx, struct gl_shader *shader); GLboolean _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog); -#ifdef __cplusplus -} - void _mesa_generate_parameters_list_for_uniforms(struct gl_shader_program *shader_program, @@ -50,4 +49,6 @@ _mesa_associate_uniform_storage(struct gl_context *ctx, struct gl_shader_program *shader_program, struct gl_program_parameter_list *params); +#ifdef __cplusplus +} #endif |