Fix #108240: Cycles fails on macOS and AMD GPU

The recent light linking commit changed some includes order,
making compilation to fail on platforms where certain features
are disabled.

Pull Request: https://projects.blender.org/blender/blender/pulls/108264

intern/cycles/kernel/integrator/shade_dedicated_light.h

@@ -4,9 +4,12 @@
 #pragma once
 
 #include "kernel/integrator/path_state.h"
-#include "kernel/integrator/shade_surface.h"
+
 #include "kernel/light/distant.h"
 #include "kernel/light/light.h"
+#include "kernel/light/sample.h"
+
+#include "kernel/integrator/shade_surface.h"
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/kernel/integrator/shade_surface.h

@@ -10,6 +10,8 @@
 #include "kernel/film/denoising_passes.h"
 #include "kernel/film/light_passes.h"
 
+#include "kernel/light/sample.h"
+
 #include "kernel/integrator/mnee.h"
 
 #include "kernel/integrator/guiding.h"
@@ -17,8 +19,6 @@
 #include "kernel/integrator/subsurface.h"
 #include "kernel/integrator/volume_stack.h"
 
-#include "kernel/light/sample.h"
-
 CCL_NAMESPACE_BEGIN
 
 ccl_device_forceinline void integrate_surface_shader_setup(KernelGlobals kg,
@@ -286,8 +286,8 @@ ccl_device_forceinline void integrate_surface_direct_light(KernelGlobals kg,
 
   const bool is_transmission = dot(ls.D, sd->N) < 0.0f;
 
-#ifdef __MNEE__
   int mnee_vertex_count = 0;
+#ifdef __MNEE__
   IF_KERNEL_FEATURE(MNEE)
   {
     if (ls.lamp != LAMP_NONE) {