feat: #86 Add Texture Linear RGB & SRGB shader

skylicht-lab · Aug 23, 2020 · af0a8cb · af0a8cb
1 parent 0752a52
commit af0a8cb
Show file tree

Hide file tree

Showing 18 changed files with 101 additions and 15 deletions.
diff --git a/Assets/BuiltIn/Shader/Basic/GLSL/TextureLinearRGBFS.d.glsl b/Assets/BuiltIn/Shader/Basic/GLSL/TextureLinearRGBFS.d.glsl
@@ -0,0 +1,15 @@
+precision mediump float;
+
+uniform sampler2D uTexDiffuse;
+
+in vec2 varTexCoord0;
+in vec4 varColor;
+out vec4 FragColor;
+
+#include "../../PostProcessing/GLSL/LibToneMapping.glsl"
+
+void main(void)
+{
+	vec4 result = texture(uTexDiffuse, varTexCoord0.xy);
+	FragColor = vec4(linearRGB(result.rgb) * varColor.rgb, result.a * varColor.a);
+}
diff --git a/Assets/BuiltIn/Shader/Basic/GLSL/TextureLinearRGBFS.glsl b/Assets/BuiltIn/Shader/Basic/GLSL/TextureLinearRGBFS.glsl
@@ -0,0 +1,20 @@
+precision mediump float;
+uniform sampler2D uTexDiffuse;
+in vec2 varTexCoord0;
+in vec4 varColor;
+out vec4 FragColor;
+const float gamma = 2.2;
+const float invGamma = 1.0/2.2;
+vec3 sRGB(vec3 color)
+{
+	return pow(color, vec3(gamma));
+}
+vec3 linearRGB(vec3 color)
+{
+	return pow(color, vec3(invGamma));
+}
+void main(void)
+{
+	vec4 result = texture(uTexDiffuse, varTexCoord0.xy);
+	FragColor = vec4(linearRGB(result.rgb) * varColor.rgb, result.a * varColor.a);
+}
diff --git a/...In/Shader/Basic/GLSL/TextureToneFS.d.glsl → ...In/Shader/Basic/GLSL/TextureSRGBFS.d.glsl b/...In/Shader/Basic/GLSL/TextureToneFS.d.glsl → ...In/Shader/Basic/GLSL/TextureSRGBFS.d.glsl
diff --git a/...ltIn/Shader/Basic/GLSL/TextureToneFS.glsl → ...ltIn/Shader/Basic/GLSL/TextureSRGBFS.glsl b/...ltIn/Shader/Basic/GLSL/TextureToneFS.glsl → ...ltIn/Shader/Basic/GLSL/TextureSRGBFS.glsl
diff --git a/Assets/BuiltIn/Shader/Basic/HLSL/TextureLinearRGBFS.d.hlsl b/Assets/BuiltIn/Shader/Basic/HLSL/TextureLinearRGBFS.d.hlsl
@@ -0,0 +1,17 @@
+Texture2D uTexDiffuse : register(t0);
+SamplerState uTexDiffuseSampler : register(s0);
+
+struct PS_INPUT
+{
+	float4 pos : SV_POSITION;
+	float4 color : COLOR0;
+	float2 tex0 : TEXCOORD0;
+};
+
+#include "../../PostProcessing/HLSL/LibToneMapping.hlsl"
+
+float4 main(PS_INPUT input) : SV_TARGET
+{
+	float4 result = uTexDiffuse.Sample(uTexDiffuseSampler, input.tex0);
+	return float4(input.color.rgb * linearRGB(result.rgb), result.a * input.color.a);
+}
diff --git a/Assets/BuiltIn/Shader/Basic/HLSL/TextureLinearRGBFS.hlsl b/Assets/BuiltIn/Shader/Basic/HLSL/TextureLinearRGBFS.hlsl
@@ -0,0 +1,23 @@
+Texture2D uTexDiffuse : register(t0);
+SamplerState uTexDiffuseSampler : register(s0);
+struct PS_INPUT
+{
+	float4 pos : SV_POSITION;
+	float4 color : COLOR0;
+	float2 tex0 : TEXCOORD0;
+};
+static const float gamma = 2.2;
+static const float invGamma = 1.0/2.2;
+float3 sRGB(float3 color)
+{
+	return pow(color, gamma);
+}
+float3 linearRGB(float3 color)
+{
+	return pow(color, invGamma);
+}
+float4 main(PS_INPUT input) : SV_TARGET
+{
+	float4 result = uTexDiffuse.Sample(uTexDiffuseSampler, input.tex0);
+	return float4(input.color.rgb * linearRGB(result.rgb), result.a * input.color.a);
+}
diff --git a/...In/Shader/Basic/HLSL/TextureToneFS.d.hlsl → ...In/Shader/Basic/HLSL/TextureSRGBFS.d.hlsl b/...In/Shader/Basic/HLSL/TextureToneFS.d.hlsl → ...In/Shader/Basic/HLSL/TextureSRGBFS.d.hlsl
diff --git a/...ltIn/Shader/Basic/HLSL/TextureToneFS.hlsl → ...ltIn/Shader/Basic/HLSL/TextureSRGBFS.hlsl b/...ltIn/Shader/Basic/HLSL/TextureToneFS.hlsl → ...ltIn/Shader/Basic/HLSL/TextureSRGBFS.hlsl
diff --git a/Assets/BuiltIn/Shader/Basic/TextureTone.xml → ...BuiltIn/Shader/Basic/TextureLinearRGB.xml b/Assets/BuiltIn/Shader/Basic/TextureTone.xml → ...BuiltIn/Shader/Basic/TextureLinearRGB.xml
@@ -1,4 +1,4 @@
-<shaderConfig name="TextureTone" baseShader="SOLID">
+<shaderConfig name="TextureLinearRGB" baseShader="SOLID">
 	<uniforms>
 		<vs>
 			<uniform name="uMvpMatrix" type="WORLD_VIEW_PROJECTION" value="0" float="16" matrix="true"/>
@@ -7,11 +7,6 @@
 			<uniform name="uTexDiffuse" type="DEFAULT_VALUE" value="0" float="1" directX="false"/>
 		</fs>
 	</uniforms>
-	<customUI>
-		<ui control="UIGroup" name="Texture">
-			<ui control="UITexture" name="uTexDiffuse" autoReplace="_diff.tga"/>
-		</ui>
-	</customUI>
-	<shader type="GLSL" vs="GLSL/TextureColorVS.glsl" fs="GLSL/TextureToneFS.glsl"/>
-	<shader type="HLSL" vs="HLSL/TextureColorVS.hlsl" fs="HLSL/TextureToneFS.hlsl"/>
+	<shader type="GLSL" vs="GLSL/TextureColorVS.glsl" fs="GLSL/TextureLinearRGBFS.glsl"/>
+	<shader type="HLSL" vs="HLSL/TextureColorVS.hlsl" fs="HLSL/TextureLinearRGBFS.hlsl"/>
 </shaderConfig>
diff --git a/Assets/BuiltIn/Shader/Basic/TextureSRGB.xml b/Assets/BuiltIn/Shader/Basic/TextureSRGB.xml
@@ -0,0 +1,12 @@
+<shaderConfig name="TextureSRGB" baseShader="SOLID">
+	<uniforms>
+		<vs>
+			<uniform name="uMvpMatrix" type="WORLD_VIEW_PROJECTION" value="0" float="16" matrix="true"/>
+		</vs>
+		<fs>
+			<uniform name="uTexDiffuse" type="DEFAULT_VALUE" value="0" float="1" directX="false"/>
+		</fs>
+	</uniforms>
+	<shader type="GLSL" vs="GLSL/TextureColorVS.glsl" fs="GLSL/TextureSRGBFS.glsl"/>
+	<shader type="HLSL" vs="HLSL/TextureColorVS.hlsl" fs="HLSL/TextureSRGBFS.hlsl"/>
+</shaderConfig>
diff --git a/Assets/BuiltIn/Shader/PostProcessing/GLSL/PostEffectFS.d.glsl b/Assets/BuiltIn/Shader/PostProcessing/GLSL/PostEffectFS.d.glsl
@@ -17,7 +17,7 @@ void main(void)
 
 	float avgLuminance = textureLod(uTexLuminance, varTexCoord0.xy, 10.0).x;			
 
-	float target = 0.25;
+	float target = 0.2;
 	float threshold = 2.5;
 	float linearExposure = max((target / avgLuminance), 0.0001);
 

diff --git a/Assets/BuiltIn/Shader/PostProcessing/GLSL/PostEffectFS.glsl b/Assets/BuiltIn/Shader/PostProcessing/GLSL/PostEffectFS.glsl
@@ -20,7 +20,7 @@ void main(void)
 {
 	vec4 color = texture(uTexColor, varTexCoord0.xy);
 	float avgLuminance = textureLod(uTexLuminance, varTexCoord0.xy, 10.0).x;
-	float target = 0.25;
+	float target = 0.2;
 	float threshold = 2.5;
 	float linearExposure = max((target / avgLuminance), 0.0001);
 	float exposure = min(exp2(log2(linearExposure)), threshold);

diff --git a/Assets/BuiltIn/Shader/PostProcessing/HLSL/PostEffectFS.d.hlsl b/Assets/BuiltIn/Shader/PostProcessing/HLSL/PostEffectFS.d.hlsl
@@ -19,7 +19,7 @@ float4 main(PS_INPUT input) : SV_TARGET
 
 	float avgLuminance = uTexLuminance.SampleLevel(uTexLuminanceSampler, input.tex0, 10.0).x;
 
-	float target = 0.25;
+	float target = 0.2;
 	float threshold = 2.5;
 	float linearExposure = max((target / avgLuminance), 0.0001);
 

diff --git a/Assets/BuiltIn/Shader/PostProcessing/HLSL/PostEffectFS.hlsl b/Assets/BuiltIn/Shader/PostProcessing/HLSL/PostEffectFS.hlsl
@@ -22,7 +22,7 @@ float4 main(PS_INPUT input) : SV_TARGET
 {
 	float4 color = uTexColor.Sample(uTexColorSampler, input.tex0);
 	float avgLuminance = uTexLuminance.SampleLevel(uTexLuminanceSampler, input.tex0, 10.0).x;
-	float target = 0.25;
+	float target = 0.2;
 	float threshold = 2.5;
 	float linearExposure = max((target / avgLuminance), 0.0001);
 	float exposure = min(exp2(log2(linearExposure)), threshold);

diff --git a/Projects/Skylicht/Components/Source/SkyDome/CSkyDomeData.cpp b/Projects/Skylicht/Components/Source/SkyDome/CSkyDomeData.cpp
@@ -42,7 +42,7 @@ namespace Skylicht
 		SMaterial& mat = Buffer->getMaterial();
 		mat.setTexture(0, SkyDomeTexture);
 		mat.ZWriteEnable = false;
-		mat.MaterialType = CShaderManager::getInstance()->getShaderIDByName("TextureTone");
+		mat.MaterialType = CShaderManager::getInstance()->getShaderIDByName("TextureSRGB");
 
 		generateMesh();
 	}

diff --git a/Projects/Skylicht/Engine/Source/Material/Shader/CShaderManager.cpp b/Projects/Skylicht/Engine/Source/Material/Shader/CShaderManager.cpp
@@ -86,7 +86,8 @@ namespace Skylicht
 		loadShader("BuiltIn/Shader/ShadowMap/ShadowDepthWrite.xml");
 		loadShader("BuiltIn/Shader/ShadowMap/ShadowCubeDepthWrite.xml");
 
-		loadShader("BuiltIn/Shader/Basic/TextureTone.xml");
+		loadShader("BuiltIn/Shader/Basic/TextureSRGB.xml");
+		loadShader("BuiltIn/Shader/Basic/TextureLinearRGB.xml");
 		loadShader("BuiltIn/Shader/Basic/Luminance.xml");
 
 		loadShader("BuiltIn/Shader/Lightmap/Lightmap.xml");

diff --git a/Projects/Skylicht/Engine/Source/RenderPipeline/CDeferredRP.cpp b/Projects/Skylicht/Engine/Source/RenderPipeline/CDeferredRP.cpp
@@ -49,6 +49,7 @@ namespace Skylicht
 		m_textureColorShader(0),
 		m_pointLightShader(0),
 		m_pointLightShadowShader(0),
+		m_textureLinearRGBShader(0),
 		m_indirectMultipler(1.0f),
 		m_directMultipler(1.0f),
 		m_lightMultipler(1.0f),
@@ -112,6 +113,7 @@ namespace Skylicht
 		// get basic shader
 		CShaderManager *shaderMgr = CShaderManager::getInstance();
 		m_textureColorShader = shaderMgr->getShaderIDByName("TextureColor");
+		m_textureLinearRGBShader = shaderMgr->getShaderIDByName("TextureLinearRGB");
 		m_vertexColorShader = shaderMgr->getShaderIDByName("VertexColor");
 		m_lightmapArrayShader = shaderMgr->getShaderIDByName("Lightmap");
 		m_lightmapVertexShader = shaderMgr->getShaderIDByName("LightmapVertex");
@@ -126,7 +128,7 @@ namespace Skylicht
 
 		// final pass
 		m_finalPass.setTexture(0, m_target);
-		m_finalPass.MaterialType = m_textureColorShader;
+		m_finalPass.MaterialType = m_textureLinearRGBShader;
 	}
 
 	void CDeferredRP::initDefferredMaterial()

diff --git a/Projects/Skylicht/Engine/Source/RenderPipeline/CDeferredRP.h b/Projects/Skylicht/Engine/Source/RenderPipeline/CDeferredRP.h
@@ -56,6 +56,7 @@ namespace Skylicht
 		bool m_isIndirectPass;
 		int m_vertexColorShader;
 		int m_textureColorShader;
+		int m_textureLinearRGBShader;
 		int m_lightmapArrayShader;
 		int m_lightmapVertexShader;
 		int m_lightmapIndirectTestShader;