From 0c70101b74db61f883fdd7907a4975ffff735044 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 13 Nov 2019 04:08:23 +0100 Subject: 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 --- 3rdparty/bgfx/src/renderer_d3d11.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '3rdparty/bgfx/src/renderer_d3d11.cpp') diff --git a/3rdparty/bgfx/src/renderer_d3d11.cpp b/3rdparty/bgfx/src/renderer_d3d11.cpp index bf1f13622b9..c098730e32e 100644 --- a/3rdparty/bgfx/src/renderer_d3d11.cpp +++ b/3rdparty/bgfx/src/renderer_d3d11.cpp @@ -2846,6 +2846,7 @@ namespace bgfx { namespace d3d11 | BGFX_STATE_MSAA | BGFX_STATE_LINEAA | BGFX_STATE_CONSERVATIVE_RASTER + | BGFX_STATE_FRONT_CCW ; _state |= _wireframe ? BGFX_STATE_PT_LINES : BGFX_STATE_NONE; _state |= _scissor ? BGFX_STATE_RESERVED_MASK : 0; @@ -2862,7 +2863,7 @@ namespace bgfx { namespace d3d11 D3D11_RASTERIZER_DESC2 desc; desc.FillMode = _wireframe ? D3D11_FILL_WIREFRAME : D3D11_FILL_SOLID; desc.CullMode = s_cullMode[cull]; - desc.FrontCounterClockwise = false; + desc.FrontCounterClockwise = !!(_state&BGFX_STATE_FRONT_CCW); desc.DepthBias = 0; desc.DepthBiasClamp = 0.0f; desc.SlopeScaledDepthBias = 0.0f; -- cgit v1.2.3-70-g09d2