Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shader_dxbc.h compiling on linux with vulkan #3382

Closed
wants to merge 2 commits into from
Closed

Fix shader_dxbc.h compiling on linux with vulkan #3382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05c965d
Fix shader_dxbc.h compiling on linux with vulkan
L3nn0x Nov 25, 2024
a80f51e
Add guards around undef
L3nn0x Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/shader_dxbc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down