summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/src/bgfx.cpp
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-11-13 04:08:23 +0100
committer R. Belmont <rb6502@users.noreply.github.com>2019-11-12 22:08:23 -0500
commit0c70101b74db61f883fdd7907a4975ffff735044 (patch)
tree067ae1c831088d6853b6f443e5a05a4c5d8cd7aa /3rdparty/bgfx/src/bgfx.cpp
parentc089bea7011de9ca78f43979d902978a113d33e2 (diff)
Sync bgfx, bx and bimg with upstream; fix the hlsl fs_chroma.sc matrix transposition properly (#5875)
* Sync bgfx with upstream revision 280420d * Sync bx with upstream revision 267727d * Sync bimg with upstream revision c1bab10 * Use bgfx helper functions to ensure correct matrix orientation * Rebuild hlsl chain
Diffstat (limited to '3rdparty/bgfx/src/bgfx.cpp')
-rw-r--r--3rdparty/bgfx/src/bgfx.cpp38
1 files changed, 20 insertions, 18 deletions
diff --git a/3rdparty/bgfx/src/bgfx.cpp b/3rdparty/bgfx/src/bgfx.cpp
index 7d8734bea5b..7a8986c500c 100644
--- a/3rdparty/bgfx/src/bgfx.cpp
+++ b/3rdparty/bgfx/src/bgfx.cpp
@@ -5153,35 +5153,37 @@ BX_STATIC_ASSERT(FLAGS_MASK_TEST(0
) );
BX_STATIC_ASSERT( (0
- | BGFX_STATE_WRITE_MASK
- | BGFX_STATE_DEPTH_TEST_MASK
- | BGFX_STATE_BLEND_MASK
+ | BGFX_STATE_ALPHA_REF_MASK
+ | BGFX_STATE_BLEND_ALPHA_TO_COVERAGE
| BGFX_STATE_BLEND_EQUATION_MASK
| BGFX_STATE_BLEND_INDEPENDENT
- | BGFX_STATE_BLEND_ALPHA_TO_COVERAGE
+ | BGFX_STATE_BLEND_MASK
+ | BGFX_STATE_CONSERVATIVE_RASTER
| BGFX_STATE_CULL_MASK
- | BGFX_STATE_ALPHA_REF_MASK
- | BGFX_STATE_PT_MASK
- | BGFX_STATE_POINT_SIZE_MASK
- | BGFX_STATE_MSAA
+ | BGFX_STATE_DEPTH_TEST_MASK
+ | BGFX_STATE_FRONT_CCW
| BGFX_STATE_LINEAA
- | BGFX_STATE_CONSERVATIVE_RASTER
+ | BGFX_STATE_MSAA
+ | BGFX_STATE_POINT_SIZE_MASK
+ | BGFX_STATE_PT_MASK
| BGFX_STATE_RESERVED_MASK
+ | BGFX_STATE_WRITE_MASK
) == (0
- ^ BGFX_STATE_WRITE_MASK
- ^ BGFX_STATE_DEPTH_TEST_MASK
- ^ BGFX_STATE_BLEND_MASK
+ ^ BGFX_STATE_ALPHA_REF_MASK
+ ^ BGFX_STATE_BLEND_ALPHA_TO_COVERAGE
^ BGFX_STATE_BLEND_EQUATION_MASK
^ BGFX_STATE_BLEND_INDEPENDENT
- ^ BGFX_STATE_BLEND_ALPHA_TO_COVERAGE
+ ^ BGFX_STATE_BLEND_MASK
+ ^ BGFX_STATE_CONSERVATIVE_RASTER
^ BGFX_STATE_CULL_MASK
- ^ BGFX_STATE_ALPHA_REF_MASK
- ^ BGFX_STATE_PT_MASK
- ^ BGFX_STATE_POINT_SIZE_MASK
- ^ BGFX_STATE_MSAA
+ ^ BGFX_STATE_DEPTH_TEST_MASK
+ ^ BGFX_STATE_FRONT_CCW
^ BGFX_STATE_LINEAA
- ^ BGFX_STATE_CONSERVATIVE_RASTER
+ ^ BGFX_STATE_MSAA
+ ^ BGFX_STATE_POINT_SIZE_MASK
+ ^ BGFX_STATE_PT_MASK
^ BGFX_STATE_RESERVED_MASK
+ ^ BGFX_STATE_WRITE_MASK
) );
BX_STATIC_ASSERT(FLAGS_MASK_TEST(BGFX_CAPS_TEXTURE_COMPARE_LEQUAL, BGFX_CAPS_TEXTURE_COMPARE_ALL) );