diff --git a/src/shader_dxbc.h b/src/shader_dxbc.h index b3a7cc3d79..b9b04e831e 100644 --- a/src/shader_dxbc.h +++ b/src/shader_dxbc.h @@ -10,6 +10,13 @@ #define DXBC_CHUNK_HEADER BX_MAKEFOURCC('D', 'X', 'B', 'C') +#ifdef None +// on linux when trying to build with vulkan on and opengl off, this file is included after Xlib.h +// which includes X.h, which in turn #define None 0 +// undefining so DxbcOperandModifier::None properly compiles +#undef None +#endif /* #ifdef None */ + namespace bgfx { struct DxbcOpcode