OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Move gen6_blorp.c to a file that gets recompiled per-gen

Browse Source 
At the moment, it's only used for gen6 but that will change soon.  We use
the genX prefix for recompiled things in the Vulkan driver.  It isn't
great, but it seems to have worked ok.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand
2016-08-08 14:07:12 -07:00
parent eea6a66222
commit c8bc1ae96a
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/drivers/dri/i965/Makefile.am
View File

@@ -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 \

4
src/mesa/drivers/dri/i965/Makefile.sources
View File

@@ -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

5
src/mesa/drivers/dri/i965/gen6_blorp.c → src/mesa/drivers/dri/i965/genX_blorp_exec.c
View File

@@ -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;