diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-06-10 17:34:41 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-06-15 21:31:02 +0200 |
commit | 9d2cc4dd766ca6538e17040b6ac845ed880ab0fe (patch) | |
tree | a674c1f10c2bb266b2cff88ef3d6d864ed932212 /src/opengl | |
parent | 37bad1f43b33a460f402f16280719d3b49dd7b24 (diff) |
Fix typos in docs and comments
Found by codespell
Pick-to: 6.4
Change-Id: Ie3e301a23830c773a2e9aff487c702a223d246eb
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qopenglengineshadermanager_p.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglframebufferobject_p.h | 4 | ||||
-rw-r--r-- | src/opengl/qopenglpaintengine.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qopengltexture.cpp | 6 | ||||
-rw-r--r-- | src/opengl/qopenglwindow.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/opengl/qopenglengineshadermanager_p.h b/src/opengl/qopenglengineshadermanager_p.h index 8175e4a026..78ad5d54fb 100644 --- a/src/opengl/qopenglengineshadermanager_p.h +++ b/src/opengl/qopenglengineshadermanager_p.h @@ -127,7 +127,7 @@ all color components so it can be defined to colorp or lowp depending upon the implementation. - So there are differnt frament shader main functions, depending on the + So there are different fragment shader main functions, depending on the number & type of pipelines the fragment needs to go through. The choice of which main() fragment shader string to use depends on: diff --git a/src/opengl/qopenglframebufferobject_p.h b/src/opengl/qopenglframebufferobject_p.h index d5614bbc65..d6c95f53de 100644 --- a/src/opengl/qopenglframebufferobject_p.h +++ b/src/opengl/qopenglframebufferobject_p.h @@ -34,8 +34,8 @@ public: { #if !QT_CONFIG(opengles2) // There is nothing that says QOpenGLFramebufferObjectFormat needs a current - // context, so we need a fallback just to be safe, even though in pratice there - // will usually be a context current. + // context, so we need a fallback just to be safe, even though in practice there + // will usually be a current context. QOpenGLContext *ctx = QOpenGLContext::currentContext(); const bool isES = ctx ? ctx->isOpenGLES() : QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL; internal_format = isES ? GL_RGBA : GL_RGBA8; diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp index 1d9afc5191..2556881e12 100644 --- a/src/opengl/qopenglpaintengine.cpp +++ b/src/opengl/qopenglpaintengine.cpp @@ -151,7 +151,7 @@ void QOpenGL2PaintEngineExPrivate::useSimpleShader() \note Any code or Qt API that internally activates or binds will not affect the cache used by this function, which means they will - lead to inconsisent state. QPainter::beginNativePainting() takes + lead to inconsistent state. QPainter::beginNativePainting() takes care of resetting the cache, so for user–code this is fine, but internally in the paint engine care must be taken to not call functions that may activate or bind under our feet. diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp index cf8b751648..8dc30cca61 100644 --- a/src/opengl/qopengltexture.cpp +++ b/src/opengl/qopengltexture.cpp @@ -3253,7 +3253,7 @@ bool QOpenGLTexture::isFixedSamplePositions() const create the mutable storage. You can use the other allocateStorage() overload to specify exactly the pixel format and the pixel type to use when allocating mutable storage; - this is particulary useful under certain OpenGL ES implementations + this is particularly useful under certain OpenGL ES implementations (notably, OpenGL ES 2), where the pixel format and the pixel type used at allocation time must perfectly match the format and the type passed to any subsequent setData() call. @@ -3318,7 +3318,7 @@ bool QOpenGLTexture::isStorageAllocated() const Attempts to create a texture view onto this texture. A texture view is somewhat analogous to a view in SQL in that it presents a restricted or reinterpreted view of the original data. Texture - views do not allocate any more server-side storage, insted relying + views do not allocate any more server-side storage, instead relying on the storage buffer of the source texture. Texture views are only available when using immutable storage. For @@ -4421,7 +4421,7 @@ float QOpenGLTexture::maximumAnisotropy() const } /*! - Sets the wrap (or repeat mode) for all texture dimentions to \a mode. + Sets the wrap (or repeat mode) for all texture dimensions to \a mode. \sa wrapMode() */ diff --git a/src/opengl/qopenglwindow.cpp b/src/opengl/qopenglwindow.cpp index de57cb99c1..4c0e9323fa 100644 --- a/src/opengl/qopenglwindow.cpp +++ b/src/opengl/qopenglwindow.cpp @@ -554,7 +554,7 @@ void QOpenGLWindow::resizeGL(int w, int h) \note When using a partial update behavior, like \c PartialUpdateBlend, the output of the previous paintGL() call is preserved and, after the additional - drawing perfomed in the current invocation of the function, the content is + drawing performed in the current invocation of the function, the content is blitted or blended over the content drawn directly to the window in paintUnderGL(). |