From 3a291fd523c0294bc1ce7dbfa58597007333f354 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 17 Aug 2024 01:12:05 +0200 Subject: [PATCH] Samples: move some materials to Tests so they are not installed --- .../materials/scripts/Examples.compositor | 42 ------------------- .../scripts => Tests/Media}/MRTtest.material | 0 .../GLSL => Tests/Media}/PassthroughFP.glsl | 0 .../GLSL => Tests/Media}/PassthroughVP.glsl | 0 .../scripts => Tests/Media}/Swizzle.material | 0 .../GLSL120 => Tests/Media}/SwizzleGP.glsl | 0 .../HLSL => Tests/Media}/mrttestfp.hlsl | 0 .../Media}/mrttestfp_quad.glsl | 0 .../Media}/mrttestfp_quad.glsles | 0 .../Media}/mrttestfp_scene.glsl | 0 .../Media}/mrttestfp_scene.glsles | 0 Tests/Media/tests.compositor | 42 +++++++++++++++++++ 12 files changed, 42 insertions(+), 42 deletions(-) rename {Samples/Media/materials/scripts => Tests/Media}/MRTtest.material (100%) rename {Samples/Media/materials/programs/GLSL => Tests/Media}/PassthroughFP.glsl (100%) rename {Samples/Media/materials/programs/GLSL => Tests/Media}/PassthroughVP.glsl (100%) rename {Samples/Media/materials/scripts => Tests/Media}/Swizzle.material (100%) rename {Samples/Media/materials/programs/GLSL120 => Tests/Media}/SwizzleGP.glsl (100%) rename {Samples/Media/materials/programs/HLSL => Tests/Media}/mrttestfp.hlsl (100%) rename {Samples/Media/materials/programs/GLSL120 => Tests/Media}/mrttestfp_quad.glsl (100%) rename {Samples/Media/materials/programs/GLSLES => Tests/Media}/mrttestfp_quad.glsles (100%) rename {Samples/Media/materials/programs/GLSL120 => Tests/Media}/mrttestfp_scene.glsl (100%) rename {Samples/Media/materials/programs/GLSLES => Tests/Media}/mrttestfp_scene.glsles (100%) create mode 100644 Tests/Media/tests.compositor diff --git a/Samples/Media/materials/scripts/Examples.compositor b/Samples/Media/materials/scripts/Examples.compositor index 57c474cb169..e2bb7dd3ddf 100644 --- a/Samples/Media/materials/scripts/Examples.compositor +++ b/Samples/Media/materials/scripts/Examples.compositor @@ -596,48 +596,6 @@ compositor "Gaussian Blur" } } -// Testing MRT -compositor TestMRT -{ - technique - { - // temporary texture (MRT!) - // 4 sub-surfaces, all 32-bit - texture mrt0 target_width target_height PF_BYTE_RGBA PF_BYTE_RGBA PF_BYTE_RGBA PF_BYTE_RGBA - - target mrt0 - { - // Render scene using MRT-compatible material scheme - input none - material_scheme MRT - pass clear - { - - } - pass render_scene - { - } - } - - target_output - { - input none - pass render_quad - { - // Renders a fullscreen quad - material Ogre/MRTtest/quad - // bind 4 MRT surfaces as texture inputs - input 0 mrt0 0 - input 1 mrt0 1 - input 2 mrt0 2 - input 3 mrt0 3 - } - - } - - } -} - //Radial blur effect compositor "Radial Blur" { diff --git a/Samples/Media/materials/scripts/MRTtest.material b/Tests/Media/MRTtest.material similarity index 100% rename from Samples/Media/materials/scripts/MRTtest.material rename to Tests/Media/MRTtest.material diff --git a/Samples/Media/materials/programs/GLSL/PassthroughFP.glsl b/Tests/Media/PassthroughFP.glsl similarity index 100% rename from Samples/Media/materials/programs/GLSL/PassthroughFP.glsl rename to Tests/Media/PassthroughFP.glsl diff --git a/Samples/Media/materials/programs/GLSL/PassthroughVP.glsl b/Tests/Media/PassthroughVP.glsl similarity index 100% rename from Samples/Media/materials/programs/GLSL/PassthroughVP.glsl rename to Tests/Media/PassthroughVP.glsl diff --git a/Samples/Media/materials/scripts/Swizzle.material b/Tests/Media/Swizzle.material similarity index 100% rename from Samples/Media/materials/scripts/Swizzle.material rename to Tests/Media/Swizzle.material diff --git a/Samples/Media/materials/programs/GLSL120/SwizzleGP.glsl b/Tests/Media/SwizzleGP.glsl similarity index 100% rename from Samples/Media/materials/programs/GLSL120/SwizzleGP.glsl rename to Tests/Media/SwizzleGP.glsl diff --git a/Samples/Media/materials/programs/HLSL/mrttestfp.hlsl b/Tests/Media/mrttestfp.hlsl similarity index 100% rename from Samples/Media/materials/programs/HLSL/mrttestfp.hlsl rename to Tests/Media/mrttestfp.hlsl diff --git a/Samples/Media/materials/programs/GLSL120/mrttestfp_quad.glsl b/Tests/Media/mrttestfp_quad.glsl similarity index 100% rename from Samples/Media/materials/programs/GLSL120/mrttestfp_quad.glsl rename to Tests/Media/mrttestfp_quad.glsl diff --git a/Samples/Media/materials/programs/GLSLES/mrttestfp_quad.glsles b/Tests/Media/mrttestfp_quad.glsles similarity index 100% rename from Samples/Media/materials/programs/GLSLES/mrttestfp_quad.glsles rename to Tests/Media/mrttestfp_quad.glsles diff --git a/Samples/Media/materials/programs/GLSL120/mrttestfp_scene.glsl b/Tests/Media/mrttestfp_scene.glsl similarity index 100% rename from Samples/Media/materials/programs/GLSL120/mrttestfp_scene.glsl rename to Tests/Media/mrttestfp_scene.glsl diff --git a/Samples/Media/materials/programs/GLSLES/mrttestfp_scene.glsles b/Tests/Media/mrttestfp_scene.glsles similarity index 100% rename from Samples/Media/materials/programs/GLSLES/mrttestfp_scene.glsles rename to Tests/Media/mrttestfp_scene.glsles diff --git a/Tests/Media/tests.compositor b/Tests/Media/tests.compositor new file mode 100644 index 00000000000..27afa35e95f --- /dev/null +++ b/Tests/Media/tests.compositor @@ -0,0 +1,42 @@ + +// Testing MRT +compositor TestMRT +{ + technique + { + // temporary texture (MRT!) + // 4 sub-surfaces, all 32-bit + texture mrt0 target_width target_height PF_BYTE_RGBA PF_BYTE_RGBA PF_BYTE_RGBA PF_BYTE_RGBA + + target mrt0 + { + // Render scene using MRT-compatible material scheme + input none + material_scheme MRT + pass clear + { + + } + pass render_scene + { + } + } + + target_output + { + input none + pass render_quad + { + // Renders a fullscreen quad + material Ogre/MRTtest/quad + // bind 4 MRT surfaces as texture inputs + input 0 mrt0 0 + input 1 mrt0 1 + input 2 mrt0 2 + input 3 mrt0 3 + } + + } + + } +} \ No newline at end of file