sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix windows / msvc build error.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-06-01 02:28:57 +00:00
parent f47cb7e2d9
commit 4f056d1be7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/device/device_opencl.cpp
View File

@ -250,28 +250,28 @@ public:
static cl_context get_context(cl_platform_id platform, cl_device_id device, static cl_context get_context(cl_platform_id platform, cl_device_id device,
thread_scoped_lock &slot_locker) thread_scoped_lock &slot_locker)
{ {
return get_something(platform, device, &Slot::context, clRetainContext, slot_locker); return get_something<cl_context>(platform, device, &Slot::context, clRetainContext, slot_locker);
} }
/* see get_something comment */ /* see get_something comment */
static cl_program get_program(cl_platform_id platform, cl_device_id device, static cl_program get_program(cl_platform_id platform, cl_device_id device,
thread_scoped_lock &slot_locker) thread_scoped_lock &slot_locker)
{ {
return get_something(platform, device, &Slot::program, clRetainProgram, slot_locker); return get_something<cl_program>(platform, device, &Slot::program, clRetainProgram, slot_locker);
} }
/* see store_something comment */ /* see store_something comment */
static void store_context(cl_platform_id platform, cl_device_id device, cl_context context, static void store_context(cl_platform_id platform, cl_device_id device, cl_context context,
thread_scoped_lock &slot_locker) thread_scoped_lock &slot_locker)
{ {
store_something(platform, device, context, &Slot::context, clRetainContext, slot_locker); store_something<cl_context>(platform, device, context, &Slot::context, clRetainContext, slot_locker);
} }
/* see store_something comment */ /* see store_something comment */
static void store_program(cl_platform_id platform, cl_device_id device, cl_program program, static void store_program(cl_platform_id platform, cl_device_id device, cl_program program,
thread_scoped_lock &slot_locker) thread_scoped_lock &slot_locker)
{ {
store_something(platform, device, program, &Slot::program, clRetainProgram, slot_locker); store_something<cl_program>(platform, device, program, &Slot::program, clRetainProgram, slot_locker);
} }
/* discard all cached contexts and programs /* discard all cached contexts and programs