griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compiler warning about undefined OSL_LIBRARY_VERSION_CODE

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/111048
This commit is contained in:
Brecht Van Lommel
2023-08-11 14:55:40 +02:00
committed by Brecht Van Lommel
parent d5c7608b39
commit c5bd71b375
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/kernel/osl/types.h
View File

@@ -4,15 +4,17 @@
#pragma once
#if !defined(__KERNEL_GPU__)
# include <OSL/oslconfig.h>
#endif
CCL_NAMESPACE_BEGIN
#if defined(__KERNEL_GPU__)
/* Strings are represented by their hashes on the GPU. */
typedef size_t DeviceString;
#elif defined(OPENIMAGEIO_USTRING_H)
typedef ustring DeviceString;
#else
typedef const char *DeviceString;
typedef OSL::ustring DeviceString;
#endif
ccl_device_inline DeviceString make_string(const char *str, size_t hash)
@@ -20,12 +22,9 @@ ccl_device_inline DeviceString make_string(const char *str, size_t hash)
#if defined(__KERNEL_GPU__)
(void)str;
return hash;
#elif defined(OPENIMAGEIO_USTRING_H)
(void)hash;
return ustring(str);
#else
(void)hash;
return str;
return OSL::ustring(str);
#endif
}