diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index db02cdf2e99..addb07fad5b 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -141,6 +141,7 @@ void ShaderCreateInfo::finalize()
       depth_write_ = info.depth_write_;
     }
 
+    /* Inherit builtin bits from additional info. */
     builtins_ |= info.builtins_;
 
     validate_merge(info);
@@ -179,9 +180,6 @@ void ShaderCreateInfo::finalize()
       assert_no_overlap(compute_source_.is_empty(), "Compute source already existing");
       compute_source_ = info.compute_source_;
     }
-
-    /* Inherit builtin bits from additional info. */
-    builtins_ |= info.builtins_;
   }
 
   if (auto_resource_location_) {