From 608ed04cc1500cb4c91356282955d13f2e89e95c Mon Sep 17 00:00:00 2001 From: Harri Nieminen Date: Mon, 24 Apr 2023 14:32:29 +0300 Subject: [PATCH] glx: fix typos Reviewed-by: Adam Jackson Part-of: --- src/glx/apple/appledri.h | 2 +- src/glx/clientinfo.c | 2 +- src/glx/dri2_glx.c | 2 +- src/glx/glxclient.h | 4 ++-- src/glx/glxcmds.c | 6 +++--- src/glx/glxconfig.c | 2 +- src/glx/glxext.c | 2 +- src/glx/indirect_vertex_array.c | 10 +++++----- src/glx/indirect_vertex_array_priv.h | 4 ++-- src/glx/pixel.c | 2 +- src/glx/tests/indirect_api.cpp | 4 ++-- src/glx/tests/query_renderer_implementation_unittest.cpp | 4 ++-- src/glx/windows/xwindowsdri.h | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/glx/apple/appledri.h b/src/glx/apple/appledri.h index 0108378..8a192cb 100644 --- a/src/glx/apple/appledri.h +++ b/src/glx/apple/appledri.h @@ -76,7 +76,7 @@ typedef struct { int type; /* of event */ unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came frome a SendEvent request */ + Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* window of event */ Time time; /* server timestamp when event happened */ diff --git a/src/glx/clientinfo.c b/src/glx/clientinfo.c index 31c62ad..6e02be8 100644 --- a/src/glx/clientinfo.c +++ b/src/glx/clientinfo.c @@ -157,7 +157,7 @@ glxSendClientInfo(struct glx_display *glx_dpy, int screen) c = XGetXCBConnection(glx_dpy->dpy); - /* Depending on the GLX verion and the available extensions on the server, + /* Depending on the GLX version and the available extensions on the server, * send the correct "flavor" of protocol to the server. * * THE ORDER IS IMPORTANT. We want to send the most recent version of the diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 633b0ba..97543b7 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -812,7 +812,7 @@ driIsThreadSafe(void *loaderPrivate) /* Check Xlib is running in thread safe mode * * 'lock_fns' is the XLockDisplay function pointer of the X11 display 'dpy'. - * It wll be NULL if XInitThreads wasn't called. + * It will be NULL if XInitThreads wasn't called. */ return pcp->psc->dpy->lock_fns != NULL; } diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index ead33c3..9571fe7 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -239,7 +239,7 @@ struct glx_context * in the buffer to be filled. \c limit is described above in the buffer * slop discussion. * - * Commands that require large amounts of data to be transfered will + * Commands that require large amounts of data to be transferred will * also use this buffer to hold a header that describes the large * command. * @@ -438,7 +438,7 @@ glx_context_init(struct glx_context *gc, /** * This implementation uses a smaller threshold for switching - * to the RenderLarge protocol than the protcol requires so that + * to the RenderLarge protocol than the protocol requires so that * large copies don't occur. */ #define __GLX_RENDER_CMD_SIZE_LIMIT 4096 diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 720cff0..21537b7 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -892,9 +892,9 @@ fbconfigs_compatible(const struct glx_config * const a, } -/* There's some trickly language in the GLX spec about how this is supposed +/* There's some tricky language in the GLX spec about how this is supposed * to work. Basically, if a given component size is either not specified - * or the requested size is zero, it is supposed to act like PERFER_SMALLER. + * or the requested size is zero, it is supposed to act like PREFER_SMALLER. * Well, that's really hard to do with the code as-is. This behavior is * closer to correct, but still not technically right. */ @@ -1893,7 +1893,7 @@ __glxGetMscRate(struct glx_screen *psc, * \param dpy Display whose refresh rate is to be determined. * \param drawable Drawable whose refresh rate is to be determined. * \param numerator Numerator of the refresh rate. - * \param demoninator Denominator of the refresh rate. + * \param denominator Denominator of the refresh rate. * \return If the refresh rate for the specified display and drawable could * be calculated, True is returned. Otherwise False is returned. * diff --git a/src/glx/glxconfig.c b/src/glx/glxconfig.c index e67d5fa..6f9670b 100644 --- a/src/glx/glxconfig.c +++ b/src/glx/glxconfig.c @@ -215,7 +215,7 @@ glx_config_get(struct glx_config * mode, int attribute, int *value_return) * * \param count Number of structures to allocate. * \returns A pointer to the first element in a linked list of \c count - * stuctures on success, or \c NULL on failure. + * structures on success, or \c NULL on failure. */ _X_HIDDEN struct glx_config * glx_config_create_list(unsigned count) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index b0c51ca..4567a5c 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -938,7 +938,7 @@ __glXInitialize(Display * dpy) glxSendClientInfo(dpyPriv, -1); - /* Grab the lock again and add the dispay private, unless somebody + /* Grab the lock again and add the display private, unless somebody * beat us to initializing on this display in the meantime. */ _XLockMutex(_Xglobal_lock); diff --git a/src/glx/indirect_vertex_array.c b/src/glx/indirect_vertex_array.c index 9a14afa..a14f8b4 100644 --- a/src/glx/indirect_vertex_array.c +++ b/src/glx/indirect_vertex_array.c @@ -60,7 +60,7 @@ * This is the GL 1.1 DrawArrays protocol. The only difference between GL * 1.1 and EXT_vertex_arrays is the opcode used for the DrawArrays command. * This protocol is called "old" because the ARB is in the process of - * defining a new protocol, which will probably be called wither "new" or + * defining a new protocol, which will probably be called either "new" or * "vbo", to support multiple texture coordinate arrays, generic attributes, * and vertex buffer objects. * @@ -518,7 +518,7 @@ fill_array_info_cache(struct array_state_vector *arrays) /** * Emit a \c glDrawArrays command using the "none" protocol. That is, - * emit immediate-mode commands that are equivalent to the requiested + * emit immediate-mode commands that are equivalent to the requested * \c glDrawArrays command. This is used with servers that don't support * the OpenGL 1.1 / EXT_vertex_arrays DrawArrays protocol or in cases where * vertex state is enabled that is not compatible with that protocol. @@ -632,13 +632,13 @@ emit_DrawArrays_header_old(struct glx_context * gc, /* Calculate the number of data packets that will be required to send - * the whole command. To do this, the number of verticies that + * the whole command. To do this, the number of vertices that * will fit in a single buffer must be calculated. * * The important value here is elements_per_request. This is the * number of complete array elements that will fit in a single * buffer. There may be some wasted space at the end of the buffer, - * but splitting elements across buffer boundries would be painful. + * but splitting elements across buffer boundaries would be painful. */ elements_per_request[0] = maxSize / single_vertex_size; @@ -1793,7 +1793,7 @@ __glXSetArrayEnable(__GLXattribute * state, GLenum key, unsigned index, struct array_state *a; - /* Texture coordinate arrays have an implict index set when the + /* Texture coordinate arrays have an implicit index set when the * application calls glClientActiveTexture. */ if (key == GL_TEXTURE_COORD_ARRAY) { diff --git a/src/glx/indirect_vertex_array_priv.h b/src/glx/indirect_vertex_array_priv.h index 488dacb..7554d49 100644 --- a/src/glx/indirect_vertex_array_priv.h +++ b/src/glx/indirect_vertex_array_priv.h @@ -121,7 +121,7 @@ struct array_state /** - * Array state that is pushed / poped by \c glPushClientAttrib and + * Array state that is pushed / popped by \c glPushClientAttrib and * \c glPopClientAttrib. */ struct array_stack_state @@ -221,7 +221,7 @@ struct array_state_vector /** * Is the cache of ARRAY_INFO data valid? The cache can become invalid - * when one of several state changes occur. Among these chages are + * when one of several state changes occur. Among these changes are * modifying the array settings for an enabled array and enabling / * disabling an array. */ diff --git a/src/glx/pixel.c b/src/glx/pixel.c index 6766ccf..237a42c 100644 --- a/src/glx/pixel.c +++ b/src/glx/pixel.c @@ -53,7 +53,7 @@ static const GLubyte HighBitsMask[9] = { /* ** Copy bitmap data from clients packed memory applying unpacking modes as the -** data is transfered into the destImage buffer. Return in modes the +** data is transferred into the destImage buffer. Return in modes the ** set of pixel modes that are to be done by the server. */ static void diff --git a/src/glx/tests/indirect_api.cpp b/src/glx/tests/indirect_api.cpp index f3bc792..0a1d12a 100644 --- a/src/glx/tests/indirect_api.cpp +++ b/src/glx/tests/indirect_api.cpp @@ -25,7 +25,7 @@ * \file indirect_api.cpp * Validate the generated code in indirect_init.c * - * Tests various apsects of the dispatch table generated by + * Tests various aspects of the dispatch table generated by * \c __glXNewIndirectAPI. * * * No entry in the table should be \c NULL. @@ -751,7 +751,7 @@ TEST_F(IndirectAPI, NoNullEntries) { const unsigned entries = _glapi_get_dispatch_table_size(); - /* There should not be any NULL entries in the dispatch table. All entires + /* There should not be any NULL entries in the dispatch table. All entries * should either point to a real implementation or to a no-op function. */ for (unsigned i = 0; i < entries; i++) { diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp index c4bc170..0b5a57e 100644 --- a/src/glx/tests/query_renderer_implementation_unittest.cpp +++ b/src/glx/tests/query_renderer_implementation_unittest.cpp @@ -191,7 +191,7 @@ TEST_F(dri2_query_renderer_string_test, DRI2_RENDERER_QUERY_not_supported) * for each GLX attribute value. * * \note - * This test does \b not perform any checking for invalid GLX attribte values. + * This test does \b not perform any checking for invalid GLX attribute values. * Other unit tests verify that invalid values are filtered before * dri2_query_renderer_string is called. */ @@ -256,7 +256,7 @@ TEST_F(dri2_query_renderer_integer_test, DRI2_RENDERER_QUERY_not_supported) * for each GLX attribute value. * * \note - * This test does \b not perform any checking for invalid GLX attribte values. + * This test does \b not perform any checking for invalid GLX attribute values. * Other unit tests verify that invalid values are filtered before * dri2_query_renderer_integer is called. */ diff --git a/src/glx/windows/xwindowsdri.h b/src/glx/windows/xwindowsdri.h index 499af26de..406172c 100644 --- a/src/glx/windows/xwindowsdri.h +++ b/src/glx/windows/xwindowsdri.h @@ -31,7 +31,7 @@ typedef struct { int type; /* of event */ unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came frome a SendEvent request */ + Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* window of event */ Time time; /* server timestamp when event happened */ -- 2.7.4