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

Cycles: Split OSLManager out of OSLShaderManager

Browse Source 
This is preparation for #129495.

Currently, all of OSL is managed by the OSLShaderManager. This makes it so that the general OSL setup is handled by a general OSLManager, and both the OSLShaderManager and (in the future) the Camera can use it to manage their scripts.

Pull Request: https://projects.blender.org/blender/blender/pulls/135050
This commit is contained in:
Lukas Stockner
2025-03-04 17:27:10 +01:00
parent a308bfca69
commit 39a6c222b2
11 changed files with 380 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/blender/python.cpp
View File

@@ -26,9 +26,9 @@
#include "GPU_state.hh"
#ifdef WITH_OSL
# include "scene/osl.h"
#include "scene/osl.h"
#ifdef WITH_OSL
# include <OSL/oslconfig.h>
# include <OSL/oslquery.h>
#endif
@@ -152,7 +152,8 @@ static PyObject *exit_func(PyObject * /*self*/, PyObject * /*args*/)
device_metal_exit();
#endif
ShaderManager::free_memory();
ColorSpaceManager::free_memory();
OSLManager::free_memory();
TaskScheduler::free_memory();
Device::free_memory();
Py_RETURN_NONE;
@@ -495,7 +496,7 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
/* query from file path */
OSL::OSLQuery query;
if (!OSLShaderManager::osl_query(query, filepath)) {
if (!OSLManager::osl_query(query, filepath)) {
Py_RETURN_FALSE;
}
@@ -722,7 +723,7 @@ static PyObject *osl_compile_func(PyObject * /*self*/, PyObject *args)
}
/* return */
if (!OSLShaderManager::osl_compile(inputfile, outputfile)) {
if (!OSLManager::osl_compile(inputfile, outputfile)) {
Py_RETURN_FALSE;
}