diff --git a/base/renderprogs/AmbientOcclusion_AO.pixel b/base/renderprogs/AmbientOcclusion_AO.ps.hlsl similarity index 99% rename from base/renderprogs/AmbientOcclusion_AO.pixel rename to base/renderprogs/AmbientOcclusion_AO.ps.hlsl index 8eb35250..da1ab86f 100644 --- a/base/renderprogs/AmbientOcclusion_AO.pixel +++ b/base/renderprogs/AmbientOcclusion_AO.ps.hlsl @@ -29,7 +29,7 @@ */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" diff --git a/base/renderprogs/DeepGBufferRadiosity_blur.vertex b/base/renderprogs/AmbientOcclusion_AO.vs.hlsl similarity index 98% rename from base/renderprogs/DeepGBufferRadiosity_blur.vertex rename to base/renderprogs/AmbientOcclusion_AO.vs.hlsl index c7830d43..290b37f6 100644 --- a/base/renderprogs/DeepGBufferRadiosity_blur.vertex +++ b/base/renderprogs/AmbientOcclusion_AO.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/AmbientOcclusion_blur.pixel b/base/renderprogs/AmbientOcclusion_blur.ps.hlsl similarity index 99% rename from base/renderprogs/AmbientOcclusion_blur.pixel rename to base/renderprogs/AmbientOcclusion_blur.ps.hlsl index 538bda67..0ac413fb 100644 --- a/base/renderprogs/AmbientOcclusion_blur.pixel +++ b/base/renderprogs/AmbientOcclusion_blur.ps.hlsl @@ -16,7 +16,7 @@ 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 "renderprogs/global.inc" +#include "global.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register( s0 ); // view normals diff --git a/base/renderprogs/AmbientOcclusion_AO.vertex b/base/renderprogs/AmbientOcclusion_blur.vs.hlsl similarity index 98% rename from base/renderprogs/AmbientOcclusion_AO.vertex rename to base/renderprogs/AmbientOcclusion_blur.vs.hlsl index c7830d43..290b37f6 100644 --- a/base/renderprogs/AmbientOcclusion_AO.vertex +++ b/base/renderprogs/AmbientOcclusion_blur.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/AmbientOcclusion_minify.pixel b/base/renderprogs/AmbientOcclusion_minify.ps.hlsl similarity index 99% rename from base/renderprogs/AmbientOcclusion_minify.pixel rename to base/renderprogs/AmbientOcclusion_minify.ps.hlsl index 7cb80d73..bc2ffc5a 100644 --- a/base/renderprogs/AmbientOcclusion_minify.pixel +++ b/base/renderprogs/AmbientOcclusion_minify.ps.hlsl @@ -15,7 +15,7 @@ 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 "renderprogs/global.inc" +#include "global.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register( s0 ); // zbuffer diff --git a/base/renderprogs/AmbientOcclusion_minify.vertex b/base/renderprogs/AmbientOcclusion_minify.vs.hlsl similarity index 98% rename from base/renderprogs/AmbientOcclusion_minify.vertex rename to base/renderprogs/AmbientOcclusion_minify.vs.hlsl index c7830d43..290b37f6 100644 --- a/base/renderprogs/AmbientOcclusion_minify.vertex +++ b/base/renderprogs/AmbientOcclusion_minify.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/BRDF.inc b/base/renderprogs/BRDF.inc.hlsl similarity index 100% rename from base/renderprogs/BRDF.inc rename to base/renderprogs/BRDF.inc.hlsl diff --git a/base/renderprogs/DeepGBufferRadiosity_blur.pixel b/base/renderprogs/DeepGBufferRadiosity_blur.ps.hlsl similarity index 99% rename from base/renderprogs/DeepGBufferRadiosity_blur.pixel rename to base/renderprogs/DeepGBufferRadiosity_blur.ps.hlsl index 62185f13..2ad646aa 100644 --- a/base/renderprogs/DeepGBufferRadiosity_blur.pixel +++ b/base/renderprogs/DeepGBufferRadiosity_blur.ps.hlsl @@ -16,7 +16,7 @@ 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 "renderprogs/global.inc" +#include "global.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register( s0 ); // view normals diff --git a/base/renderprogs/AmbientOcclusion_blur.vertex b/base/renderprogs/DeepGBufferRadiosity_blur.vs.hlsl similarity index 98% rename from base/renderprogs/AmbientOcclusion_blur.vertex rename to base/renderprogs/DeepGBufferRadiosity_blur.vs.hlsl index c7830d43..290b37f6 100644 --- a/base/renderprogs/AmbientOcclusion_blur.vertex +++ b/base/renderprogs/DeepGBufferRadiosity_blur.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/DeepGBufferRadiosity_radiosity.pixel b/base/renderprogs/DeepGBufferRadiosity_radiosity.ps.hlsl similarity index 99% rename from base/renderprogs/DeepGBufferRadiosity_radiosity.pixel rename to base/renderprogs/DeepGBufferRadiosity_radiosity.ps.hlsl index c0a0295c..6a109c10 100644 --- a/base/renderprogs/DeepGBufferRadiosity_radiosity.pixel +++ b/base/renderprogs/DeepGBufferRadiosity_radiosity.ps.hlsl @@ -1,5 +1,5 @@ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" // #version 120 // -*- c++ -*- // #extension GL_EXT_gpu_shader4 : require diff --git a/base/renderprogs/DeepGBufferRadiosity_radiosity.vertex b/base/renderprogs/DeepGBufferRadiosity_radiosity.vertex deleted file mode 100644 index c7830d43..00000000 --- a/base/renderprogs/DeepGBufferRadiosity_radiosity.vertex +++ /dev/null @@ -1,47 +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 "renderprogs/global.inc" - -struct VS_IN -{ - float4 position : POSITION; - float2 texcoord : TEXCOORD0; -}; - -struct VS_OUT -{ - float4 position : POSITION; - float2 texcoord0 : TEXCOORD0; -}; - -void main( VS_IN vertex, out VS_OUT result ) -{ - result.position = vertex.position; - result.texcoord0 = vertex.texcoord; -} \ No newline at end of file diff --git a/base/renderprogs/DeepGBufferRadiosity_radiosity.vs.hlsl b/base/renderprogs/DeepGBufferRadiosity_radiosity.vs.hlsl new file mode 100644 index 00000000..290b37f6 --- /dev/null +++ b/base/renderprogs/DeepGBufferRadiosity_radiosity.vs.hlsl @@ -0,0 +1,47 @@ +/* +=========================================================================== + +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" + +struct VS_IN +{ + float4 position : POSITION; + float2 texcoord : TEXCOORD0; +}; + +struct VS_OUT +{ + float4 position : POSITION; + float2 texcoord0 : TEXCOORD0; +}; + +void main( VS_IN vertex, out VS_OUT result ) +{ + result.position = vertex.position; + result.texcoord0 = vertex.texcoord; +} \ No newline at end of file diff --git a/base/renderprogs/SMAA.inc b/base/renderprogs/SMAA.inc.hlsl similarity index 100% rename from base/renderprogs/SMAA.inc rename to base/renderprogs/SMAA.inc.hlsl diff --git a/base/renderprogs/SMAA_blending_weight_calc.pixel b/base/renderprogs/SMAA_blending_weight_calc.ps.hlsl similarity index 97% rename from base/renderprogs/SMAA_blending_weight_calc.pixel rename to base/renderprogs/SMAA_blending_weight_calc.ps.hlsl index e390fb9c..215366d7 100644 --- a/base/renderprogs/SMAA_blending_weight_calc.pixel +++ b/base/renderprogs/SMAA_blending_weight_calc.ps.hlsl @@ -27,11 +27,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define SMAA_INCLUDE_VS 0 #define SMAA_INCLUDE_PS 1 -#include "renderprogs/SMAA.inc" + +#include "SMAA.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // _smaaEdges diff --git a/base/renderprogs/SMAA_blending_weight_calc.vertex b/base/renderprogs/SMAA_blending_weight_calc.vs.hlsl similarity index 97% rename from base/renderprogs/SMAA_blending_weight_calc.vertex rename to base/renderprogs/SMAA_blending_weight_calc.vs.hlsl index b103d7e6..073f6bf1 100644 --- a/base/renderprogs/SMAA_blending_weight_calc.vertex +++ b/base/renderprogs/SMAA_blending_weight_calc.vs.hlsl @@ -27,11 +27,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define SMAA_INCLUDE_VS 1 #define SMAA_INCLUDE_PS 0 -#include "renderprogs/SMAA.inc" +#include "SMAA.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/SMAA_edge_detection.pixel b/base/renderprogs/SMAA_edge_detection.ps.hlsl similarity index 97% rename from base/renderprogs/SMAA_edge_detection.pixel rename to base/renderprogs/SMAA_edge_detection.ps.hlsl index ba8e81b7..ab1373b1 100644 --- a/base/renderprogs/SMAA_edge_detection.pixel +++ b/base/renderprogs/SMAA_edge_detection.ps.hlsl @@ -27,11 +27,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define SMAA_INCLUDE_VS 0 #define SMAA_INCLUDE_PS 1 -#include "renderprogs/SMAA.inc" +#include "SMAA.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // _currentColor diff --git a/base/renderprogs/SMAA_edge_detection.vertex b/base/renderprogs/SMAA_edge_detection.vs.hlsl similarity index 97% rename from base/renderprogs/SMAA_edge_detection.vertex rename to base/renderprogs/SMAA_edge_detection.vs.hlsl index ccfb1f9b..bd89bc25 100644 --- a/base/renderprogs/SMAA_edge_detection.vertex +++ b/base/renderprogs/SMAA_edge_detection.vs.hlsl @@ -27,11 +27,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define SMAA_INCLUDE_VS 1 #define SMAA_INCLUDE_PS 0 -#include "renderprogs/SMAA.inc" +#include "SMAA.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/SMAA_final.pixel b/base/renderprogs/SMAA_final.ps.hlsl similarity index 97% rename from base/renderprogs/SMAA_final.pixel rename to base/renderprogs/SMAA_final.ps.hlsl index 051f8b32..11cb7b3c 100644 --- a/base/renderprogs/SMAA_final.pixel +++ b/base/renderprogs/SMAA_final.ps.hlsl @@ -27,11 +27,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define SMAA_INCLUDE_VS 0 #define SMAA_INCLUDE_PS 1 -#include "renderprogs/SMAA.inc" +#include "SMAA.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register(s0); // _currentColor diff --git a/base/renderprogs/SMAA_final.vertex b/base/renderprogs/SMAA_final.vs.hlsl similarity index 97% rename from base/renderprogs/SMAA_final.vertex rename to base/renderprogs/SMAA_final.vs.hlsl index 1bf06b86..a24f159b 100644 --- a/base/renderprogs/SMAA_final.vertex +++ b/base/renderprogs/SMAA_final.vs.hlsl @@ -27,11 +27,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define SMAA_INCLUDE_VS 1 #define SMAA_INCLUDE_PS 0 -#include "renderprogs/SMAA.inc" +#include "SMAA.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/_manifest.lua b/base/renderprogs/_manifest.lua index ba6f5608..58f18bfc 100644 --- a/base/renderprogs/_manifest.lua +++ b/base/renderprogs/_manifest.lua @@ -1,130 +1,130 @@ return { -- includes - "global.inc", - "skinning.inc", - "SMAA.inc", - "BRDF.inc", + "global.inc.hlsl", + "skinning.inc.hlsl", + "SMAA.inc.hlsl", + "BRDF.inc.hlsl", -- shaders - "ambient_lighting.pixel", - "ambient_lighting.vertex", - "AmbientOcclusion_AO.pixel", - "AmbientOcclusion_AO.vertex", - "AmbientOcclusion_blur.pixel", - "AmbientOcclusion_blur.vertex", - "AmbientOcclusion_minify.pixel", - "AmbientOcclusion_minify.vertex", - "bink.pixel", - "bink.vertex", - "bink_gui.pixel", - "bink_gui.vertex", - "blendLight.pixel", - "blendLight.vertex", - "bloodorb1_capture.pixel", - "bloodorb1_capture.vertex", - "bloodorb2_capture.pixel", - "bloodorb2_capture.vertex", - "bloodorb3_capture.pixel", - "bloodorb3_capture.vertex", - "bloodorb_draw.pixel", - "bloodorb_draw.vertex", - "bumpyenvironment.pixel", - "bumpyenvironment.vertex", - "bumpyenvironment_skinned.pixel", - "bumpyenvironment_skinned.vertex", - "color.pixel", - "color.vertex", - "colorProcess.pixel", - "colorProcess.vertex", - "DeepGBufferRadiosity_radiosity.pixel", - "DeepGBufferRadiosity_radiosity.vertex", - "DeepGBufferRadiosity_blur.pixel", - "DeepGBufferRadiosity_blur.vertex", - "debug_shadowmap.pixel", - "debug_shadowmap.vertex", - "depth.pixel", - "depth.vertex", - "depth_skinned.pixel", - "depth_skinned.vertex", - "enviroSuit.pixel", - "enviroSuit.vertex", - "environment.pixel", - "environment.vertex", - "environment_skinned.pixel", - "environment_skinned.vertex", - "fog.pixel", - "fog.vertex", - "fog_skinned.pixel", - "fog_skinned.vertex", - "fxaa.pixel", - "fxaa.vertex", - "gbuffer.pixel", - "gbuffer.vertex", - "gui.pixel", - "gui.vertex", - "hdr_glare_chromatic.pixel", - "hdr_glare_chromatic.vertex", - "heatHazeWithMask.pixel", - "heatHazeWithMask.vertex", - "heatHazeWithMaskAndVertex.pixel", - "heatHazeWithMaskAndVertex.vertex", - "heathaze.pixel", - "heathaze.vertex", - "interaction.pixel", - "interaction.vertex", - "interactionAmbient.pixel", - "interactionAmbient.vertex", - "interactionAmbient_skinned.pixel", - "interactionAmbient_skinned.vertex", - "interactionSM.pixel", - "interactionSM.vertex", - "motionBlur.pixel", - "motionBlur.vertex", - "postprocess.pixel", - "postprocess.vertex", - "screen.pixel", - "screen.vertex", - "shadow.pixel", - "shadow.vertex", - "shadowDebug.pixel", - "shadowDebug.vertex", - "shadowDebug_skinned.pixel", - "shadowDebug_skinned.vertex", - "shadow_skinned.pixel", - "shadow_skinned.vertex", - "simpleshade.pixel", - "simpleshade.vertex", - "skybox.pixel", - "skybox.vertex", - "SMAA_blending_weight_calc.pixel", - "SMAA_blending_weight_calc.vertex", - "SMAA_edge_detection.pixel", - "SMAA_edge_detection.vertex", - "SMAA_final.pixel", - "SMAA_final.vertex", - "stereoDeGhost.pixel", - "stereoDeGhost.vertex", - "stereoInterlace.pixel", - "stereoInterlace.vertex", - "stereoWarp.pixel", - "stereoWarp.vertex", - "texture.pixel", - "texture.vertex", - "texture_color.pixel", - "texture_color.vertex", - "texture_color_skinned.pixel", - "texture_color_skinned.vertex", - "texture_color_texgen.pixel", - "texture_color_texgen.vertex", - "tonemap.pixel", - "tonemap.vertex", - "vertex_color.pixel", - "vertex_color.vertex", - "wobblesky.pixel", - "wobblesky.vertex", - "zcullReconstruct.pixel", - "zcullReconstruct.vertex", + "ambient_lighting.ps.hlsl", + "ambient_lighting.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", + "bloodorb1_capture.ps.hlsl", + "bloodorb1_capture.vs.hlsl", + "bloodorb2_capture.ps.hlsl", + "bloodorb2_capture.vs.hlsl", + "bloodorb3_capture.ps.hlsl", + "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", + "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/ambient_lighting.pixel b/base/renderprogs/ambient_lighting.ps.hlsl similarity index 99% rename from base/renderprogs/ambient_lighting.pixel rename to base/renderprogs/ambient_lighting.ps.hlsl index 11115299..099eaa34 100644 --- a/base/renderprogs/ambient_lighting.pixel +++ b/base/renderprogs/ambient_lighting.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface bump map uniform sampler2D samp1 : register(s1); // texture 2 is the light falloff texture diff --git a/base/renderprogs/ambient_lighting.vertex b/base/renderprogs/ambient_lighting.vs.hlsl similarity index 99% rename from base/renderprogs/ambient_lighting.vertex rename to base/renderprogs/ambient_lighting.vs.hlsl index c6473cd7..1f50bfd7 100644 --- a/base/renderprogs/ambient_lighting.vertex +++ b/base/renderprogs/ambient_lighting.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/bink.pixel b/base/renderprogs/bink.ps.hlsl similarity index 98% rename from base/renderprogs/bink.pixel rename to base/renderprogs/bink.ps.hlsl index bc5913e2..2213c5da 100644 --- a/base/renderprogs/bink.pixel +++ b/base/renderprogs/bink.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // Y uniform sampler2D samp1 : register(s1); // Cr diff --git a/base/renderprogs/bink.vertex b/base/renderprogs/bink.vs.hlsl similarity index 98% rename from base/renderprogs/bink.vertex rename to base/renderprogs/bink.vs.hlsl index 0b3d1b48..7a1e9a91 100644 --- a/base/renderprogs/bink.vertex +++ b/base/renderprogs/bink.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/bink_gui.pixel b/base/renderprogs/bink_gui.ps.hlsl similarity index 98% rename from base/renderprogs/bink_gui.pixel rename to base/renderprogs/bink_gui.ps.hlsl index 35419a41..173d5b03 100644 --- a/base/renderprogs/bink_gui.pixel +++ b/base/renderprogs/bink_gui.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // Y uniform sampler2D samp1 : register(s1); // Cr diff --git a/base/renderprogs/gui.vertex b/base/renderprogs/bink_gui.vs.hlsl similarity index 98% rename from base/renderprogs/gui.vertex rename to base/renderprogs/bink_gui.vs.hlsl index 76f38849..68089b23 100644 --- a/base/renderprogs/gui.vertex +++ b/base/renderprogs/bink_gui.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/blendLight.pixel b/base/renderprogs/blendLight.ps.hlsl similarity index 98% rename from base/renderprogs/blendLight.pixel rename to base/renderprogs/blendLight.ps.hlsl index 187fcddd..c1f0da31 100644 --- a/base/renderprogs/blendLight.pixel +++ b/base/renderprogs/blendLight.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); uniform sampler2D samp1 : register(s1); diff --git a/base/renderprogs/blendLight.vertex b/base/renderprogs/blendLight.vs.hlsl similarity index 98% rename from base/renderprogs/blendLight.vertex rename to base/renderprogs/blendLight.vs.hlsl index 1e1c343d..23363752 100644 --- a/base/renderprogs/blendLight.vertex +++ b/base/renderprogs/blendLight.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/bloodorb1_capture.pixel b/base/renderprogs/bloodorb1_capture.ps.hlsl similarity index 98% rename from base/renderprogs/bloodorb1_capture.pixel rename to base/renderprogs/bloodorb1_capture.ps.hlsl index 7c44f784..0deb7fcf 100644 --- a/base/renderprogs/bloodorb1_capture.pixel +++ b/base/renderprogs/bloodorb1_capture.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); //_accum uniform sampler2D samp1 : register(s1); //_currentRender diff --git a/base/renderprogs/bloodorb1_capture.vertex b/base/renderprogs/bloodorb1_capture.vs.hlsl similarity index 98% rename from base/renderprogs/bloodorb1_capture.vertex rename to base/renderprogs/bloodorb1_capture.vs.hlsl index b3f7c926..104349e4 100644 --- a/base/renderprogs/bloodorb1_capture.vertex +++ b/base/renderprogs/bloodorb1_capture.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform float4 rpUser0 : register( c128 ); //rpCenterScale diff --git a/base/renderprogs/bloodorb2_capture.pixel b/base/renderprogs/bloodorb2_capture.ps.hlsl similarity index 98% rename from base/renderprogs/bloodorb2_capture.pixel rename to base/renderprogs/bloodorb2_capture.ps.hlsl index e897785f..82f78227 100644 --- a/base/renderprogs/bloodorb2_capture.pixel +++ b/base/renderprogs/bloodorb2_capture.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); //_accum uniform sampler2D samp1 : register(s1); //_currentRender diff --git a/base/renderprogs/bloodorb2_capture.vertex b/base/renderprogs/bloodorb2_capture.vs.hlsl similarity index 99% rename from base/renderprogs/bloodorb2_capture.vertex rename to base/renderprogs/bloodorb2_capture.vs.hlsl index 0e7deada..704df4e6 100644 --- a/base/renderprogs/bloodorb2_capture.vertex +++ b/base/renderprogs/bloodorb2_capture.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform float4 rpUser0 : register( c128 ); //rpCenterScaleTex0 uniform float4 rpUser1 : register( c129 ); //rpRotateTex0 diff --git a/base/renderprogs/bloodorb3_capture.pixel b/base/renderprogs/bloodorb3_capture.ps.hlsl similarity index 99% rename from base/renderprogs/bloodorb3_capture.pixel rename to base/renderprogs/bloodorb3_capture.ps.hlsl index 588486e8..bf539525 100644 --- a/base/renderprogs/bloodorb3_capture.pixel +++ b/base/renderprogs/bloodorb3_capture.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); //_accum uniform sampler2D samp1 : register(s1); //_currentRender diff --git a/base/renderprogs/bloodorb3_capture.vertex b/base/renderprogs/bloodorb3_capture.vs.hlsl similarity index 99% rename from base/renderprogs/bloodorb3_capture.vertex rename to base/renderprogs/bloodorb3_capture.vs.hlsl index 29d31dff..b50a92f6 100644 --- a/base/renderprogs/bloodorb3_capture.vertex +++ b/base/renderprogs/bloodorb3_capture.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform float4 rpUser0 : register( c128 ); //rpCenterScaleTex uniform float4 rpUser1 : register( c129 ); //rpRotateTex diff --git a/base/renderprogs/bloodorb_draw.pixel b/base/renderprogs/bloodorb_draw.ps.hlsl similarity index 98% rename from base/renderprogs/bloodorb_draw.pixel rename to base/renderprogs/bloodorb_draw.ps.hlsl index 3714e6da..b4b1085b 100644 --- a/base/renderprogs/bloodorb_draw.pixel +++ b/base/renderprogs/bloodorb_draw.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); //_accum uniform sampler2D samp1 : register(s1); //_currentRender diff --git a/base/renderprogs/bloodorb_draw.vertex b/base/renderprogs/bloodorb_draw.vs.hlsl similarity index 98% rename from base/renderprogs/bloodorb_draw.vertex rename to base/renderprogs/bloodorb_draw.vs.hlsl index a0a179d6..a19f8a4f 100644 --- a/base/renderprogs/bloodorb_draw.vertex +++ b/base/renderprogs/bloodorb_draw.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/bumpyenvironment.pixel b/base/renderprogs/bumpyenvironment.ps.hlsl similarity index 98% rename from base/renderprogs/bumpyenvironment.pixel rename to base/renderprogs/bumpyenvironment.ps.hlsl index 2c489c63..f24b32e8 100644 --- a/base/renderprogs/bumpyenvironment.pixel +++ b/base/renderprogs/bumpyenvironment.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map uniform sampler2D samp1 : register(s1); // normal map diff --git a/base/renderprogs/bumpyenvironment.vertex b/base/renderprogs/bumpyenvironment.vs.hlsl similarity index 98% rename from base/renderprogs/bumpyenvironment.vertex rename to base/renderprogs/bumpyenvironment.vs.hlsl index 4d02b662..7584fff2 100644 --- a/base/renderprogs/bumpyenvironment.vertex +++ b/base/renderprogs/bumpyenvironment.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/bumpyenvironment_skinned.pixel b/base/renderprogs/bumpyenvironment_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/bumpyenvironment_skinned.pixel rename to base/renderprogs/bumpyenvironment_skinned.ps.hlsl index 157e102f..30088499 100644 --- a/base/renderprogs/bumpyenvironment_skinned.pixel +++ b/base/renderprogs/bumpyenvironment_skinned.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map uniform sampler2D samp1 : register(s1); // normal map diff --git a/base/renderprogs/bumpyenvironment_skinned.vertex b/base/renderprogs/bumpyenvironment_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/bumpyenvironment_skinned.vertex rename to base/renderprogs/bumpyenvironment_skinned.vs.hlsl index 1b6fe4f7..5b1cb0c5 100644 --- a/base/renderprogs/bumpyenvironment_skinned.vertex +++ b/base/renderprogs/bumpyenvironment_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/color.pixel b/base/renderprogs/color.ps.hlsl similarity index 98% rename from base/renderprogs/color.pixel rename to base/renderprogs/color.ps.hlsl index f924a931..53ea8a17 100644 --- a/base/renderprogs/color.pixel +++ b/base/renderprogs/color.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/color.vertex b/base/renderprogs/color.vs.hlsl similarity index 99% rename from base/renderprogs/color.vertex rename to base/renderprogs/color.vs.hlsl index 22b6f655..1c7a35c4 100644 --- a/base/renderprogs/color.vertex +++ b/base/renderprogs/color.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #if defined(USE_GPU_SKINNING) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/colorProcess.pixel b/base/renderprogs/colorProcess.ps.hlsl similarity index 98% rename from base/renderprogs/colorProcess.pixel rename to base/renderprogs/colorProcess.ps.hlsl index 5c602b68..ec5ca995 100644 --- a/base/renderprogs/colorProcess.pixel +++ b/base/renderprogs/colorProcess.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/colorProcess.vertex b/base/renderprogs/colorProcess.vs.hlsl similarity index 98% rename from base/renderprogs/colorProcess.vertex rename to base/renderprogs/colorProcess.vs.hlsl index a90be574..8ff16396 100644 --- a/base/renderprogs/colorProcess.vertex +++ b/base/renderprogs/colorProcess.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform float4 rpUser0 : register(c128); //rpFraction uniform float4 rpUser1 : register(c129); //rpTargetHue diff --git a/base/renderprogs/debug_shadowmap.pixel b/base/renderprogs/debug_shadowmap.ps.hlsl similarity index 98% rename from base/renderprogs/debug_shadowmap.pixel rename to base/renderprogs/debug_shadowmap.ps.hlsl index 422650df..a0ed63ae 100644 --- a/base/renderprogs/debug_shadowmap.pixel +++ b/base/renderprogs/debug_shadowmap.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2DArray samp0 : register(s0); diff --git a/base/renderprogs/debug_shadowmap.vertex b/base/renderprogs/debug_shadowmap.vs.hlsl similarity index 98% rename from base/renderprogs/debug_shadowmap.vertex rename to base/renderprogs/debug_shadowmap.vs.hlsl index 6cad9776..5b4dacec 100644 --- a/base/renderprogs/debug_shadowmap.vertex +++ b/base/renderprogs/debug_shadowmap.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/depth.pixel b/base/renderprogs/depth.ps.hlsl similarity index 98% rename from base/renderprogs/depth.pixel rename to base/renderprogs/depth.ps.hlsl index 0b7e3858..7d1c2dce 100644 --- a/base/renderprogs/depth.pixel +++ b/base/renderprogs/depth.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); struct PS_OUT { diff --git a/base/renderprogs/depth.vertex b/base/renderprogs/depth.vs.hlsl similarity index 98% rename from base/renderprogs/depth.vertex rename to base/renderprogs/depth.vs.hlsl index b528b343..bc104075 100644 --- a/base/renderprogs/depth.vertex +++ b/base/renderprogs/depth.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/depth_skinned.pixel b/base/renderprogs/depth_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/depth_skinned.pixel rename to base/renderprogs/depth_skinned.ps.hlsl index 0b7e3858..7d1c2dce 100644 --- a/base/renderprogs/depth_skinned.pixel +++ b/base/renderprogs/depth_skinned.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); struct PS_OUT { diff --git a/base/renderprogs/depth_skinned.vertex b/base/renderprogs/depth_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/depth_skinned.vertex rename to base/renderprogs/depth_skinned.vs.hlsl index 7250a845..66cd0f37 100644 --- a/base/renderprogs/depth_skinned.vertex +++ b/base/renderprogs/depth_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/enviroSuit.pixel b/base/renderprogs/enviroSuit.ps.hlsl similarity index 98% rename from base/renderprogs/enviroSuit.pixel rename to base/renderprogs/enviroSuit.ps.hlsl index 83ab7d06..e8a3e916 100644 --- a/base/renderprogs/enviroSuit.pixel +++ b/base/renderprogs/enviroSuit.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 0 is _current Render uniform sampler2D samp1 : register(s1); // texture 1 is the per-surface bump map diff --git a/base/renderprogs/enviroSuit.vertex b/base/renderprogs/enviroSuit.vs.hlsl similarity index 98% rename from base/renderprogs/enviroSuit.vertex rename to base/renderprogs/enviroSuit.vs.hlsl index 56de6805..6b508812 100644 --- a/base/renderprogs/enviroSuit.vertex +++ b/base/renderprogs/enviroSuit.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" // User Renderparms start at 128 as per renderprogs.h diff --git a/base/renderprogs/environment.pixel b/base/renderprogs/environment.ps.hlsl similarity index 98% rename from base/renderprogs/environment.pixel rename to base/renderprogs/environment.ps.hlsl index 4d7e831f..1fe6eb98 100644 --- a/base/renderprogs/environment.pixel +++ b/base/renderprogs/environment.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map diff --git a/base/renderprogs/environment.vertex b/base/renderprogs/environment.vs.hlsl similarity index 98% rename from base/renderprogs/environment.vertex rename to base/renderprogs/environment.vs.hlsl index f5752104..14c692e8 100644 --- a/base/renderprogs/environment.vertex +++ b/base/renderprogs/environment.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/environment_skinned.pixel b/base/renderprogs/environment_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/environment_skinned.pixel rename to base/renderprogs/environment_skinned.ps.hlsl index 4d7e831f..1fe6eb98 100644 --- a/base/renderprogs/environment_skinned.pixel +++ b/base/renderprogs/environment_skinned.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform samplerCUBE samp0 : register(s0); // texture 0 is the cube map diff --git a/base/renderprogs/environment_skinned.vertex b/base/renderprogs/environment_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/environment_skinned.vertex rename to base/renderprogs/environment_skinned.vs.hlsl index 63110f1b..4962d7b3 100644 --- a/base/renderprogs/environment_skinned.vertex +++ b/base/renderprogs/environment_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/fog_skinned.pixel b/base/renderprogs/fog.ps.hlsl similarity index 98% rename from base/renderprogs/fog_skinned.pixel rename to base/renderprogs/fog.ps.hlsl index 542e7b3a..6292e65b 100644 --- a/base/renderprogs/fog_skinned.pixel +++ b/base/renderprogs/fog.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); uniform sampler2D samp1 : register(s1); diff --git a/base/renderprogs/fog.vertex b/base/renderprogs/fog.vs.hlsl similarity index 98% rename from base/renderprogs/fog.vertex rename to base/renderprogs/fog.vs.hlsl index 41341142..1990525a 100644 --- a/base/renderprogs/fog.vertex +++ b/base/renderprogs/fog.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/fog.pixel b/base/renderprogs/fog_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/fog.pixel rename to base/renderprogs/fog_skinned.ps.hlsl index 542e7b3a..6292e65b 100644 --- a/base/renderprogs/fog.pixel +++ b/base/renderprogs/fog_skinned.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); uniform sampler2D samp1 : register(s1); diff --git a/base/renderprogs/fog_skinned.vertex b/base/renderprogs/fog_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/fog_skinned.vertex rename to base/renderprogs/fog_skinned.vs.hlsl index 7a3558db..7ea248e3 100644 --- a/base/renderprogs/fog_skinned.vertex +++ b/base/renderprogs/fog_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/fxaa.pixel b/base/renderprogs/fxaa.ps.hlsl similarity index 99% rename from base/renderprogs/fxaa.pixel rename to base/renderprogs/fxaa.ps.hlsl index d8110d56..e6477b28 100644 --- a/base/renderprogs/fxaa.pixel +++ b/base/renderprogs/fxaa.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #define FXAA_GREEN_AS_LUMA 1 #define FXAA_EARLY_EXIT 0 #include "Fxaa3_11.h" diff --git a/base/renderprogs/fxaa.vertex b/base/renderprogs/fxaa.vs.hlsl similarity index 98% rename from base/renderprogs/fxaa.vertex rename to base/renderprogs/fxaa.vs.hlsl index ec9b40f8..05a32fea 100644 --- a/base/renderprogs/fxaa.vertex +++ b/base/renderprogs/fxaa.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/gbuffer.pixel b/base/renderprogs/gbuffer.ps.hlsl similarity index 98% rename from base/renderprogs/gbuffer.pixel rename to base/renderprogs/gbuffer.ps.hlsl index daab1678..25fc0a0c 100644 --- a/base/renderprogs/gbuffer.pixel +++ b/base/renderprogs/gbuffer.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // normal map diff --git a/base/renderprogs/gbuffer.vertex b/base/renderprogs/gbuffer.vs.hlsl similarity index 99% rename from base/renderprogs/gbuffer.vertex rename to base/renderprogs/gbuffer.vs.hlsl index f20d1f6d..55d69c1d 100644 --- a/base/renderprogs/gbuffer.vertex +++ b/base/renderprogs/gbuffer.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/global.inc b/base/renderprogs/global.inc.hlsl similarity index 100% rename from base/renderprogs/global.inc rename to base/renderprogs/global.inc.hlsl diff --git a/base/renderprogs/gui.pixel b/base/renderprogs/gui.ps.hlsl similarity index 98% rename from base/renderprogs/gui.pixel rename to base/renderprogs/gui.ps.hlsl index 33bbbeff..83f6b727 100644 --- a/base/renderprogs/gui.pixel +++ b/base/renderprogs/gui.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/bink_gui.vertex b/base/renderprogs/gui.vs.hlsl similarity index 98% rename from base/renderprogs/bink_gui.vertex rename to base/renderprogs/gui.vs.hlsl index 76f38849..68089b23 100644 --- a/base/renderprogs/bink_gui.vertex +++ b/base/renderprogs/gui.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/hdr_glare_chromatic.pixel b/base/renderprogs/hdr_glare_chromatic.ps.hlsl similarity index 99% rename from base/renderprogs/hdr_glare_chromatic.pixel rename to base/renderprogs/hdr_glare_chromatic.ps.hlsl index 62393cb7..37cbed1a 100644 --- a/base/renderprogs/hdr_glare_chromatic.pixel +++ b/base/renderprogs/hdr_glare_chromatic.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/hdr_glare_chromatic.vertex b/base/renderprogs/hdr_glare_chromatic.vs.hlsl similarity index 98% rename from base/renderprogs/hdr_glare_chromatic.vertex rename to base/renderprogs/hdr_glare_chromatic.vs.hlsl index 8f52424a..d1c94722 100644 --- a/base/renderprogs/hdr_glare_chromatic.vertex +++ b/base/renderprogs/hdr_glare_chromatic.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/heatHazeWithMask.pixel b/base/renderprogs/heatHazeWithMask.ps.hlsl similarity index 99% rename from base/renderprogs/heatHazeWithMask.pixel rename to base/renderprogs/heatHazeWithMask.ps.hlsl index 3f7261e8..fc52dad1 100644 --- a/base/renderprogs/heatHazeWithMask.pixel +++ b/base/renderprogs/heatHazeWithMask.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 0 is _current Render uniform sampler2D samp1 : register(s1); // texture 1 is the per-surface bump map diff --git a/base/renderprogs/heatHazeWithMask.vertex b/base/renderprogs/heatHazeWithMask.vs.hlsl similarity index 98% rename from base/renderprogs/heatHazeWithMask.vertex rename to base/renderprogs/heatHazeWithMask.vs.hlsl index 88dace45..1d5e7767 100644 --- a/base/renderprogs/heatHazeWithMask.vertex +++ b/base/renderprogs/heatHazeWithMask.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" // RB: no GPU skinning with ES 2.0 #if defined(USE_GPU_SKINNING) @@ -56,7 +56,7 @@ struct VS_OUT { void main( VS_IN vertex, out VS_OUT result ) { - #include "skinning.inc" + #include "skinning.inc.hlsl" // texture 0 takes the texture coordinates unmodified result.texcoord0 = float4( vertex.texcoord.xy, 0, 0 ); diff --git a/base/renderprogs/heatHazeWithMaskAndVertex.pixel b/base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl similarity index 99% rename from base/renderprogs/heatHazeWithMaskAndVertex.pixel rename to base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl index b9dea7c9..7031b5e9 100644 --- a/base/renderprogs/heatHazeWithMaskAndVertex.pixel +++ b/base/renderprogs/heatHazeWithMaskAndVertex.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 0 is _current Render uniform sampler2D samp1 : register(s1); // texture 1 is the per-surface bump map diff --git a/base/renderprogs/heatHazeWithMaskAndVertex.vertex b/base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl similarity index 98% rename from base/renderprogs/heatHazeWithMaskAndVertex.vertex rename to base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl index 857c629f..a77add42 100644 --- a/base/renderprogs/heatHazeWithMaskAndVertex.vertex +++ b/base/renderprogs/heatHazeWithMaskAndVertex.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" // RB: no GPU skinning with ES 2.0 #if defined(USE_GPU_SKINNING) @@ -57,7 +57,7 @@ struct VS_OUT { void main( VS_IN vertex, out VS_OUT result ) { - #include "skinning.inc" + #include "skinning.inc.hlsl" // texture 0 takes the texture coordinates unmodified result.texcoord0 = float4( vertex.texcoord, 0 , 0 ); diff --git a/base/renderprogs/heathaze.pixel b/base/renderprogs/heathaze.ps.hlsl similarity index 98% rename from base/renderprogs/heathaze.pixel rename to base/renderprogs/heathaze.ps.hlsl index e29d7017..5bb15ccb 100644 --- a/base/renderprogs/heathaze.pixel +++ b/base/renderprogs/heathaze.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 0 is _current Render uniform sampler2D samp1 : register(s1); // texture 1 is the per-surface bump map diff --git a/base/renderprogs/heathaze.vertex b/base/renderprogs/heathaze.vs.hlsl similarity index 98% rename from base/renderprogs/heathaze.vertex rename to base/renderprogs/heathaze.vs.hlsl index 9a661350..36ec9656 100644 --- a/base/renderprogs/heathaze.vertex +++ b/base/renderprogs/heathaze.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global.inc" +#include "global.inc.hlsl" // User Renderparms start at 128 as per renderprogs.h @@ -57,7 +57,7 @@ struct VS_OUT { void main( VS_IN vertex, out VS_OUT result ) { - #include "skinning.inc" + #include "skinning.inc.hlsl" //texture 0 takes the texture coordinates and adds a scroll const float4 textureScroll = rpUser0; diff --git a/base/renderprogs/interaction.pixel b/base/renderprogs/interaction.ps.hlsl similarity index 99% rename from base/renderprogs/interaction.pixel rename to base/renderprogs/interaction.ps.hlsl index ef378494..9d3a75f1 100644 --- a/base/renderprogs/interaction.pixel +++ b/base/renderprogs/interaction.ps.hlsl @@ -27,8 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" -#include "renderprogs/BRDF.inc" +#include "global.inc.hlsl" +#include "BRDF.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface bump map uniform sampler2D samp1 : register(s1); // texture 2 is the light falloff texture diff --git a/base/renderprogs/interaction.vertex b/base/renderprogs/interaction.vs.hlsl similarity index 99% rename from base/renderprogs/interaction.vertex rename to base/renderprogs/interaction.vs.hlsl index f7232a44..8b2b05a1 100644 --- a/base/renderprogs/interaction.vertex +++ b/base/renderprogs/interaction.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/interactionAmbient.pixel b/base/renderprogs/interactionAmbient.ps.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient.pixel rename to base/renderprogs/interactionAmbient.ps.hlsl index 7735fa61..20939ef5 100644 --- a/base/renderprogs/interactionAmbient.pixel +++ b/base/renderprogs/interactionAmbient.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface bump map uniform sampler2D samp1 : register(s1); // texture 2 is the light falloff texture diff --git a/base/renderprogs/interactionAmbient.vertex b/base/renderprogs/interactionAmbient.vs.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient.vertex rename to base/renderprogs/interactionAmbient.vs.hlsl index 630b847e..238e0b46 100644 --- a/base/renderprogs/interactionAmbient.vertex +++ b/base/renderprogs/interactionAmbient.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/interactionAmbient_skinned.pixel b/base/renderprogs/interactionAmbient_skinned.ps.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient_skinned.pixel rename to base/renderprogs/interactionAmbient_skinned.ps.hlsl index 226429aa..518dcc3c 100644 --- a/base/renderprogs/interactionAmbient_skinned.pixel +++ b/base/renderprogs/interactionAmbient_skinned.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface bump map uniform sampler2D samp1 : register(s1); // texture 2 is the light falloff texture diff --git a/base/renderprogs/interactionAmbient_skinned.vertex b/base/renderprogs/interactionAmbient_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/interactionAmbient_skinned.vertex rename to base/renderprogs/interactionAmbient_skinned.vs.hlsl index 6bbdd991..3cd4bc21 100644 --- a/base/renderprogs/interactionAmbient_skinned.vertex +++ b/base/renderprogs/interactionAmbient_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/interactionSM.pixel b/base/renderprogs/interactionSM.ps.hlsl similarity index 99% rename from base/renderprogs/interactionSM.pixel rename to base/renderprogs/interactionSM.ps.hlsl index 19cda57f..1b00cc16 100644 --- a/base/renderprogs/interactionSM.pixel +++ b/base/renderprogs/interactionSM.ps.hlsl @@ -27,8 +27,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" -#include "renderprogs/BRDF.inc" +#include "global.inc.hlsl" +#include "BRDF.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 1 is the per-surface bump map uniform sampler2D samp1 : register(s1); // texture 2 is the light falloff texture diff --git a/base/renderprogs/interactionSM.vertex b/base/renderprogs/interactionSM.vs.hlsl similarity index 99% rename from base/renderprogs/interactionSM.vertex rename to base/renderprogs/interactionSM.vs.hlsl index 5f42507c..37dcf2a1 100644 --- a/base/renderprogs/interactionSM.vertex +++ b/base/renderprogs/interactionSM.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" #if defined( USE_GPU_SKINNING ) uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/motionBlur.pixel b/base/renderprogs/motionBlur.ps.hlsl similarity index 99% rename from base/renderprogs/motionBlur.pixel rename to base/renderprogs/motionBlur.ps.hlsl index 08d0d274..dc47a62d 100644 --- a/base/renderprogs/motionBlur.pixel +++ b/base/renderprogs/motionBlur.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // view color uniform sampler2D samp1 : register(s1); // view depth diff --git a/base/renderprogs/motionBlur.vertex b/base/renderprogs/motionBlur.vs.hlsl similarity index 98% rename from base/renderprogs/motionBlur.vertex rename to base/renderprogs/motionBlur.vs.hlsl index 9e288a62..3d5c28af 100644 --- a/base/renderprogs/motionBlur.vertex +++ b/base/renderprogs/motionBlur.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/postprocess.pixel b/base/renderprogs/postprocess.ps.hlsl similarity index 99% rename from base/renderprogs/postprocess.pixel rename to base/renderprogs/postprocess.ps.hlsl index 85802cc1..9dbfcc31 100644 --- a/base/renderprogs/postprocess.pixel +++ b/base/renderprogs/postprocess.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" // *INDENT-OFF* uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/postprocess.vertex b/base/renderprogs/postprocess.vs.hlsl similarity index 98% rename from base/renderprogs/postprocess.vertex rename to base/renderprogs/postprocess.vs.hlsl index 8f52424a..d1c94722 100644 --- a/base/renderprogs/postprocess.vertex +++ b/base/renderprogs/postprocess.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/screen.pixel b/base/renderprogs/screen.ps.hlsl similarity index 98% rename from base/renderprogs/screen.pixel rename to base/renderprogs/screen.ps.hlsl index fbbf0b74..2093ebd0 100644 --- a/base/renderprogs/screen.pixel +++ b/base/renderprogs/screen.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/screen.vertex b/base/renderprogs/screen.vs.hlsl similarity index 98% rename from base/renderprogs/screen.vertex rename to base/renderprogs/screen.vs.hlsl index 8f52424a..d1c94722 100644 --- a/base/renderprogs/screen.vertex +++ b/base/renderprogs/screen.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/shadow_skinned.pixel b/base/renderprogs/shadow.ps.hlsl similarity index 98% rename from base/renderprogs/shadow_skinned.pixel rename to base/renderprogs/shadow.ps.hlsl index 29ef165b..46fa6b1d 100644 --- a/base/renderprogs/shadow_skinned.pixel +++ b/base/renderprogs/shadow.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); struct PS_OUT { diff --git a/base/renderprogs/shadowDebug.vertex b/base/renderprogs/shadow.vs.hlsl similarity index 98% rename from base/renderprogs/shadowDebug.vertex rename to base/renderprogs/shadow.vs.hlsl index 98d47891..122f9cf5 100644 --- a/base/renderprogs/shadowDebug.vertex +++ b/base/renderprogs/shadow.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/shadowDebug.pixel b/base/renderprogs/shadowDebug.ps.hlsl similarity index 98% rename from base/renderprogs/shadowDebug.pixel rename to base/renderprogs/shadowDebug.ps.hlsl index 29ef165b..46fa6b1d 100644 --- a/base/renderprogs/shadowDebug.pixel +++ b/base/renderprogs/shadowDebug.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); struct PS_OUT { diff --git a/base/renderprogs/shadow.vertex b/base/renderprogs/shadowDebug.vs.hlsl similarity index 98% rename from base/renderprogs/shadow.vertex rename to base/renderprogs/shadowDebug.vs.hlsl index 98d47891..122f9cf5 100644 --- a/base/renderprogs/shadow.vertex +++ b/base/renderprogs/shadowDebug.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/shadowDebug_skinned.pixel b/base/renderprogs/shadowDebug_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/shadowDebug_skinned.pixel rename to base/renderprogs/shadowDebug_skinned.ps.hlsl index 29ef165b..46fa6b1d 100644 --- a/base/renderprogs/shadowDebug_skinned.pixel +++ b/base/renderprogs/shadowDebug_skinned.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); struct PS_OUT { diff --git a/base/renderprogs/shadowDebug_skinned.vertex b/base/renderprogs/shadowDebug_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/shadowDebug_skinned.vertex rename to base/renderprogs/shadowDebug_skinned.vs.hlsl index 789f5afc..c5ecead0 100644 --- a/base/renderprogs/shadowDebug_skinned.vertex +++ b/base/renderprogs/shadowDebug_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/shadow.pixel b/base/renderprogs/shadow_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/shadow.pixel rename to base/renderprogs/shadow_skinned.ps.hlsl index 29ef165b..46fa6b1d 100644 --- a/base/renderprogs/shadow.pixel +++ b/base/renderprogs/shadow_skinned.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); struct PS_OUT { diff --git a/base/renderprogs/shadow_skinned.vertex b/base/renderprogs/shadow_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/shadow_skinned.vertex rename to base/renderprogs/shadow_skinned.vs.hlsl index e76d41fd..d125a6dd 100644 --- a/base/renderprogs/shadow_skinned.vertex +++ b/base/renderprogs/shadow_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/simpleshade.pixel b/base/renderprogs/simpleshade.ps.hlsl similarity index 98% rename from base/renderprogs/simpleshade.pixel rename to base/renderprogs/simpleshade.ps.hlsl index 37b26be3..f14e74d6 100644 --- a/base/renderprogs/simpleshade.pixel +++ b/base/renderprogs/simpleshade.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct PS_IN { float4 position : VPOS; diff --git a/base/renderprogs/simpleshade.vertex b/base/renderprogs/simpleshade.vs.hlsl similarity index 98% rename from base/renderprogs/simpleshade.vertex rename to base/renderprogs/simpleshade.vs.hlsl index 1cfd5bcf..9da67447 100644 --- a/base/renderprogs/simpleshade.vertex +++ b/base/renderprogs/simpleshade.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/skinning.inc b/base/renderprogs/skinning.inc.hlsl similarity index 100% rename from base/renderprogs/skinning.inc rename to base/renderprogs/skinning.inc.hlsl diff --git a/base/renderprogs/wobblesky.pixel b/base/renderprogs/skybox.ps.hlsl similarity index 98% rename from base/renderprogs/wobblesky.pixel rename to base/renderprogs/skybox.ps.hlsl index 4b32ce90..6c99001d 100644 --- a/base/renderprogs/wobblesky.pixel +++ b/base/renderprogs/skybox.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform samplerCUBE samp0 : register(s0); diff --git a/base/renderprogs/skybox.vertex b/base/renderprogs/skybox.vs.hlsl similarity index 98% rename from base/renderprogs/skybox.vertex rename to base/renderprogs/skybox.vs.hlsl index f624e2d2..b728c7a6 100644 --- a/base/renderprogs/skybox.vertex +++ b/base/renderprogs/skybox.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/stereoDeGhost.pixel b/base/renderprogs/stereoDeGhost.ps.hlsl similarity index 98% rename from base/renderprogs/stereoDeGhost.pixel rename to base/renderprogs/stereoDeGhost.ps.hlsl index f924a931..53ea8a17 100644 --- a/base/renderprogs/stereoDeGhost.pixel +++ b/base/renderprogs/stereoDeGhost.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/stereoDeGhost.vertex b/base/renderprogs/stereoDeGhost.vs.hlsl similarity index 98% rename from base/renderprogs/stereoDeGhost.vertex rename to base/renderprogs/stereoDeGhost.vs.hlsl index 5514b539..785665a1 100644 --- a/base/renderprogs/stereoDeGhost.vertex +++ b/base/renderprogs/stereoDeGhost.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/stereoInterlace.pixel b/base/renderprogs/stereoInterlace.ps.hlsl similarity index 98% rename from base/renderprogs/stereoInterlace.pixel rename to base/renderprogs/stereoInterlace.ps.hlsl index 4a5cc165..cbe5c96b 100644 --- a/base/renderprogs/stereoInterlace.pixel +++ b/base/renderprogs/stereoInterlace.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); uniform sampler2D samp1 : register(s1); diff --git a/base/renderprogs/stereoInterlace.vertex b/base/renderprogs/stereoInterlace.vs.hlsl similarity index 98% rename from base/renderprogs/stereoInterlace.vertex rename to base/renderprogs/stereoInterlace.vs.hlsl index 9b6704ef..a16ced75 100644 --- a/base/renderprogs/stereoInterlace.vertex +++ b/base/renderprogs/stereoInterlace.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/stereoWarp.pixel b/base/renderprogs/stereoWarp.ps.hlsl similarity index 98% rename from base/renderprogs/stereoWarp.pixel rename to base/renderprogs/stereoWarp.ps.hlsl index 6022fed3..0484a317 100644 --- a/base/renderprogs/stereoWarp.pixel +++ b/base/renderprogs/stereoWarp.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" /* diff --git a/base/renderprogs/stereoWarp.vertex b/base/renderprogs/stereoWarp.vs.hlsl similarity index 98% rename from base/renderprogs/stereoWarp.vertex rename to base/renderprogs/stereoWarp.vs.hlsl index f33786a4..480e2d63 100644 --- a/base/renderprogs/stereoWarp.vertex +++ b/base/renderprogs/stereoWarp.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/texture.pixel b/base/renderprogs/texture.ps.hlsl similarity index 98% rename from base/renderprogs/texture.pixel rename to base/renderprogs/texture.ps.hlsl index b7acb110..01d0f922 100644 --- a/base/renderprogs/texture.pixel +++ b/base/renderprogs/texture.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture.vertex b/base/renderprogs/texture.vs.hlsl similarity index 98% rename from base/renderprogs/texture.vertex rename to base/renderprogs/texture.vs.hlsl index 6cad9776..5b4dacec 100644 --- a/base/renderprogs/texture.vertex +++ b/base/renderprogs/texture.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/texture_color.pixel b/base/renderprogs/texture_color.ps.hlsl similarity index 98% rename from base/renderprogs/texture_color.pixel rename to base/renderprogs/texture_color.ps.hlsl index 625872ee..babb68c4 100644 --- a/base/renderprogs/texture_color.pixel +++ b/base/renderprogs/texture_color.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture_color.vertex b/base/renderprogs/texture_color.vs.hlsl similarity index 98% rename from base/renderprogs/texture_color.vertex rename to base/renderprogs/texture_color.vs.hlsl index a2c636cd..a41b7908 100644 --- a/base/renderprogs/texture_color.vertex +++ b/base/renderprogs/texture_color.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/texture_color_skinned.pixel b/base/renderprogs/texture_color_skinned.ps.hlsl similarity index 98% rename from base/renderprogs/texture_color_skinned.pixel rename to base/renderprogs/texture_color_skinned.ps.hlsl index 625872ee..babb68c4 100644 --- a/base/renderprogs/texture_color_skinned.pixel +++ b/base/renderprogs/texture_color_skinned.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture_color_skinned.vertex b/base/renderprogs/texture_color_skinned.vs.hlsl similarity index 99% rename from base/renderprogs/texture_color_skinned.vertex rename to base/renderprogs/texture_color_skinned.vs.hlsl index 7c27e7bb..0e0aa55e 100644 --- a/base/renderprogs/texture_color_skinned.vertex +++ b/base/renderprogs/texture_color_skinned.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform matrices_ubo { float4 matrices[408]; }; diff --git a/base/renderprogs/texture_color_texgen.pixel b/base/renderprogs/texture_color_texgen.ps.hlsl similarity index 98% rename from base/renderprogs/texture_color_texgen.pixel rename to base/renderprogs/texture_color_texgen.ps.hlsl index 432a75ee..a95853cb 100644 --- a/base/renderprogs/texture_color_texgen.pixel +++ b/base/renderprogs/texture_color_texgen.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/texture_color_texgen.vertex b/base/renderprogs/texture_color_texgen.vs.hlsl similarity index 98% rename from base/renderprogs/texture_color_texgen.vertex rename to base/renderprogs/texture_color_texgen.vs.hlsl index 35d43b33..425dae96 100644 --- a/base/renderprogs/texture_color_texgen.vertex +++ b/base/renderprogs/texture_color_texgen.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/tonemap.pixel b/base/renderprogs/tonemap.ps.hlsl similarity index 99% rename from base/renderprogs/tonemap.pixel rename to base/renderprogs/tonemap.ps.hlsl index 58c575b7..2d42d0d5 100644 --- a/base/renderprogs/tonemap.pixel +++ b/base/renderprogs/tonemap.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); // texture 0 is _currentRender uniform sampler2D samp1 : register(s1); // texture 1 is heatmap diff --git a/base/renderprogs/tonemap.vertex b/base/renderprogs/tonemap.vs.hlsl similarity index 98% rename from base/renderprogs/tonemap.vertex rename to base/renderprogs/tonemap.vs.hlsl index 8f52424a..d1c94722 100644 --- a/base/renderprogs/tonemap.vertex +++ b/base/renderprogs/tonemap.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/vertex_color.pixel b/base/renderprogs/vertex_color.ps.hlsl similarity index 98% rename from base/renderprogs/vertex_color.pixel rename to base/renderprogs/vertex_color.ps.hlsl index 86533423..70392e72 100644 --- a/base/renderprogs/vertex_color.pixel +++ b/base/renderprogs/vertex_color.ps.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform sampler2D samp0 : register(s0); diff --git a/base/renderprogs/vertex_color.vertex b/base/renderprogs/vertex_color.vs.hlsl similarity index 98% rename from base/renderprogs/vertex_color.vertex rename to base/renderprogs/vertex_color.vs.hlsl index de1480c0..6cb95bb9 100644 --- a/base/renderprogs/vertex_color.vertex +++ b/base/renderprogs/vertex_color.vs.hlsl @@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { diff --git a/base/renderprogs/skybox.pixel b/base/renderprogs/wobblesky.ps.hlsl similarity index 98% rename from base/renderprogs/skybox.pixel rename to base/renderprogs/wobblesky.ps.hlsl index 4b32ce90..6c99001d 100644 --- a/base/renderprogs/skybox.pixel +++ b/base/renderprogs/wobblesky.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" uniform samplerCUBE samp0 : register(s0); diff --git a/base/renderprogs/wobblesky.vertex b/base/renderprogs/wobblesky.vs.hlsl similarity index 98% rename from base/renderprogs/wobblesky.vertex rename to base/renderprogs/wobblesky.vs.hlsl index aa8725b9..797ee2b2 100644 --- a/base/renderprogs/wobblesky.vertex +++ b/base/renderprogs/wobblesky.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION; diff --git a/base/renderprogs/zcullReconstruct.pixel b/base/renderprogs/zcullReconstruct.ps.hlsl similarity index 98% rename from base/renderprogs/zcullReconstruct.pixel rename to base/renderprogs/zcullReconstruct.ps.hlsl index 061929a2..4a950399 100644 --- a/base/renderprogs/zcullReconstruct.pixel +++ b/base/renderprogs/zcullReconstruct.ps.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct PS_OUT { float depth : DEPTH; diff --git a/base/renderprogs/zcullReconstruct.vertex b/base/renderprogs/zcullReconstruct.vs.hlsl similarity index 98% rename from base/renderprogs/zcullReconstruct.vertex rename to base/renderprogs/zcullReconstruct.vs.hlsl index 9a4d30e9..e46efd76 100644 --- a/base/renderprogs/zcullReconstruct.vertex +++ b/base/renderprogs/zcullReconstruct.vs.hlsl @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "renderprogs/global.inc" +#include "global.inc.hlsl" struct VS_IN { float4 position : POSITION;