diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 14 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_blorp_exec.c (renamed from src/mesa/drivers/dri/i965/gen6_blorp.c) | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 77ad1e84c45..02e46ad1289 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -48,11 +48,22 @@ brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py $(top_srcdir)/src/compil $(MKDIR_GEN) $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_nir_trig_workarounds.py > $@ || ($(RM) $@; false) -noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la +I965_PERGEN_LIBS = \ + libi965_gen6.la + +libi965_gen6_la_SOURCES = $(i965_gen6_FILES) +libi965_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60 + +noinst_LTLIBRARIES = \ + libi965_dri.la \ + libi965_compiler.la \ + $(I965_PERGEN_LIBS) + libi965_dri_la_SOURCES = $(i965_FILES) libi965_dri_la_LIBADD = \ $(top_builddir)/src/intel/isl/libisl.la \ libi965_compiler.la \ + $(I965_PERGEN_LIBS) \ $(INTEL_LIBS) libi965_compiler_la_SOURCES = \ @@ -67,6 +78,7 @@ EXTRA_DIST = \ TEST_LIBS = \ libi965_compiler.la \ + $(I965_PERGEN_LIBS) \ $(top_builddir)/src/compiler/nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/intel/isl/libisl.la \ diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 735a312e9a5..11dc08c538f 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -176,7 +176,6 @@ i965_FILES = \ brw_wm.h \ brw_wm_state.c \ brw_wm_surface_state.c \ - gen6_blorp.c \ gen6_cc.c \ gen6_clip_state.c \ gen6_constant_state.c \ @@ -261,3 +260,6 @@ i965_FILES = \ intel_tiled_memcpy.c \ intel_tiled_memcpy.h \ intel_upload.c + +i965_gen6_FILES = \ + genX_blorp_exec.c diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index ce65f348796..87318272cfa 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -31,7 +31,6 @@ #include "blorp_priv.h" -#define GEN_VERSIONx10 60 #include "genxml/gen_macros.h" static void * @@ -302,8 +301,8 @@ blorp_emit_viewport_state(struct brw_context *brw, * This function alters no GL state. */ void -gen6_blorp_exec(struct brw_context *brw, - const struct brw_blorp_params *params) +genX(blorp_exec)(struct brw_context *brw, + const struct brw_blorp_params *params) { uint32_t cc_blend_state_offset = 0; uint32_t cc_state_offset = 0; |