diff --git a/source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh b/source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh
index 99f9802284f..dbf3d7787f7 100644
--- a/source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh
+++ b/source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh
@@ -150,7 +150,7 @@ GPU_SHADER_CREATE_END()
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_common)
 ADDITIONAL_INFO(eevee_legacy_common_lib)
 ADDITIONAL_INFO(eevee_legacy_common_utiltex_lib)
-/* FRAGMENT_OUT(1, UINT, resource_id_out) */
+FRAGMENT_OUT(1, UINT, resource_id_out)
 ADDITIONAL_INFO(draw_view)
 ADDITIONAL_INFO(eevee_legacy_closure_eval_surface_lib)
 GPU_SHADER_CREATE_END()
@@ -163,20 +163,20 @@ GPU_SHADER_CREATE_END()
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_opaque)
 ADDITIONAL_INFO(eevee_legacy_surface_lib_common)
 ADDITIONAL_INFO(eevee_legacy_material_prepass_frag_opaque_common)
-FRAGMENT_OUT(1, VEC2, out_normal);
+FRAGMENT_OUT(2, VEC2, out_normal);
 GPU_SHADER_CREATE_END()
 
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_opaque_hair)
 ADDITIONAL_INFO(eevee_legacy_surface_lib_hair)
 ADDITIONAL_INFO(eevee_legacy_material_prepass_frag_opaque_common)
 ADDITIONAL_INFO(draw_hair)
-FRAGMENT_OUT(1, VEC2, out_normal);
+FRAGMENT_OUT(2, VEC2, out_normal);
 GPU_SHADER_CREATE_END()
 
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_opaque_pointcloud)
 ADDITIONAL_INFO(eevee_legacy_material_prepass_frag_opaque_common)
 ADDITIONAL_INFO(draw_pointcloud)
-FRAGMENT_OUT(1, VEC2, out_normal);
+FRAGMENT_OUT(2, VEC2, out_normal);
 GPU_SHADER_CREATE_END()
 
 /* Common info for all `prepass_frag_alpha_hash` variants. */
@@ -189,21 +189,21 @@ GPU_SHADER_CREATE_END()
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_alpha_hash)
 ADDITIONAL_INFO(eevee_legacy_surface_lib_common)
 ADDITIONAL_INFO(eevee_legacy_material_prepass_frag_alpha_hash_common)
-FRAGMENT_OUT(1, VEC2, out_normal);
+FRAGMENT_OUT(2, VEC2, out_normal);
 GPU_SHADER_CREATE_END()
 
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_alpha_hash_hair)
 ADDITIONAL_INFO(eevee_legacy_surface_lib_hair)
 ADDITIONAL_INFO(eevee_legacy_material_prepass_frag_alpha_hash_common)
 ADDITIONAL_INFO(draw_hair)
-FRAGMENT_OUT(1, VEC2, out_normal);
+FRAGMENT_OUT(2, VEC2, out_normal);
 GPU_SHADER_CREATE_END()
 
 GPU_SHADER_CREATE_INFO(eevee_legacy_material_prepass_frag_alpha_hash_pointcloud)
 ADDITIONAL_INFO(eevee_legacy_surface_lib_pointcloud)
 ADDITIONAL_INFO(eevee_legacy_material_prepass_frag_alpha_hash_common)
 ADDITIONAL_INFO(draw_pointcloud)
-FRAGMENT_OUT(1, VEC2, out_normal);
+FRAGMENT_OUT(2, VEC2, out_normal);
 GPU_SHADER_CREATE_END()
 
 /* Shadow Variants (Same as prepass but NO Normal Output) */
diff --git a/source/blender/draw/engines/gooengine/shaders/prepass_frag.glsl b/source/blender/draw/engines/gooengine/shaders/prepass_frag.glsl
index 3f7cbcfd771..b146c6eeb89 100644
--- a/source/blender/draw/engines/gooengine/shaders/prepass_frag.glsl
+++ b/source/blender/draw/engines/gooengine/shaders/prepass_frag.glsl
@@ -92,7 +92,7 @@ void main()
   }
 #endif
 
-  /* resource_id_out = resource_id; */
+  resource_id_out = resource_id;
   /* GooEngine Fix: Output Normal to RG16 buffer (Loc 1).
    * Use viewNormal from vertex shader interface, which is always initialized.
    * g_data.N is only initialized when USE_ALPHA_HASH is defined. */