diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /src/osd/modules/render/bgfx/shaders/shader.mk | |
parent | c913ccb59d713ce0b91135520719ac5385e54358 (diff) |
WIP: sync bgfx, bx and bimg with latest upstream (#5723)
* Sync with bgfx upstream revision b91d0b6
* Sync with bx upstream revision d60912b
* Sync with bimg upstream revision bd81f60
* Add astc-codec decoder
* Rename VertexDecl to VertexLayout
* Rename UniformType enum Int1 to Sampler.
* Add NVN stub
* Fix unused-const-variable error on macOS
* Drop redundant explicit language parameters
buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only
applied to objective c++ files. As such, hardcoding -x offers no benefit while
preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on
macOS) from working.
* Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning
* Build bgfx as Objective-C++ on macOS
It is needed due to included headers
* Enable Direct3D12 and Vulkan bgfx rendering backends
* Enable building of spirv shaders
* Properly escape /c in cmd call
* Comment out dx12 bgfx renderer
* Honor VERBOSE setting during shaders build
* Only invert hlsl shader XYZ_TO_sRGB matrix for opengl
* Add spirv shaders
* OpenGL ES needs transposed matrix too
* Metal needs transposed matrix as well
Diffstat (limited to 'src/osd/modules/render/bgfx/shaders/shader.mk')
-rw-r--r-- | src/osd/modules/render/bgfx/shaders/shader.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/render/bgfx/shaders/shader.mk b/src/osd/modules/render/bgfx/shaders/shader.mk index e7db3cdc242..b9cf2f47cef 100644 --- a/src/osd/modules/render/bgfx/shaders/shader.mk +++ b/src/osd/modules/render/bgfx/shaders/shader.mk @@ -43,24 +43,24 @@ SHADER_PATH=shaders/dx11/$(SHADERS_DIR) else ifeq ($(TARGET), 2) VS_FLAGS=--platform nacl -FS_FLAGS=--platform nacl +FS_FLAGS=--platform nacl --define TRANSPOSED_XYZ_TO_sRGB SHADER_PATH=shaders/essl/$(SHADERS_DIR) else ifeq ($(TARGET), 3) VS_FLAGS=--platform android -FS_FLAGS=--platform android +FS_FLAGS=--platform android --define TRANSPOSED_XYZ_TO_sRGB CS_FLAGS=--platform android SHADER_PATH=shaders/essl/$(SHADERS_DIR) else ifeq ($(TARGET), 4) VS_FLAGS=--platform linux -p 120 -FS_FLAGS=--platform linux -p 120 +FS_FLAGS=--platform linux -p 120 --define TRANSPOSED_XYZ_TO_sRGB CS_FLAGS=--platform linux -p 430 SHADER_PATH=shaders/glsl/$(SHADERS_DIR) else ifeq ($(TARGET), 5) VS_FLAGS=--platform osx -p metal -FS_FLAGS=--platform osx -p metal +FS_FLAGS=--platform osx -p metal --define TRANSPOSED_XYZ_TO_sRGB CS_FLAGS=--platform osx -p metal SHADER_PATH=shaders/metal/$(SHADERS_DIR) else |