From b162d681aab49f0ce2056a1838f72e610ae4634d Mon Sep 17 00:00:00 2001 From: emil28092005 Date: Thu, 18 Jun 2026 19:46:05 +0300 Subject: [PATCH] =?UTF-8?q?debug:=20albedo-only=20fragment=20shader=20?= =?UTF-8?q?=E2=80=94=20tests=20if=20vp=20matrix=20works=20with=20128B=20UB?= =?UTF-8?q?O?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If objects are colored: vp matrix is fine, problem is in lighting If objects are black: vp matrix is broken by 128B UBO change --- .../Shaders/triangle.frag | 87 +----------------- .../Shaders/triangle.frag.spv | Bin 8552 -> 928 bytes 2 files changed, 2 insertions(+), 85 deletions(-) diff --git a/src/Engine.Graphics.Vulkan/Shaders/triangle.frag b/src/Engine.Graphics.Vulkan/Shaders/triangle.frag index 9ed81eb..1cb8f53 100644 --- a/src/Engine.Graphics.Vulkan/Shaders/triangle.frag +++ b/src/Engine.Graphics.Vulkan/Shaders/triangle.frag @@ -12,91 +12,8 @@ layout(set = 0, binding = 0) uniform CameraUBO { vec4 pointLightColor; }; -const vec3 AMBIENT = vec3(0.01, 0.01, 0.02); -const float PI = 3.14159265359; - -float distributionGGX(vec3 N, vec3 H, float roughness) -{ - float a = roughness * roughness; - float a2 = a * a; - float NdotH = max(dot(N, H), 0.0); - float NdotH2 = NdotH * NdotH; - float num = a2; - float denom = NdotH2 * (a2 - 1.0) + 1.0; - denom = PI * denom * denom; - return num / denom; -} - -float geometrySchlickGGX(float NdotV, float roughness) -{ - float r = roughness + 1.0; - float k = (r * r) / 8.0; - return NdotV / (NdotV * (1.0 - k) + k); -} - -float geometrySmith(vec3 N, vec3 V, vec3 L, float roughness) -{ - float NdotV = max(dot(N, V), 0.0); - float NdotL = max(dot(N, L), 0.0); - return geometrySchlickGGX(NdotV, roughness) * geometrySchlickGGX(NdotL, roughness); -} - -vec3 fresnelSchlick(float cosTheta, vec3 F0) -{ - return F0 + (1.0 - F0) * pow(clamp(1.0 - cosTheta, 0.0, 1.0), 5.0); -} - -vec3 acesTonemap(vec3 color) -{ - float a = 2.51; - float b = 0.03; - float c = 2.43; - float d = 0.59; - float e = 0.14; - return clamp((color * (a * color + b)) / (color * (c * color + d) + e), 0.0, 1.0); -} - void main() { - vec3 N = normalize(fragNormal); - vec3 V = normalize(-fragWorldPos); - vec3 albedo = fragAlbedo; - float roughness = 0.5; - float metallic = 0.1; - - vec3 color = AMBIENT * albedo; - - vec3 lightPos = pointLightPos.xyz; - float lightIntensity = pointLightPos.w; - vec3 lightColor = pointLightColor.xyz; - float lightRange = pointLightColor.w; - - vec3 toLight = lightPos - fragWorldPos; - float dist = length(toLight); - vec3 L = toLight / max(dist, 0.001); - - float attenuation = pow(clamp(1.0 - dist / max(lightRange, 0.001), 0.0, 1.0), 2.0); - vec3 radiance = lightColor * lightIntensity * attenuation; - - vec3 H = normalize(V + L); - vec3 F0 = mix(vec3(0.04), albedo, metallic); - - float NDF = distributionGGX(N, H, roughness); - float G = geometrySmith(N, V, L, roughness); - vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); - - vec3 numerator = NDF * G * F; - float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; - vec3 specular = numerator / denominator; - - vec3 kS = F; - vec3 kD = (vec3(1.0) - kS) * (1.0 - metallic); - - float NdotL = max(dot(N, L), 0.0); - color += (kD * albedo / PI + specular) * radiance * NdotL; - - color = acesTonemap(color); - color = pow(color, vec3(1.0 / 2.2)); - - outColor = vec4(color, 1.0); + // Just output albedo — tests if vp matrix in 128B UBO works + outColor = vec4(fragAlbedo, 1.0); } diff --git a/src/Engine.Graphics.Vulkan/Shaders/triangle.frag.spv b/src/Engine.Graphics.Vulkan/Shaders/triangle.frag.spv index ee7a612df1f8d0c398b561bacda9ba1ecf6e2e35..aaa49571c4ede38911f8c3a270c02fcebc2febc1 100644 GIT binary patch literal 928 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