← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to intern/cycles/util/util_opencl.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/cycles/util/util_opencl.cpp
114
114
#endif  //  CLCC_GENERATE_DOCUMENTATION
115
115
 
116
116
 
 
117
#if 0
117
118
//! \brief Unloads OpenCL dynamic library, should not be called directly
118
119
static void clewExit(void)
119
120
{
124
125
                module = NULL;
125
126
        }
126
127
}
 
128
#endif
127
129
 
128
130
//! \param path path to dynamic library to load
129
131
//! \return CLEW_ERROR_OPEN_FAILED if the library could not be opened
138
140
#else
139
141
        const char *path = "libOpenCL.so";
140
142
#endif
141
 
        int error = 0;
142
143
 
143
144
        // OpenCL disabled for now, only works with this environment variable set
144
145
        if(!getenv("CYCLES_OPENCL_TEST"))
159
160
                return 0;
160
161
        }
161
162
 
 
163
        // Disabled because we retain OpenCL context and it's difficult to ensure
 
164
        // this will exit after releasing the context
 
165
#if 0
162
166
        //  Set unloading
163
 
        error = atexit(clewExit);
 
167
        int error = atexit(clewExit);
164
168
 
165
169
        if (error)
166
170
        {
170
174
 
171
175
                return 0;
172
176
        }
 
177
#endif
173
178
 
174
179
        //  Determine function entry-points
175
180
        __clewGetPlatformIDs                = (PFNCLGETPLATFORMIDS              )CLCC_DYNLIB_IMPORT(module, "clGetPlatformIDs");
328
333
 
329
334
CCL_NAMESPACE_END
330
335
 
 
336
#ifdef CLCC_DYNLIB_CLOSE
 
337
#endif