diff options
| author | Matt Turner <[email protected]> | 2015-11-22 21:54:28 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-11-24 10:05:33 -0800 |
| commit | 64cc7572c12fcbfb8346bdd994940a2af314342d (patch) | |
| tree | 25c6f8d586036b4f56b5a275e03eed0569ca3db7 /src/mesa/drivers | |
| parent | fb86f0e75ade89535f8603754c8e24e415d7c52b (diff) | |
i965: Mark functions called from C as extern "C".
These functions' prototypes are marked with extern "C", which apparently
overrides a lack of extern "C" at the definition site if the prototype
has been seen first.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 14421d421b6..b3a97476ec6 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -198,7 +198,7 @@ process_glsl_ir(gl_shader_stage stage, } } -GLboolean +extern "C" GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) { struct brw_context *brw = brw_context(ctx); diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 810a36abe04..2a25be5aa3b 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -144,7 +144,7 @@ brw_compiler_create(void *mem_ctx, const struct brw_device_info *devinfo) return compiler; } -struct gl_shader * +extern "C" struct gl_shader * brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type) { struct brw_shader *shader; @@ -160,7 +160,7 @@ brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type) return &shader->base; } -void +extern "C" void brw_mark_surface_used(struct brw_stage_prog_data *prog_data, unsigned surf_index) { |