diff --git a/base/renderprogs/_manifest.lua b/base/renderprogs/_manifest.lua index 5d301c4e..05f27770 100644 --- a/base/renderprogs/_manifest.lua +++ b/base/renderprogs/_manifest.lua @@ -7,22 +7,121 @@ return "BRDF.inc.hlsl", -- shaders - "ambient_lighting.ps.hlsl", - "ambient_lighting.vs.hlsl", - "ambient_lighting_IBL.ps.hlsl", - "ambient_lighting_IBL.vs.hlsl", - "AmbientOcclusion_AO.ps.hlsl", - "AmbientOcclusion_AO.vs.hlsl", - "AmbientOcclusion_blur.ps.hlsl", - "AmbientOcclusion_blur.vs.hlsl", - "AmbientOcclusion_minify.ps.hlsl", - "AmbientOcclusion_minify.vs.hlsl", - "bink.ps.hlsl", - "bink.vs.hlsl", - "bink_gui.ps.hlsl", - "bink_gui.vs.hlsl", - "blendLight.ps.hlsl", - "blendLight.vs.hlsl", + "builtin/debug/debug_shadowmap.ps.hlsl", + "builtin/debug/debug_shadowmap.vs.hlsl", + "builtin/debug/shadowDebug.ps.hlsl", + "builtin/debug/shadowDebug.vs.hlsl", + "builtin/debug/shadowDebug_skinned.ps.hlsl", + "builtin/debug/shadowDebug_skinned.vs.hlsl", + "builtin/debug/octahedron.ps.hlsl", + "builtin/debug/octahedron.vs.hlsl", + + "builtin/fog/blendLight.ps.hlsl", + "builtin/fog/blendLight.vs.hlsl", + "builtin/fog/fog.ps.hlsl", + "builtin/fog/fog.vs.hlsl", + "builtin/fog/fog_skinned.ps.hlsl", + "builtin/fog/fog_skinned.vs.hlsl", + + "builtin/legacy/bumpyenvironment.ps.hlsl", + "builtin/legacy/bumpyenvironment.vs.hlsl", + "builtin/legacy/bumpyenvironment_skinned.ps.hlsl", + "builtin/legacy/bumpyenvironment_skinned.vs.hlsl", + "builtin/legacy/environment.ps.hlsl", + "builtin/legacy/environment.vs.hlsl", + "builtin/legacy/environment_skinned.ps.hlsl", + "builtin/legacy/environment_skinned.vs.hlsl", + "builtin/legacy/skybox.ps.hlsl", + "builtin/legacy/skybox.vs.hlsl", + "builtin/legacy/wobblesky.ps.hlsl", + "builtin/legacy/wobblesky.vs.hlsl", + + "builtin/lighting/ambient_lighting.ps.hlsl", + "builtin/lighting/ambient_lighting.vs.hlsl", + "builtin/lighting/ambient_lighting_IBL.ps.hlsl", + "builtin/lighting/ambient_lighting_IBL.vs.hlsl", + "builtin/lighting/interaction.ps.hlsl", + "builtin/lighting/interaction.vs.hlsl", + "builtin/lighting/interactionAmbient.ps.hlsl", + "builtin/lighting/interactionAmbient.vs.hlsl", + "builtin/lighting/interactionAmbient_skinned.ps.hlsl", + "builtin/lighting/interactionAmbient_skinned.vs.hlsl", + "builtin/lighting/interactionSM.ps.hlsl", + "builtin/lighting/interactionSM.vs.hlsl", + "builtin/lighting/shadow.ps.hlsl", + "builtin/lighting/shadow.vs.hlsl", + "builtin/lighting/shadow_skinned.ps.hlsl", + "builtin/lighting/shadow_skinned.vs.hlsl", + + "builtin/post/fxaa.ps.hlsl", + "builtin/post/fxaa.vs.hlsl", + "builtin/post/hdr_glare_chromatic.ps.hlsl", + "builtin/post/hdr_glare_chromatic.vs.hlsl", + "builtin/post/motionBlur.ps.hlsl", + "builtin/post/motionBlur.vs.hlsl", + "builtin/post/postprocess.ps.hlsl", + "builtin/post/postprocess.vs.hlsl", + "builtin/post/screen.ps.hlsl", + "builtin/post/screen.vs.hlsl", + "builtin/post/SMAA_blending_weight_calc.ps.hlsl", + "builtin/post/SMAA_blending_weight_calc.vs.hlsl", + "builtin/post/SMAA_edge_detection.ps.hlsl", + "builtin/post/SMAA_edge_detection.vs.hlsl", + "builtin/post/SMAA_final.ps.hlsl", + "builtin/post/SMAA_final.vs.hlsl", + "builtin/post/tonemap.ps.hlsl", + "builtin/post/tonemap.vs.hlsl", + + "builtin/SSAO/AmbientOcclusion_AO.ps.hlsl", + "builtin/SSAO/AmbientOcclusion_AO.vs.hlsl", + "builtin/SSAO/AmbientOcclusion_blur.ps.hlsl", + "builtin/SSAO/AmbientOcclusion_blur.vs.hlsl", + "builtin/SSAO/AmbientOcclusion_minify.ps.hlsl", + "builtin/SSAO/AmbientOcclusion_minify.vs.hlsl", + + "builtin/SSGI/DeepGBufferRadiosity_radiosity.ps.hlsl", + "builtin/SSGI/DeepGBufferRadiosity_radiosity.vs.hlsl", + "builtin/SSGI/DeepGBufferRadiosity_blur.ps.hlsl", + "builtin/SSGI/DeepGBufferRadiosity_blur.vs.hlsl", + + "builtin/video/bink.ps.hlsl", + "builtin/video/bink.vs.hlsl", + "builtin/video/bink_gui.ps.hlsl", + "builtin/video/bink_gui.vs.hlsl", + + "builtin/VR/stereoDeGhost.ps.hlsl", + "builtin/VR/stereoDeGhost.vs.hlsl", + "builtin/VR/stereoInterlace.ps.hlsl", + "builtin/VR/stereoInterlace.vs.hlsl", + "builtin/VR/stereoWarp.ps.hlsl", + "builtin/VR/stereoWarp.vs.hlsl", + + "builtin/color.ps.hlsl", + "builtin/color.vs.hlsl", + + "builtin/depth.ps.hlsl", + "builtin/depth.vs.hlsl", + "builtin/depth_skinned.ps.hlsl", + "builtin/depth_skinned.vs.hlsl", + + "builtin/gbuffer.ps.hlsl", + "builtin/gbuffer.vs.hlsl", + "builtin/gui.ps.hlsl", + "builtin/gui.vs.hlsl", + + "builtin/texture.ps.hlsl", + "builtin/texture.vs.hlsl", + "builtin/texture_color.ps.hlsl", + "builtin/texture_color.vs.hlsl", + "builtin/texture_color_skinned.ps.hlsl", + "builtin/texture_color_skinned.vs.hlsl", + "builtin/texture_color_texgen.ps.hlsl", + "builtin/texture_color_texgen.vs.hlsl", + + "builtin/vertex_color.ps.hlsl", + "builtin/vertex_color.vs.hlsl", + + -- optional shaders required by game materials "bloodorb1_capture.ps.hlsl", "bloodorb1_capture.vs.hlsl", "bloodorb2_capture.ps.hlsl", @@ -31,104 +130,16 @@ return "bloodorb3_capture.vs.hlsl", "bloodorb_draw.ps.hlsl", "bloodorb_draw.vs.hlsl", - "bumpyenvironment.ps.hlsl", - "bumpyenvironment.vs.hlsl", - "bumpyenvironment_skinned.ps.hlsl", - "bumpyenvironment_skinned.vs.hlsl", - "color.ps.hlsl", - "color.vs.hlsl", "colorProcess.ps.hlsl", "colorProcess.vs.hlsl", - "DeepGBufferRadiosity_radiosity.ps.hlsl", - "DeepGBufferRadiosity_radiosity.vs.hlsl", - "DeepGBufferRadiosity_blur.ps.hlsl", - "DeepGBufferRadiosity_blur.vs.hlsl", - "debug_shadowmap.ps.hlsl", - "debug_shadowmap.vs.hlsl", - "depth.ps.hlsl", - "depth.vs.hlsl", - "depth_skinned.ps.hlsl", - "depth_skinned.vs.hlsl", "enviroSuit.ps.hlsl", "enviroSuit.vs.hlsl", - "environment.ps.hlsl", - "environment.vs.hlsl", - "environment_skinned.ps.hlsl", - "environment_skinned.vs.hlsl", - "fog.ps.hlsl", - "fog.vs.hlsl", - "fog_skinned.ps.hlsl", - "fog_skinned.vs.hlsl", - "fxaa.ps.hlsl", - "fxaa.vs.hlsl", - "gbuffer.ps.hlsl", - "gbuffer.vs.hlsl", - "gui.ps.hlsl", - "gui.vs.hlsl", - "hdr_glare_chromatic.ps.hlsl", - "hdr_glare_chromatic.vs.hlsl", "heatHazeWithMask.ps.hlsl", "heatHazeWithMask.vs.hlsl", "heatHazeWithMaskAndVertex.ps.hlsl", "heatHazeWithMaskAndVertex.vs.hlsl", "heathaze.ps.hlsl", "heathaze.vs.hlsl", - "interaction.ps.hlsl", - "interaction.vs.hlsl", - "interactionAmbient.ps.hlsl", - "interactionAmbient.vs.hlsl", - "interactionAmbient_skinned.ps.hlsl", - "interactionAmbient_skinned.vs.hlsl", - "interactionSM.ps.hlsl", - "interactionSM.vs.hlsl", - "motionBlur.ps.hlsl", - "motionBlur.vs.hlsl", - "octahedron.ps.hlsl", - "octahedron.vs.hlsl", - "postprocess.ps.hlsl", - "postprocess.vs.hlsl", - "screen.ps.hlsl", - "screen.vs.hlsl", - "shadow.ps.hlsl", - "shadow.vs.hlsl", - "shadowDebug.ps.hlsl", - "shadowDebug.vs.hlsl", - "shadowDebug_skinned.ps.hlsl", - "shadowDebug_skinned.vs.hlsl", - "shadow_skinned.ps.hlsl", - "shadow_skinned.vs.hlsl", - "simpleshade.ps.hlsl", - "simpleshade.vs.hlsl", - "skybox.ps.hlsl", - "skybox.vs.hlsl", - "SMAA_blending_weight_calc.ps.hlsl", - "SMAA_blending_weight_calc.vs.hlsl", - "SMAA_edge_detection.ps.hlsl", - "SMAA_edge_detection.vs.hlsl", - "SMAA_final.ps.hlsl", - "SMAA_final.vs.hlsl", - "stereoDeGhost.ps.hlsl", - "stereoDeGhost.vs.hlsl", - "stereoInterlace.ps.hlsl", - "stereoInterlace.vs.hlsl", - "stereoWarp.ps.hlsl", - "stereoWarp.vs.hlsl", - "texture.ps.hlsl", - "texture.vs.hlsl", - "texture_color.ps.hlsl", - "texture_color.vs.hlsl", - "texture_color_skinned.ps.hlsl", - "texture_color_skinned.vs.hlsl", - "texture_color_texgen.ps.hlsl", - "texture_color_texgen.vs.hlsl", - "tonemap.ps.hlsl", - "tonemap.vs.hlsl", - "vertex_color.ps.hlsl", - "vertex_color.vs.hlsl", - "wobblesky.ps.hlsl", - "wobblesky.vs.hlsl", - "zcullReconstruct.ps.hlsl", - "zcullReconstruct.vs.hlsl", } diff --git a/base/renderprogs/bloodorb1_capture.ps.hlsl b/base/renderprogs/bloodorb1_capture.ps.hlsl index 04162ae8..bb6efa0d 100644 --- a/base/renderprogs/bloodorb1_capture.ps.hlsl +++ b/base/renderprogs/bloodorb1_capture.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); //_accum diff --git a/base/renderprogs/bloodorb1_capture.vs.hlsl b/base/renderprogs/bloodorb1_capture.vs.hlsl index 30b4cf8c..57fc9a70 100644 --- a/base/renderprogs/bloodorb1_capture.vs.hlsl +++ b/base/renderprogs/bloodorb1_capture.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform float4 rpUser0 : register( c128 ); //rpCenterScale diff --git a/base/renderprogs/bloodorb2_capture.ps.hlsl b/base/renderprogs/bloodorb2_capture.ps.hlsl index 7b500dd1..a0dddc8a 100644 --- a/base/renderprogs/bloodorb2_capture.ps.hlsl +++ b/base/renderprogs/bloodorb2_capture.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); //_accum diff --git a/base/renderprogs/bloodorb2_capture.vs.hlsl b/base/renderprogs/bloodorb2_capture.vs.hlsl index ce677359..08aed7f4 100644 --- a/base/renderprogs/bloodorb2_capture.vs.hlsl +++ b/base/renderprogs/bloodorb2_capture.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform float4 rpUser0 : register( c128 ); //rpCenterScaleTex0 diff --git a/base/renderprogs/bloodorb3_capture.ps.hlsl b/base/renderprogs/bloodorb3_capture.ps.hlsl index d49d1cf5..9c115252 100644 --- a/base/renderprogs/bloodorb3_capture.ps.hlsl +++ b/base/renderprogs/bloodorb3_capture.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); //_accum diff --git a/base/renderprogs/bloodorb3_capture.vs.hlsl b/base/renderprogs/bloodorb3_capture.vs.hlsl index 80531a83..e7eb7bd8 100644 --- a/base/renderprogs/bloodorb3_capture.vs.hlsl +++ b/base/renderprogs/bloodorb3_capture.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform float4 rpUser0 : register( c128 ); //rpCenterScaleTex diff --git a/base/renderprogs/bloodorb_draw.ps.hlsl b/base/renderprogs/bloodorb_draw.ps.hlsl index 01a9b378..b81a92a7 100644 --- a/base/renderprogs/bloodorb_draw.ps.hlsl +++ b/base/renderprogs/bloodorb_draw.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); //_accum diff --git a/base/renderprogs/bloodorb_draw.vs.hlsl b/base/renderprogs/bloodorb_draw.vs.hlsl index 81561cc1..5474a9da 100644 --- a/base/renderprogs/bloodorb_draw.vs.hlsl +++ b/base/renderprogs/bloodorb_draw.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/AmbientOcclusion_AO.ps.hlsl b/base/renderprogs/builtin/SSAO/AmbientOcclusion_AO.ps.hlsl similarity index 99% rename from base/renderprogs/AmbientOcclusion_AO.ps.hlsl rename to base/renderprogs/builtin/SSAO/AmbientOcclusion_AO.ps.hlsl index 389176a8..98b039a6 100644 --- a/base/renderprogs/AmbientOcclusion_AO.ps.hlsl +++ b/base/renderprogs/builtin/SSAO/AmbientOcclusion_AO.ps.hlsl @@ -29,7 +29,8 @@ */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + diff --git a/base/renderprogs/AmbientOcclusion_AO.vs.hlsl b/base/renderprogs/builtin/SSAO/AmbientOcclusion_AO.vs.hlsl similarity index 97% rename from base/renderprogs/AmbientOcclusion_AO.vs.hlsl rename to base/renderprogs/builtin/SSAO/AmbientOcclusion_AO.vs.hlsl index 06898657..b8e13538 100644 --- a/base/renderprogs/AmbientOcclusion_AO.vs.hlsl +++ b/base/renderprogs/builtin/SSAO/AmbientOcclusion_AO.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN diff --git a/base/renderprogs/AmbientOcclusion_blur.ps.hlsl b/base/renderprogs/builtin/SSAO/AmbientOcclusion_blur.ps.hlsl similarity index 99% rename from base/renderprogs/AmbientOcclusion_blur.ps.hlsl rename to base/renderprogs/builtin/SSAO/AmbientOcclusion_blur.ps.hlsl index 14196763..4c67d3ca 100644 --- a/base/renderprogs/AmbientOcclusion_blur.ps.hlsl +++ b/base/renderprogs/builtin/SSAO/AmbientOcclusion_blur.ps.hlsl @@ -16,7 +16,8 @@ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register( s0 ); // view normals diff --git a/base/renderprogs/AmbientOcclusion_blur.vs.hlsl b/base/renderprogs/builtin/SSAO/AmbientOcclusion_blur.vs.hlsl similarity index 97% rename from base/renderprogs/AmbientOcclusion_blur.vs.hlsl rename to base/renderprogs/builtin/SSAO/AmbientOcclusion_blur.vs.hlsl index 06898657..b8e13538 100644 --- a/base/renderprogs/AmbientOcclusion_blur.vs.hlsl +++ b/base/renderprogs/builtin/SSAO/AmbientOcclusion_blur.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN diff --git a/base/renderprogs/AmbientOcclusion_minify.ps.hlsl b/base/renderprogs/builtin/SSAO/AmbientOcclusion_minify.ps.hlsl similarity index 98% rename from base/renderprogs/AmbientOcclusion_minify.ps.hlsl rename to base/renderprogs/builtin/SSAO/AmbientOcclusion_minify.ps.hlsl index 7b4b37cb..0ddd69de 100644 --- a/base/renderprogs/AmbientOcclusion_minify.ps.hlsl +++ b/base/renderprogs/builtin/SSAO/AmbientOcclusion_minify.ps.hlsl @@ -15,7 +15,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register( s0 ); // zbuffer diff --git a/base/renderprogs/AmbientOcclusion_minify.vs.hlsl b/base/renderprogs/builtin/SSAO/AmbientOcclusion_minify.vs.hlsl similarity index 97% rename from base/renderprogs/AmbientOcclusion_minify.vs.hlsl rename to base/renderprogs/builtin/SSAO/AmbientOcclusion_minify.vs.hlsl index 06898657..b8e13538 100644 --- a/base/renderprogs/AmbientOcclusion_minify.vs.hlsl +++ b/base/renderprogs/builtin/SSAO/AmbientOcclusion_minify.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN diff --git a/base/renderprogs/DeepGBufferRadiosity_blur.ps.hlsl b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_blur.ps.hlsl similarity index 99% rename from base/renderprogs/DeepGBufferRadiosity_blur.ps.hlsl rename to base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_blur.ps.hlsl index 93049278..30c84858 100644 --- a/base/renderprogs/DeepGBufferRadiosity_blur.ps.hlsl +++ b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_blur.ps.hlsl @@ -16,7 +16,8 @@ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register( s0 ); // view normals diff --git a/base/renderprogs/DeepGBufferRadiosity_blur.vs.hlsl b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_blur.vs.hlsl similarity index 97% rename from base/renderprogs/DeepGBufferRadiosity_blur.vs.hlsl rename to base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_blur.vs.hlsl index 06898657..b8e13538 100644 --- a/base/renderprogs/DeepGBufferRadiosity_blur.vs.hlsl +++ b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_blur.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN diff --git a/base/renderprogs/DeepGBufferRadiosity_radiosity.ps.hlsl b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_radiosity.ps.hlsl similarity index 99% rename from base/renderprogs/DeepGBufferRadiosity_radiosity.ps.hlsl rename to base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_radiosity.ps.hlsl index 45c2aa04..d76c681a 100644 --- a/base/renderprogs/DeepGBufferRadiosity_radiosity.ps.hlsl +++ b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_radiosity.ps.hlsl @@ -1,5 +1,6 @@ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // #version 120 // -*- c++ -*- // #extension GL_EXT_gpu_shader4 : require diff --git a/base/renderprogs/DeepGBufferRadiosity_radiosity.vs.hlsl b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_radiosity.vs.hlsl similarity index 97% rename from base/renderprogs/DeepGBufferRadiosity_radiosity.vs.hlsl rename to base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_radiosity.vs.hlsl index 06898657..b8e13538 100644 --- a/base/renderprogs/DeepGBufferRadiosity_radiosity.vs.hlsl +++ b/base/renderprogs/builtin/SSGI/DeepGBufferRadiosity_radiosity.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN diff --git a/base/renderprogs/stereoDeGhost.ps.hlsl b/base/renderprogs/builtin/VR/stereoDeGhost.ps.hlsl similarity index 97% rename from base/renderprogs/stereoDeGhost.ps.hlsl rename to base/renderprogs/builtin/VR/stereoDeGhost.ps.hlsl index 3251a234..17a4d39f 100644 --- a/base/renderprogs/stereoDeGhost.ps.hlsl +++ b/base/renderprogs/builtin/VR/stereoDeGhost.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/stereoDeGhost.vs.hlsl b/base/renderprogs/builtin/VR/stereoDeGhost.vs.hlsl similarity index 98% rename from base/renderprogs/stereoDeGhost.vs.hlsl rename to base/renderprogs/builtin/VR/stereoDeGhost.vs.hlsl index 5ba29f16..941643cd 100644 --- a/base/renderprogs/stereoDeGhost.vs.hlsl +++ b/base/renderprogs/builtin/VR/stereoDeGhost.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/stereoInterlace.ps.hlsl b/base/renderprogs/builtin/VR/stereoInterlace.ps.hlsl similarity index 98% rename from base/renderprogs/stereoInterlace.ps.hlsl rename to base/renderprogs/builtin/VR/stereoInterlace.ps.hlsl index 405a3e02..434b2df7 100644 --- a/base/renderprogs/stereoInterlace.ps.hlsl +++ b/base/renderprogs/builtin/VR/stereoInterlace.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/stereoInterlace.vs.hlsl b/base/renderprogs/builtin/VR/stereoInterlace.vs.hlsl similarity index 98% rename from base/renderprogs/stereoInterlace.vs.hlsl rename to base/renderprogs/builtin/VR/stereoInterlace.vs.hlsl index f51f67c3..fd1e6d18 100644 --- a/base/renderprogs/stereoInterlace.vs.hlsl +++ b/base/renderprogs/builtin/VR/stereoInterlace.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/stereoWarp.ps.hlsl b/base/renderprogs/builtin/VR/stereoWarp.ps.hlsl similarity index 98% rename from base/renderprogs/stereoWarp.ps.hlsl rename to base/renderprogs/builtin/VR/stereoWarp.ps.hlsl index 90dccf37..e50c6cc2 100644 --- a/base/renderprogs/stereoWarp.ps.hlsl +++ b/base/renderprogs/builtin/VR/stereoWarp.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + /* diff --git a/base/renderprogs/stereoWarp.vs.hlsl b/base/renderprogs/builtin/VR/stereoWarp.vs.hlsl similarity index 98% rename from base/renderprogs/stereoWarp.vs.hlsl rename to base/renderprogs/builtin/VR/stereoWarp.vs.hlsl index ebaec269..e5217bf0 100644 --- a/base/renderprogs/stereoWarp.vs.hlsl +++ b/base/renderprogs/builtin/VR/stereoWarp.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/color.ps.hlsl b/base/renderprogs/builtin/color.ps.hlsl similarity index 97% rename from base/renderprogs/color.ps.hlsl rename to base/renderprogs/builtin/color.ps.hlsl index 3251a234..17a4d39f 100644 --- a/base/renderprogs/color.ps.hlsl +++ b/base/renderprogs/builtin/color.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/color.vs.hlsl b/base/renderprogs/builtin/color.vs.hlsl similarity index 98% rename from base/renderprogs/color.vs.hlsl rename to base/renderprogs/builtin/color.vs.hlsl index 177605ac..57b2d72c 100644 --- a/base/renderprogs/color.vs.hlsl +++ b/base/renderprogs/builtin/color.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #if defined(USE_GPU_SKINNING) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/debug_shadowmap.ps.hlsl b/base/renderprogs/builtin/debug/debug_shadowmap.ps.hlsl similarity index 98% rename from base/renderprogs/debug_shadowmap.ps.hlsl rename to base/renderprogs/builtin/debug/debug_shadowmap.ps.hlsl index ec330b44..c99b9c5a 100644 --- a/base/renderprogs/debug_shadowmap.ps.hlsl +++ b/base/renderprogs/builtin/debug/debug_shadowmap.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2DArray samp0 : register(s0); diff --git a/base/renderprogs/debug_shadowmap.vs.hlsl b/base/renderprogs/builtin/debug/debug_shadowmap.vs.hlsl similarity index 98% rename from base/renderprogs/debug_shadowmap.vs.hlsl rename to base/renderprogs/builtin/debug/debug_shadowmap.vs.hlsl index d15c952f..a8aca020 100644 --- a/base/renderprogs/debug_shadowmap.vs.hlsl +++ b/base/renderprogs/builtin/debug/debug_shadowmap.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/octahedron.ps.hlsl b/base/renderprogs/builtin/debug/octahedron.ps.hlsl similarity index 98% rename from base/renderprogs/octahedron.ps.hlsl rename to base/renderprogs/builtin/debug/octahedron.ps.hlsl index 3b53cbdb..8ef576de 100644 --- a/base/renderprogs/octahedron.ps.hlsl +++ b/base/renderprogs/builtin/debug/octahedron.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is octahedron cube map diff --git a/base/renderprogs/octahedron.vs.hlsl b/base/renderprogs/builtin/debug/octahedron.vs.hlsl similarity index 99% rename from base/renderprogs/octahedron.vs.hlsl rename to base/renderprogs/builtin/debug/octahedron.vs.hlsl index ffd3a629..ca9cab0c 100644 --- a/base/renderprogs/octahedron.vs.hlsl +++ b/base/renderprogs/builtin/debug/octahedron.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/shadowDebug.ps.hlsl b/base/renderprogs/builtin/debug/shadowDebug.ps.hlsl similarity index 97% rename from base/renderprogs/shadowDebug.ps.hlsl rename to base/renderprogs/builtin/debug/shadowDebug.ps.hlsl index 3251a234..17a4d39f 100644 --- a/base/renderprogs/shadowDebug.ps.hlsl +++ b/base/renderprogs/builtin/debug/shadowDebug.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/shadowDebug.vs.hlsl b/base/renderprogs/builtin/debug/shadowDebug.vs.hlsl similarity index 98% rename from base/renderprogs/shadowDebug.vs.hlsl rename to base/renderprogs/builtin/debug/shadowDebug.vs.hlsl index 58aed0dd..24aacd4e 100644 --- a/base/renderprogs/shadowDebug.vs.hlsl +++ b/base/renderprogs/builtin/debug/shadowDebug.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/shadowDebug_skinned.ps.hlsl b/base/renderprogs/builtin/debug/shadowDebug_skinned.ps.hlsl similarity index 97% rename from base/renderprogs/shadowDebug_skinned.ps.hlsl rename to base/renderprogs/builtin/debug/shadowDebug_skinned.ps.hlsl index 3251a234..17a4d39f 100644 --- a/base/renderprogs/shadowDebug_skinned.ps.hlsl +++ b/base/renderprogs/builtin/debug/shadowDebug_skinned.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/shadowDebug_skinned.vs.hlsl b/base/renderprogs/builtin/debug/shadowDebug_skinned.vs.hlsl similarity index 98% rename from base/renderprogs/shadowDebug_skinned.vs.hlsl rename to base/renderprogs/builtin/debug/shadowDebug_skinned.vs.hlsl index 78653b28..9c03f6a1 100644 --- a/base/renderprogs/shadowDebug_skinned.vs.hlsl +++ b/base/renderprogs/builtin/debug/shadowDebug_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/depth.ps.hlsl b/base/renderprogs/builtin/depth.ps.hlsl similarity index 97% rename from base/renderprogs/depth.ps.hlsl rename to base/renderprogs/builtin/depth.ps.hlsl index 26f25047..18732db9 100644 --- a/base/renderprogs/depth.ps.hlsl +++ b/base/renderprogs/builtin/depth.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/depth.vs.hlsl b/base/renderprogs/builtin/depth.vs.hlsl similarity index 98% rename from base/renderprogs/depth.vs.hlsl rename to base/renderprogs/builtin/depth.vs.hlsl index f57f5d43..c79954a4 100644 --- a/base/renderprogs/depth.vs.hlsl +++ b/base/renderprogs/builtin/depth.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/depth_skinned.ps.hlsl b/base/renderprogs/builtin/depth_skinned.ps.hlsl similarity index 97% rename from base/renderprogs/depth_skinned.ps.hlsl rename to base/renderprogs/builtin/depth_skinned.ps.hlsl index 26f25047..18732db9 100644 --- a/base/renderprogs/depth_skinned.ps.hlsl +++ b/base/renderprogs/builtin/depth_skinned.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/depth_skinned.vs.hlsl b/base/renderprogs/builtin/depth_skinned.vs.hlsl similarity index 98% rename from base/renderprogs/depth_skinned.vs.hlsl rename to base/renderprogs/builtin/depth_skinned.vs.hlsl index 30f6ea0c..2cfb93e7 100644 --- a/base/renderprogs/depth_skinned.vs.hlsl +++ b/base/renderprogs/builtin/depth_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/blendLight.ps.hlsl b/base/renderprogs/builtin/fog/blendLight.ps.hlsl similarity index 98% rename from base/renderprogs/blendLight.ps.hlsl rename to base/renderprogs/builtin/fog/blendLight.ps.hlsl index 6dd83028..919b5dd7 100644 --- a/base/renderprogs/blendLight.ps.hlsl +++ b/base/renderprogs/builtin/fog/blendLight.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/blendLight.vs.hlsl b/base/renderprogs/builtin/fog/blendLight.vs.hlsl similarity index 98% rename from base/renderprogs/blendLight.vs.hlsl rename to base/renderprogs/builtin/fog/blendLight.vs.hlsl index a8e2c5e8..ce4ffab1 100644 --- a/base/renderprogs/blendLight.vs.hlsl +++ b/base/renderprogs/builtin/fog/blendLight.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/fog.ps.hlsl b/base/renderprogs/builtin/fog/fog.ps.hlsl similarity index 98% rename from base/renderprogs/fog.ps.hlsl rename to base/renderprogs/builtin/fog/fog.ps.hlsl index 95c7fd70..28507e63 100644 --- a/base/renderprogs/fog.ps.hlsl +++ b/base/renderprogs/builtin/fog/fog.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/fog.vs.hlsl b/base/renderprogs/builtin/fog/fog.vs.hlsl similarity index 98% rename from base/renderprogs/fog.vs.hlsl rename to base/renderprogs/builtin/fog/fog.vs.hlsl index 47e0302d..438b945e 100644 --- a/base/renderprogs/fog.vs.hlsl +++ b/base/renderprogs/builtin/fog/fog.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/fog_skinned.ps.hlsl b/base/renderprogs/builtin/fog/fog_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/fog_skinned.ps.hlsl rename to base/renderprogs/builtin/fog/fog_skinned.ps.hlsl index 95c7fd70..28507e63 100644 --- a/base/renderprogs/fog_skinned.ps.hlsl +++ b/base/renderprogs/builtin/fog/fog_skinned.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/fog_skinned.vs.hlsl b/base/renderprogs/builtin/fog/fog_skinned.vs.hlsl similarity index 98% rename from base/renderprogs/fog_skinned.vs.hlsl rename to base/renderprogs/builtin/fog/fog_skinned.vs.hlsl index 054a0a3f..5d968151 100644 --- a/base/renderprogs/fog_skinned.vs.hlsl +++ b/base/renderprogs/builtin/fog/fog_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/gbuffer.ps.hlsl b/base/renderprogs/builtin/gbuffer.ps.hlsl similarity index 98% rename from base/renderprogs/gbuffer.ps.hlsl rename to base/renderprogs/builtin/gbuffer.ps.hlsl index ba03b484..8cc0d393 100644 --- a/base/renderprogs/gbuffer.ps.hlsl +++ b/base/renderprogs/builtin/gbuffer.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // normal map diff --git a/base/renderprogs/gbuffer.vs.hlsl b/base/renderprogs/builtin/gbuffer.vs.hlsl similarity index 99% rename from base/renderprogs/gbuffer.vs.hlsl rename to base/renderprogs/builtin/gbuffer.vs.hlsl index 1c339b87..40f45b0b 100644 --- a/base/renderprogs/gbuffer.vs.hlsl +++ b/base/renderprogs/builtin/gbuffer.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/gui.ps.hlsl b/base/renderprogs/builtin/gui.ps.hlsl similarity index 98% rename from base/renderprogs/gui.ps.hlsl rename to base/renderprogs/builtin/gui.ps.hlsl index a3357f0c..cb4bf123 100644 --- a/base/renderprogs/gui.ps.hlsl +++ b/base/renderprogs/builtin/gui.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/gui.vs.hlsl b/base/renderprogs/builtin/gui.vs.hlsl similarity index 98% rename from base/renderprogs/gui.vs.hlsl rename to base/renderprogs/builtin/gui.vs.hlsl index f0c0501d..673ae1fe 100644 --- a/base/renderprogs/gui.vs.hlsl +++ b/base/renderprogs/builtin/gui.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/bumpyenvironment.ps.hlsl b/base/renderprogs/builtin/legacy/bumpyenvironment.ps.hlsl similarity index 98% rename from base/renderprogs/bumpyenvironment.ps.hlsl rename to base/renderprogs/builtin/legacy/bumpyenvironment.ps.hlsl index abcba0f9..912b732b 100644 --- a/base/renderprogs/bumpyenvironment.ps.hlsl +++ b/base/renderprogs/builtin/legacy/bumpyenvironment.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map diff --git a/base/renderprogs/bumpyenvironment.vs.hlsl b/base/renderprogs/builtin/legacy/bumpyenvironment.vs.hlsl similarity index 98% rename from base/renderprogs/bumpyenvironment.vs.hlsl rename to base/renderprogs/builtin/legacy/bumpyenvironment.vs.hlsl index 2884bf16..03ece170 100644 --- a/base/renderprogs/bumpyenvironment.vs.hlsl +++ b/base/renderprogs/builtin/legacy/bumpyenvironment.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/bumpyenvironment_skinned.ps.hlsl b/base/renderprogs/builtin/legacy/bumpyenvironment_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/bumpyenvironment_skinned.ps.hlsl rename to base/renderprogs/builtin/legacy/bumpyenvironment_skinned.ps.hlsl index ab6e566f..0a8d65c0 100644 --- a/base/renderprogs/bumpyenvironment_skinned.ps.hlsl +++ b/base/renderprogs/builtin/legacy/bumpyenvironment_skinned.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map diff --git a/base/renderprogs/bumpyenvironment_skinned.vs.hlsl b/base/renderprogs/builtin/legacy/bumpyenvironment_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/bumpyenvironment_skinned.vs.hlsl rename to base/renderprogs/builtin/legacy/bumpyenvironment_skinned.vs.hlsl index 0d7de212..02afd6d0 100644 --- a/base/renderprogs/bumpyenvironment_skinned.vs.hlsl +++ b/base/renderprogs/builtin/legacy/bumpyenvironment_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/environment.ps.hlsl b/base/renderprogs/builtin/legacy/environment.ps.hlsl similarity index 98% rename from base/renderprogs/environment.ps.hlsl rename to base/renderprogs/builtin/legacy/environment.ps.hlsl index 12511ff4..53d6a35d 100644 --- a/base/renderprogs/environment.ps.hlsl +++ b/base/renderprogs/builtin/legacy/environment.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map diff --git a/base/renderprogs/environment.vs.hlsl b/base/renderprogs/builtin/legacy/environment.vs.hlsl similarity index 98% rename from base/renderprogs/environment.vs.hlsl rename to base/renderprogs/builtin/legacy/environment.vs.hlsl index 931838d1..312451da 100644 --- a/base/renderprogs/environment.vs.hlsl +++ b/base/renderprogs/builtin/legacy/environment.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/environment_skinned.ps.hlsl b/base/renderprogs/builtin/legacy/environment_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/environment_skinned.ps.hlsl rename to base/renderprogs/builtin/legacy/environment_skinned.ps.hlsl index 12511ff4..53d6a35d 100644 --- a/base/renderprogs/environment_skinned.ps.hlsl +++ b/base/renderprogs/builtin/legacy/environment_skinned.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map diff --git a/base/renderprogs/environment_skinned.vs.hlsl b/base/renderprogs/builtin/legacy/environment_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/environment_skinned.vs.hlsl rename to base/renderprogs/builtin/legacy/environment_skinned.vs.hlsl index 02892239..64652c6b 100644 --- a/base/renderprogs/environment_skinned.vs.hlsl +++ b/base/renderprogs/builtin/legacy/environment_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/skybox.ps.hlsl b/base/renderprogs/builtin/legacy/skybox.ps.hlsl similarity index 97% rename from base/renderprogs/skybox.ps.hlsl rename to base/renderprogs/builtin/legacy/skybox.ps.hlsl index 18fdd1fa..a1fd7746 100644 --- a/base/renderprogs/skybox.ps.hlsl +++ b/base/renderprogs/builtin/legacy/skybox.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform samplerCUBE samp0 : register(s0); diff --git a/base/renderprogs/skybox.vs.hlsl b/base/renderprogs/builtin/legacy/skybox.vs.hlsl similarity index 98% rename from base/renderprogs/skybox.vs.hlsl rename to base/renderprogs/builtin/legacy/skybox.vs.hlsl index 4db0dc39..5675fd62 100644 --- a/base/renderprogs/skybox.vs.hlsl +++ b/base/renderprogs/builtin/legacy/skybox.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/wobblesky.ps.hlsl b/base/renderprogs/builtin/legacy/wobblesky.ps.hlsl similarity index 97% rename from base/renderprogs/wobblesky.ps.hlsl rename to base/renderprogs/builtin/legacy/wobblesky.ps.hlsl index 18fdd1fa..a1fd7746 100644 --- a/base/renderprogs/wobblesky.ps.hlsl +++ b/base/renderprogs/builtin/legacy/wobblesky.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform samplerCUBE samp0 : register(s0); diff --git a/base/renderprogs/wobblesky.vs.hlsl b/base/renderprogs/builtin/legacy/wobblesky.vs.hlsl similarity index 98% rename from base/renderprogs/wobblesky.vs.hlsl rename to base/renderprogs/builtin/legacy/wobblesky.vs.hlsl index d0d72137..79b6f684 100644 --- a/base/renderprogs/wobblesky.vs.hlsl +++ b/base/renderprogs/builtin/legacy/wobblesky.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/ambient_lighting.ps.hlsl b/base/renderprogs/builtin/lighting/ambient_lighting.ps.hlsl similarity index 99% rename from base/renderprogs/ambient_lighting.ps.hlsl rename to base/renderprogs/builtin/lighting/ambient_lighting.ps.hlsl index d60ec9f9..517d9753 100644 --- a/base/renderprogs/ambient_lighting.ps.hlsl +++ b/base/renderprogs/builtin/lighting/ambient_lighting.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface normal map diff --git a/base/renderprogs/ambient_lighting.vs.hlsl b/base/renderprogs/builtin/lighting/ambient_lighting.vs.hlsl similarity index 99% rename from base/renderprogs/ambient_lighting.vs.hlsl rename to base/renderprogs/builtin/lighting/ambient_lighting.vs.hlsl index a1e5e82f..1839ac1b 100644 --- a/base/renderprogs/ambient_lighting.vs.hlsl +++ b/base/renderprogs/builtin/lighting/ambient_lighting.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/ambient_lighting_IBL.ps.hlsl b/base/renderprogs/builtin/lighting/ambient_lighting_IBL.ps.hlsl similarity index 98% rename from base/renderprogs/ambient_lighting_IBL.ps.hlsl rename to base/renderprogs/builtin/lighting/ambient_lighting_IBL.ps.hlsl index 9760d29a..d4108784 100644 --- a/base/renderprogs/ambient_lighting_IBL.ps.hlsl +++ b/base/renderprogs/builtin/lighting/ambient_lighting_IBL.ps.hlsl @@ -27,8 +27,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" -#include "BRDF.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + +#include "renderprogs/BRDF.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is the per-surface normal map diff --git a/base/renderprogs/ambient_lighting_IBL.vs.hlsl b/base/renderprogs/builtin/lighting/ambient_lighting_IBL.vs.hlsl similarity index 99% rename from base/renderprogs/ambient_lighting_IBL.vs.hlsl rename to base/renderprogs/builtin/lighting/ambient_lighting_IBL.vs.hlsl index 5bfc659c..7eee66c1 100644 --- a/base/renderprogs/ambient_lighting_IBL.vs.hlsl +++ b/base/renderprogs/builtin/lighting/ambient_lighting_IBL.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/interaction.ps.hlsl b/base/renderprogs/builtin/lighting/interaction.ps.hlsl similarity index 98% rename from base/renderprogs/interaction.ps.hlsl rename to base/renderprogs/builtin/lighting/interaction.ps.hlsl index fad381ee..d0faa08f 100644 --- a/base/renderprogs/interaction.ps.hlsl +++ b/base/renderprogs/builtin/lighting/interaction.ps.hlsl @@ -27,8 +27,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" -#include "BRDF.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + +#include "renderprogs/BRDF.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface normal map @@ -103,7 +105,7 @@ void main( PS_IN fragment, out PS_OUT result ) const half roughness = specMapSRGB.r; const half glossiness = 1.0 - roughness; - // the vast majority of real-world materials (anything not metal or gems) have F(0°) + // the vast majority of real-world materials (anything not metal or gems) have F(0�) // values in a very narrow range (~0.02 - 0.08) // approximate non-metals with linear RGB 0.04 which is 0.08 * 0.5 (default in UE4) diff --git a/base/renderprogs/interaction.vs.hlsl b/base/renderprogs/builtin/lighting/interaction.vs.hlsl similarity index 99% rename from base/renderprogs/interaction.vs.hlsl rename to base/renderprogs/builtin/lighting/interaction.vs.hlsl index 7fd920a2..3cc5c2d1 100644 --- a/base/renderprogs/interaction.vs.hlsl +++ b/base/renderprogs/builtin/lighting/interaction.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/interactionAmbient.ps.hlsl b/base/renderprogs/builtin/lighting/interactionAmbient.ps.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient.ps.hlsl rename to base/renderprogs/builtin/lighting/interactionAmbient.ps.hlsl index 9db23247..1315575e 100644 --- a/base/renderprogs/interactionAmbient.ps.hlsl +++ b/base/renderprogs/builtin/lighting/interactionAmbient.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface normal map diff --git a/base/renderprogs/interactionAmbient.vs.hlsl b/base/renderprogs/builtin/lighting/interactionAmbient.vs.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient.vs.hlsl rename to base/renderprogs/builtin/lighting/interactionAmbient.vs.hlsl index 87b213f9..0dbe9644 100644 --- a/base/renderprogs/interactionAmbient.vs.hlsl +++ b/base/renderprogs/builtin/lighting/interactionAmbient.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/interactionAmbient_skinned.ps.hlsl b/base/renderprogs/builtin/lighting/interactionAmbient_skinned.ps.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient_skinned.ps.hlsl rename to base/renderprogs/builtin/lighting/interactionAmbient_skinned.ps.hlsl index 9db23247..1315575e 100644 --- a/base/renderprogs/interactionAmbient_skinned.ps.hlsl +++ b/base/renderprogs/builtin/lighting/interactionAmbient_skinned.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface normal map diff --git a/base/renderprogs/interactionAmbient_skinned.vs.hlsl b/base/renderprogs/builtin/lighting/interactionAmbient_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient_skinned.vs.hlsl rename to base/renderprogs/builtin/lighting/interactionAmbient_skinned.vs.hlsl index df7ad214..1e72d695 100644 --- a/base/renderprogs/interactionAmbient_skinned.vs.hlsl +++ b/base/renderprogs/builtin/lighting/interactionAmbient_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/interactionSM.ps.hlsl b/base/renderprogs/builtin/lighting/interactionSM.ps.hlsl similarity index 99% rename from base/renderprogs/interactionSM.ps.hlsl rename to base/renderprogs/builtin/lighting/interactionSM.ps.hlsl index 8bb2dca6..f77a74bc 100644 --- a/base/renderprogs/interactionSM.ps.hlsl +++ b/base/renderprogs/builtin/lighting/interactionSM.ps.hlsl @@ -28,8 +28,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" -#include "BRDF.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + +#include "renderprogs/BRDF.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface normal map @@ -394,7 +396,7 @@ void main( PS_IN fragment, out PS_OUT result ) const half roughness = specMapSRGB.r; const half glossiness = 1.0 - roughness; - // the vast majority of real-world materials (anything not metal or gems) have F(0°) + // the vast majority of real-world materials (anything not metal or gems) have F(0�) // values in a very narrow range (~0.02 - 0.08) // approximate non-metals with linear RGB 0.04 which is 0.08 * 0.5 (default in UE4) diff --git a/base/renderprogs/interactionSM.vs.hlsl b/base/renderprogs/builtin/lighting/interactionSM.vs.hlsl similarity index 99% rename from base/renderprogs/interactionSM.vs.hlsl rename to base/renderprogs/builtin/lighting/interactionSM.vs.hlsl index 7747510d..18f58003 100644 --- a/base/renderprogs/interactionSM.vs.hlsl +++ b/base/renderprogs/builtin/lighting/interactionSM.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/shadow.ps.hlsl b/base/renderprogs/builtin/lighting/shadow.ps.hlsl similarity index 97% rename from base/renderprogs/shadow.ps.hlsl rename to base/renderprogs/builtin/lighting/shadow.ps.hlsl index 3251a234..17a4d39f 100644 --- a/base/renderprogs/shadow.ps.hlsl +++ b/base/renderprogs/builtin/lighting/shadow.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/shadow.vs.hlsl b/base/renderprogs/builtin/lighting/shadow.vs.hlsl similarity index 98% rename from base/renderprogs/shadow.vs.hlsl rename to base/renderprogs/builtin/lighting/shadow.vs.hlsl index 58aed0dd..24aacd4e 100644 --- a/base/renderprogs/shadow.vs.hlsl +++ b/base/renderprogs/builtin/lighting/shadow.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/shadow_skinned.ps.hlsl b/base/renderprogs/builtin/lighting/shadow_skinned.ps.hlsl similarity index 97% rename from base/renderprogs/shadow_skinned.ps.hlsl rename to base/renderprogs/builtin/lighting/shadow_skinned.ps.hlsl index 3251a234..17a4d39f 100644 --- a/base/renderprogs/shadow_skinned.ps.hlsl +++ b/base/renderprogs/builtin/lighting/shadow_skinned.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/shadow_skinned.vs.hlsl b/base/renderprogs/builtin/lighting/shadow_skinned.vs.hlsl similarity index 98% rename from base/renderprogs/shadow_skinned.vs.hlsl rename to base/renderprogs/builtin/lighting/shadow_skinned.vs.hlsl index a6c73ea4..445fa4d1 100644 --- a/base/renderprogs/shadow_skinned.vs.hlsl +++ b/base/renderprogs/builtin/lighting/shadow_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/SMAA.inc.hlsl b/base/renderprogs/builtin/post/SMAA.inc.hlsl similarity index 100% rename from base/renderprogs/SMAA.inc.hlsl rename to base/renderprogs/builtin/post/SMAA.inc.hlsl diff --git a/base/renderprogs/SMAA_blending_weight_calc.ps.hlsl b/base/renderprogs/builtin/post/SMAA_blending_weight_calc.ps.hlsl similarity index 98% rename from base/renderprogs/SMAA_blending_weight_calc.ps.hlsl rename to base/renderprogs/builtin/post/SMAA_blending_weight_calc.ps.hlsl index 86a20b29..fca0703a 100644 --- a/base/renderprogs/SMAA_blending_weight_calc.ps.hlsl +++ b/base/renderprogs/builtin/post/SMAA_blending_weight_calc.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define SMAA_INCLUDE_VS 0 #define SMAA_INCLUDE_PS 1 diff --git a/base/renderprogs/SMAA_blending_weight_calc.vs.hlsl b/base/renderprogs/builtin/post/SMAA_blending_weight_calc.vs.hlsl similarity index 98% rename from base/renderprogs/SMAA_blending_weight_calc.vs.hlsl rename to base/renderprogs/builtin/post/SMAA_blending_weight_calc.vs.hlsl index 0bb9882d..9e9c536b 100644 --- a/base/renderprogs/SMAA_blending_weight_calc.vs.hlsl +++ b/base/renderprogs/builtin/post/SMAA_blending_weight_calc.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define SMAA_INCLUDE_VS 1 #define SMAA_INCLUDE_PS 0 diff --git a/base/renderprogs/SMAA_edge_detection.ps.hlsl b/base/renderprogs/builtin/post/SMAA_edge_detection.ps.hlsl similarity index 98% rename from base/renderprogs/SMAA_edge_detection.ps.hlsl rename to base/renderprogs/builtin/post/SMAA_edge_detection.ps.hlsl index 9801984d..886a5b37 100644 --- a/base/renderprogs/SMAA_edge_detection.ps.hlsl +++ b/base/renderprogs/builtin/post/SMAA_edge_detection.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define SMAA_INCLUDE_VS 0 #define SMAA_INCLUDE_PS 1 diff --git a/base/renderprogs/SMAA_edge_detection.vs.hlsl b/base/renderprogs/builtin/post/SMAA_edge_detection.vs.hlsl similarity index 98% rename from base/renderprogs/SMAA_edge_detection.vs.hlsl rename to base/renderprogs/builtin/post/SMAA_edge_detection.vs.hlsl index ce802173..1fc8c4c2 100644 --- a/base/renderprogs/SMAA_edge_detection.vs.hlsl +++ b/base/renderprogs/builtin/post/SMAA_edge_detection.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define SMAA_INCLUDE_VS 1 #define SMAA_INCLUDE_PS 0 diff --git a/base/renderprogs/SMAA_final.ps.hlsl b/base/renderprogs/builtin/post/SMAA_final.ps.hlsl similarity index 98% rename from base/renderprogs/SMAA_final.ps.hlsl rename to base/renderprogs/builtin/post/SMAA_final.ps.hlsl index 353dfabb..5bba4729 100644 --- a/base/renderprogs/SMAA_final.ps.hlsl +++ b/base/renderprogs/builtin/post/SMAA_final.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define SMAA_INCLUDE_VS 0 #define SMAA_INCLUDE_PS 1 diff --git a/base/renderprogs/SMAA_final.vs.hlsl b/base/renderprogs/builtin/post/SMAA_final.vs.hlsl similarity index 98% rename from base/renderprogs/SMAA_final.vs.hlsl rename to base/renderprogs/builtin/post/SMAA_final.vs.hlsl index d63eb676..3f658623 100644 --- a/base/renderprogs/SMAA_final.vs.hlsl +++ b/base/renderprogs/builtin/post/SMAA_final.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define SMAA_INCLUDE_VS 1 #define SMAA_INCLUDE_PS 0 diff --git a/base/renderprogs/fxaa.ps.hlsl b/base/renderprogs/builtin/post/fxaa.ps.hlsl similarity index 99% rename from base/renderprogs/fxaa.ps.hlsl rename to base/renderprogs/builtin/post/fxaa.ps.hlsl index 7df020fd..e7aca66c 100644 --- a/base/renderprogs/fxaa.ps.hlsl +++ b/base/renderprogs/builtin/post/fxaa.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + #define FXAA_GREEN_AS_LUMA 1 #define FXAA_EARLY_EXIT 0 #include "Fxaa3_11.h" diff --git a/base/renderprogs/fxaa.vs.hlsl b/base/renderprogs/builtin/post/fxaa.vs.hlsl similarity index 98% rename from base/renderprogs/fxaa.vs.hlsl rename to base/renderprogs/builtin/post/fxaa.vs.hlsl index 0687ba0f..74262be2 100644 --- a/base/renderprogs/fxaa.vs.hlsl +++ b/base/renderprogs/builtin/post/fxaa.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/hdr_glare_chromatic.ps.hlsl b/base/renderprogs/builtin/post/hdr_glare_chromatic.ps.hlsl similarity index 99% rename from base/renderprogs/hdr_glare_chromatic.ps.hlsl rename to base/renderprogs/builtin/post/hdr_glare_chromatic.ps.hlsl index c2c3c176..b9282b07 100644 --- a/base/renderprogs/hdr_glare_chromatic.ps.hlsl +++ b/base/renderprogs/builtin/post/hdr_glare_chromatic.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/hdr_glare_chromatic.vs.hlsl b/base/renderprogs/builtin/post/hdr_glare_chromatic.vs.hlsl similarity index 98% rename from base/renderprogs/hdr_glare_chromatic.vs.hlsl rename to base/renderprogs/builtin/post/hdr_glare_chromatic.vs.hlsl index 38ff6db5..5830cc1b 100644 --- a/base/renderprogs/hdr_glare_chromatic.vs.hlsl +++ b/base/renderprogs/builtin/post/hdr_glare_chromatic.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/motionBlur.ps.hlsl b/base/renderprogs/builtin/post/motionBlur.ps.hlsl similarity index 98% rename from base/renderprogs/motionBlur.ps.hlsl rename to base/renderprogs/builtin/post/motionBlur.ps.hlsl index 40d1be0b..8cc951db 100644 --- a/base/renderprogs/motionBlur.ps.hlsl +++ b/base/renderprogs/builtin/post/motionBlur.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // view color diff --git a/base/renderprogs/motionBlur.vs.hlsl b/base/renderprogs/builtin/post/motionBlur.vs.hlsl similarity index 97% rename from base/renderprogs/motionBlur.vs.hlsl rename to base/renderprogs/builtin/post/motionBlur.vs.hlsl index 5810eb11..1cba163f 100644 --- a/base/renderprogs/motionBlur.vs.hlsl +++ b/base/renderprogs/builtin/post/motionBlur.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/postprocess.ps.hlsl b/base/renderprogs/builtin/post/postprocess.ps.hlsl similarity index 99% rename from base/renderprogs/postprocess.ps.hlsl rename to base/renderprogs/builtin/post/postprocess.ps.hlsl index 1c086cc2..5342785d 100644 --- a/base/renderprogs/postprocess.ps.hlsl +++ b/base/renderprogs/builtin/post/postprocess.ps.hlsl @@ -29,7 +29,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/postprocess.vs.hlsl b/base/renderprogs/builtin/post/postprocess.vs.hlsl similarity index 98% rename from base/renderprogs/postprocess.vs.hlsl rename to base/renderprogs/builtin/post/postprocess.vs.hlsl index 38ff6db5..5830cc1b 100644 --- a/base/renderprogs/postprocess.vs.hlsl +++ b/base/renderprogs/builtin/post/postprocess.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/screen.ps.hlsl b/base/renderprogs/builtin/post/screen.ps.hlsl similarity index 98% rename from base/renderprogs/screen.ps.hlsl rename to base/renderprogs/builtin/post/screen.ps.hlsl index d6544af7..2760cdde 100644 --- a/base/renderprogs/screen.ps.hlsl +++ b/base/renderprogs/builtin/post/screen.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/screen.vs.hlsl b/base/renderprogs/builtin/post/screen.vs.hlsl similarity index 98% rename from base/renderprogs/screen.vs.hlsl rename to base/renderprogs/builtin/post/screen.vs.hlsl index 38ff6db5..5830cc1b 100644 --- a/base/renderprogs/screen.vs.hlsl +++ b/base/renderprogs/builtin/post/screen.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/tonemap.ps.hlsl b/base/renderprogs/builtin/post/tonemap.ps.hlsl similarity index 99% rename from base/renderprogs/tonemap.ps.hlsl rename to base/renderprogs/builtin/post/tonemap.ps.hlsl index 1184ff76..d0d6d1e2 100644 --- a/base/renderprogs/tonemap.ps.hlsl +++ b/base/renderprogs/builtin/post/tonemap.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is _currentRender diff --git a/base/renderprogs/tonemap.vs.hlsl b/base/renderprogs/builtin/post/tonemap.vs.hlsl similarity index 98% rename from base/renderprogs/tonemap.vs.hlsl rename to base/renderprogs/builtin/post/tonemap.vs.hlsl index 38ff6db5..5830cc1b 100644 --- a/base/renderprogs/tonemap.vs.hlsl +++ b/base/renderprogs/builtin/post/tonemap.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/texture.ps.hlsl b/base/renderprogs/builtin/texture.ps.hlsl similarity index 98% rename from base/renderprogs/texture.ps.hlsl rename to base/renderprogs/builtin/texture.ps.hlsl index 9c301df2..c368628b 100644 --- a/base/renderprogs/texture.ps.hlsl +++ b/base/renderprogs/builtin/texture.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture.vs.hlsl b/base/renderprogs/builtin/texture.vs.hlsl similarity index 98% rename from base/renderprogs/texture.vs.hlsl rename to base/renderprogs/builtin/texture.vs.hlsl index d15c952f..a8aca020 100644 --- a/base/renderprogs/texture.vs.hlsl +++ b/base/renderprogs/builtin/texture.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/texture_color.ps.hlsl b/base/renderprogs/builtin/texture_color.ps.hlsl similarity index 98% rename from base/renderprogs/texture_color.ps.hlsl rename to base/renderprogs/builtin/texture_color.ps.hlsl index f946e43b..c3103eee 100644 --- a/base/renderprogs/texture_color.ps.hlsl +++ b/base/renderprogs/builtin/texture_color.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture_color.vs.hlsl b/base/renderprogs/builtin/texture_color.vs.hlsl similarity index 98% rename from base/renderprogs/texture_color.vs.hlsl rename to base/renderprogs/builtin/texture_color.vs.hlsl index 75a83d6c..f431b112 100644 --- a/base/renderprogs/texture_color.vs.hlsl +++ b/base/renderprogs/builtin/texture_color.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/texture_color_skinned.ps.hlsl b/base/renderprogs/builtin/texture_color_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/texture_color_skinned.ps.hlsl rename to base/renderprogs/builtin/texture_color_skinned.ps.hlsl index f946e43b..c3103eee 100644 --- a/base/renderprogs/texture_color_skinned.ps.hlsl +++ b/base/renderprogs/builtin/texture_color_skinned.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture_color_skinned.vs.hlsl b/base/renderprogs/builtin/texture_color_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/texture_color_skinned.vs.hlsl rename to base/renderprogs/builtin/texture_color_skinned.vs.hlsl index efd15a0a..c57d8715 100644 --- a/base/renderprogs/texture_color_skinned.vs.hlsl +++ b/base/renderprogs/builtin/texture_color_skinned.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/texture_color_texgen.ps.hlsl b/base/renderprogs/builtin/texture_color_texgen.ps.hlsl similarity index 98% rename from base/renderprogs/texture_color_texgen.ps.hlsl rename to base/renderprogs/builtin/texture_color_texgen.ps.hlsl index d6aa1906..4391b609 100644 --- a/base/renderprogs/texture_color_texgen.ps.hlsl +++ b/base/renderprogs/builtin/texture_color_texgen.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + uniform sampler2D samp0 : register( s0 ); diff --git a/base/renderprogs/texture_color_texgen.vs.hlsl b/base/renderprogs/builtin/texture_color_texgen.vs.hlsl similarity index 98% rename from base/renderprogs/texture_color_texgen.vs.hlsl rename to base/renderprogs/builtin/texture_color_texgen.vs.hlsl index f1ae40f6..71b10bf5 100644 --- a/base/renderprogs/texture_color_texgen.vs.hlsl +++ b/base/renderprogs/builtin/texture_color_texgen.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/vertex_color.ps.hlsl b/base/renderprogs/builtin/vertex_color.ps.hlsl similarity index 97% rename from base/renderprogs/vertex_color.ps.hlsl rename to base/renderprogs/builtin/vertex_color.ps.hlsl index 39b8620a..6977a517 100644 --- a/base/renderprogs/vertex_color.ps.hlsl +++ b/base/renderprogs/builtin/vertex_color.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/vertex_color.vs.hlsl b/base/renderprogs/builtin/vertex_color.vs.hlsl similarity index 98% rename from base/renderprogs/vertex_color.vs.hlsl rename to base/renderprogs/builtin/vertex_color.vs.hlsl index 8fe784ee..ffa15799 100644 --- a/base/renderprogs/vertex_color.vs.hlsl +++ b/base/renderprogs/builtin/vertex_color.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN diff --git a/base/renderprogs/bink.ps.hlsl b/base/renderprogs/builtin/video/bink.ps.hlsl similarity index 98% rename from base/renderprogs/bink.ps.hlsl rename to base/renderprogs/builtin/video/bink.ps.hlsl index 89cd689a..a0e236fc 100644 --- a/base/renderprogs/bink.ps.hlsl +++ b/base/renderprogs/builtin/video/bink.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // Y diff --git a/base/renderprogs/bink.vs.hlsl b/base/renderprogs/builtin/video/bink.vs.hlsl similarity index 98% rename from base/renderprogs/bink.vs.hlsl rename to base/renderprogs/builtin/video/bink.vs.hlsl index 8188818b..edf787ef 100644 --- a/base/renderprogs/bink.vs.hlsl +++ b/base/renderprogs/builtin/video/bink.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/bink_gui.ps.hlsl b/base/renderprogs/builtin/video/bink_gui.ps.hlsl similarity index 98% rename from base/renderprogs/bink_gui.ps.hlsl rename to base/renderprogs/builtin/video/bink_gui.ps.hlsl index 5a7a3d82..8adf8f41 100644 --- a/base/renderprogs/bink_gui.ps.hlsl +++ b/base/renderprogs/builtin/video/bink_gui.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // Y diff --git a/base/renderprogs/bink_gui.vs.hlsl b/base/renderprogs/builtin/video/bink_gui.vs.hlsl similarity index 98% rename from base/renderprogs/bink_gui.vs.hlsl rename to base/renderprogs/builtin/video/bink_gui.vs.hlsl index f0c0501d..673ae1fe 100644 --- a/base/renderprogs/bink_gui.vs.hlsl +++ b/base/renderprogs/builtin/video/bink_gui.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* struct VS_IN { diff --git a/base/renderprogs/colorProcess.ps.hlsl b/base/renderprogs/colorProcess.ps.hlsl index 1f6510a8..417f0cf2 100644 --- a/base/renderprogs/colorProcess.ps.hlsl +++ b/base/renderprogs/colorProcess.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/colorProcess.vs.hlsl b/base/renderprogs/colorProcess.vs.hlsl index 9844effc..e9f657a1 100644 --- a/base/renderprogs/colorProcess.vs.hlsl +++ b/base/renderprogs/colorProcess.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform float4 rpUser0 : register(c128); //rpFraction diff --git a/base/renderprogs/enviroSuit.ps.hlsl b/base/renderprogs/enviroSuit.ps.hlsl index 061c2356..a1040bc9 100644 --- a/base/renderprogs/enviroSuit.ps.hlsl +++ b/base/renderprogs/enviroSuit.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is _current Render diff --git a/base/renderprogs/enviroSuit.vs.hlsl b/base/renderprogs/enviroSuit.vs.hlsl index b14a2a64..fdb79b35 100644 --- a/base/renderprogs/enviroSuit.vs.hlsl +++ b/base/renderprogs/enviroSuit.vs.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // User Renderparms start at 128 as per renderprogs.h diff --git a/base/renderprogs/heatHazeWithMask.ps.hlsl b/base/renderprogs/heatHazeWithMask.ps.hlsl index 53db287f..63206168 100644 --- a/base/renderprogs/heatHazeWithMask.ps.hlsl +++ b/base/renderprogs/heatHazeWithMask.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is _current Render diff --git a/base/renderprogs/heatHazeWithMask.vs.hlsl b/base/renderprogs/heatHazeWithMask.vs.hlsl index 0e5e1615..158f2a39 100644 --- a/base/renderprogs/heatHazeWithMask.vs.hlsl +++ b/base/renderprogs/heatHazeWithMask.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // RB: no GPU skinning with ES 2.0 #if defined(USE_GPU_SKINNING) @@ -59,7 +60,8 @@ struct VS_OUT { void main( VS_IN vertex, out VS_OUT result ) { -#include "skinning.inc.hlsl" +#include "renderprogs/skinning.inc.hlsl" + // texture 0 takes the texture coordinates unmodified result.texcoord0 = float4( vertex.texcoord.xy, 0, 0 ); diff --git a/base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl b/base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl index c4f58130..1c60f2f3 100644 --- a/base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl +++ b/base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl @@ -26,7 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is _current Render diff --git a/base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl b/base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl index c965b849..9b0898fd 100644 --- a/base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl +++ b/base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // RB: no GPU skinning with ES 2.0 #if defined(USE_GPU_SKINNING) @@ -60,7 +61,8 @@ struct VS_OUT { void main( VS_IN vertex, out VS_OUT result ) { -#include "skinning.inc.hlsl" +#include "renderprogs/skinning.inc.hlsl" + // texture 0 takes the texture coordinates unmodified result.texcoord0 = float4( vertex.texcoord, 0 , 0 ); diff --git a/base/renderprogs/heathaze.ps.hlsl b/base/renderprogs/heathaze.ps.hlsl index 41c7add3..c99e86af 100644 --- a/base/renderprogs/heathaze.ps.hlsl +++ b/base/renderprogs/heathaze.ps.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // texture 0 is _current Render diff --git a/base/renderprogs/heathaze.vs.hlsl b/base/renderprogs/heathaze.vs.hlsl index dd00de1d..081c6878 100644 --- a/base/renderprogs/heathaze.vs.hlsl +++ b/base/renderprogs/heathaze.vs.hlsl @@ -27,7 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc.hlsl" +#include "renderprogs/global.inc.hlsl" + // User Renderparms start at 128 as per renderprogs.h @@ -60,7 +61,8 @@ struct VS_OUT { void main( VS_IN vertex, out VS_OUT result ) { -#include "skinning.inc.hlsl" +#include "renderprogs/skinning.inc.hlsl" + //texture 0 takes the texture coordinates and adds a scroll const float4 textureScroll = rpUser0; diff --git a/base/renderprogs/simpleshade.ps.hlsl b/base/renderprogs/simpleshade.ps.hlsl deleted file mode 100644 index 7129cbee..00000000 --- a/base/renderprogs/simpleshade.ps.hlsl +++ /dev/null @@ -1,64 +0,0 @@ -/* -=========================================================================== - -Doom 3 BFG Edition GPL Source Code -Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). - -Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 BFG Edition Source Code. If not, see . - -In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ - -#include "global.inc.hlsl" - -// *INDENT-OFF* -uniform sampler2D samp0 : register(s0); - -struct PS_IN { - float4 position : VPOS; - float4 texcoord0 : TEXCOORD0_centroid; -}; - -struct PS_OUT { - float4 color : COLOR; -}; -// *INDENT-OFF* - -static float2 screenPosToTexcoord( float2 pos, float4 bias_scale ) { return ( pos * bias_scale.zw + bias_scale.xy ); } - -void main( PS_IN fragment, out PS_OUT result ) { - const float renderWidth = 1280.0f; - const float renderHeight = 720.0f; - const float4 positionToViewTexture = float4( 0.5f / renderWidth, 0.5f / renderHeight, 1.0f / renderWidth, 1.0f / renderHeight ); - - float interpolatedZOverW = ( 1.0 - ( fragment.texcoord0.z / fragment.texcoord0.w ) ); - - float3 pos; - pos.z = 1.0 / interpolatedZOverW; - pos.xy = pos.z * ( 2.0 * screenPosToTexcoord( fragment.position.xy, positionToViewTexture ) - 1.0 ); - - float3 normal = normalize( cross( ddy( pos ), ddx( pos ) ) ); - - // light is above and to the right in the eye plane - float3 L = normalize( float3( 1.0, 1.0, 0.0 ) - pos ); - - result.color.xyz = _float3( dot3( normal, L ) * 0.75 ); - result.color.w = 1.0; -} \ No newline at end of file diff --git a/base/renderprogs/simpleshade.vs.hlsl b/base/renderprogs/simpleshade.vs.hlsl deleted file mode 100644 index e0d60bf2..00000000 --- a/base/renderprogs/simpleshade.vs.hlsl +++ /dev/null @@ -1,56 +0,0 @@ -/* -=========================================================================== - -Doom 3 BFG Edition GPL Source Code -Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). - -Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 BFG Edition Source Code. If not, see . - -In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ - -#include "global.inc.hlsl" - -// *INDENT-OFF* -struct VS_IN { - float4 position : POSITION; - float2 texcoord : TEXCOORD0; - float4 normal : NORMAL; - float4 tangent : TANGENT; - float4 color : COLOR0; -}; - -struct VS_OUT { - float4 position : POSITION; - float4 texcoord0 : TEXCOORD0; -}; -// *INDENT-ON* - -void main( VS_IN vertex, out VS_OUT result ) -{ - float4 position; - position.x = dot4( vertex.position, rpMVPmatrixX ); - position.y = dot4( vertex.position, rpMVPmatrixY ); - position.z = dot4( vertex.position, rpMVPmatrixZ ); - position.w = dot4( vertex.position, rpMVPmatrixW ); - - result.position = position; - result.texcoord0 = position; -} \ No newline at end of file diff --git a/base/renderprogs/zcullReconstruct.ps.hlsl b/base/renderprogs/zcullReconstruct.ps.hlsl deleted file mode 100644 index 8194481b..00000000 --- a/base/renderprogs/zcullReconstruct.ps.hlsl +++ /dev/null @@ -1,42 +0,0 @@ -/* -=========================================================================== - -Doom 3 BFG Edition GPL Source Code -Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). - -Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 BFG Edition Source Code. If not, see . - -In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ - -#include "global.inc.hlsl" - -// *INDENT-OFF* -struct PS_OUT { - float depth : DEPTH; - float4 color : COLOR; -}; -// *INDENT-ON* - -void main( out PS_OUT result ) -{ - result.depth = 1; - result.color = float4( 0.0, 0.0, 0.0, 0.0 ); -} \ No newline at end of file diff --git a/base/renderprogs/zcullReconstruct.vs.hlsl b/base/renderprogs/zcullReconstruct.vs.hlsl deleted file mode 100644 index ea5e5534..00000000 --- a/base/renderprogs/zcullReconstruct.vs.hlsl +++ /dev/null @@ -1,45 +0,0 @@ -/* -=========================================================================== - -Doom 3 BFG Edition GPL Source Code -Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). - -Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 BFG Edition Source Code. If not, see . - -In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ - -#include "global.inc.hlsl" - -// *INDENT-OFF* -struct VS_IN { - float4 position : POSITION; -}; - -struct VS_OUT { - float4 position : POSITION; -}; -// *INDENT-ON* - -void main( VS_IN vertex, out VS_OUT result ) -{ - result.position = vertex.position; - result.position.z = -1.0; -} \ No newline at end of file diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 112759b8..3c24854e 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -471,6 +471,16 @@ file(GLOB RENDERER_VULKAN_INCLUDES renderer/Vulkan/*.h) file(GLOB RENDERER_VULKAN_SOURCES renderer/Vulkan/*.cpp) file(GLOB SHADERS ../base/renderprogs/*.hlsl ../base/renderprogs/*.inc ) +file(GLOB SHADERS_BUILTIN ../base/renderprogs/builtin/*.hlsl ) +file(GLOB SHADERS_BUILTIN_DEBUG ../base/renderprogs/builtin/debug/*.hlsl ) +file(GLOB SHADERS_BUILTIN_FOG ../base/renderprogs/builtin/fog/*.hlsl ) +file(GLOB SHADERS_BUILTIN_LEGACY ../base/renderprogs/builtin/legacy/*.hlsl ) +file(GLOB SHADERS_BUILTIN_LIGHTING ../base/renderprogs/builtin/lighting/*.hlsl ) +file(GLOB SHADERS_BUILTIN_POST ../base/renderprogs/builtin/post/*.hlsl ) +file(GLOB SHADERS_BUILTIN_SSAO ../base/renderprogs/builtin/SSAO/*.hlsl ) +file(GLOB SHADERS_BUILTIN_SSGI ../base/renderprogs/builtin/SSGI/*.hlsl ) +file(GLOB SHADERS_BUILTIN_VIDEO ../base/renderprogs/builtin/video/*.hlsl ) +file(GLOB SHADERS_BUILTIN_VR ../base/renderprogs/builtin/VR/*.hlsl ) file(GLOB IRRXML_INCLUDES libs/irrxml/src/*.h) file(GLOB IRRXML_SOURCES libs/irrxml/src/*.cpp) @@ -1081,6 +1091,16 @@ source_group("renderer\\Vulkan" FILES ${RENDERER_VULKAN_SOURCES}) source_group("renderer\\SMAA" FILES ${RENDERER_SMAA_INCLUDES}) source_group("renderer\\Shaders" FILES ${SHADERS}) +source_group("renderer\\Shaders\\builtin" FILES ${SHADERS_BUILTIN}) +source_group("renderer\\Shaders\\builtin\\debug" FILES ${SHADERS_BUILTIN_DEBUG}) +source_group("renderer\\Shaders\\builtin\\fog" FILES ${SHADERS_BUILTIN_FOG}) +source_group("renderer\\Shaders\\builtin\\legacy" FILES ${SHADERS_BUILTIN_LEGACY}) +source_group("renderer\\Shaders\\builtin\\lighting" FILES ${SHADERS_BUILTIN_LIGHTING}) +source_group("renderer\\Shaders\\builtin\\post" FILES ${SHADERS_BUILTIN_POST}) +source_group("renderer\\Shaders\\builtin\\SSAO" FILES ${SHADERS_BUILTIN_SSAO}) +source_group("renderer\\Shaders\\builtin\\SSGI" FILES ${SHADERS_BUILTIN_SSGI}) +source_group("renderer\\Shaders\\builtin\\video" FILES ${SHADERS_BUILTIN_VIDEO}) +source_group("renderer\\Shaders\\builtin\\VR" FILES ${SHADERS_BUILTIN_VR}) source_group("libs\\irrxml" FILES ${IRRXML_INCLUDES}) source_group("libs\\irrxml" FILES ${IRRXML_SOURCES}) @@ -1259,6 +1279,17 @@ set(RBDOOM3_INCLUDES ${RENDERER_JOBS_STATICSHADOWVOLUME_INCLUDES} ${SHADERS} + ${SHADERS_BUILTIN} + ${SHADERS_BUILTIN_DEBUG} + ${SHADERS_BUILTIN_FOG} + ${SHADERS_BUILTIN_LEGACY} + ${SHADERS_BUILTIN_LIGHTING} + ${SHADERS_BUILTIN_POST} + ${SHADERS_BUILTIN_SSAO} + ${SHADERS_BUILTIN_SSGI} + ${SHADERS_BUILTIN_VIDEO} + ${SHADERS_BUILTIN_VR} + ${RENDERER_SMAA_INCLUDES} ${IRRXML_INCLUDES} ${FRAMEWORK_IMGUI_INCLUDES} @@ -1532,6 +1563,16 @@ if(MSVC) endif() set_source_files_properties( ${SHADERS} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_DEBUG} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_FOG} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_LEGACY} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_LIGHTING} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_POST} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_SSAO} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_SSGI} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_VIDEO} PROPERTIES VS_TOOL_OVERRIDE "None" ) + set_source_files_properties( ${SHADERS_BUILTIN_VR} PROPERTIES VS_TOOL_OVERRIDE "None" ) list(APPEND RBDOOM3_SOURCES ${WIN32_RESOURCES}) diff --git a/neo/astyle-code.bat b/neo/astyle-code.bat index d4f5218a..4ed11ba9 100644 --- a/neo/astyle-code.bat +++ b/neo/astyle-code.bat @@ -4,6 +4,6 @@ astyle.exe -v --formatted --options=astyle-options.ini --exclude="libs" --exclud astyle.exe -v --formatted --options=astyle-options.ini --recursive libs/imgui/*.h astyle.exe -v --formatted --options=astyle-options.ini --recursive libs/imgui/*.cpp -astyle.exe -v -Q --options=astyle-options.ini ../base/renderprogs/*.hlsl +astyle.exe -v -Q --options=astyle-options.ini --recursive ../base/renderprogs/*.hlsl pause \ No newline at end of file diff --git a/neo/renderer/RenderProgs.cpp b/neo/renderer/RenderProgs.cpp index 9eba9fcb..d3aadac4 100644 --- a/neo/renderer/RenderProgs.cpp +++ b/neo/renderer/RenderProgs.cpp @@ -102,112 +102,112 @@ void idRenderProgManager::Init() vertexLayoutType_t layout; } builtins[] = { - { BUILTIN_GUI, "gui", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_COLOR, "color", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_GUI, "builtin/gui", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_COLOR, "builtin/color", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB begin - { BUILTIN_COLOR_SKINNED, "color", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_VERTEX_COLOR, "vertex_color", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING, "ambient_lighting", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_SKINNED, "ambient_lighting", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_IBL, "ambient_lighting_IBL", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_IBL_SKINNED, "ambient_lighting_IBL", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_IBL_PBR, "ambient_lighting_IBL", "_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_IBL_PBR_SKINNED, "ambient_lighting_IBL", "_PBR_skinned", BIT( USE_GPU_SKINNING | USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SMALL_GEOMETRY_BUFFER, "gbuffer", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SMALL_GEOMETRY_BUFFER_SKINNED, "gbuffer", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_COLOR_SKINNED, "builtin/color", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_VERTEX_COLOR, "builtin/vertex_color", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING, "builtin/lighting/ambient_lighting", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_SKINNED, "builtin/lighting/ambient_lighting", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL, "builtin/lighting/ambient_lighting_IBL", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL_SKINNED, "builtin/lighting/ambient_lighting_IBL", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL_PBR, "builtin/lighting/ambient_lighting_IBL", "_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL_PBR_SKINNED, "builtin/lighting/ambient_lighting_IBL", "_PBR_skinned", BIT( USE_GPU_SKINNING | USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SMALL_GEOMETRY_BUFFER, "builtin/gbuffer", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SMALL_GEOMETRY_BUFFER_SKINNED, "builtin/gbuffer", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB end - { BUILTIN_TEXTURED, "texture", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_TEXTURE_VERTEXCOLOR, "texture_color", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_TEXTURE_VERTEXCOLOR_SRGB, "texture_color", "_sRGB", BIT( USE_SRGB ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_TEXTURE_VERTEXCOLOR_SKINNED, "texture_color_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_TEXTURE_TEXGEN_VERTEXCOLOR, "texture_color_texgen", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_TEXTURED, "builtin/texture", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_TEXTURE_VERTEXCOLOR, "builtin/texture_color", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_TEXTURE_VERTEXCOLOR_SRGB, "builtin/texture_color", "_sRGB", BIT( USE_SRGB ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_TEXTURE_VERTEXCOLOR_SKINNED, "builtin/texture_color_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_TEXTURE_TEXGEN_VERTEXCOLOR, "builtin/texture_color_texgen", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB begin - { BUILTIN_INTERACTION, "interaction", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SKINNED, "interaction", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION, "builtin/lighting/interaction", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SKINNED, "builtin/lighting/interaction", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_AMBIENT, "interactionAmbient", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_AMBIENT_SKINNED, "interactionAmbient_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_AMBIENT, "builtin/lighting/interactionAmbient", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_AMBIENT_SKINNED, "builtin/lighting/interactionAmbient_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SHADOW_MAPPING_SPOT, "interactionSM", "_spot", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SHADOW_MAPPING_SPOT_SKINNED, "interactionSM", "_spot_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SHADOW_MAPPING_SPOT, "builtin/lighting/interactionSM", "_spot", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SHADOW_MAPPING_SPOT_SKINNED, "builtin/lighting/interactionSM", "_spot_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SHADOW_MAPPING_POINT, "interactionSM", "_point", BIT( LIGHT_POINT ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SHADOW_MAPPING_POINT_SKINNED, "interactionSM", "_point_skinned", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_POINT ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SHADOW_MAPPING_POINT, "builtin/lighting/interactionSM", "_point", BIT( LIGHT_POINT ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SHADOW_MAPPING_POINT_SKINNED, "builtin/lighting/interactionSM", "_point_skinned", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_POINT ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SHADOW_MAPPING_PARALLEL, "interactionSM", "_parallel", BIT( LIGHT_PARALLEL ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_INTERACTION_SHADOW_MAPPING_PARALLEL_SKINNED, "interactionSM", "_parallel_skinned", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_PARALLEL ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SHADOW_MAPPING_PARALLEL, "builtin/lighting/interactionSM", "_parallel", BIT( LIGHT_PARALLEL ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_INTERACTION_SHADOW_MAPPING_PARALLEL_SKINNED, "builtin/lighting/interactionSM", "_parallel_skinned", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_PARALLEL ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // PBR variants - { BUILTIN_PBR_INTERACTION, "interaction", "_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SKINNED, "interaction", "_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION, "builtin/lighting/interaction", "_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SKINNED, "builtin/lighting/interaction", "_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_AMBIENT, "interactionAmbient", "_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_AMBIENT_SKINNED, "interactionAmbient_skinned", "_PBR", BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_AMBIENT, "builtin/lighting/interactionAmbient", "_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_AMBIENT_SKINNED, "builtin/lighting/interactionAmbient_skinned", "_PBR", BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_SPOT, "interactionSM", "_spot_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_SPOT_SKINNED, "interactionSM", "_spot_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_SPOT, "builtin/lighting/interactionSM", "_spot_PBR", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_SPOT_SKINNED, "builtin/lighting/interactionSM", "_spot_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_POINT, "interactionSM", "_point_PBR", BIT( LIGHT_POINT ) | BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_POINT_SKINNED, "interactionSM", "_point_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_POINT ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_POINT, "builtin/lighting/interactionSM", "_point_PBR", BIT( LIGHT_POINT ) | BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_POINT_SKINNED, "builtin/lighting/interactionSM", "_point_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_POINT ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_PARALLEL, "interactionSM", "_parallel_PBR", BIT( LIGHT_PARALLEL ) | BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_PARALLEL_SKINNED, "interactionSM", "_parallel_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_PARALLEL ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_PARALLEL, "builtin/lighting/interactionSM", "_parallel_PBR", BIT( LIGHT_PARALLEL ) | BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_PBR_INTERACTION_SHADOW_MAPPING_PARALLEL_SKINNED, "builtin/lighting/interactionSM", "_parallel_skinned_PBR", BIT( USE_GPU_SKINNING ) | BIT( LIGHT_PARALLEL ) | BIT( USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_OCTAHEDRON, "octahedron", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_OCTAHEDRON_SKINNED, "octahedron", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_OCTAHEDRON, "builtin/debug/octahedron", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_OCTAHEDRON_SKINNED, "builtin/debug/octahedron", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB end - { BUILTIN_ENVIRONMENT, "environment", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_ENVIRONMENT_SKINNED, "environment_skinned", "", 0, true , SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT}, - { BUILTIN_BUMPY_ENVIRONMENT, "bumpyenvironment", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_BUMPY_ENVIRONMENT_SKINNED, "bumpyenvironment_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_ENVIRONMENT, "builtin/legacy/environment", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_ENVIRONMENT_SKINNED, "builtin/legacy/environment_skinned", "", 0, true , SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT}, + { BUILTIN_BUMPY_ENVIRONMENT, "builtin/legacy/bumpyenvironment", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_BUMPY_ENVIRONMENT_SKINNED, "builtin/legacy/bumpyenvironment_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_DEPTH, "depth", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_DEPTH_SKINNED, "depth_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_DEPTH, "builtin/depth", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_DEPTH_SKINNED, "builtin/depth_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SHADOW, "shadow", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_SHADOW_VERT }, - { BUILTIN_SHADOW_SKINNED, "shadow_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_SHADOW_VERT_SKINNED }, + { BUILTIN_SHADOW, "builtin/lighting/shadow", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_SHADOW_VERT }, + { BUILTIN_SHADOW_SKINNED, "builtin/lighting/shadow_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_SHADOW_VERT_SKINNED }, - { BUILTIN_SHADOW_DEBUG, "shadowDebug", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SHADOW_DEBUG_SKINNED, "shadowDebug_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SHADOW_DEBUG, "builtin/debug/shadowDebug", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SHADOW_DEBUG_SKINNED, "builtin/debug/shadowDebug_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_BLENDLIGHT, "blendlight", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_FOG, "fog", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_FOG_SKINNED, "fog_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SKYBOX, "skybox", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_WOBBLESKY, "wobblesky", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_POSTPROCESS, "postprocess", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_BLENDLIGHT, "builtin/fog/blendlight", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_FOG, "builtin/fog/fog", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_FOG_SKINNED, "builtin/fog/fog_skinned", "", 0, true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SKYBOX, "builtin/legacy/skybox", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_WOBBLESKY, "builtin/legacy/wobblesky", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_POSTPROCESS, "builtin/post/postprocess", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB begin - { BUILTIN_SCREEN, "screen", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_TONEMAP, "tonemap", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_BRIGHTPASS, "tonemap", "_brightpass", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_HDR_GLARE_CHROMATIC, "hdr_glare_chromatic", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_HDR_DEBUG, "tonemap", "_debug", BIT( HDR_DEBUG ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SCREEN, "builtin/post/screen", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_TONEMAP, "builtin/post/tonemap", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_BRIGHTPASS, "builtin/post/tonemap", "_brightpass", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_HDR_GLARE_CHROMATIC, "builtin/post/hdr_glare_chromatic", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_HDR_DEBUG, "builtin/post/tonemap", "_debug", BIT( HDR_DEBUG ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SMAA_EDGE_DETECTION, "SMAA_edge_detection", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SMAA_BLENDING_WEIGHT_CALCULATION, "SMAA_blending_weight_calc", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_SMAA_NEIGHBORHOOD_BLENDING, "SMAA_final", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SMAA_EDGE_DETECTION, "builtin/post/SMAA_edge_detection", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SMAA_BLENDING_WEIGHT_CALCULATION, "builtin/post/SMAA_blending_weight_calc", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_SMAA_NEIGHBORHOOD_BLENDING, "builtin/post/SMAA_final", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_OCCLUSION, "AmbientOcclusion_AO", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_OCCLUSION_AND_OUTPUT, "AmbientOcclusion_AO", "_write", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_OCCLUSION_BLUR, "AmbientOcclusion_blur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_OCCLUSION_BLUR_AND_OUTPUT, "AmbientOcclusion_blur", "_write", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_OCCLUSION_MINIFY, "AmbientOcclusion_minify", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_OCCLUSION_RECONSTRUCT_CSZ, "AmbientOcclusion_minify", "_mip0", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_DEEP_GBUFFER_RADIOSITY_SSGI, "DeepGBufferRadiosity_radiosity", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR, "DeepGBufferRadiosity_blur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR_AND_OUTPUT, "DeepGBufferRadiosity_blur", "_write", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_OCCLUSION, "builtin/SSAO/AmbientOcclusion_AO", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_OCCLUSION_AND_OUTPUT, "builtin/SSAO/AmbientOcclusion_AO", "_write", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_OCCLUSION_BLUR, "builtin/SSAO/AmbientOcclusion_blur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_OCCLUSION_BLUR_AND_OUTPUT, "builtin/SSAO/AmbientOcclusion_blur", "_write", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_OCCLUSION_MINIFY, "builtin/SSAO/AmbientOcclusion_minify", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_OCCLUSION_RECONSTRUCT_CSZ, "builtin/SSAO/AmbientOcclusion_minify", "_mip0", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_DEEP_GBUFFER_RADIOSITY_SSGI, "builtin/SSGI/DeepGBufferRadiosity_radiosity", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR, "builtin/SSGI/DeepGBufferRadiosity_blur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR_AND_OUTPUT, "builtin/SSGI/DeepGBufferRadiosity_blur", "_write", BIT( BRIGHTPASS ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB end - { BUILTIN_STEREO_DEGHOST, "stereoDeGhost", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_STEREO_WARP, "stereoWarp", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_BINK, "bink", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_BINK_GUI, "bink_gui", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_STEREO_INTERLACE, "stereoInterlace", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_MOTION_BLUR, "motionBlur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_STEREO_DEGHOST, "builtin/VR/stereoDeGhost", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_STEREO_WARP, "builtin/VR/stereoWarp", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_BINK, "builtin/video/bink", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_BINK_GUI, "builtin/video/bink_gui", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_STEREO_INTERLACE, "builtin/VR/stereoInterlace", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_MOTION_BLUR, "builtin/post/motionBlur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB begin - { BUILTIN_DEBUG_SHADOWMAP, "debug_shadowmap", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_DEBUG_SHADOWMAP, "builtin/debug/debug_shadowmap", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB end }; int numBuiltins = sizeof( builtins ) / sizeof( builtins[0] );