From a13620c66d902b8b32aef92e4f09031fa6ee8a78 Mon Sep 17 00:00:00 2001 From: Pixelflinger Date: Fri, 31 Jul 2020 00:12:32 -0700 Subject: [PATCH] reorganize material folder Sets of post-process materials are in their own folder now. Also moved fxaa.fs from shaders/ to materials/ so it's next to the material that includes it. This file is not shared with any other material. --- filament/CMakeLists.txt | 44 +++++++++---------- .../src/materials/antiAliasing}/fxaa.fs | 0 .../src/materials/{ => antiAliasing}/fxaa.mat | 2 +- .../materials/{ => bloom}/bloomDownsample.mat | 0 .../materials/{ => bloom}/bloomUpsample.mat | 0 .../{ => colorGrading}/colorGrading.mat | 6 +-- .../colorGradingAsSubpass.mat | 4 +- filament/src/materials/{ => dof}/dof.mat | 0 .../src/materials/{ => dof}/dofCombine.mat | 0 .../src/materials/{ => dof}/dofDilate.mat | 0 .../src/materials/{ => dof}/dofDownsample.mat | 0 .../src/materials/{ => dof}/dofMedian.mat | 0 .../src/materials/{ => dof}/dofMipmap.mat | 0 filament/src/materials/{ => dof}/dofTiles.mat | 0 filament/src/materials/{ => dof}/dofUtils.fs | 0 .../materials/{ => ssao}/bilateralBlur.mat | 0 .../src/materials/{ => ssao}/mipmapDepth.mat | 0 filament/src/materials/{ => ssao}/sao.mat | 0 shaders/CMakeLists.txt | 1 - 19 files changed, 28 insertions(+), 29 deletions(-) rename {shaders/src => filament/src/materials/antiAliasing}/fxaa.fs (100%) rename filament/src/materials/{ => antiAliasing}/fxaa.mat (98%) rename filament/src/materials/{ => bloom}/bloomDownsample.mat (100%) rename filament/src/materials/{ => bloom}/bloomUpsample.mat (100%) rename filament/src/materials/{ => colorGrading}/colorGrading.mat (95%) rename filament/src/materials/{ => colorGrading}/colorGradingAsSubpass.mat (96%) rename filament/src/materials/{ => dof}/dof.mat (100%) rename filament/src/materials/{ => dof}/dofCombine.mat (100%) rename filament/src/materials/{ => dof}/dofDilate.mat (100%) rename filament/src/materials/{ => dof}/dofDownsample.mat (100%) rename filament/src/materials/{ => dof}/dofMedian.mat (100%) rename filament/src/materials/{ => dof}/dofMipmap.mat (100%) rename filament/src/materials/{ => dof}/dofTiles.mat (100%) rename filament/src/materials/{ => dof}/dofUtils.fs (100%) rename filament/src/materials/{ => ssao}/bilateralBlur.mat (100%) rename filament/src/materials/{ => ssao}/mipmapDepth.mat (100%) rename filament/src/materials/{ => ssao}/sao.mat (100%) diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt index 042473a671..fcf96682d4 100644 --- a/filament/CMakeLists.txt +++ b/filament/CMakeLists.txt @@ -146,27 +146,27 @@ set(PRIVATE_HDRS src/upcast.h) set(MATERIAL_SRCS - src/materials/colorGrading.mat - src/materials/colorGradingAsSubpass.mat + src/materials/colorGrading/colorGrading.mat + src/materials/colorGrading/colorGradingAsSubpass.mat src/materials/defaultMaterial.mat - src/materials/dof.mat - src/materials/dofDownsample.mat - src/materials/dofCombine.mat - src/materials/dofTiles.mat - src/materials/dofDilate.mat - src/materials/dofMipmap.mat - src/materials/dofMedian.mat + src/materials/dof/dof.mat + src/materials/dof/dofDownsample.mat + src/materials/dof/dofCombine.mat + src/materials/dof/dofTiles.mat + src/materials/dof/dofDilate.mat + src/materials/dof/dofMipmap.mat + src/materials/dof/dofMedian.mat src/materials/blitLow.mat src/materials/blitMedium.mat src/materials/blitHigh.mat - src/materials/bloomDownsample.mat - src/materials/bloomUpsample.mat - src/materials/bilateralBlur.mat - src/materials/mipmapDepth.mat + src/materials/bloom/bloomDownsample.mat + src/materials/bloom/bloomUpsample.mat + src/materials/ssao/bilateralBlur.mat + src/materials/ssao/mipmapDepth.mat src/materials/skybox.mat - src/materials/sao.mat + src/materials/ssao/sao.mat src/materials/separableGaussianBlur.mat - src/materials/fxaa.mat + src/materials/antiAliasing/fxaa.mat ) # Embed the binary resource blob for materials. @@ -240,43 +240,43 @@ add_custom_command( add_custom_command( OUTPUT "${MATERIAL_DIR}/fxaa.filamat" - DEPENDS ../shaders/src/fxaa.fs + DEPENDS src/materials/antiAliasing/fxaa.fs APPEND ) add_custom_command( OUTPUT "${MATERIAL_DIR}/dofDownsample.filamat" - DEPENDS src/materials/dofUtils.fs + DEPENDS src/materials/dof/dofUtils.fs APPEND ) add_custom_command( OUTPUT "${MATERIAL_DIR}/dofMipmap.filamat" - DEPENDS src/materials/dofUtils.fs + DEPENDS src/materials/dof/dofUtils.fs APPEND ) add_custom_command( OUTPUT "${MATERIAL_DIR}/dofDilate.filamat" - DEPENDS src/materials/dofUtils.fs + DEPENDS src/materials/dof/dofUtils.fs APPEND ) add_custom_command( OUTPUT "${MATERIAL_DIR}/dof.filamat" - DEPENDS src/materials/dofUtils.fs + DEPENDS src/materials/dof/dofUtils.fs APPEND ) add_custom_command( OUTPUT "${MATERIAL_DIR}/dofMedian.filamat" - DEPENDS src/materials/dofUtils.fs + DEPENDS src/materials/dof/dofUtils.fs APPEND ) add_custom_command( OUTPUT "${MATERIAL_DIR}/dofCombine.filamat" - DEPENDS src/materials/dofUtils.fs + DEPENDS src/materials/dof/dofUtils.fs APPEND ) diff --git a/shaders/src/fxaa.fs b/filament/src/materials/antiAliasing/fxaa.fs similarity index 100% rename from shaders/src/fxaa.fs rename to filament/src/materials/antiAliasing/fxaa.fs diff --git a/filament/src/materials/fxaa.mat b/filament/src/materials/antiAliasing/fxaa.mat similarity index 98% rename from filament/src/materials/fxaa.mat rename to filament/src/materials/antiAliasing/fxaa.mat index af2a00bf89..d88d95b76e 100644 --- a/filament/src/materials/fxaa.mat +++ b/filament/src/materials/antiAliasing/fxaa.mat @@ -25,7 +25,7 @@ vertex { fragment { -#include "../../../shaders/src/fxaa.fs" +#include "fxaa.fs" void postProcess(inout PostProcessInputs postProcess) { // First, compute an exact upper bound for the area we need to sample from. diff --git a/filament/src/materials/bloomDownsample.mat b/filament/src/materials/bloom/bloomDownsample.mat similarity index 100% rename from filament/src/materials/bloomDownsample.mat rename to filament/src/materials/bloom/bloomDownsample.mat diff --git a/filament/src/materials/bloomUpsample.mat b/filament/src/materials/bloom/bloomUpsample.mat similarity index 100% rename from filament/src/materials/bloomUpsample.mat rename to filament/src/materials/bloom/bloomUpsample.mat diff --git a/filament/src/materials/colorGrading.mat b/filament/src/materials/colorGrading/colorGrading.mat similarity index 95% rename from filament/src/materials/colorGrading.mat rename to filament/src/materials/colorGrading/colorGrading.mat index a9d454bfae..193f89a211 100644 --- a/filament/src/materials/colorGrading.mat +++ b/filament/src/materials/colorGrading/colorGrading.mat @@ -58,9 +58,9 @@ vertex { fragment { -#include "../../../shaders/src/dithering.fs" -#include "../../../shaders/src/vignette.fs" -#include "../../../shaders/src/bloom.fs" +#include "../../../../shaders/src/dithering.fs" +#include "../../../../shaders/src/vignette.fs" +#include "../../../../shaders/src/bloom.fs" vec3 colorGrade(mediump sampler3D lut, const vec3 x) { // Alexa LogC EI 1000 diff --git a/filament/src/materials/colorGradingAsSubpass.mat b/filament/src/materials/colorGrading/colorGradingAsSubpass.mat similarity index 96% rename from filament/src/materials/colorGradingAsSubpass.mat rename to filament/src/materials/colorGrading/colorGradingAsSubpass.mat index 52e494c9cb..2bfdd4f8b7 100644 --- a/filament/src/materials/colorGradingAsSubpass.mat +++ b/filament/src/materials/colorGrading/colorGradingAsSubpass.mat @@ -45,8 +45,8 @@ fragment { layout (input_attachment_index = 0, set = 2, binding = 0) uniform mediump subpassInput colorBuffer; layout(location = 1) out vec4 tonemappedOutput; -#include "../../../shaders/src/dithering.fs" -#include "../../../shaders/src/vignette.fs" +#include "../../../../shaders/src/dithering.fs" +#include "../../../../shaders/src/vignette.fs" vec3 colorGrade(mediump sampler3D lut, const vec3 x) { // Alexa LogC EI 1000 diff --git a/filament/src/materials/dof.mat b/filament/src/materials/dof/dof.mat similarity index 100% rename from filament/src/materials/dof.mat rename to filament/src/materials/dof/dof.mat diff --git a/filament/src/materials/dofCombine.mat b/filament/src/materials/dof/dofCombine.mat similarity index 100% rename from filament/src/materials/dofCombine.mat rename to filament/src/materials/dof/dofCombine.mat diff --git a/filament/src/materials/dofDilate.mat b/filament/src/materials/dof/dofDilate.mat similarity index 100% rename from filament/src/materials/dofDilate.mat rename to filament/src/materials/dof/dofDilate.mat diff --git a/filament/src/materials/dofDownsample.mat b/filament/src/materials/dof/dofDownsample.mat similarity index 100% rename from filament/src/materials/dofDownsample.mat rename to filament/src/materials/dof/dofDownsample.mat diff --git a/filament/src/materials/dofMedian.mat b/filament/src/materials/dof/dofMedian.mat similarity index 100% rename from filament/src/materials/dofMedian.mat rename to filament/src/materials/dof/dofMedian.mat diff --git a/filament/src/materials/dofMipmap.mat b/filament/src/materials/dof/dofMipmap.mat similarity index 100% rename from filament/src/materials/dofMipmap.mat rename to filament/src/materials/dof/dofMipmap.mat diff --git a/filament/src/materials/dofTiles.mat b/filament/src/materials/dof/dofTiles.mat similarity index 100% rename from filament/src/materials/dofTiles.mat rename to filament/src/materials/dof/dofTiles.mat diff --git a/filament/src/materials/dofUtils.fs b/filament/src/materials/dof/dofUtils.fs similarity index 100% rename from filament/src/materials/dofUtils.fs rename to filament/src/materials/dof/dofUtils.fs diff --git a/filament/src/materials/bilateralBlur.mat b/filament/src/materials/ssao/bilateralBlur.mat similarity index 100% rename from filament/src/materials/bilateralBlur.mat rename to filament/src/materials/ssao/bilateralBlur.mat diff --git a/filament/src/materials/mipmapDepth.mat b/filament/src/materials/ssao/mipmapDepth.mat similarity index 100% rename from filament/src/materials/mipmapDepth.mat rename to filament/src/materials/ssao/mipmapDepth.mat diff --git a/filament/src/materials/sao.mat b/filament/src/materials/ssao/sao.mat similarity index 100% rename from filament/src/materials/sao.mat rename to filament/src/materials/ssao/sao.mat diff --git a/shaders/CMakeLists.txt b/shaders/CMakeLists.txt index be5cd96a46..e4f2d16f6d 100644 --- a/shaders/CMakeLists.txt +++ b/shaders/CMakeLists.txt @@ -53,7 +53,6 @@ set(SHADERS # These files aren't part of libshaders, but are included by materials inside # filament/src/materials: # -# fxaa.fs # tone_mapping.fs # conversion_functions.fs # dithering.fs