Skip to content

Commit e4a15fc

Browse files
committed
Fix issues with ktxLoadOpenGL documentation.
1 parent b35a478 commit e4a15fc

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

lib/gl_funcs.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,14 @@ ktxLoadOpenGLLibrary(void)
192192
}
193193

194194
/**
195+
* @ingroup ktx\_glloader
195196
* @~English
196-
* @brief Load pointers for the GL functions used by ktxTexture_GLUpload.
197+
* @brief Load pointers for the GL functions used by the ktxTexture\*\_GLUpload functions.
197198
*
198-
* Should be called by an application before its first call to
199-
* ktxTexture\_GLUpload, passing a pointer to the GLGetProcAddress function
199+
* Should be called by an application before its first call to a
200+
* ktxTexture\*\_GLUpload function, passing a pointer to the GLGetProcAddress function
200201
* provided by whatever OpenGL framework it is using. For backward
201-
* compatibility, ktxTexture\_GLUpload calls this with a NULL pointer causing an
202+
* compatibility, the ktxTexture\*\_GLUpload functions call this with a NULL pointer causing an
202203
* attempt to load the pointers from the program module using
203204
* @c dlsym (GNU/Linux, macOS), @c wglGetProcAddr and @c GetProcAddr (Windows)
204205
* or @c emscripten_GetProcAddress (Web). This works with the vast majority of
@@ -211,7 +212,7 @@ ktxLoadOpenGLLibrary(void)
211212
* attempted using system dependent generic
212213
* functions.
213214
*/
214-
KTX_API ktx_error_code_e KTX_APIENTRY
215+
ktx_error_code_e
215216
ktxLoadOpenGL(PFNGLGETPROCADDRESS pfnGLGetProcAddress)
216217
{
217218
if (openGLLoaded)

lib/glloader.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ ktxTexture2_GLUpload(ktxTexture2* This, GLuint* pTexture, GLenum* pTarget,
10591059
/**
10601060
* @memberof ktxTexture
10611061
* @~English
1062-
* @brief Create a GL texture object from a ktxTexture1 object.
1062+
* @brief Create a GL texture object from a ktxTexture object.
10631063
*
10641064
* In order to ensure that the GL uploader is not linked into an application unless explicitly called,
10651065
* this is not a virtual function. It determines the texture type then dispatches to the correct function.

0 commit comments

Comments
 (0)