summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-10-13 13:50:38 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2019-10-13 07:50:38 -0400
commit0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch)
tree626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc
parentc913ccb59d713ce0b91135520719ac5385e54358 (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 '3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc')
-rw-r--r--3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc19
1 files changed, 8 insertions, 11 deletions
diff --git a/3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc b/3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc
index 24c509732b7..31929c4b648 100644
--- a/3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc
+++ b/3rdparty/bgfx/examples/06-bump/vs_bump_instanced.sc
@@ -2,7 +2,7 @@ $input a_position, a_normal, a_tangent, a_texcoord0, i_data0, i_data1, i_data2,
$output v_wpos, v_view, v_normal, v_tangent, v_bitangent, v_texcoord0
/*
- * Copyright 2011-2018 Branimir Karadzic. All rights reserved.
+ * Copyright 2011-2019 Branimir Karadzic. All rights reserved.
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
@@ -25,19 +25,16 @@ void main()
vec4 tangent = a_tangent * 2.0 - 1.0;
vec3 wtangent = instMul(model, vec4(tangent.xyz, 0.0) ).xyz;
- vec3 viewNormal = normalize(mul(u_view, vec4(wnormal, 0.0) ).xyz);
- vec3 viewTangent = normalize(mul(u_view, vec4(wtangent, 0.0) ).xyz);
- vec3 viewBitangent = cross(viewNormal, viewTangent) * tangent.w;
- mat3 tbn = mat3(viewTangent, viewBitangent, viewNormal);
+ v_normal = wnormal;
+ v_tangent = wtangent;
+ v_bitangent = cross(v_normal, v_tangent) * tangent.w;
- v_wpos = wpos;
+ mat3 tbn = mat3(v_tangent, v_bitangent, v_normal);
- vec3 view = mul(u_view, vec4(wpos, 0.0) ).xyz;
- v_view = instMul(view, tbn);
+ v_wpos = wpos;
- v_normal = viewNormal;
- v_tangent = viewTangent;
- v_bitangent = viewBitangent;
+ vec3 weyepos = mul(vec4(0.0, 0.0, 0.0, 1.0), u_view).xyz;
+ v_view = instMul(weyepos - wpos, tbn);
v_texcoord0 = a_texcoord0;
}