[Mesa-stable] [PATCH 2/3] i965: fix glsl/float64_glsl.h include

Mauro Rossi issor.oruam at gmail.com
Sat Feb 2 10:29:55 UTC 2019


Fixes the following build error:

external/mesa/src/mesa/drivers/dri/i965/brw_program.c:45:10:
fatal error: 'compiler/glsl/float64_glsl.h' file not found
#include "compiler/glsl/float64_glsl.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

Include of src/compiler in builddir is added accordingly

Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Fixes: 7d7b308 ("automake: Fix path to generated source")
Fixes: b63a1f8 ("glsl: Create file to contain software fp64 functions")
Cc: 19.0 <mesa-stable at lists.freedesktop.org>
---
 src/mesa/drivers/dri/i965/Makefile.am   | 1 +
 src/mesa/drivers/dri/i965/brw_program.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index b562c6ea21..48d15296d9 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -34,6 +34,7 @@ AM_CFLAGS = \
 	-I$(top_builddir)/src/util \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	-I$(top_srcdir)/src/gtest/include \
+	-I$(top_builddir)/src/compiler/ \
 	-I$(top_builddir)/src/compiler/glsl \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/src/compiler/nir \
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 9ab25cf664..1038d9a47a 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -42,7 +42,7 @@
 #include "compiler/glsl/ir.h"
 #include "compiler/glsl/program.h"
 #include "compiler/glsl/glsl_to_nir.h"
-#include "compiler/glsl/float64_glsl.h"
+#include "glsl/float64_glsl.h"
 
 #include "brw_program.h"
 #include "brw_context.h"
-- 
2.19.1



More information about the mesa-stable mailing list