summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2015-02-11 15:21:37 -0800
committerEric Anholt <[email protected]>2015-02-20 11:36:34 -0800
commit90b4bf2e6e1289442331f0368221fde69b60915f (patch)
treee8fb514a4f0eb2881dad12ee64c61d2ecd2faf44 /src/glsl
parentb53d035825ef3ad680470aa5c4f9dc51f8f5676b (diff)
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 <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/glsl_types.h2
1 files changed, 1 insertions, 1 deletions
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 <string.h>
#include <assert.h>
-#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;