From 90b4bf2e6e1289442331f0368221fde69b60915f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Feb 2015 15:21:37 -0800 Subject: [PATCH] glsl: Only include mtypes from glsl_types.h for the C++ code that needs it. It's used in one of the methods, not in the structure definitions. Reviewed-by: Jose Fonseca --- src/glsl/glsl_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 5dc7e459b3d..7359e94764c 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -28,7 +28,6 @@ #include #include -#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */ #ifdef __cplusplus extern "C" { @@ -104,6 +103,7 @@ enum glsl_matrix_layout { #ifdef __cplusplus #include "GL/gl.h" #include "util/ralloc.h" +#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */ struct glsl_type { GLenum gl_type; -- 2.30.2