Browse Source

Rebuilt shaders.

Branimir Karadžić 9 years ago
parent
commit
e4dc2bc02c
93 changed files with 13 additions and 11 deletions
  1. 11 11
      examples/28-wireframe/fs_wf_mesh.sc
  2. 2 0
      examples/makefile
  3. BIN
      examples/runtime/shaders/dx11/fs_ibl_mesh.bin
  4. BIN
      examples/runtime/shaders/dx11/fs_ibl_skybox.bin
  5. BIN
      examples/runtime/shaders/dx11/fs_wf_mesh.bin
  6. BIN
      examples/runtime/shaders/dx11/fs_wf_wireframe.bin
  7. BIN
      examples/runtime/shaders/dx11/vs_ibl_mesh.bin
  8. BIN
      examples/runtime/shaders/dx11/vs_ibl_skybox.bin
  9. BIN
      examples/runtime/shaders/dx11/vs_wf_mesh.bin
  10. BIN
      examples/runtime/shaders/dx11/vs_wf_wireframe.bin
  11. BIN
      examples/runtime/shaders/dx9/fs_ibl_mesh.bin
  12. BIN
      examples/runtime/shaders/dx9/fs_ibl_skybox.bin
  13. BIN
      examples/runtime/shaders/dx9/fs_wf_mesh.bin
  14. BIN
      examples/runtime/shaders/dx9/fs_wf_wireframe.bin
  15. BIN
      examples/runtime/shaders/dx9/vs_ibl_mesh.bin
  16. BIN
      examples/runtime/shaders/dx9/vs_ibl_skybox.bin
  17. BIN
      examples/runtime/shaders/dx9/vs_wf_mesh.bin
  18. BIN
      examples/runtime/shaders/dx9/vs_wf_wireframe.bin
  19. BIN
      examples/runtime/shaders/gles/fs_ibl_mesh.bin
  20. BIN
      examples/runtime/shaders/gles/fs_ibl_skybox.bin
  21. BIN
      examples/runtime/shaders/gles/fs_oit_wb.bin
  22. BIN
      examples/runtime/shaders/gles/fs_oit_wb_separate.bin
  23. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm.bin
  24. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_csm.bin
  25. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_linear.bin
  26. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_linear_csm.bin
  27. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_linear_omni.bin
  28. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_omni.bin
  29. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard.bin
  30. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_csm.bin
  31. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_linear.bin
  32. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_linear_csm.bin
  33. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_linear_omni.bin
  34. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_omni.bin
  35. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf.bin
  36. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_csm.bin
  37. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear.bin
  38. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_csm.bin
  39. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_omni.bin
  40. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_omni.bin
  41. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm.bin
  42. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_csm.bin
  43. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_linear.bin
  44. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_linear_csm.bin
  45. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_linear_omni.bin
  46. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_omni.bin
  47. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_hblur.bin
  48. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_packdepth.bin
  49. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_packdepth_linear.bin
  50. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_unpackdepth.bin
  51. BIN
      examples/runtime/shaders/gles/fs_shadowmaps_vblur.bin
  52. BIN
      examples/runtime/shaders/gles/fs_sms_mesh_pd.bin
  53. BIN
      examples/runtime/shaders/gles/fs_sms_shadow_pd.bin
  54. BIN
      examples/runtime/shaders/gles/fs_wf_mesh.bin
  55. BIN
      examples/runtime/shaders/gles/fs_wf_wireframe.bin
  56. BIN
      examples/runtime/shaders/gles/vs_ibl_mesh.bin
  57. BIN
      examples/runtime/shaders/gles/vs_ibl_skybox.bin
  58. BIN
      examples/runtime/shaders/gles/vs_wf_mesh.bin
  59. BIN
      examples/runtime/shaders/gles/vs_wf_wireframe.bin
  60. BIN
      examples/runtime/shaders/glsl/fs_oit_wb.bin
  61. BIN
      examples/runtime/shaders/glsl/fs_oit_wb_separate.bin
  62. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm.bin
  63. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_csm.bin
  64. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_linear.bin
  65. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_linear_csm.bin
  66. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_linear_omni.bin
  67. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_omni.bin
  68. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard.bin
  69. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_csm.bin
  70. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_linear.bin
  71. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_linear_csm.bin
  72. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_linear_omni.bin
  73. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_omni.bin
  74. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf.bin
  75. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_csm.bin
  76. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear.bin
  77. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_csm.bin
  78. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_omni.bin
  79. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_omni.bin
  80. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm.bin
  81. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_csm.bin
  82. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_linear.bin
  83. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_linear_csm.bin
  84. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_linear_omni.bin
  85. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_omni.bin
  86. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_hblur.bin
  87. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_packdepth.bin
  88. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_packdepth_linear.bin
  89. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_unpackdepth.bin
  90. BIN
      examples/runtime/shaders/glsl/fs_shadowmaps_vblur.bin
  91. BIN
      examples/runtime/shaders/glsl/fs_sms_mesh_pd.bin
  92. BIN
      examples/runtime/shaders/glsl/fs_sms_shadow_pd.bin
  93. BIN
      examples/runtime/shaders/glsl/fs_wf_mesh.bin

+ 11 - 11
examples/28-wireframe/fs_wf_mesh.sc

@@ -8,17 +8,6 @@ $input v_view, v_bc, v_normal
 #include "../common/common.sh"
 #include "../common/common.sh"
 #include "uniforms.sh"
 #include "uniforms.sh"
 
 
-const vec3 shEnv[9] = vec3[9](vec3( 0.967757057878229854,  0.976516067990363390,  0.891218272348969998) /* Band 0 */
-							, vec3(-0.384163503608655643, -0.423492289131209787, -0.425532726148547868) /* Band 1 */
-							, vec3( 0.055906294587354334,  0.056627436881069373,  0.069969936396987467)
-							, vec3( 0.120985157386215209,  0.119297994074027414,  0.117111965829213599)
-							, vec3(-0.176711633774331106, -0.170331404095516392, -0.151345020570876621) /* Band 2 */
-							, vec3(-0.124682114349692147, -0.119340785411183953, -0.096300354204368860)
-							, vec3( 0.001852378550138503, -0.032592784164597745, -0.088204495001329680)
-							, vec3( 0.296365482782109446,  0.281268696656263029,  0.243328223888495510)
-							, vec3(-0.079826665303240341, -0.109340956251195970, -0.157208859664677764)
-							);
-
 vec3 evalSh(vec3 _dir)
 vec3 evalSh(vec3 _dir)
 {
 {
 #	define k01 0.2820947918 // sqrt( 1/PI)/2
 #	define k01 0.2820947918 // sqrt( 1/PI)/2
@@ -27,6 +16,17 @@ vec3 evalSh(vec3 _dir)
 #	define k04 0.3153915652 // sqrt( 5/PI)/4
 #	define k04 0.3153915652 // sqrt( 5/PI)/4
 #	define k05 0.5462742153 // sqrt(15/PI)/4
 #	define k05 0.5462742153 // sqrt(15/PI)/4
 
 
+	vec3 shEnv[9];
+	shEnv[0] = vec3( 0.967757057878229854,  0.976516067990363390,  0.891218272348969998); /* Band 0 */
+	shEnv[1] = vec3(-0.384163503608655643, -0.423492289131209787, -0.425532726148547868); /* Band 1 */
+	shEnv[2] = vec3( 0.055906294587354334,  0.056627436881069373,  0.069969936396987467);
+	shEnv[3] = vec3( 0.120985157386215209,  0.119297994074027414,  0.117111965829213599);
+	shEnv[4] = vec3(-0.176711633774331106, -0.170331404095516392, -0.151345020570876621); /* Band 2 */
+	shEnv[5] = vec3(-0.124682114349692147, -0.119340785411183953, -0.096300354204368860);
+	shEnv[6] = vec3( 0.001852378550138503, -0.032592784164597745, -0.088204495001329680);
+	shEnv[7] = vec3( 0.296365482782109446,  0.281268696656263029,  0.243328223888495510);
+	shEnv[8] = vec3(-0.079826665303240341, -0.109340956251195970, -0.157208859664677764);
+
 	vec3 nn = _dir.zxy;
 	vec3 nn = _dir.zxy;
 
 
 	float sh[9];
 	float sh[9];

+ 2 - 0
examples/makefile

@@ -30,6 +30,7 @@ rebuild:
 #	@make -s --no-print-directory rebuild -C 25-c99
 #	@make -s --no-print-directory rebuild -C 25-c99
 #	@make -s --no-print-directory rebuild -C 26-occlusion
 #	@make -s --no-print-directory rebuild -C 26-occlusion
 	@make -s --no-print-directory rebuild -C 27-terrain
 	@make -s --no-print-directory rebuild -C 27-terrain
+	@make -s --no-print-directory rebuild -C 28-wireframe
 	@make -s --no-print-directory rebuild -C common/font
 	@make -s --no-print-directory rebuild -C common/font
 	@make -s --no-print-directory rebuild -C common/imgui
 	@make -s --no-print-directory rebuild -C common/imgui
 	@make -s --no-print-directory rebuild -C common/nanovg
 	@make -s --no-print-directory rebuild -C common/nanovg
@@ -54,3 +55,4 @@ metal:
 	@make -s --no-print-directory TARGET=5 -C 23-vectordisplay
 	@make -s --no-print-directory TARGET=5 -C 23-vectordisplay
 	@make -s --no-print-directory TARGET=5 -C 24-nbody
 	@make -s --no-print-directory TARGET=5 -C 24-nbody
 	@make -s --no-print-directory TARGET=5 -C 27-terrain
 	@make -s --no-print-directory TARGET=5 -C 27-terrain
+	@make -s --no-print-directory TARGET=5 -C 28-wireframe

BIN
examples/runtime/shaders/dx11/fs_ibl_mesh.bin


BIN
examples/runtime/shaders/dx11/fs_ibl_skybox.bin


BIN
examples/runtime/shaders/dx11/fs_wf_mesh.bin


BIN
examples/runtime/shaders/dx11/fs_wf_wireframe.bin


BIN
examples/runtime/shaders/dx11/vs_ibl_mesh.bin


BIN
examples/runtime/shaders/dx11/vs_ibl_skybox.bin


BIN
examples/runtime/shaders/dx11/vs_wf_mesh.bin


BIN
examples/runtime/shaders/dx11/vs_wf_wireframe.bin


BIN
examples/runtime/shaders/dx9/fs_ibl_mesh.bin


BIN
examples/runtime/shaders/dx9/fs_ibl_skybox.bin


BIN
examples/runtime/shaders/dx9/fs_wf_mesh.bin


BIN
examples/runtime/shaders/dx9/fs_wf_wireframe.bin


BIN
examples/runtime/shaders/dx9/vs_ibl_mesh.bin


BIN
examples/runtime/shaders/dx9/vs_ibl_skybox.bin


BIN
examples/runtime/shaders/dx9/vs_wf_mesh.bin


BIN
examples/runtime/shaders/dx9/vs_wf_wireframe.bin


BIN
examples/runtime/shaders/gles/fs_ibl_mesh.bin


BIN
examples/runtime/shaders/gles/fs_ibl_skybox.bin


BIN
examples/runtime/shaders/gles/fs_oit_wb.bin


BIN
examples/runtime/shaders/gles/fs_oit_wb_separate.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_linear.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_linear_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_linear_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_esm_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_linear.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_linear_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_linear_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_hard_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_linear.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_linear_csm.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_linear_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_vsm_omni.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_hblur.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_packdepth.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_packdepth_linear.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_unpackdepth.bin


BIN
examples/runtime/shaders/gles/fs_shadowmaps_vblur.bin


BIN
examples/runtime/shaders/gles/fs_sms_mesh_pd.bin


BIN
examples/runtime/shaders/gles/fs_sms_shadow_pd.bin


BIN
examples/runtime/shaders/gles/fs_wf_mesh.bin


BIN
examples/runtime/shaders/gles/fs_wf_wireframe.bin


BIN
examples/runtime/shaders/gles/vs_ibl_mesh.bin


BIN
examples/runtime/shaders/gles/vs_ibl_skybox.bin


BIN
examples/runtime/shaders/gles/vs_wf_mesh.bin


BIN
examples/runtime/shaders/gles/vs_wf_wireframe.bin


BIN
examples/runtime/shaders/glsl/fs_oit_wb.bin


BIN
examples/runtime/shaders/glsl/fs_oit_wb_separate.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_linear.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_linear_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_linear_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_esm_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_linear.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_linear_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_linear_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_hard_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_linear.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_linear_csm.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_linear_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_vsm_omni.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_hblur.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_packdepth.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_packdepth_linear.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_unpackdepth.bin


BIN
examples/runtime/shaders/glsl/fs_shadowmaps_vblur.bin


BIN
examples/runtime/shaders/glsl/fs_sms_mesh_pd.bin


BIN
examples/runtime/shaders/glsl/fs_sms_shadow_pd.bin


BIN
examples/runtime/shaders/glsl/fs_wf_mesh.bin