diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_ContextCGL.h | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_ContextCGL.mm | 10 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Window.h | 4 | ||||
-rw-r--r-- | intern/mikktspace/mikk_util.hh | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/intern/ghost/intern/GHOST_ContextCGL.h b/intern/ghost/intern/GHOST_ContextCGL.h index 5caabb8ce00..130b926f25c 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.h +++ b/intern/ghost/intern/GHOST_ContextCGL.h @@ -93,7 +93,7 @@ class GHOST_ContextCGL : public GHOST_Context { /** * Returns a texture that Metal code can use as a render target. The current - * contents of this texture will be composited on top of the framebuffer + * contents of this texture will be composited on top of the frame-buffer * each time `swapBuffers` is called. */ id<MTLTexture> metalOverlayTexture(); @@ -134,7 +134,7 @@ class GHOST_ContextCGL : public GHOST_Context { /** The virtualized default frame-buffer. */ unsigned int m_defaultFramebuffer; - /** The virtualized default framebuffer's texture */ + /** The virtualized default frame-buffer's texture. */ /** * Texture that you can render into with Metal. The texture will be * composited on top of `m_defaultFramebufferMetalTexture` whenever diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index 6a0fed79fb0..ff53ecdbbba 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -57,7 +57,7 @@ GHOST_ContextCGL::GHOST_ContextCGL(bool stereoVisual, m_defaultFramebuffer(0), m_debug(false) { - /* Init Metal Swapchain. */ + /* Initialize Metal Swap-chain. */ current_swapchain_index = 0; for (int i = 0; i < METAL_SWAPCHAIN_SIZE; i++) { m_defaultFramebufferMetalTexture[i].texture = nil; @@ -94,7 +94,7 @@ GHOST_ContextCGL::GHOST_ContextCGL(bool stereoVisual, } } - /* Initialise swapinterval. */ + /* Initialize swap-interval. */ mtl_SwapInterval = 60; } @@ -302,7 +302,7 @@ GHOST_TSuccess GHOST_ContextCGL::updateDrawingContext() id<MTLTexture> GHOST_ContextCGL::metalOverlayTexture() { - /* Increment Swapchain - Only needed if context is requesting a new texture */ + /* Increment Swap-chain - Only needed if context is requesting a new texture */ current_swapchain_index = (current_swapchain_index + 1) % METAL_SWAPCHAIN_SIZE; /* Ensure backing texture is ready for current swapchain index */ @@ -409,7 +409,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext() pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:&attribs[0]]; if (pixelFormat == nil) { /* If pixel format creation fails when testing increased sampler limit, - * attempt intialisation again with feature disabled, otherwise, fail. */ + * attempt initialization again with feature disabled, otherwise, fail. */ if (increasedSamplerLimit) { increasedSamplerLimit = false; continue; @@ -594,7 +594,7 @@ void GHOST_ContextCGL::metalInit() } /* Create a render pipeline to composite things rendered with Metal on top - * of the framebuffer contents. Uses the same vertex and fragment shader + * of the frame-buffer contents. Uses the same vertex and fragment shader * as the blit above, but with alpha blending enabled. */ desc.label = @"Metal Overlay"; desc.colorAttachments[0].blendingEnabled = YES; diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index 8e1f73d3430..1c0991bba30 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -258,8 +258,8 @@ class GHOST_Window : public GHOST_IWindow { GHOST_Context *getContext(); /** - * Gets the OpenGL framebuffer associated with the window's contents. - * \return The ID of an OpenGL framebuffer object. + * Gets the OpenGL frame-buffer associated with the window's contents. + * \return The ID of an OpenGL frame-buffer object. */ virtual unsigned int getDefaultFramebuffer() override; diff --git a/intern/mikktspace/mikk_util.hh b/intern/mikktspace/mikk_util.hh index 857ca95910b..4064d2af617 100644 --- a/intern/mikktspace/mikk_util.hh +++ b/intern/mikktspace/mikk_util.hh @@ -139,8 +139,8 @@ void radixsort(std::vector<T> &data, std::vector<T> &data2, KeyGetter getKey) static void float_add_atomic(float *val, float add) { - /* Hacky, but atomic floats are only supported from C++20 onwards. - * This works in practise since std::atomic<uint32_t> is really just an uint32_t in memory, + /* Hacky, but atomic floats are only supported from C++20 onward. + * This works in practice since `std::atomic<uint32_t>` is really just an `uint32_t` in memory, * so this cast lets us do a 32-bit CAS operation (which is used to build the atomic float * operation) without needing any external libraries or compiler-specific builtins. */ std::atomic<uint32_t> *atomic_val = reinterpret_cast<std::atomic<uint32_t> *>(val); |