glsl: remove extern "C" around #includes
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
@@ -25,13 +25,10 @@
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
extern "C" {
|
||||
#include "main/core.h" /* for struct gl_context */
|
||||
#include "main/context.h"
|
||||
#include "main/shaderobj.h"
|
||||
#include "util/u_atomic.h" /* for p_atomic_cmpxchg */
|
||||
}
|
||||
|
||||
#include "util/ralloc.h"
|
||||
#include "ast.h"
|
||||
#include "glsl_parser_extras.h"
|
||||
|
||||
@@ -25,9 +25,8 @@
|
||||
#include "main/core.h" /* for Elements, MAX2 */
|
||||
#include "glsl_parser_extras.h"
|
||||
#include "glsl_types.h"
|
||||
extern "C" {
|
||||
#include "program/hash_table.h"
|
||||
}
|
||||
|
||||
|
||||
mtx_t glsl_type::mutex = _MTX_INITIALIZER_NP;
|
||||
hash_table *glsl_type::array_types = NULL;
|
||||
|
||||
+1
-2
@@ -76,10 +76,9 @@
|
||||
#include "ir_rvalue_visitor.h"
|
||||
#include "ir_uniform.h"
|
||||
|
||||
extern "C" {
|
||||
#include "main/shaderobj.h"
|
||||
#include "main/enums.h"
|
||||
}
|
||||
|
||||
|
||||
void linker_error(gl_shader_program *, const char *, ...);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user