Color correction and bloom now work together.

luciusDXL · Aug 1, 2023 · 37f0476 · 37f0476
1 parent cff7917
commit 37f0476
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/TheForceEngine/TFE_PostProcess/blit.cpp b/TheForceEngine/TFE_PostProcess/blit.cpp
@@ -57,7 +57,7 @@ bool Blit::buildShaders()
 	// BLIT_BLOOM + BLIT_GPU_COLOR_CORRECTION feature
 	defines[0] = { "ENABLE_BLOOM", "1" };
 	defines[1] = { "ENABLE_GPU_COLOR_CORRECTION", "1" };
-	m_featureShaders[5].load("Shaders/blit.vert", "Shaders/blit.frag", 1, defines);
+	m_featureShaders[5].load("Shaders/blit.vert", "Shaders/blit.frag", 2, defines);
 	m_featureShaders[5].bindTextureNameToSlot("VirtualDisplay", 0);
 	m_featureShaders[5].bindTextureNameToSlot("Bloom", 1);
 
@@ -85,13 +85,13 @@ void Blit::setupShader()
 	{
 		m_shader = &m_featureShaders[1];
 	}
-	else if (m_features & BLIT_GPU_COLOR_CORRECTION)
+	else if ((m_features & BLIT_GPU_COLOR_CORRECTION) && (m_features & BLIT_BLOOM))
 	{
-		m_shader = &m_featureShaders[2];
+		m_shader = &m_featureShaders[5];
 	}
-	else if ((m_features & BLIT_GPU_COLOR_CONVERSION) && (m_features & BLIT_BLOOM))
+	else if (m_features & BLIT_GPU_COLOR_CORRECTION)
 	{
-		m_shader = &m_featureShaders[5];
+		m_shader = &m_featureShaders[2];
 	}
 	else if (m_features & BLIT_BLOOM)
 	{