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

Cycles: Remove dynamic library helper files

Browse Source 
They were only needed for CUDA wrangler. Since we've switched to CUEW
this utility functions are no longer needed.
This commit is contained in:
Sergey Sharybin
2014-11-20 18:54:41 +05:00
parent d6579fe7f3
commit d4315398fc
3 changed files with 0 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/util/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ set(INC_SYS
set(SRC
util_cache.cpp
util_dynlib.cpp
util_logging.cpp
util_md5.cpp
util_path.cpp
@@ -34,7 +33,6 @@ set(SRC_HEADERS
util_boundbox.h
util_cache.h
util_debug.h
util_dynlib.h
util_foreach.h
util_function.h
util_half.h

94
intern/cycles/util/util_dynlib.cpp
View File

@@ -1,94 +0,0 @@
/*
* Copyright 2011-2013 Blender Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
#include <stdlib.h>
#include "util_dynlib.h"
#ifdef _WIN32
#include <windows.h>
CCL_NAMESPACE_BEGIN
struct DynamicLibrary {
HMODULE module;
};
DynamicLibrary *dynamic_library_open(const char *name)
{
HMODULE module = LoadLibrary(name);
if(!module)
return NULL;
DynamicLibrary *lib = new DynamicLibrary();
lib->module = module;
return lib;
}
void *dynamic_library_find(DynamicLibrary *lib, const char *name)
{
return (void*)GetProcAddress(lib->module, name);
}
void dynamic_library_close(DynamicLibrary *lib)
{
FreeLibrary(lib->module);
delete lib;
}
CCL_NAMESPACE_END
#else
#include <dlfcn.h>
CCL_NAMESPACE_BEGIN
struct DynamicLibrary {
void *module;
};
DynamicLibrary *dynamic_library_open(const char *name)
{
void *module = dlopen(name, RTLD_NOW);
if(!module)
return NULL;
DynamicLibrary *lib = new DynamicLibrary();
lib->module = module;
return lib;
}
void *dynamic_library_find(DynamicLibrary *lib, const char *name)
{
return dlsym(lib->module, name);
}
void dynamic_library_close(DynamicLibrary *lib)
{
dlclose(lib->module);
delete lib;
}
CCL_NAMESPACE_END
#endif

31
intern/cycles/util/util_dynlib.h
View File

@@ -1,31 +0,0 @@
/*
* Copyright 2011-2013 Blender Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
#ifndef __UTIL_DYNLIB_H__
#define __UTIL_DYNLIB_H__
CCL_NAMESPACE_BEGIN
struct DynamicLibrary;
DynamicLibrary *dynamic_library_open(const char *name);
void *dynamic_library_find(DynamicLibrary *lib, const char *name);
void dynamic_library_close(DynamicLibrary *lib);
CCL_NAMESPACE_END
#endif /* __UTIL_DYNLIB_H__ */