On Monday, April 24, 2017 3:19:08 PM PDT Rafael Antognolli wrote: > We need to use some enums inside genX_state_upload.c, but including the > whole header will cause several conflicts between things defined in this > header and the genxml auto-generated headers. > > So create a separate header that is included both by brw_eu_defines.h > and genX_state_upload.c. > > Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com> > --- > src/intel/Makefile.sources | 1 +- > src/intel/compiler/brw_defines_common.h | 46 ++++++++++++++++++++++++++- > src/intel/compiler/brw_eu_defines.h | 22 +------------ > 3 files changed, 48 insertions(+), 21 deletions(-) > create mode 100644 src/intel/compiler/brw_defines_common.h
I don't really like this, but without digging into the issue, I'm not sure what else to suggest. Acked-by: Kenneth Graunke <kenn...@whitecape.org> Maybe we could just remove the conflicting pieces?
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev