diff options
| author | der richter <der.richter@gmx.de> | 2024-02-20 21:24:54 +0100 |
|---|---|---|
| committer | der richter <der.richter@gmx.de> | 2024-02-21 20:46:53 +0100 |
| commit | d954646d29bfb7110253ea40d6ff853971425de0 (patch) | |
| tree | 106e962ba203849983e1efc2903a825997712345 /video/out | |
| parent | d6fdc0ae746ce3304f47349ae1df2b1f089155aa (diff) | |
| download | mpv-d954646d29bfb7110253ea40d6ff853971425de0.tar.bz2 mpv-d954646d29bfb7110253ea40d6ff853971425de0.tar.xz | |
various: make mentions of macOS consistent
change all mentions and variations of OSX, OS X, MacOSX, MacOS X, etc
consistent. use the official naming macOS.
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/gpu/ra.h | 4 | ||||
| -rw-r--r-- | video/out/opengl/common.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/context_glx.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/formats.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/video/out/gpu/ra.h b/video/out/gpu/ra.h index 5f229f8bd6..c0c58ac679 100644 --- a/video/out/gpu/ra.h +++ b/video/out/gpu/ra.h @@ -143,8 +143,8 @@ struct ra_tex_params { // be true depends on ra_format.linear_filter) bool src_repeat; // if false, clamp texture coordinates to edge // if true, repeat texture coordinates - bool non_normalized; // hack for GL_TEXTURE_RECTANGLE OSX idiocy - // always set to false, except in OSX code + bool non_normalized; // hack for GL_TEXTURE_RECTANGLE macOS idiocy + // always set to false, except in macOS code bool external_oes; // hack for GL_TEXTURE_EXTERNAL_OES idiocy // If non-NULL, the texture will be created with these contents. Using // this does *not* require setting host_mutable. Otherwise, the initial diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c index ee2650867c..e3fc1ba032 100644 --- a/video/out/opengl/common.c +++ b/video/out/opengl/common.c @@ -398,7 +398,7 @@ static const struct gl_functions gl_functions[] = { .provides = MPGL_CAP_NESTED_ARRAY, }, // Swap control, always an OS specific extension - // The OSX code loads this manually. + // The macOS code loads this manually. { .extension = "GLX_SGI_swap_control", .functions = (const struct gl_function[]) { diff --git a/video/out/opengl/context_glx.c b/video/out/opengl/context_glx.c index 40622245e6..a2a63e137a 100644 --- a/video/out/opengl/context_glx.c +++ b/video/out/opengl/context_glx.c @@ -25,7 +25,7 @@ #define GLX_CONTEXT_FLAGS_ARB 0x2094 #define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 #ifndef __APPLE__ -// These are respectively 0x00000001 and 0x00000002 on OSX +// These are respectively 0x00000001 and 0x00000002 on macOS #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 #endif diff --git a/video/out/opengl/formats.c b/video/out/opengl/formats.c index a0b79e269d..dd0e89d54d 100644 --- a/video/out/opengl/formats.c +++ b/video/out/opengl/formats.c @@ -94,7 +94,7 @@ const struct gl_format gl_formats[] = { // Special formats. {"rgb565", GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, F_TF | F_GL2 | F_GL3}, - // Worthless, but needed by OSX videotoolbox interop on old Apple hardware. + // Worthless, but needed by macOS videotoolbox interop on old Apple hardware. {"appleyp", GL_RGB, GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, F_TF | F_APPL}, |