nir: remove dependency on glsl
Move glsl_types into NIR, now that the dependency on glsl_symbol_table has been split out. Possibly makes sense to rename things at this point, but if we do that I'd like to keep it split out into a separate patch to make git history easier to follow (IMHO). v2: fix android build v3: I f***ing hate scons.. but at least it builds Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
parent
183db3a645
commit
b9b40ef9b7
|
@ -6,6 +6,8 @@ Import('*')
|
|||
env = env.Clone()
|
||||
|
||||
env.Append(CPPPATH = [
|
||||
'#/src/glsl',
|
||||
'#/src/glsl/nir',
|
||||
'#/src/mapi',
|
||||
'#/src/mesa',
|
||||
'#/src/mesa/main',
|
||||
|
@ -36,6 +38,7 @@ env.Prepend(LIBS = [
|
|||
|
||||
sources = [
|
||||
'xlib.c',
|
||||
'glsl_types_hack.cpp',
|
||||
]
|
||||
|
||||
if True:
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
/* errrg scons.. otherwise "scons: *** Two environments with different actions were specified for the same target: $mesa/build/linux-x86_64-debug/glsl/nir/glsl_types.os" */
|
||||
#include "glsl_types.cpp"
|
||||
|
|
@ -148,9 +148,6 @@ libglsl_la_SOURCES = \
|
|||
|
||||
|
||||
libnir_la_SOURCES = \
|
||||
glsl_types.cpp \
|
||||
builtin_types.cpp \
|
||||
glsl_symbol_table.cpp \
|
||||
$(NIR_FILES) \
|
||||
$(NIR_GENERATED_FILES)
|
||||
|
||||
|
|
|
@ -20,6 +20,8 @@ NIR_GENERATED_FILES = \
|
|||
NIR_FILES = \
|
||||
nir/glsl_to_nir.cpp \
|
||||
nir/glsl_to_nir.h \
|
||||
nir/glsl_types.cpp \
|
||||
nir/glsl_types.h \
|
||||
nir/nir.c \
|
||||
nir/nir.h \
|
||||
nir/nir_array.h \
|
||||
|
@ -104,8 +106,6 @@ LIBGLSL_FILES = \
|
|||
glsl_parser_extras.h \
|
||||
glsl_symbol_table.cpp \
|
||||
glsl_symbol_table.h \
|
||||
glsl_types.cpp \
|
||||
glsl_types.h \
|
||||
hir_field_selection.cpp \
|
||||
ir_basic_block.cpp \
|
||||
ir_basic_block.h \
|
||||
|
|
|
@ -16,6 +16,7 @@ env.Prepend(CPPPATH = [
|
|||
'#src/gallium/include',
|
||||
'#src/gallium/auxiliary',
|
||||
'#src/glsl',
|
||||
'#src/glsl/nir',
|
||||
'#src/glsl/glcpp',
|
||||
])
|
||||
|
||||
|
@ -80,6 +81,7 @@ mesa_objs = env.StaticObject([
|
|||
'prog_hash_table.c',
|
||||
'symbol_table.c',
|
||||
'dummy_errors.c',
|
||||
'nir/glsl_types.cpp',
|
||||
])
|
||||
|
||||
compiler_objs += mesa_objs
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
/* C wrapper around glsl_types.h */
|
||||
|
||||
#include "../glsl_types.h"
|
||||
#include "glsl_types.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -60,6 +60,7 @@ LOCAL_C_INCLUDES := \
|
|||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/mesa/main \
|
||||
$(MESA_TOP)/src/glsl \
|
||||
$(MESA_TOP)/src/glsl/nir \
|
||||
$(MESA_TOP)/src/gallium/include \
|
||||
$(MESA_TOP)/src/gallium/auxiliary
|
||||
|
||||
|
|
|
@ -37,6 +37,7 @@ LOCAL_MODULE := libmesa_glsl_utils
|
|||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(MESA_TOP)/src/glsl \
|
||||
$(MESA_TOP)/src/glsl/nir \
|
||||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/gallium/include \
|
||||
$(MESA_TOP)/src/gallium/auxiliary
|
||||
|
@ -62,6 +63,7 @@ LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
|
|||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(MESA_TOP)/src/glsl \
|
||||
$(MESA_TOP)/src/glsl/nir \
|
||||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/gallium/include \
|
||||
$(MESA_TOP)/src/gallium/auxiliary
|
||||
|
|
|
@ -55,6 +55,7 @@ LOCAL_C_INCLUDES := \
|
|||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/mesa/main \
|
||||
$(MESA_TOP)/src/glsl \
|
||||
$(MESA_TOP)/src/glsl/nir \
|
||||
$(MESA_TOP)/src/gallium/auxiliary \
|
||||
$(MESA_TOP)/src/gallium/include
|
||||
|
||||
|
|
|
@ -620,6 +620,7 @@ INCLUDE_DIRS = \
|
|||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/glsl \
|
||||
-I$(top_srcdir)/src/glsl/nir \
|
||||
-I$(top_builddir)/src/glsl \
|
||||
-I$(top_builddir)/src/glsl/nir \
|
||||
-I$(top_srcdir)/src/glsl/glcpp \
|
||||
|
|
|
@ -16,6 +16,7 @@ env.Append(CPPPATH = [
|
|||
'#/src',
|
||||
'#/src/mapi',
|
||||
'#/src/glsl',
|
||||
'#/src/glsl/nir',
|
||||
'#/src/mesa',
|
||||
'#/src/gallium/include',
|
||||
'#/src/gallium/auxiliary',
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
* \author Eric Anholt <eric@anholt.net>
|
||||
*/
|
||||
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir.h"
|
||||
#include "program/prog_instruction.h" /* For WRITEMASK_* */
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "brw_dead_control_flow.h"
|
||||
#include "main/uniforms.h"
|
||||
#include "brw_fs_live_variables.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "program/sampler.h"
|
||||
|
||||
using namespace brw;
|
||||
|
|
|
@ -48,7 +48,7 @@ extern "C" {
|
|||
#include "brw_wm.h"
|
||||
#include "intel_asm_annotation.h"
|
||||
}
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir.h"
|
||||
#include "glsl/nir/nir.h"
|
||||
#include "program/sampler.h"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
#include "brw_wm.h"
|
||||
#include "glsl/ir.h"
|
||||
#include "glsl/ir_expression_flattening.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
|
||||
class ir_channel_expressions_visitor : public ir_hierarchical_visitor {
|
||||
public:
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "brw_fs.h"
|
||||
#include "brw_cfg.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir_optimization.h"
|
||||
|
||||
using namespace brw;
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include "glsl/ir.h"
|
||||
#include "glsl/ir_visitor.h"
|
||||
#include "glsl/ir_rvalue_visitor.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "util/hash_table.h"
|
||||
|
||||
static bool debug = false;
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include "brw_vec4.h"
|
||||
#include "brw_fs.h"
|
||||
#include "main/uniforms.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir_optimization.h"
|
||||
#include "program/sampler.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
* \author Chris Forbes <chrisf@ijw.co.nz>
|
||||
*/
|
||||
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir.h"
|
||||
#include "glsl/ir_builder.h"
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "brw_vec4.h"
|
||||
#include "brw_cfg.h"
|
||||
#include "brw_shader.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir_optimization.h"
|
||||
|
||||
using namespace brw;
|
||||
|
|
|
@ -4,6 +4,8 @@ env = env.Clone()
|
|||
|
||||
env.Append(CPPPATH = [
|
||||
'#/src',
|
||||
'#/src/glsl',
|
||||
'#/src/glsl/nir',
|
||||
'#/src/mapi',
|
||||
'#/src/mesa',
|
||||
'#/src/mesa/main',
|
||||
|
@ -31,6 +33,7 @@ sources = [
|
|||
'xm_dd.c',
|
||||
'xm_line.c',
|
||||
'xm_tri.c',
|
||||
'../../../glsl/nir/glsl_types.cpp',
|
||||
]
|
||||
|
||||
# Disallow undefined symbols
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "glsl/ir_optimization.h"
|
||||
#include "glsl/glsl_parser_extras.h"
|
||||
#include "glsl/glsl_symbol_table.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "program/ir_to_mesa.h"
|
||||
#include "program/program.h"
|
||||
#include "program/programopt.h"
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#define UNIFORMS_H
|
||||
|
||||
#include "main/glheader.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir_uniform.h"
|
||||
#include "program/prog_parameter.h"
|
||||
|
||||
|
|
|
@ -75,6 +75,7 @@ LOCAL_C_INCLUDES := \
|
|||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/mesa \
|
||||
$(MESA_TOP)/src/glsl \
|
||||
$(MESA_TOP)/src/glsl/nir \
|
||||
$(MESA_TOP)/src/gallium/auxiliary \
|
||||
$(MESA_TOP)/src/gallium/include
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include "glsl/ir_optimization.h"
|
||||
#include "glsl/ir_uniform.h"
|
||||
#include "glsl/glsl_parser_extras.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/linker.h"
|
||||
#include "glsl/program.h"
|
||||
#include "program/hash_table.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
*/
|
||||
|
||||
#include "main/mtypes.h"
|
||||
#include "glsl/glsl_types.h"
|
||||
#include "glsl/nir/glsl_types.h"
|
||||
#include "glsl/ir.h"
|
||||
#include "glsl/ir_uniform.h"
|
||||
#include "glsl/ir_visitor.h"
|
||||
|
|
Loading…
Reference in New Issue