compiler: Move glsl_to_nir to libglsl.la
Right now libglsl.la depends on libnir.la so putting it in libnir.la adds a dependency on libglsl.la that goes the wrong direction. Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
parent
ddcfc35f62
commit
32210dea8e
|
@ -38,6 +38,7 @@ LOCAL_SRC_FILES := \
|
|||
$(LIBGLSL_FILES) \
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(MESA_TOP)/src/compiler/nir \
|
||||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/mesa \
|
||||
$(MESA_TOP)/src/gallium/include \
|
||||
|
|
|
@ -31,6 +31,8 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/src/compiler/glsl\
|
||||
-I$(top_srcdir)/src/compiler/glsl\
|
||||
-I$(top_srcdir)/src/compiler/glsl/glcpp\
|
||||
-I$(top_builddir)/src/compiler/nir \
|
||||
-I$(top_srcdir)/src/compiler/nir \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_srcdir)/src/gtest/include \
|
||||
|
|
|
@ -23,11 +23,6 @@
|
|||
|
||||
noinst_LTLIBRARIES += nir/libnir.la
|
||||
|
||||
nir_libnir_la_CPPFLAGS = \
|
||||
$(AM_CPPFLAGS) \
|
||||
-I$(top_builddir)/src/compiler/nir \
|
||||
-I$(top_srcdir)/src/compiler/nir
|
||||
|
||||
nir_libnir_la_LIBADD = \
|
||||
libcompiler.la
|
||||
|
||||
|
|
|
@ -25,6 +25,8 @@ LIBGLSL_FILES = \
|
|||
glsl/glsl_parser_extras.h \
|
||||
glsl/glsl_symbol_table.cpp \
|
||||
glsl/glsl_symbol_table.h \
|
||||
glsl/glsl_to_nir.cpp \
|
||||
glsl/glsl_to_nir.h \
|
||||
glsl/hir_field_selection.cpp \
|
||||
glsl/ir_basic_block.cpp \
|
||||
glsl/ir_basic_block.h \
|
||||
|
@ -164,8 +166,6 @@ NIR_GENERATED_FILES = \
|
|||
nir/nir_opt_algebraic.c
|
||||
|
||||
NIR_FILES = \
|
||||
nir/glsl_to_nir.cpp \
|
||||
nir/glsl_to_nir.h \
|
||||
nir/nir.c \
|
||||
nir/nir.h \
|
||||
nir/nir_array.h \
|
||||
|
|
|
@ -17,12 +17,15 @@ env.Prepend(CPPPATH = [
|
|||
'#src/gallium/auxiliary',
|
||||
'#src/compiler/glsl',
|
||||
'#src/compiler/glsl/glcpp',
|
||||
'#src/compiler/nir',
|
||||
])
|
||||
|
||||
env.Prepend(LIBS = [mesautil])
|
||||
|
||||
# Make glcpp-parse.h and glsl_parser.h reachable from the include path.
|
||||
env.Prepend(CPPPATH = [Dir('.').abspath, Dir('glsl').abspath])
|
||||
# Make NIR headers reachable from the include path.
|
||||
env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath])
|
||||
|
||||
glcpp_env = env.Clone()
|
||||
glcpp_env.Append(YACCFLAGS = [
|
||||
|
|
|
@ -26,11 +26,11 @@
|
|||
*/
|
||||
|
||||
#include "glsl_to_nir.h"
|
||||
#include "nir_control_flow.h"
|
||||
#include "nir_builder.h"
|
||||
#include "compiler/glsl/ir_visitor.h"
|
||||
#include "compiler/glsl/ir_hierarchical_visitor.h"
|
||||
#include "compiler/glsl/ir.h"
|
||||
#include "ir_visitor.h"
|
||||
#include "ir_hierarchical_visitor.h"
|
||||
#include "ir.h"
|
||||
#include "compiler/nir/nir_control_flow.h"
|
||||
#include "compiler/nir/nir_builder.h"
|
||||
#include "main/imports.h"
|
||||
|
||||
/*
|
|
@ -25,7 +25,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "nir.h"
|
||||
#include "compiler/nir/nir.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
|
@ -45,7 +45,7 @@
|
|||
#include "ir3.h"
|
||||
|
||||
#include "compiler/glsl/standalone.h"
|
||||
#include "compiler/nir/glsl_to_nir.h"
|
||||
#include "compiler/glsl/glsl_to_nir.h"
|
||||
|
||||
static void dump_info(struct ir3_shader_variant *so, const char *str)
|
||||
{
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "brw_nir.h"
|
||||
#include "brw_shader.h"
|
||||
#include "compiler/glsl_types.h"
|
||||
#include "compiler/nir/glsl_to_nir.h"
|
||||
#include "compiler/glsl/glsl_to_nir.h"
|
||||
#include "compiler/nir/nir_builder.h"
|
||||
#include "program/prog_to_nir.h"
|
||||
#include "program/prog_parameter.h"
|
||||
|
|
|
@ -42,8 +42,8 @@
|
|||
#include "st_glsl_types.h"
|
||||
|
||||
#include "compiler/nir/nir.h"
|
||||
#include "compiler/nir/glsl_to_nir.h"
|
||||
#include "compiler/glsl_types.h"
|
||||
#include "compiler/glsl/glsl_to_nir.h"
|
||||
#include "compiler/glsl/ir.h"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue