mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes example 42 (#2235)

Browse Source 
Because example 42 was using the shaders from example 07 (callback), which have
input vertex attributes position and color, while the mesh from example 42 has
attributes position and normal, this causes problems on Windows when using
AMD gpus (no bunny mesh would appear on the window).
This commit is contained in:
kingscallop 2020-08-16 19:44:00 +01:00 committed by GitHub
parent e5d25a7d88
commit ba3be9affd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/42-bunnylod/bunnylod.cpp
View File

@ -265,7 +265,7 @@ public:
u_tint = bgfx::createUniform("u_tint", bgfx::UniformType::Vec4);
// Create program from shaders.
m_program = loadProgram("vs_callback", "fs_callback");
m_program = loadProgram("vs_bunnylod", "fs_bunnylod");
Mesh* mesh = meshLoad("meshes/bunny_patched.bin", true);
loadMesh(mesh);

17
examples/42-bunnylod/fs_bunnylod.sc Normal file
View File

@ -0,0 +1,17 @@
$input v_world, v_color0
/*
* Copyright 2011-2020 Branimir Karadzic. All rights reserved.
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#include "../common/common.sh"
void main()
{
vec3 normal = normalize(cross(dFdx(v_world), dFdy(v_world) ) );
vec3 lightDir = vec3(0.0, 0.0, 1.0);
float ndotl = max(dot(normal, lightDir), 0.0);
float spec = pow(ndotl, 30.0);
gl_FragColor = pow(pow(v_color0, vec4_splat(2.2) ) * ndotl + spec, vec4_splat(1.0/2.2) );
}

10
examples/42-bunnylod/makefile Normal file
View File

@ -0,0 +1,10 @@
#
# Copyright 2011-2020 Branimir Karadzic. All rights reserved.
# License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
#
BGFX_DIR=../..
RUNTIME_DIR=$(BGFX_DIR)/examples/runtime
BUILD_DIR=../../.build
include $(BGFX_DIR)/scripts/shader.mk

5
examples/42-bunnylod/varying.def.sc Normal file
View File

@ -0,0 +1,5 @@
vec3 v_world : TEXCOORD0 = vec3(0.0, 0.0, 0.0);
vec4 v_color0 : COLOR0 = vec4(1.0, 0.0, 0.0, 1.0);
vec3 a_position : POSITION;
vec3 a_normal : NORMAL;

16
examples/42-bunnylod/vs_bunnylod.sc Normal file
View File

@ -0,0 +1,16 @@
$input a_position, a_normal
$output v_world, v_color0
/*
* Copyright 2011-2020 Branimir Karadzic. All rights reserved.
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#include "../common/common.sh"
void main()
{
gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0) );
v_world = mul(u_model[0], vec4(a_position, 1.0) ).xyz;
v_color0 = vec4(a_normal, 1.0);
}