Merge pull request #542 from KhronosGroup/fix/mainDebugChannels

Include factors in main extension debug channels
KhronosGroup · Apr 26, 2024 · ba079f5 · ba079f5
2 parents eda8bf6 + c0d14c3
commit ba079f5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/source/Renderer/shaders/pbr.frag b/source/Renderer/shaders/pbr.frag
@@ -373,7 +373,7 @@ void main()
     // MR:
 #ifdef MATERIAL_METALLICROUGHNESS
 #if DEBUG == DEBUG_METALLIC_ROUGHNESS
-    g_finalColor.rgb = linearTosRGB(f_diffuse + f_diffuse_ibl + f_specular);
+    g_finalColor.rgb = linearTosRGB(diffuse + specular);
 #endif
 #if DEBUG == DEBUG_METALLIC
     g_finalColor.rgb = vec3(materialInfo.metallic);
@@ -389,7 +389,7 @@ void main()
     // Clearcoat:
 #ifdef MATERIAL_CLEARCOAT
 #if DEBUG == DEBUG_CLEARCOAT
-    g_finalColor.rgb = linearTosRGB(f_clearcoat + f_clearcoat_ibl);
+    g_finalColor.rgb = linearTosRGB(clearcoat);
 #endif
 #if DEBUG == DEBUG_CLEARCOAT_FACTOR
     g_finalColor.rgb = vec3(materialInfo.clearcoatFactor);
@@ -405,7 +405,7 @@ void main()
     // Sheen:
 #ifdef MATERIAL_SHEEN
 #if DEBUG == DEBUG_SHEEN
-    g_finalColor.rgb = linearTosRGB(f_sheen + f_sheen_ibl);
+    g_finalColor.rgb = linearTosRGB(sheen);
 #endif
 #if DEBUG == DEBUG_SHEEN_COLOR
     g_finalColor.rgb = materialInfo.sheenColorFactor;
@@ -418,7 +418,7 @@ void main()
     // Specular:
 #ifdef MATERIAL_SPECULAR
 #if DEBUG == DEBUG_SPECULAR
-    g_finalColor.rgb = linearTosRGB(f_specular + f_specular_ibl);
+    g_finalColor.rgb = linearTosRGB(specular);
 #endif
 #if DEBUG == DEBUG_SPECULAR_FACTOR
     g_finalColor.rgb = vec3(materialInfo.specularWeight);
@@ -436,7 +436,7 @@ vec3 specularTexture = vec3(1.0);
     // Transmission, Volume:
 #ifdef MATERIAL_TRANSMISSION
 #if DEBUG == DEBUG_TRANSMISSION_VOLUME
-    g_finalColor.rgb = linearTosRGB(f_transmission);
+    g_finalColor.rgb = linearTosRGB(f_transmission * materialInfo.transmissionFactor);
 #endif
 #if DEBUG == DEBUG_TRANSMISSION_FACTOR
     g_finalColor.rgb = vec3(materialInfo.transmissionFactor);
@@ -451,7 +451,7 @@ vec3 specularTexture = vec3(1.0);
     // Iridescence:
 #ifdef MATERIAL_IRIDESCENCE
 #if DEBUG == DEBUG_IRIDESCENCE
-    g_finalColor.rgb = iridescenceFresnel;
+    g_finalColor.rgb = iridescenceFresnel * materialInfo.iridescenceFactor;
 #endif
 #if DEBUG == DEBUG_IRIDESCENCE_FACTOR
     g_finalColor.rgb = vec3(materialInfo.iridescenceFactor);