From f41a0d5ab9a8159f1896eaf0ad62172289e24c64 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Tue, 19 Aug 2025 13:22:07 +0200
Subject: [PATCH] Fix: Cycles OptiX + OSL fails to render images with OSL
 releases

It works with the beta we are using to build Blender 4.5, but the official
release is a bit different. This fix was tested to work with OSL 1.14.7.

Thanks to Paul Zander for finding the OSL commit that lead to this.

Pull Request: https://projects.blender.org/blender/blender/pulls/144715
---
 intern/cycles/kernel/osl/services_gpu.h | 118 ++++++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/intern/cycles/kernel/osl/services_gpu.h b/intern/cycles/kernel/osl/services_gpu.h
index 8ac3cc41c81..a3e716beb4b 100644
--- a/intern/cycles/kernel/osl/services_gpu.h
+++ b/intern/cycles/kernel/osl/services_gpu.h
@@ -1207,3 +1207,121 @@ ccl_device_extern bool rs_trace_get(ccl_private ShaderGlobals *sg,
 {
   return false;
 }
+
+/* These osl_ functions are supposed to be implemented by OSL itself, but they are not yet.
+ * See: https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1951
+ * So we have to keep them around for now.
+ *
+ * The 1.14.4 based beta used for Blender 4.5 does not need them though, so we check the
+ * version for that. */
+#if (OSL_LIBRARY_VERSION_CODE >= 11405) || (OSL_LIBRARY_VERSION_CODE < 11403)
+ccl_device_extern void osl_texture_set_firstchannel(ccl_private OSLTextureOptions *opt,
+                                                    const int firstchannel)
+{
+}
+
+ccl_device_extern int osl_texture_decode_wrapmode(DeviceString name_)
+{
+  return 0;
+}
+
+ccl_device_extern void osl_texture_set_swrap_code(ccl_private OSLTextureOptions *opt,
+                                                  const int mode)
+{
+}
+
+ccl_device_extern void osl_texture_set_twrap_code(ccl_private OSLTextureOptions *opt,
+                                                  const int mode)
+{
+}
+
+ccl_device_extern void osl_texture_set_rwrap_code(ccl_private OSLTextureOptions *opt,
+                                                  const int mode)
+{
+}
+
+ccl_device_extern void osl_texture_set_stwrap_code(ccl_private OSLTextureOptions *opt,
+                                                   const int mode)
+{
+}
+
+ccl_device_extern void osl_texture_set_sblur(ccl_private OSLTextureOptions *opt, const float blur)
+{
+}
+
+ccl_device_extern void osl_texture_set_tblur(ccl_private OSLTextureOptions *opt, const float blur)
+{
+}
+
+ccl_device_extern void osl_texture_set_rblur(ccl_private OSLTextureOptions *opt, const float blur)
+{
+}
+
+ccl_device_extern void osl_texture_set_stblur(ccl_private OSLTextureOptions *opt, const float blur)
+{
+}
+
+ccl_device_extern void osl_texture_set_swidth(ccl_private OSLTextureOptions *opt,
+                                              const float width)
+{
+}
+
+ccl_device_extern void osl_texture_set_twidth(ccl_private OSLTextureOptions *opt,
+                                              const float width)
+{
+}
+
+ccl_device_extern void osl_texture_set_rwidth(ccl_private OSLTextureOptions *opt,
+                                              const float width)
+{
+}
+
+ccl_device_extern void osl_texture_set_stwidth(ccl_private OSLTextureOptions *opt,
+                                               const float width)
+{
+}
+
+ccl_device_extern void osl_texture_set_fill(ccl_private OSLTextureOptions *opt, const float fill)
+{
+}
+
+ccl_device_extern void osl_texture_set_time(ccl_private OSLTextureOptions *opt, const float time)
+{
+}
+
+ccl_device_extern void osl_texture_set_interp_code(ccl_private OSLTextureOptions *opt,
+                                                   const int mode)
+{
+}
+
+ccl_device_extern void osl_texture_set_subimage(ccl_private OSLTextureOptions *opt,
+                                                const int subimage)
+{
+}
+
+ccl_device_extern void osl_texture_set_subimagename(ccl_private OSLTextureOptions *opt,
+                                                    DeviceString subimagename_)
+{
+}
+
+ccl_device_extern void osl_texture_set_missingcolor_arena(ccl_private OSLTextureOptions *opt,
+                                                          ccl_private float3 *color)
+{
+}
+
+ccl_device_extern void osl_texture_set_missingcolor_alpha(ccl_private OSLTextureOptions *opt,
+                                                          const int nchannels,
+                                                          const float alpha)
+{
+}
+
+ccl_device_extern void osl_init_trace_options(ccl_private void *oec, ccl_private void *opt) {}
+
+ccl_device_extern void osl_trace_set_mindist(ccl_private void *opt, float x) {}
+
+ccl_device_extern void osl_trace_set_maxdist(ccl_private void *opt, float x) {}
+
+ccl_device_extern void osl_trace_set_shade(ccl_private void *opt, int x) {}
+
+ccl_device_extern void osl_trace_set_traceset(ccl_private void *opt, const DeviceString x) {}
+#endif