@@ -1684,25 +1684,25 @@ Context& initializeContextFromGL()
1684
1684
if (status != CL_SUCCESS)
1685
1685
continue ;
1686
1686
1687
- std::string stdDevString (extensions);
1687
+ std::string devString (extensions);
1688
1688
free (extensions);
1689
1689
1690
1690
1691
- size_t szOldPos = 0 ;
1692
- size_t szSpacePos = stdDevString .find (' ' , szOldPos ); // extensions string is space delimited
1693
- while (szSpacePos != stdDevString .npos ) {
1691
+ size_t oldPos = 0 ;
1692
+ size_t spacePos = devString .find (' ' , oldPos ); // extensions string is space delimited
1693
+ while (spacePos != devString .npos ) {
1694
1694
if (strcmp (GL_SHARING_EXTENSION,
1695
- stdDevString .substr (szOldPos, szSpacePos - szOldPos ).c_str ())
1695
+ devString .substr (oldPos, spacePos - oldPos ).c_str ())
1696
1696
== 0 ) {
1697
1697
// Device supports context sharing with OpenGL
1698
1698
devUsed = i;
1699
1699
sharingSupported = true ;
1700
1700
break ;
1701
1701
}
1702
1702
do {
1703
- szOldPos = szSpacePos + 1 ;
1704
- szSpacePos = stdDevString .find (' ' , szOldPos );
1705
- } while (szSpacePos == szOldPos );
1703
+ oldPos = spacePos + 1 ;
1704
+ spacePos = devString .find (' ' , oldPos );
1705
+ } while (spacePos == oldPos );
1706
1706
}
1707
1707
}
1708
1708
}
@@ -1713,11 +1713,11 @@ Context& initializeContextFromGL()
1713
1713
1714
1714
// Define OS-specific context properties and create the OpenCL context
1715
1715
#if defined (__APPLE__)
1716
- CGLContextObj kCGLContext = CGLGetCurrentContext ();
1717
- CGLShareGroupObj kCGLShareGroup = CGLGetShareGroup (kCGLContext );
1716
+ CGLContextObj cglContext = CGLGetCurrentContext ();
1717
+ CGLShareGroupObj cglShareGroup = CGLGetShareGroup (cglContext );
1718
1718
cl_context_properties props[] =
1719
1719
{
1720
- CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE, (cl_context_properties)kCGLShareGroup ,
1720
+ CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE, (cl_context_properties)cglShareGroup ,
1721
1721
0
1722
1722
};
1723
1723
context = clCreateContext (props, 0 ,0 , NULL , NULL , &ciErrNum);
0 commit comments