OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3810c15
)
nir: include what we want/need
author
Emil Velikov
<emil.velikov@collabora.com>
Tue, 24 Nov 2015 15:33:45 +0000
(15:33 +0000)
committer
Emil Velikov
<emil.l.velikov@gmail.com>
Wed, 25 Nov 2015 20:19:47 +0000
(20:19 +0000)
Swap core.h with macros.h, as the latter provides the required MAX2
macro.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
src/glsl/nir/glsl_types.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/nir/glsl_types.cpp
b/src/glsl/nir/glsl_types.cpp
index
9cc3715
..
3cf2f03
100644
(file)
--- a/
src/glsl/nir/glsl_types.cpp
+++ b/
src/glsl/nir/glsl_types.cpp
@@
-22,7
+22,7
@@
*/
#include <stdio.h>
-#include "main/
core.h" /* for Elements, MAX2 */
+#include "main/
macros.h"
#include "glsl_parser_extras.h"
#include "glsl_types.h"
#include "util/hash_table.h"