From 5e795c4a7f0d0fbdf946550115fafa44a70342c1 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sun, 8 Oct 2023 10:40:01 +0800 Subject: [PATCH] fragment shader output use "FragColor" instead of "Color". --- ShaderLibrary/Std2D/PureColor2D.mtl | 4 ++-- ShaderLibrary/Std2D/PureTexture2D.mtl | 4 ++-- ShaderLibrary/Std2D/RectTexture2D.mtl | 4 ++-- ShaderLibrary/Std2D/RectTexture2DArray.mtl | 4 ++-- ShaderLibrary/Std2D/VertexColor2D.mtl | 4 ++-- ShaderLibrary/Std3D/VertexColor3D.mtl | 4 ++-- ShaderLibrary/Std3D/VertexLum3D.mtl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ShaderLibrary/Std2D/PureColor2D.mtl b/ShaderLibrary/Std2D/PureColor2D.mtl index 9386ee1c..f72aa779 100644 --- a/ShaderLibrary/Std2D/PureColor2D.mtl +++ b/ShaderLibrary/Std2D/PureColor2D.mtl @@ -24,7 +24,7 @@ Code #Fragment Output { - vec4 Color + vec4 FragColor } Code @@ -33,6 +33,6 @@ Code { MaterialInstance mi=GetMI(); - Color=mi.Color; + FragColor=mi.Color; } } diff --git a/ShaderLibrary/Std2D/PureTexture2D.mtl b/ShaderLibrary/Std2D/PureTexture2D.mtl index 65c3f8b7..0195498b 100644 --- a/ShaderLibrary/Std2D/PureTexture2D.mtl +++ b/ShaderLibrary/Std2D/PureTexture2D.mtl @@ -29,13 +29,13 @@ Sampler2D TextureColor Output { - vec4 Color; + vec4 FragColor; } Code { void main() { - Color=texture(TextureColor,Input.TexCoord); + FragColor=texture(TextureColor,Input.TexCoord); } } diff --git a/ShaderLibrary/Std2D/RectTexture2D.mtl b/ShaderLibrary/Std2D/RectTexture2D.mtl index 9303a5a8..00c1f21a 100644 --- a/ShaderLibrary/Std2D/RectTexture2D.mtl +++ b/ShaderLibrary/Std2D/RectTexture2D.mtl @@ -58,13 +58,13 @@ Sampler2D TextureColor Output { - vec4 Color; + vec4 FragColor; } Code { void main() { - Color=texture(TextureColor,Input.TexCoord); + FragColor=texture(TextureColor,Input.TexCoord); } } diff --git a/ShaderLibrary/Std2D/RectTexture2DArray.mtl b/ShaderLibrary/Std2D/RectTexture2DArray.mtl index da56569e..a2f9f92d 100644 --- a/ShaderLibrary/Std2D/RectTexture2DArray.mtl +++ b/ShaderLibrary/Std2D/RectTexture2DArray.mtl @@ -67,7 +67,7 @@ Sampler2DArray TextureColor Output { - vec4 Color; + vec4 FragColor; } Code @@ -76,6 +76,6 @@ Code { MaterialInstance mi=GetMI(); - Color=texture(TextureColor,vec3(Input.TexCoord,mi.id.x)); + FragColor=texture(TextureColor,vec3(Input.TexCoord,mi.id.x)); } } diff --git a/ShaderLibrary/Std2D/VertexColor2D.mtl b/ShaderLibrary/Std2D/VertexColor2D.mtl index d29fc4d1..f65316f5 100644 --- a/ShaderLibrary/Std2D/VertexColor2D.mtl +++ b/ShaderLibrary/Std2D/VertexColor2D.mtl @@ -27,13 +27,13 @@ Code Output { - vec4 Color; + vec4 FragColor } Code { void main() { - Color=Input.Color; + FragColor=Input.Color; } } diff --git a/ShaderLibrary/Std3D/VertexColor3D.mtl b/ShaderLibrary/Std3D/VertexColor3D.mtl index 927265a3..b4d37d20 100644 --- a/ShaderLibrary/Std3D/VertexColor3D.mtl +++ b/ShaderLibrary/Std3D/VertexColor3D.mtl @@ -27,13 +27,13 @@ Code Output { - vec4 Color; + vec4 FragColor; } Code { void main() { - Color=Input.Color; + FragColor=Input.Color; } } diff --git a/ShaderLibrary/Std3D/VertexLum3D.mtl b/ShaderLibrary/Std3D/VertexLum3D.mtl index 872a18cf..30b417cf 100644 --- a/ShaderLibrary/Std3D/VertexLum3D.mtl +++ b/ShaderLibrary/Std3D/VertexLum3D.mtl @@ -37,13 +37,13 @@ Code Output { - vec4 Color; + vec4 FragColor; } Code { void main() { - Color=Input.Color; + FragColor=Input.Color; } }