projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc16942
)
nir: remove recursive inclusion in builtin_type_macros.h
author
Emil Velikov
<emil.velikov@collabora.com>
Wed, 25 Nov 2015 21:31:56 +0000
(21:31 +0000)
committer
Emil Velikov
<emil.l.velikov@gmail.com>
Sun, 29 Nov 2015 14:41:39 +0000
(14:41 +0000)
The header is already included by glsl_types.{cpp,h}.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
src/glsl/nir/builtin_type_macros.h
patch
|
blob
|
history
diff --git
a/src/glsl/nir/builtin_type_macros.h
b/src/glsl/nir/builtin_type_macros.h
index 8e16ae4548937e1e68c5989234f0ed6f5986a684..7bd2e4e65583c9cc085d70c97533251a380f40b1 100644
(file)
--- a/
src/glsl/nir/builtin_type_macros.h
+++ b/
src/glsl/nir/builtin_type_macros.h
@@
-28,8
+28,6
@@
* language version or extension might provide them.
*/
-#include "glsl_types.h"
-
DECL_TYPE(error, GL_INVALID_ENUM, GLSL_TYPE_ERROR, 0, 0)
DECL_TYPE(void, GL_INVALID_ENUM, GLSL_TYPE_VOID, 0, 0)