diff options
| author | Jose Fonseca <j_r_fonseca@yahoo.co.uk> | 2003-05-18 21:16:59 +0000 |
|---|---|---|
| committer | Jose Fonseca <j_r_fonseca@yahoo.co.uk> | 2003-05-18 21:16:59 +0000 |
| commit | 8007c1f324ee45b43e323f59d819c0d201f6b7a6 (patch) | |
| tree | 9f9bbdbc7bc504a491443ce7f5486e6f85067feb | |
| parent | ace39eb8cf4640cdad573e5f394a9950aa075f0e (diff) | |
Documentation proof-reading.
66 files changed, 259 insertions, 265 deletions
diff --git a/doxygen/radeondrm.doxy b/doxygen/radeondrm.doxy index 85583df50d..c7a1fa3f73 100644 --- a/doxygen/radeondrm.doxy +++ b/doxygen/radeondrm.doxy @@ -354,7 +354,7 @@ INPUT = ../src/kernel/radeon # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp # *.h++ *.idl *.odl -FILE_PATTERNS = drm.h drmP.h drm_*.h radeon_*.[ch] +FILE_PATTERNS = drm.h drmP.h drm_*.h radeon*.[ch] # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. diff --git a/src/glu/mini/gluP.h b/src/glu/mini/gluP.h index 89df234e5a..0dfdfe3351 100644 --- a/src/glu/mini/gluP.h +++ b/src/glu/mini/gluP.h @@ -1,4 +1,4 @@ -/* $Id: gluP.h,v 1.1.2.1 2003/03/21 13:02:10 keithw Exp $ */ +/* $Id: gluP.h,v 1.1.2.2 2003/05/18 21:17:19 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -85,7 +85,7 @@ # define GLWINAPIV #endif /* WIN32 / CYGWIN bracket */ -/* compatability guard so we don't need to change client code */ +/* compatibility guard so we don't need to change client code */ #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) # define CALLBACK GLCALLBACK diff --git a/src/glu/mini/mipmap.c b/src/glu/mini/mipmap.c index 70986dec9c..bde4c67892 100644 --- a/src/glu/mini/mipmap.c +++ b/src/glu/mini/mipmap.c @@ -1,4 +1,4 @@ -/* $Id: mipmap.c,v 1.1.2.1 2003/03/21 13:02:12 keithw Exp $ */ +/* $Id: mipmap.c,v 1.1.2.2 2003/05/18 21:17:19 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -553,7 +553,7 @@ round2(GLint n) /* - * Given an pixel format and datatype, return the number of bytes to + * Given an pixel format and data type, return the number of bytes to * store one pixel. */ static GLint diff --git a/src/kernel/agpgart/agp.c b/src/kernel/agpgart/agp.c index 7e8d3c8ab6..4531911eb2 100644 --- a/src/kernel/agpgart/agp.c +++ b/src/kernel/agpgart/agp.c @@ -251,7 +251,7 @@ void agp_free_memory(agp_memory * curr) * \param page_count number of pages to allocate. * \param type type of memory to be allocated. Every agp bridge device will * allow you to allocate AGP_NORMAL_MEMORY which maps to physical ram. Any - * other type is device dependant. + * other type is device dependent. * \return pointer to a agp_memory structure on success, or NULL on failure. * * If \p type is not zero then the call is dispatched to the @@ -481,7 +481,7 @@ int agp_unbind_memory(agp_memory * curr) /** * \sa agp_bridge_data::agp_enable. * - * Goes trhough all devices that claim to be AGP devices collecting their data + * Goes through all devices that claim to be AGP devices collecting their data * and disabling impossible settings. Decides the 4X/2X/1X setting and enables * the AGP bridge device. */ @@ -494,7 +494,7 @@ void agp_generic_agp_enable(u32 mode) pci_read_config_dword(agp_bridge.dev, agp_bridge.capndx + 4, &command); /* - * PASS1: go throu all devices that claim to be + * PASS1: go through all devices that claim to be * AGP devices and collect their data. */ @@ -564,7 +564,7 @@ void agp_generic_agp_enable(u32 mode) command); /* - * PASS3: Go throu all AGP devices and update the + * PASS3: Go through all AGP devices and update the * command registers. */ @@ -580,7 +580,7 @@ void agp_generic_agp_enable(u32 mode) * * Determines the GATT size, according to agp_bridge_data::current_size (can't * handle 2 level GATT's) and allocates the table. For the variable apertures, - * tries successive aperture sizes until succeding in allocating the table. + * tries successive aperture sizes until succeeding in allocating the table. * * Marks each page in the table as reserved, and points the entries in the * table to the scratch page. diff --git a/src/kernel/agpgart/frontend.c b/src/kernel/agpgart/frontend.c index 5350bded12..f87651d73d 100644 --- a/src/kernel/agpgart/frontend.c +++ b/src/kernel/agpgart/frontend.c @@ -53,7 +53,7 @@ static struct agp_front_data agp_fe; * \param key allocation tag. * \return pointer to the agp_memory on success or NULL on failure. * - * Walks trhough the agp_controller::pool list until finding a matching key. + * Walks through the agp_controller::pool list until finding a matching key. */ static agp_memory *agp_find_mem_by_key(int key) { @@ -124,7 +124,7 @@ static void agp_remove_from_pool(agp_memory * temp) * \param page_prot memory protection flags . * \return pointer to the segment private data on success or NULL on failure. * - * Walks through every segment in \p client until find one with a macthing + * Walks through every segment in \p client until find one with a matching * offset, size and memory protection flags. */ static agp_segment_priv *agp_find_seg_in_client(const agp_client * client, @@ -658,7 +658,7 @@ static void agp_controller_release_current(agp_controller * controller, * Find a client in a controller with a given process id. * * \param controller controller to search the client on. - * \param id clinet process id. + * \param id client process id. * \return pointer to the client structure on success or NULL otherwise. * * Search the given process id in agp_contoller::clients. @@ -963,7 +963,7 @@ static int agp_release(struct inode *inode, struct file *file) * and sets the client allow flag. If the user or the suid is zero then sets the * <i>controller allow</i> flag too. * - * If there is a client with the current proccess id then set the \e client and + * If there is a client with the current process id then set the \e client and * \e valid flags. * * The AGP lock is held during the function call. @@ -1069,7 +1069,7 @@ static int agpioc_info_wrap(agp_file_private * priv, unsigned long arg) * acquired the device, and acquires it. * * If there is a controller with a given process id the make it current, - * otherwsie create a new controller, insert it, and make it current. Sets the + * otherwise create a new controller, insert it, and make it current. Sets the * controller and valid flags. */ static int agpioc_acquire_wrap(agp_file_private * priv, unsigned long arg) diff --git a/src/kernel/fbdev/radeonfb-2.5/radeonfb.c b/src/kernel/fbdev/radeonfb-2.5/radeonfb.c index d35d4db8f2..880848ac20 100644 --- a/src/kernel/fbdev/radeonfb-2.5/radeonfb.c +++ b/src/kernel/fbdev/radeonfb-2.5/radeonfb.c @@ -1030,7 +1030,7 @@ static int radeon_get_dfpinfo_BIOS(struct radeonfb_info *rinfo) * Get DFP information. * * \param rinfo framebuffer device private data. - * \return non-zero on success, or zero on failure. (Actually is always succesful.) + * \return non-zero on success, or zero on failure. (Actually is always successful.) * * Attempts to get the DFP information, first from the BIOS via * radeon_get_dfpinfo_BIOS(), second from the EDID block via @@ -1577,8 +1577,8 @@ static int radeonfb_blank (int blank, struct fb_info *info) * \param info framebuffer device data. * \return zero on success, or non-zero on failure. * - * Updates the respective palette entry in radeonfb_info::pallete and if not - * asleep updates the pallete entry on the hardware. For bit depths greater or + * Updates the respective palette entry in radeonfb_info::palette and if not + * asleep updates the palette entry on the hardware. For bit depths greater or * equal to 15 updates makes the first 16 colors available to the framebuffer device. */ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green, diff --git a/src/mesa/drivers/dri/mga/mgatexcnv.c b/src/mesa/drivers/dri/mga/mgatexcnv.c index d561df37c5..3a05c7d3eb 100644 --- a/src/mesa/drivers/dri/mga/mgatexcnv.c +++ b/src/mesa/drivers/dri/mga/mgatexcnv.c @@ -38,7 +38,7 @@ /* * mgaConvertTexture - * Converts a mesa format texture to the apropriate hardware format + * Converts a mesa format texture to the appropriate hardware format * Note that sometimes width may be larger than the texture, like 64x1 * for an 8x8 texture. This happens when we have to crutch the pitch * limits of the mga by uploading a block of texels as a single line. diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 147764f5e8..b35c8a5640 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -701,7 +701,7 @@ radeonMakeCurrent( __DRIcontextPrivate *driContextPriv, /** * \brief Unbind context from its buffer. * - * \param driContextPriv DRI specifc context data. + * \param driContextPriv DRI specific context data. * * \returns always GL_TRUE. * @@ -797,7 +797,7 @@ __driRegisterExtensions( void ) * * \param sPriv DRI specific screen data. * - * \return GL_TRUE on success or GL_FALSE on faillure. + * \return GL_TRUE on success or GL_FALSE on failure. * * Calls radeonCreateScreen() and if it fails calls radeonDestroyScreen() * before returning. diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h index 16170e718c..1e38bd8b52 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_context.h @@ -242,7 +242,7 @@ struct radeon_state_atom { GLuint is_tcl; /**< \brief whether is associated with TCL */ int *cmd; /**< \brief one or more command packets */ int *lastcmd; /**< \brief one or more command packets */ - GLboolean (*check)( GLcontext * ); /**< \brief callback to determin whether this state is active */ + GLboolean (*check)( GLcontext * ); /**< \brief callback to determine whether this state is active */ }; @@ -250,7 +250,7 @@ struct radeon_state_atom { * \name Indices for the command packets fields * * \note Trying to keep these relatively short as the variables are becoming - * extravagently long. Drop the RADEON_ off the front of everything - I think + * extravagantly long. Drop the RADEON_ off the front of everything - I think * we know we're in the radeon driver by now, and keep the prefix to 3 letters * unless absolutely impossible. */ @@ -470,7 +470,7 @@ struct radeon_hw_state { * Stored as cmdbuf commands: * - Need to doublebuffer for * - reviving state after loss of context - * - eliding no-op statechange loops? (except line stipple count) + * - eliding no-op state change loops? (except line stipple count) */ /*@{*/ struct radeon_state_atom ctx; @@ -585,7 +585,7 @@ struct radeon_tcl_info { GLuint vertex_format; GLint last_offset; GLuint hw_primitive; - GLuint tcl_flag; /**< \brief Whether TCL is inabled */ + GLuint tcl_flag; /**< \brief Whether TCL is enabled */ struct radeon_dma_region *aos_components[8]; GLuint nr_aos_components; @@ -739,7 +739,7 @@ struct radeon_context { /** * \brief Pack color. * - * \param cpp desired characters (bytes) per pixel. Shouble be either 2 or 4. + * \param cpp desired characters (bytes) per pixel. Should be either 2 or 4. * \param r red color component. * \param g green color component. * \param b blue color component. diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c index 4e5650ac82..3b7a6bf2d6 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c @@ -119,7 +119,7 @@ static void radeon_emit_state_list( radeonContextPtr rmesa, * * Calls radeon_emit_state_list() with the radeon_hw_state::dirty list. * - * If radeon_context::lost_context is set then all state is emited by moving + * If radeon_context::lost_context is set then all state is emitted by moving * everything in radeon_hw_state::dirty prior to the radeon_emit_state_list() * call. * @@ -511,7 +511,7 @@ void radeonRefillCurrentDmaRegion( radeonContextPtr rmesa ) * \brief Release DMA region. * * \param rmesa Radeon context. - * \param region ragion to be released. + * \param region region to be released. * \param caller caller's name for debugging purposes. * * Decreases the region reference count, and if it reaches zero sends the @@ -710,7 +710,7 @@ static void radeonWaitIrq( radeonContextPtr rmesa ) * Waits until the number of processed frames reaches RADEONSAREAPriv::last_frame in the * SAREA. * - * The idea is to only emit IRQ's if the graphics card is the bottleneck -- ie + * The idea is to only emit IRQ's if the graphics card is the bottleneck -- i.e., * only do it if we find that the previous frame hasn't completed. When the * card is the bottlneck one'd like to do something like: * @@ -851,7 +851,7 @@ void radeonCopyBuffer( const __DRIdrawablePrivate *dPriv ) /** * \brief Do page flipping. * - * \param dPriv DRI drawable speficic data. + * \param dPriv DRI drawable specific data. * * Fires the existing vertices and waits for frame completion and vertical * retrace. Sends the DRM_RADEON_FLIP command and updates the value of @@ -944,7 +944,7 @@ void radeonPageFlip( const __DRIdrawablePrivate *dPriv ) * \param ctx GL context. * \param mask buffer clear mask. * \param all whether to clear them all or just a rectangle. - * \param cx clearing rectangle abcissa. + * \param cx clearing rectangle abscissa. * \param cy clearing rectangle ordinate. * \param cw clearing rectangle width. * \param ch clearing rectangle height. diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h index 23e64bb442..2a4ee0d3f1 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.h @@ -116,7 +116,7 @@ do { \ } while (0) /** - * Can accomodate several state changes and primitive changes without + * Can accommodate several state changes and primitive changes without * actually firing the buffer. * * \param rmesa Radeon context. @@ -170,7 +170,7 @@ do { \ * \param where Not used. * * If there isn't enough space available flush the command buffer, otherwise - * just advance the buffer head the requested ammount. + * just advance the buffer head the requested amount. */ static __inline char *radeonAllocCmdBuf( radeonContextPtr rmesa, int bytes, const char *where ) diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 2d8ae45ea6..b05507d6d8 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -68,7 +68,7 @@ * * \return pointer to the device specific screen private data. * - * Checks the version compatability of the DRI extension, the DDX driver and + * Checks the version compatibility of the DRI extension, the DDX driver and * the DRM driver. * * Disables the TCL for DRM versions less than 1.3.x, or if the RADEON_COMPAT diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 713391a764..8c32eaac31 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -177,7 +177,7 @@ static void radeonBlendEquation( GLcontext *ctx, GLenum mode ) * * Calculates the appropriate new value of the RADEON_RB3D_BLENDCNTL register and informs of the state change. * - * If the final state not supported by the hardward it fallbacks to software + * If the final state not supported by the hardware it fallbacks to software * rendering. */ static void radeonBlendFunc( GLcontext *ctx, GLenum sfactor, GLenum dfactor ) @@ -352,7 +352,7 @@ static void radeonDepthFunc( GLcontext *ctx, GLenum func ) * \brief Enable or disable depth buffering. * * \param ctx GL context - * \param flag whether depth buferring is enabled or not. + * \param flag whether depth buffering is enabled or not. * * \sa glDepthBuffer(). * @@ -374,7 +374,7 @@ static void radeonDepthMask( GLcontext *ctx, GLboolean flag ) /** * \brief Specify the clear value for the depth buffer. * - * \param d depth value to be used when clering the depth buffer. + * \param d depth value to be used when clearing the depth buffer. * * \sa glClearDepth(). * @@ -409,7 +409,7 @@ static void radeonClearDepth( GLcontext *ctx, GLclampd d ) /** * \brief Intersection of two cliprects. * - * \param out resulting clirect. + * \param out resulting cliprect. * \param a fist cliprect. * \param b second cliprect. * @@ -1099,7 +1099,7 @@ static void radeonDepthRange( GLcontext *ctx, GLclampd nearval, * \brief Specify the clear value of the color buffers. * * \param ctx GL context. - * \param color red, green, blue and alpha values used when clering the color buffers. + * \param color red, green, blue and alpha values used when clearing the color buffers. * * \sa glClearColor(). * @@ -1294,7 +1294,7 @@ static void radeonReadBuffer( GLcontext *ctx, GLenum mode ) * * \sa glEnable() and glDisable(). * - * Changes the apropriate registers and state variables, informing of the state + * Changes the appropriate registers and state variables, informing of the state * change if necessary. */ static void radeonEnable( GLcontext *ctx, GLenum cap, GLboolean state ) diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c index 8808a73ee1..f30a82df9c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state_init.c +++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c @@ -134,7 +134,7 @@ static int cmdscl( int offset, int stride, int count ) /** * \brief Utility macro for state checking functions definition. * - * It is used for a shorthand definiton of the state checking functions. Four + * It is used for a shorthand definition of the state checking functions. Four * functions are defined: * - one which always returns GL_TRUE for state which is always active; * - two which determine whether the respective texture unit is enabled; @@ -202,7 +202,7 @@ TCL_CHECK( tcl_eyespace_or_fog, ctx->_NeedEyeCoords || ctx->Fog.Enabled ) * \brief Utility macro to initialize a state atom. * * Used internally by radeonInitState() to allocate the state atom command - * buffer and initiaze the state checking function. + * buffer and initialize the state checking function. * * \param ATOM atom name, as defined in radeon_hw_state. * \param CHK state checking function, as defined by #CHECK or #TCL_CHECK. @@ -217,7 +217,7 @@ TCL_CHECK( tcl_eyespace_or_fog, ctx->_NeedEyeCoords || ctx->Fog.Enabled ) * * \param rmesa Radeon context. * - * Initalizes all state atoms giving apropriate inital state values. Allocates + * Initializes all state atoms giving appropriate initial state values. Allocates * the state atoms' command buffers, using internally the #ALLOC_STATE macro * for this effect. Fills in the packet headers with the register ID * associated with the atom, via cmdpkt(). diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_readpix.c b/src/mesa/drivers/dri/radeon/radeon_subset_readpix.c index 330aca2895..4f3f19eb51 100644 --- a/src/mesa/drivers/dri/radeon/radeon_subset_readpix.c +++ b/src/mesa/drivers/dri/radeon/radeon_subset_readpix.c @@ -140,7 +140,7 @@ static void ReadRGBASpan( const GLcontext *ctx, * \param x x start position of the reading rectangle. * \param y y start position of the reading rectangle. * \param width width of the reading rectangle. - * \param height height of the reading recatangle. + * \param height height of the reading rectangle. * \param format pixel format. Must be GL_RGBA. * \param type pixel type. Must be GL_UNSIGNED_BYTE. * \param pixels pixel data. diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_select.c b/src/mesa/drivers/dri/radeon/radeon_subset_select.c index 25ff28d8ed..1e21cf215c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_subset_select.c +++ b/src/mesa/drivers/dri/radeon/radeon_subset_select.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: radeon_subset_select.c,v 1.1.2.8 2003/05/18 14:11:28 jrfonseca Exp $ */ +/* $Id: radeon_subset_select.c,v 1.1.2.9 2003/05/18 21:17:13 jrfonseca Exp $ */ #include "glheader.h" @@ -48,7 +48,7 @@ typedef struct { struct { GLfloat x, y, z, w; } pos; /**< \brief position */ struct { GLfloat x, y, z, w; } eyePos; /**< \brief position, eye coordinates */ - struct { GLfloat x, y, z, w; } clipPos; /**< \brief clipped coordiantes */ + struct { GLfloat x, y, z, w; } clipPos; /**< \brief clipped coordinates */ struct { GLfloat x, y, z, w; } winPos; /**< \brief position, windows coordinates */ struct { GLfloat s, t; } texCoord; /**< \brief texture coordinates */ struct { GLfloat r, g, b, a; } color; /**< \brief color */ @@ -194,10 +194,10 @@ clip_point(const vertex *v) /** * \brief Apply clipping to a line segment. * - * \param v0in input start vertice - * \param v1in input end vertice - * \param v0new output start vertice - * \param v1new output end vertice + * \param v0in input start vertex + * \param v1in input end vertesx + * \param v0new output start vertex + * \param v1new output end vertex * * \return GL_TRUE if the line segment is visible, or GL_FALSE if it is totally * clipped. @@ -565,7 +565,7 @@ select_triangle(const vertex *v0, * Stores the vertex and current attributes in ::vb, transforms it into eye space and then clip space. * * If a sufficient number of vertices is stored calls one of select_point(), - * select_line() or select_triangle(), according to the current primtive. + * select_line() or select_triangle(), according to the current primitive. */ static void radeon_select_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) @@ -968,7 +968,7 @@ void radeon_select_Install( GLcontext *ctx ) * * If mode is GL_RENDER, calls either radeonVtxfmtInit() or * radeon_noop_Install depending on whether the application has focus - * (ie a fullscreen-cliprect) or not. If mode is GL_SELECT, calls + * (i.e., a fullscreen-cliprect) or not. If mode is GL_SELECT, calls * radeon_select_Install(). */ static void radeonRenderMode( GLcontext *ctx, GLenum mode ) diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_tex.c b/src/mesa/drivers/dri/radeon/radeon_subset_tex.c index afbeda13de..e401779513 100644 --- a/src/mesa/drivers/dri/radeon/radeon_subset_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_subset_tex.c @@ -134,10 +134,10 @@ void radeonAgeTextures( radeonContextPtr rmesa, int heap ) * \param rmesa Radeon context. * \param t Radeon texture object. * \param level level of the image to take the sub-image. - * \param x sub-image abcissa. + * \param x sub-image abscissa. * \param y sub-image ordinate. * \param width sub-image width. - * \param height sub-imate height. + * \param height sub-image height. * * Fills in a drmRadeonTexture and drmRadeonTexImage structures and uploads the * texture via the DRM_RADEON_TEXTURE ioctl, aborting in case of failure. @@ -702,7 +702,7 @@ void radeonUpdateTextureState( GLcontext *ctx ) * \param format pixel format. Not used. * \param type pixel data type. Not used. * - * \return pointer to choosen texture format. + * \return pointer to chosen texture format. * * Returns a pointer to one of the Mesa texture formats which is supported by * Radeon and matches the internal format. diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_vtx.c b/src/mesa/drivers/dri/radeon/radeon_subset_vtx.c index 235f4acea3..75f5a498c2 100644 --- a/src/mesa/drivers/dri/radeon/radeon_subset_vtx.c +++ b/src/mesa/drivers/dri/radeon/radeon_subset_vtx.c @@ -60,7 +60,7 @@ union vertex_dword { /** - * \brief Maxium number of dwords per vertex. + * \brief Maximum number of dwords per vertex. * * Defined as 10 to hold: \code xyzw rgba st \endcode */ @@ -154,7 +154,7 @@ static struct prims_t { * \param rmesa Radeon context. * * Truncates any redundant vertices off the end of the buffer, emit the - * remainging vertices and advances the current DMA region. + * remaining vertices and advances the current DMA region. */ static void finish_prim( radeonContextPtr rmesa ) { @@ -185,7 +185,7 @@ static void finish_prim( radeonContextPtr rmesa ) * \brief Copy a vertex from the current DMA region * * \param rmesa Radeon context. - * \param n vertice index relative to the current DMA region. + * \param n vertex index relative to the current DMA region. * \param dst destination pointer. * * Used internally by copy_dma_verts(). @@ -270,7 +270,7 @@ static GLuint copy_dma_verts( radeonContextPtr rmesa, static void notify_wrap_buffer( void ); /** - * \brief Resets the vertex buffer notifycation mechanism. + * \brief Resets the vertex buffer notification mechanism. * * Fills in vb_t::stack with the values from the current DMA region in * radeon_dma::current and sets the notification callback to @@ -293,7 +293,7 @@ static void reset_notify( void ) * \brief Full buffer notification callback. * * Makes a copy of the necessary vertices of the current buffer via - * copy_dma_verts(), gets and resets new buffer via radeon and reemits the + * copy_dma_verts(), gets and resets new buffer via radeon and re-emits the * saved vertices. */ static void notify_wrap_buffer( void ) @@ -486,7 +486,7 @@ void radeonVtxfmtInvalidate( GLcontext *ctx ) * \param ctx GL context. * * Signals a new primitive and determines the appropriate vertex format and - * size. Points vb_t::floatcolorptr and vb_t::texcoordptr to the curent vertex + * size. Points vb_t::floatcolorptr and vb_t::texcoordptr to the current vertex * and sets them to the current color and texture attributes. * * Clears the vb_t::recheck flag on exit. @@ -928,7 +928,7 @@ static void radeon_noop_End(void) * * Installs the noop callbacks into the glapi table. These functions * will not attempt to emit any DMA vertices, but will keep internal - * GL state uptodate. Borrows heavily from the select code. + * GL state updated. Borrows heavily from the select code. */ static void radeon_noop_Install( GLcontext *ctx ) { diff --git a/src/mesa/drivers/dri/radeon/server/radeon.h b/src/mesa/drivers/dri/radeon/server/radeon.h index 44cc2921de..4606a0b71e 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon.h +++ b/src/mesa/drivers/dri/radeon/server/radeon.h @@ -1,6 +1,6 @@ /** * \file server/radeon.h - * \brief Radeon 2D driver data strucures. + * \brief Radeon 2D driver data structures. */ /* diff --git a/src/mesa/drivers/dri/radeon/server/radeon_common.h b/src/mesa/drivers/dri/radeon/server/radeon_common.h index a4d0258d1a..c26ccd3cc2 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_common.h +++ b/src/mesa/drivers/dri/radeon/server/radeon_common.h @@ -2,7 +2,7 @@ * \file server/radeon_common.h * \brief Common header definitions for Radeon 2D/3D/DRM driver suite. * - * \note Some of these structures are meant for backward compatability and + * \note Some of these structures are meant for backward compatibility and * aren't used by the subset driver. * * \author Gareth Hughes <gareth@valinux.com> diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.c b/src/mesa/drivers/dri/radeon/server/radeon_dri.c index 8d36e449bf..1f527f65b6 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_dri.c +++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.c @@ -4,7 +4,7 @@ * done in the X server. * * Here they are converted to run in the client (or perhaps a standalone - * process), and to work with the frambe buffer device rather than the X + * process), and to work with the frame buffer device rather than the X * server infrastructure. */ @@ -165,7 +165,7 @@ static void RADEONEngineReset( struct DRIDriverContextRec *ctx ) * Resets the graphics card and sets initial values for several registers of * the card's drawing engine. * - * Turns on the radeon command processor engine (ie: the ringbuffer). + * Turns on the radeon command processor engine (i.e., the ringbuffer). */ static int RADEONEngineRestore( struct DRIDriverContextRec *ctx ) { @@ -305,7 +305,7 @@ static int RADEONMinBits(int val) * \param ctx display handle. * \param info driver private data. * - * \return one on sucess, or zero on failure. + * \return one on success, or zero on failure. * * Acquires and enables the AGP device. Reserves memory in the AGP space for * the ring buffer, vertex buffers and textures. Initialize the Radeon @@ -439,7 +439,7 @@ static int RADEONDRIAgpInit( struct DRIDriverContextRec *ctx, RADEONInfoPtr info * \param ctx display handle. * \param info driver private data. * - * \return non-zero on sucess, or zero on failure. + * \return non-zero on success, or zero on failure. * * This function is a wrapper around the DRM_RADEON_CP_INIT command, passing * all the parameters in a drmRadeonInit structure. @@ -526,7 +526,7 @@ static void RADEONDRIAgpHeapInit(struct DRIDriverContextRec *ctx, * \param ctx display handle. * \param info driver private data. * - * \return one on sucess, or zero on failure. + * \return one on success, or zero on failure. * * Calls drmAddBufs() with the previously allocated vertex buffers. */ @@ -557,7 +557,7 @@ static int RADEONDRIBufInit( struct DRIDriverContextRec *ctx, RADEONInfoPtr info * \param ctx display handle. * \param info driver private data. * - * Attemps to install an IRQ handler via drmCtlInstHandler(), falling back to + * Attempts to install an IRQ handler via drmCtlInstHandler(), falling back to * IRQ-free operation on failure. */ static void RADEONDRIIrqInit(struct DRIDriverContextRec *ctx, @@ -723,12 +723,12 @@ static int RADEONMemoryInit( struct DRIDriverContextRec *ctx, RADEONInfoPtr info * \param ctx display handle. * \param info driver private data. * - * \return non-zero on sucess, or zero on failure. + * \return non-zero on success, or zero on failure. * * Performs static frame buffer allocation. Opens the DRM device and add maps * to the SAREA, framebuffer and MMIO regions. Fills in \p info with more * information. Creates a \e server context to grab the lock for the - * initialization ioctls and calls the other initliaztion functions in this + * initialization ioctls and calls the other initilization functions in this * file. Starts the CP engine via the DRM_RADEON_CP_START command. * * Setups a RADEONDRIRec structure to be passed to radeon_dri.so for its @@ -951,11 +951,11 @@ static int RADEONScreenInit( struct DRIDriverContextRec *ctx, RADEONInfoPtr info * * \param info driver private data. * - * \return non-zero on sucess, or zero on failure. + * \return non-zero on success, or zero on failure. * * Called by radeonInitFBDev() to set RADEONInfoRec::ChipFamily * according to the value of RADEONInfoRec::Chipset. Fails if the - * chipset is unrecognized or not appropriate for this driver (ie. not + * chipset is unrecognized or not appropriate for this driver (i.e., not * an r100 style radeon) */ static int get_chipfamily_from_chipset( RADEONInfoPtr info ) @@ -1026,7 +1026,7 @@ static int get_chipfamily_from_chipset( RADEONInfoPtr info ) * \param numConfigs will receive the number of supported visuals. * \param configs will point to the list of supported visuals. * - * \return one on sucess, or zero on failure. + * \return one on success, or zero on failure. * * \note Requires the ::__GLXvisualConfig data type. * @@ -1159,7 +1159,7 @@ static int radeonPostValidateMode( struct DRIDriverContextRec *ctx ) * Fills in \p info with some default values and some information from \p ctx * and then calls RADEONScreenInit() for the screen initialization. * - * Before exiting clears the framebuffer memomry accessing it directly. + * Before exiting clears the framebuffer memory accessing it directly. */ static int radeonInitFBDev( struct DRIDriverContextRec *ctx ) { diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 7b36d41964..0f71db4493 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,4 +1,4 @@ -/* $Id: glxapi.c,v 1.30 2002/08/22 21:10:01 brianp Exp $ */ +/* $Id: glxapi.c,v 1.30.6.1 2003/05/18 21:17:11 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -154,7 +154,7 @@ static GLXContext CurrentContext = 0; /* - * GLX API entrypoints + * GLX API entry points */ /*** GLX_VERSION_1_0 ***/ diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 95be8d39c2..1e8c7137bd 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -1,4 +1,4 @@ -/* $Id: glapi.c,v 1.67.4.3 2003/01/19 18:47:53 jrfonseca Exp $ */ +/* $Id: glapi.c,v 1.67.4.4 2003/05/18 21:17:04 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -44,7 +44,7 @@ * 2000/02/23 - original version for Mesa 3.3 and XFree86 4.0 * 2001/01/16 - added dispatch override feature for Mesa 3.5 * 2002/06/28 - added _glapi_set_warning_func(), Mesa 4.1. - * 2002/10/01 - _glapi_get_proc_address() will now generate new entrypoints + * 2002/10/01 - _glapi_get_proc_address() will now generate new entry points * itself (using offset ~0). _glapi_add_entrypoint() can be * called afterward and it'll fill in the correct dispatch * offset. This allows DRI libGL to avoid probing for DRI @@ -659,7 +659,7 @@ extern void __glapi_sparc_icache_flush(unsigned int *); #endif /** - * Generate a dispatch function (entrypoint) which jumps through + * Generate a dispatch function (entry point) which jumps through * the given slot number (offset) in the current dispatch table. * * \param functionOffset dispatch table offset. @@ -809,7 +809,7 @@ fill_in_entrypoint_offset(void *entrypoint, GLuint offset) /** - * \brief Add a new extension function entrypoint. + * \brief Add a new extension function entry point. * * \param funcName name of the extension function. It must begin with "gl". * \param offset dispatch table offset. diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index d63d0650f5..e48a0e5f2a 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -42,7 +42,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: glthread.h,v 1.11.6.4 2003/03/23 23:22:48 jrfonseca Exp $ */ +/* $Id: glthread.h,v 1.11.6.5 2003/05/18 21:17:04 jrfonseca Exp $ */ #ifndef GLTHREAD_H @@ -238,7 +238,7 @@ create_sem(0, #name"_benaphore") } typedef GLuint _glthread_TSD; /** - * \brief Thread datatype + * \brief Thread data type * * Dummy type */ diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 8e577e6dfd..28bf0574cd 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: blend.c,v 1.38.4.5 2003/03/23 23:22:47 jrfonseca Exp $ */ +/* $Id: blend.c,v 1.38.4.6 2003/05/18 21:17:00 jrfonseca Exp $ */ #include "glheader.h" @@ -385,7 +385,7 @@ _mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) /** * \brief Specify the alpha test function. * - * \param func alpha comparision function. + * \param func alpha comparison function. * \param ref reference value. * * Verifies the parameters and updates gl_colorbuffer_attrib. diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 4777ec3ac6..7d3c5c2ca7 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: buffers.c,v 1.42.4.4 2003/03/23 23:22:47 jrfonseca Exp $ */ +/* $Id: buffers.c,v 1.42.4.5 2003/05/18 21:17:00 jrfonseca Exp $ */ #include "glheader.h" @@ -501,8 +501,7 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert) /** * \brief Define the scissor box. * - * \param x abcissa of the scissor box lower-left corner. - * \param y ordinate of the scissor box lower-left corner. + * \param x, y coordinates of the scissor box lower-left corner. * \param width width of the scissor box. * \param height height of the scissor box. * diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h index cb5f31c7c9..64c403a947 100644 --- a/src/mesa/main/colormac.h +++ b/src/mesa/main/colormac.h @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: colormac.h,v 1.11.6.2 2003/03/23 23:22:47 jrfonseca Exp $ */ +/* $Id: colormac.h,v 1.11.6.3 2003/05/18 21:17:01 jrfonseca Exp $ */ #ifndef COLORMAC_H @@ -76,7 +76,7 @@ * \brief Copy a GLchan[4] array */ /** \def CHAN_PRODUCT - * \brief Scaled product (usually aproximated) between two GLchan arguments */ + * \brief Scaled product (usually approximated) between two GLchan arguments */ #if CHAN_BITS == 8 diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index cc6b97f6a3..5936807cf4 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -28,7 +28,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: context.c,v 1.188.2.1.2.18 2003/05/18 14:11:24 jrfonseca Exp $ */ +/* $Id: context.c,v 1.188.2.1.2.19 2003/05/18 21:17:01 jrfonseca Exp $ */ /** * \mainpage Mesa Core Module @@ -724,14 +724,14 @@ _mesa_free_framebuffer_data( GLframebuffer *buffer ) /**********************************************************************/ /** \name Context allocation, initialization, destroying * - * The purpose of the most initalization functions here is to provide the + * The purpose of the most initialization functions here is to provide the * default state values according to the OpenGL specification. */ /**********************************************************************/ /*@{*/ /** - * \brief One-time initalization mutex lock. + * \brief One-time initialization mutex lock. * * \sa Used by one_time_init(). */ @@ -801,7 +801,7 @@ one_time_init( GLcontext *ctx ) * * Initializes the display list, texture objects and vertex programs hash * tables, allocates the texture objects. If it runs out of memory, frees - * everything already allocated before returing NULL. + * everything already allocated before returning NULL. */ static struct gl_shared_state * alloc_shared_state( void ) @@ -1024,8 +1024,8 @@ init_attrib_groups( GLcontext *ctx ) * * \sa _mesa_create_context() for the parameter description. * - * Performs the imports and exports callback tables initialzation, and - * miscellaenuos one-time initializations. If no shared context is supplied one + * Performs the imports and exports callback tables initialization, and + * miscellaneous one-time initializations. If no shared context is supplied one * is allocated, and increase its reference count. Setups the GL API dispatch * tables. Initialize the TNL module. Sets the maximum Z buffer depth. * Finally queries the \c MESA_DEBUG and \c MESA_VERBOSE environment variables @@ -1355,7 +1355,7 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *buffer ) * \param readBuffer read framebuffer. * * Check that the context's and framebuffer's visuals are compatible, returning - * imediatly otherwise. Sets the glapi current context via + * immediately otherwise. Sets the glapi current context via * _glapi_set_context(). If \p newCtx is not NULL, associates \p drawBuffer and * \p readBuffer with it and calls dd_function_table::ResizeBuffers if the buffers size has changed. * Calls dd_function_table::MakeCurrent callback if defined. diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 4f6634265f..94e63ed5f5 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -2,7 +2,7 @@ * \file context.h * \brief Mesa context/visual/framebuffer management functions. * - * There are three Mesa datatypes which are meant to be used by device + * There are three Mesa data types which are meant to be used by device * drivers: * - GLcontext: this contains the Mesa rendering state * - GLvisual: this describes the color buffer (RGB vs. ci), whether or not @@ -11,12 +11,12 @@ * accum buffer and alpha buffers. * * These types should be encapsulated by corresponding device driver - * datatypes. See xmesa.h and xmesaP.h for an example. + * data types. See xmesa.h and xmesaP.h for an example. * * In OOP terms, GLcontext, GLvisual, and GLframebuffer are base classes * which the device driver must derive from. * - * The following functions create and destroy these datatypes. + * The following functions create and destroy these data types. */ /* @@ -43,7 +43,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: context.h,v 1.35.4.3 2003/03/23 23:22:47 jrfonseca Exp $ */ +/* $Id: context.h,v 1.35.4.4 2003/05/18 21:17:01 jrfonseca Exp $ */ #ifndef CONTEXT_H #define CONTEXT_H diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index bf96b6a3dc..c0a6f05205 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: dd.h,v 1.74.6.7 2003/05/18 14:11:25 jrfonseca Exp $ */ +/* $Id: dd.h,v 1.74.6.8 2003/05/18 21:17:01 jrfonseca Exp $ */ #ifndef DD_INCLUDED @@ -66,7 +66,7 @@ struct dd_function_table { /** * \brief Notify the driver after Mesa has made some internal state changes. * - * This is in addition to any statechange callbacks Mesa may already have + * This is in addition to any state change callbacks Mesa may already have * made. */ void (*UpdateState)( GLcontext *ctx, GLuint new_state ); @@ -715,7 +715,7 @@ struct dd_function_table { * \brief Validate the current T&L module. * * This is called directly after UpdateState() when a state change that has - * occured matches the dd_function_table::NeedValidate bitmask above. This + * occurred matches the dd_function_table::NeedValidate bitmask above. This * ensures all computed values are up to date, thus allowing the driver to * decide if the current T&L module needs to be swapped out. * @@ -750,7 +750,7 @@ struct dd_function_table { /** * Set by the driver-supplied T&L engine whenever vertices are buffered * between glBegin()/glEnd() objects or __GLcontextRec::Current is not - * uptodate. + * updated. * * The dd_function_table::FlushVertices call below may be used to resolve * these conditions. @@ -825,7 +825,7 @@ struct dd_function_table { * * Drivers present a reduced set of the functions possible in * glBegin()/glEnd() objects. Core mesa provides translation stubs for the - * remaining functions to map down to these entrypoints. + * remaining functions to map down to these entry points. * * These are the initial values to be installed into dispatch by * mesa. If the T&L driver wants to modify the dispatch table @@ -834,7 +834,7 @@ struct dd_function_table { * functions, but this way there is an obvious list of what is * expected of the driver. * - * If the driver wants to hook in entrypoints other than those + * If the driver wants to hook in entry points other than those * listed, it must restore them to their original values in * the disable() callback, below. */ diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 900ca25307..fbccda691b 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: dlist.c,v 1.100.4.3 2003/03/20 09:20:31 keithw Exp $ */ +/* $Id: dlist.c,v 1.100.4.4 2003/05/18 21:17:02 jrfonseca Exp $ */ #include "glheader.h" #include "imports.h" @@ -269,7 +269,7 @@ typedef enum { * * Each instruction in the display list is stored as a sequence of * contiguous nodes in memory. - * Each node is the union of a variety of datatypes. + * Each node is the union of a variety of data types. */ union node { OpCode opcode; @@ -4264,7 +4264,7 @@ execute_list( GLcontext *ctx, GLuint list ) case OPCODE_CALL_LIST_OFFSET: /* Generated by glCallLists() so we must add ListBase */ if (n[2].b) { - /* user specified a bad datatype at compile time */ + /* user specified a bad data type at compile time */ _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)"); } else if (ctx->CallDepth < MAX_LIST_NESTING) { diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index ad55a581a8..51a13f2146 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: dlist.h,v 1.17.6.3 2003/03/23 03:51:34 jrfonseca Exp $ */ +/* $Id: dlist.h,v 1.17.6.4 2003/05/18 21:17:02 jrfonseca Exp $ */ #ifndef DLIST_H @@ -42,7 +42,7 @@ * glBegin()/glEnd() pair, with return value. * * \param ctx GL context. - * \param retval value to return value in case the assertation fails. + * \param retval value to return value in case the assertion fails. */ #define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval) \ do { \ @@ -85,7 +85,7 @@ do { \ * glBegin()/glEnd() pair and flush the vertices, with return value. * * \param ctx GL context. - * \param retval value to return value in case the assertation fails. + * \param retval value to return value in case the assertion fails. */ #define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\ do { \ diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index 29157af50d..c69d505029 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: feedback.c,v 1.27.4.5 2003/03/23 23:22:47 jrfonseca Exp $ */ +/* $Id: feedback.c,v 1.27.4.6 2003/05/18 21:17:03 jrfonseca Exp $ */ #include "glheader.h" @@ -212,7 +212,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer ) /** - * \brief Update the hit flag and the maximum and minimun depth values. + * \brief Update the hit flag and the maximum and minimum depth values. * * \param ctx GL context. * \param z depth. diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 8a022f6973..e253da49f1 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -6,7 +6,7 @@ * It includes gl.h and all system headers which are needed. * Other Mesa source files should \e not directly include any system * headers. This allows Mesa to be integrated into XFree86 and - * allows system-dependent hacks/work-arounds to be collected in one place. + * allows system-dependent hacks/workarounds to be collected in one place. * * If you touch this file, everything gets recompiled! * @@ -40,7 +40,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: glheader.h,v 1.29.4.3 2003/05/18 14:11:25 jrfonseca Exp $ */ +/* $Id: glheader.h,v 1.29.4.4 2003/05/18 21:17:04 jrfonseca Exp $ */ #ifndef GLHEADER_H @@ -126,7 +126,7 @@ # define GLWINAPIV #endif /* WIN32 / CYGWIN bracket */ -/* compatability guard so we don't need to change client code */ +/* compatibility guard so we don't need to change client code */ #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) #if 0 diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index 6a84b1eae3..93625c3a19 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -34,7 +34,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: hash.c,v 1.14.4.3 2003/05/18 14:11:26 jrfonseca Exp $ */ +/* $Id: hash.c,v 1.14.4.4 2003/05/18 21:17:04 jrfonseca Exp $ */ #include "glheader.h" #include "imports.h" @@ -196,7 +196,8 @@ void _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data) * \param table the hash table. * \param key key of entry to remove. * - * While holding the hash table's lock, searchs the entry with the matching key and unlinks it. + * While holding the hash table's lock, searches the entry with the matching + * key and unlinks it. */ void _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key) { diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index 4b5182bcb4..b20a781599 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: image.c,v 1.69.4.5 2003/03/23 23:22:48 jrfonseca Exp $ */ +/* $Id: image.c,v 1.69.4.6 2003/05/18 21:17:04 jrfonseca Exp $ */ #include "glheader.h" @@ -47,7 +47,7 @@ * * _mesa_unpack_image() returns image data in this format. When we execute * image commands (glDrawPixels(), glTexImage(), etc) from within display lists - * we have to be sure to set the current unpacking params to these values! + * we have to be sure to set the current unpacking parameters to these values! */ const struct gl_pixelstore_attrib _mesa_native_packing = { 1, /* Alignment */ @@ -134,11 +134,11 @@ _mesa_swap4( GLuint *p, GLuint n ) /** - * \brief Get the size of a GL datatype. + * \brief Get the size of a GL data type. * * \param type GL data type. * - * \return the size, in bytes, of the given datatype, 0 if a GL_BITMAP, or -1 + * \return the size, in bytes, of the given data type, 0 if a GL_BITMAP, or -1 * if an invalid type enum. */ GLint _mesa_sizeof_type( GLenum type ) @@ -168,7 +168,7 @@ GLint _mesa_sizeof_type( GLenum type ) /** * \brief Same as _mesa_sizeof_type() but also accepting the packed pixel - * format datatypes. + * format data types. */ GLint _mesa_sizeof_packed_type( GLenum type ) { @@ -1825,7 +1825,7 @@ _mesa_pack_float_rgba_span( GLcontext *ctx, * n - number of pixels in the span * rgba - the pixels * format - dest packing format - * type - dest packing datatype + * type - dest packing data type * destination - destination packing address * packing - pixel packing parameters * transferOps - bitmask of IMAGE_*_BIT operations to apply @@ -2080,7 +2080,7 @@ extract_uint_indexes(GLuint n, GLuint indexes[], * Args: n - number of pixels * rgba - output colors * srcFormat - format of incoming data - * srcType - datatype of incoming data + * srcType - data type of incoming data * src - source data pointer * swapBytes - perform byteswapping of incoming data? */ @@ -2581,7 +2581,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4], * dstFormat - format of destination color array * dest - the destination color array * srcFormat - source image format - * srcType - source image datatype + * srcType - source image data type * source - source image pointer * srcPacking - pixel unpacking parameters * transferOps - bitmask of IMAGE_*_BIT values of operations to apply @@ -3263,7 +3263,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx, * * Args: ctx - the context * n - number of pixels - * dstType - destination datatype + * dstType - destination data type * dest - destination array * srcType - source pixel type * source - source data pointer @@ -3469,7 +3469,7 @@ _mesa_pack_index_span( const GLcontext *ctx, GLuint n, * * Args: ctx - the context * n - number of pixels - * dstType - destination datatype + * dstType - destination data type * dest - destination array * srcType - source pixel type * source - source data pointer diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 392e3ece5a..c9f56c7f90 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -45,7 +45,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: imports.c,v 1.25.4.2 2003/03/20 12:56:57 jrfonseca Exp $ */ +/* $Id: imports.c,v 1.25.4.3 2003/05/18 21:17:05 jrfonseca Exp $ */ #include "glheader.h" @@ -115,7 +115,7 @@ _mesa_free(void *ptr) * \param bytes number of bytes to allocate. * \param alignment alignment (must be greater than zero). * - * Allocates extra memory to accomodate rounding up the address for + * Allocates extra memory to accommodate rounding up the address for * alignment and to record the real malloc address. * * \sa _mesa_align_free(). diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 50e157abec..0eb57b112f 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.54.4.2 2003/03/21 11:35:18 keithw Exp $ */ +/* $Id: light.c,v 1.54.4.3 2003/05/18 21:17:05 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -1419,7 +1419,7 @@ init_lightmodel( struct gl_lightmodel *lm ) } /** - * \brief Initalize the material data structure. + * \brief Initialize the material data structure. * * \param m pointer to the gl_material structure to be initialized. */ diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 80dd10672b..e2224be74e 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: macros.h,v 1.30.4.2 2003/05/18 14:11:26 jrfonseca Exp $ */ +/* $Id: macros.h,v 1.30.4.3 2003/05/18 21:17:05 jrfonseca Exp $ */ #ifndef MACROS_H @@ -87,7 +87,7 @@ (a)[2] == (b)[2] && \ (a)[3] == (b)[3]) -/** \brief Test for equality (unsined bytes) */ +/** \brief Test for equality (unsigned bytes) */ #if defined(__i386__) #define TEST_EQ_4UBV(DST, SRC) *((GLuint*)(DST)) == *((GLuint*)(SRC)) #else @@ -151,7 +151,7 @@ do { \ } \ } while(0) -/** \brief Copy \p SZ elements into a homegenous (4-element) vector, giving +/** \brief Copy \p SZ elements into a homegeneous (4-element) vector, giving * default values to the remaining */ #define COPY_CLEAN_4V(DST, SZ, SRC) \ do { \ diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index ff78c026bf..7b5d9b5e6d 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -32,7 +32,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: matrix.c,v 1.45.4.9 2003/05/18 14:11:26 jrfonseca Exp $ */ +/* $Id: matrix.c,v 1.45.4.10 2003/05/18 21:17:05 jrfonseca Exp $ */ #include "glheader.h" @@ -253,7 +253,7 @@ _mesa_PopMatrix( void ) /** - * \brief Replace the current matrix with the indentity matrix. + * \brief Replace the current matrix with the identity matrix. * * \sa glLoadIdentity(). * @@ -496,8 +496,7 @@ _mesa_MultTransposeMatrixdARB( const GLdouble *m ) /** * \brief Set the viewport. * - * \param x ordinate of the lower left corner of the viewport rectangle. - * \param y abcissa of the lower left corner of the viewport rectangle. + * \param x, y coordinates of the lower-left corner of the viewport rectangle. * \param width width of the viewport rectangle. * \param height height of the viewport rectangle. * @@ -515,12 +514,11 @@ _mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height ) } /** - * \brief Define a new viewport and reallocate auxillary buffers if the size of + * \brief Define a new viewport and reallocate auxiliary buffers if the size of * the window (color buffer) has changed. * * \param ctx GL context. - * \param x ordinate of the lower left corner of the viewport rectangle. - * \param y abcissa of the lower left corner of the viewport rectangle. + * \param x, y coordinates of the lower left corner of the viewport rectangle. * \param width width of the viewport rectangle. * \param height height of the viewport rectangle. * diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index dcbf442a6a..a8714886f4 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -29,7 +29,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: mtypes.h,v 1.97.4.10 2003/05/18 14:11:26 jrfonseca Exp $ */ +/* $Id: mtypes.h,v 1.97.4.11 2003/05/18 21:17:05 jrfonseca Exp $ */ #ifndef TYPES_H @@ -259,7 +259,7 @@ struct gl_light { GLfloat EyePosition[4]; /**< \brief position in eye coordinates */ GLfloat EyeDirection[4]; /**< \brief spotlight dir in eye coordinates */ GLfloat SpotExponent; - GLfloat SpotCutoff; /**< \brief in degress */ + GLfloat SpotCutoff; /**< \brief in degrees */ GLfloat _CosCutoff; /**< \brief = MAX(0, cos(SpotCutoff)) */ GLfloat ConstantAttenuation; GLfloat LinearAttenuation; @@ -374,7 +374,7 @@ struct gl_colorbuffer_attrib { GLenum BlendSrcA; /**< \brief GL_INGR_blend_func_separate */ GLenum BlendDstA; /**< \brief GL_INGR_blend_func_separate */ GLenum BlendEquation; /**< \brief Blending equation */ - GLfloat BlendColor[4]; /**< \brief Bleding color */ + GLfloat BlendColor[4]; /**< \brief Blending color */ /*@}*/ /** @@ -407,7 +407,7 @@ struct gl_current_attrib { /** * \name Values are always valid. * - * \note BTW, note how similar this set of attributes is to the SWvertex datatype + * \note BTW, note how similar this set of attributes is to the SWvertex data type * in the software rasterizer... */ /*@{*/ @@ -960,9 +960,9 @@ struct gl_texture_image { GLuint HeightLog2; /**< \brief = log2(Height2) */ GLuint DepthLog2; /**< \brief = log2(Depth2) */ GLuint MaxLog2; /**< \brief = MAX(WidthLog2, HeightLog2) */ - GLfloat WidthScale; /**< \brief used for mipmap lod computation */ - GLfloat HeightScale; /**< \brief used for mipmap lod computation */ - GLfloat DepthScale; /**< \brief used for mipmap lod computation */ + GLfloat WidthScale; /**< \brief used for mipmap LOD computation */ + GLfloat HeightScale; /**< \brief used for mipmap LOD computation */ + GLfloat DepthScale; /**< \brief used for mipmap LOD computation */ GLvoid *Data; /**< \brief Image data, accessed via FetchTexel() */ GLboolean IsClientData; /**< \brief Data owned by client? */ @@ -1194,7 +1194,7 @@ struct gl_pixelstore_attrib { }; -#define CA_CLIENT_DATA 0x1 /**< \brief Data not alloced by mesa */ +#define CA_CLIENT_DATA 0x1 /**< \brief Data not allocated by mesa */ /** @@ -1284,7 +1284,7 @@ struct gl_2d_map { /** - * \brief All evalutator control points + * \brief All evaluator control points */ struct gl_evaluators { /** @@ -1322,7 +1322,7 @@ struct gl_evaluators { /** - * \name Vertex program tokens and datatypes + * \name Vertex program tokens and data types */ /*@{*/ @@ -1539,7 +1539,7 @@ struct gl_frame_buffer { /** - * \brief Constants which may be overriden by device driver during context creation + * \brief Constants which may be overridden by device driver during context creation * but are never changed after that. */ struct gl_constants { @@ -1689,7 +1689,7 @@ struct matrix_stack IMAGE_MAP_COLOR_BIT | \ IMAGE_COLOR_TABLE_BIT) -/** \brief Ttransfer ops after convolution */ +/** \brief Transfer ops after convolution */ #define IMAGE_POST_CONVOLUTION_BITS (IMAGE_POST_CONVOLUTION_SCALE_BIAS | \ IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT | \ IMAGE_COLOR_MATRIX_BIT | \ @@ -1837,7 +1837,7 @@ struct matrix_stack /* - * Forward declaration of display list datatypes: + * Forward declaration of display list data types: */ union node; typedef union node Node; @@ -1894,8 +1894,8 @@ struct __GLcontextRec { /** \name API function pointer tables */ /*@{*/ - struct _glapi_table *Save; /**< \brief Display list save funcs */ - struct _glapi_table *Exec; /**< \brief Execute funcs */ + struct _glapi_table *Save; /**< \brief Display list save functions */ + struct _glapi_table *Exec; /**< \brief Execute functions */ struct _glapi_table *CurrentDispatch; /**< == Save or Exec !! */ /*@}*/ @@ -2028,7 +2028,7 @@ struct __GLcontextRec { GLboolean _RotateMode; struct gl_shine_tab *_ShineTable[2]; /**< \brief Active shine tables */ - struct gl_shine_tab *_ShineTabList; /**< \brief Mru list of inactive shine tables */ + struct gl_shine_tab *_ShineTabList; /**< \brief MRU list of inactive shine tables */ /**@}*/ struct gl_list_extensions listext; /**< \brief driver dlist extensions */ @@ -2143,7 +2143,7 @@ enum _debug { * and calls dd_function_table::FlushVertices if so. Marks * __GLcontextRec::NewState with \p newstate. * - * \todo Eventually let the driver specify what statechanges require a flush: + * \todo Eventually let the driver specify what state changes require a flush: */ #define FLUSH_VERTICES(ctx, newstate) \ do { \ @@ -2178,7 +2178,7 @@ do { \ * glBegin()/glEnd() pair, with return value. * * \param ctx GL context. - * \param retval value to return value in case the assertation fails. + * \param retval value to return value in case the assertion fails. */ #define ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval) \ do { \ @@ -2219,7 +2219,7 @@ do { \ * glBegin()/glEnd() pair and flush the vertices, with return value. * * \param ctx GL context. - * \param retval value to return value in case the assertation fails. + * \param retval value to return value in case the assertion fails. */ #define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval) \ do { \ diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index f8c36f4115..b62037aa30 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: polygon.c,v 1.25.4.5 2003/03/23 23:22:48 jrfonseca Exp $ */ +/* $Id: polygon.c,v 1.25.4.6 2003/05/18 21:17:06 jrfonseca Exp $ */ #include "glheader.h" @@ -274,7 +274,7 @@ void _mesa_update_polygon( GLcontext *ctx ) /*@{*/ /** - * \brief Initalize the context polygon state. + * \brief Initialize the context polygon state. * * \param ctx GL context. * diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 92cd77e9b1..075829c97d 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: rastpos.c,v 1.39.4.9 2003/05/18 14:11:27 jrfonseca Exp $ */ +/* $Id: rastpos.c,v 1.39.4.10 2003/05/18 21:17:06 jrfonseca Exp $ */ #include "glheader.h" @@ -859,8 +859,8 @@ void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) * * \param ctx GL context. * - * Initalize the current raster position information in - * __GLcontextRec::Current, and adds the extension entrypoints to the + * Initialize the current raster position information in + * __GLcontextRec::Current, and adds the extension entry points to the * dispatcher. */ void _mesa_init_rastpos( GLcontext * ctx ) diff --git a/src/mesa/main/simple_list.h b/src/mesa/main/simple_list.h index c855408aec..4db02ce197 100644 --- a/src/mesa/main/simple_list.h +++ b/src/mesa/main/simple_list.h @@ -1,6 +1,6 @@ /** * \file simple_list.h - * \brief Simple macros for typesafe, intrusive lists. + * \brief Simple macros for type-safe, intrusive lists. * * Intended to work with a list sentinal which is created as an empty * list. Insert & delete are O(1). @@ -33,7 +33,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: simple_list.h,v 1.2.8.2 2003/05/18 14:11:27 jrfonseca Exp $ */ +/* $Id: simple_list.h,v 1.2.8.3 2003/05/18 21:17:06 jrfonseca Exp $ */ #ifndef _SIMPLE_LIST_H @@ -169,7 +169,7 @@ do { \ #define is_empty_list(list) ((list)->next == (list)) /** - * \brief Walk trhough the elements of a list. + * \brief Walk through the elements of a list. * * \param ptr pointer to the current element. * \param list list. @@ -181,7 +181,7 @@ do { \ for( ptr=(list)->next ; ptr!=list ; ptr=(ptr)->next ) /** - * \brief Walk trhough the elements of a list. + * \brief Walk through the elements of a list. * * Same as #foreach but lets you unlink the current value during a list * traversal. Useful for freeing a list, element by element. diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index e42292bcc9..59fffe3dc9 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -29,7 +29,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: state.c,v 1.97.4.10 2003/03/22 16:49:58 jrfonseca Exp $ */ +/* $Id: state.c,v 1.97.4.11 2003/05/18 21:17:06 jrfonseca Exp $ */ #include "glheader.h" @@ -83,7 +83,7 @@ /** * \brief Generic no-op dispatch function. * - * Used in replacementof the functions which are not part of Mesa subset. + * Used in replacement of the functions which are not part of Mesa subset. * * Displays a message. */ @@ -121,7 +121,7 @@ _mesa_init_no_op_table(struct _glapi_table *table, GLuint tableSize) * are provided via the GLvertexformat interface. * * \param exec dispatch table. - * \param tableSize disptach table size. + * \param tableSize dispatch table size. */ void _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize) @@ -616,7 +616,7 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize) * miscellaneous flags are updated to reflect the current state of the state * machine. * - * Calls dd_function_table::UpdateState to perform any internal stte management + * Calls dd_function_table::UpdateState to perform any internal state management * necessary. * * \sa _mesa_update_modelview_project(), _mesa_update_texture(), diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index 28fb1bfbc0..e435ae6c53 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: stencil.c,v 1.29.4.4 2003/03/23 23:22:48 jrfonseca Exp $ */ +/* $Id: stencil.c,v 1.29.4.5 2003/05/18 21:17:07 jrfonseca Exp $ */ #include "glheader.h" @@ -127,7 +127,7 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask ) /** * \brief Set the stencil writing mask. * - * \param mask bit-mask to enable/disbale writing of individual bits in the + * \param mask bit-mask to enable/disable writing of individual bits in the * stencil planes. * * \sa glStencilMask(). diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index afd41fdd23..de2490304b 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -29,7 +29,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: texformat.c,v 1.18.4.2 2003/03/22 16:49:58 jrfonseca Exp $ */ +/* $Id: texformat.c,v 1.18.4.3 2003/05/18 21:17:08 jrfonseca Exp $ */ #include "glheader.h" #include "colormac.h" @@ -651,7 +651,7 @@ _mesa_is_hardware_tex_format( const struct gl_texture_format *format ) /** - * \brief Choose an apropriate texture format. + * \brief Choose an appropriate texture format. * * \param ctx GL context. * \param internalFormat internal texture format. diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h index 71690a0119..dbfb4333e6 100644 --- a/src/mesa/main/texformat.h +++ b/src/mesa/main/texformat.h @@ -29,7 +29,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: texformat.h,v 1.13.4.1 2003/03/16 00:27:13 jrfonseca Exp $ */ +/* $Id: texformat.h,v 1.13.4.2 2003/05/18 21:17:08 jrfonseca Exp $ */ #ifndef TEXFORMAT_H #define TEXFORMAT_H @@ -54,7 +54,7 @@ enum _format { * * \note In the default case, some of these formats will be duplicates of * the generic formats listed below. However, these formats guarantee their - * internal component sizes, while GLchan may vary betwen GLubyte, GLushort + * internal component sizes, while GLchan may vary between GLubyte, GLushort * and GLfloat. */ /*@{*/ @@ -102,7 +102,7 @@ enum _format { * converted to one of these formats. Components are arrays of GLchan * values, so there will be no big/little endian issues. * - * \note Because these are based on the GLchan datatype, one cannot assume 8 + * \note Because these are based on the GLchan data type, one cannot assume 8 * bits per channel with these formats. If you require GLubyte channels, * use one of the hardware formats above. */ diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index bedbcb81e0..0c9399549c 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -2,7 +2,7 @@ * \file teximage.c * \brief Texture images manipulation functions. * - * \note Mesa's native texture datatype is GLchan. Native formats are + * \note Mesa's native texture data type is GLchan. Native formats are * GL_ALPHA, GL_LUMINANCE, GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, GL_RGBA, and * GL_COLOR_INDEX. * @@ -33,7 +33,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: teximage.c,v 1.124.4.3 2003/03/22 16:49:58 jrfonseca Exp $ */ +/* $Id: teximage.c,v 1.124.4.4 2003/05/18 21:17:08 jrfonseca Exp $ */ #include "glheader.h" #include "context.h" diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 3db47d507f..c7682be79a 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,6 +1,6 @@ /** * \file texobj.c - * \brief Texture object managment. + * \brief Texture object management. */ /* @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: texobj.c,v 1.62.4.7 2003/03/23 23:22:48 jrfonseca Exp $ */ +/* $Id: texobj.c,v 1.62.4.8 2003/05/18 21:17:08 jrfonseca Exp $ */ #include "glheader.h" #include "colortab.h" @@ -58,7 +58,7 @@ * * \return pointer to new texture object. * - * Allocate and initalize a gl_texture_object structure, and insert in the + * Allocate and initialize a gl_texture_object structure, and insert in the * shared state texture list while holding its mutex. * If <tt>name > 0</tt> then also insert the new texture object into the hash * table. @@ -139,7 +139,7 @@ _mesa_alloc_texture_object( struct gl_shared_state *shared, * * Unlink the texture object from the shared state texture linked list while * holding its lock. If the texture is a name number it's also removed from the - * hash table. Finally rees the texture images and the object itself. + * hash table. Finally frees the texture images and the object itself. */ void _mesa_free_texture_object( struct gl_shared_state *shared, struct gl_texture_object *t ) @@ -554,7 +554,7 @@ _glthread_DECLARE_STATIC_MUTEX(GenTexturesLock); * * \sa glGenTextures(). * - * While holdind the GenTexturesLock lock, calls _mesa_HashFindFreeKeyBlock() + * While holding the GenTexturesLock lock, calls _mesa_HashFindFreeKeyBlock() * to find a block of free texture IDs which are stored in \p texName. * Corresponding empty texture objects are also generated. */ @@ -690,7 +690,7 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *texName) * * \sa glBindTexture(). * - * Determines the old texture object bound and returns immediatly if rebinding + * Determines the old texture object bound and returns immediately if rebinding * the same texture. Get the current texture which is either a default texture * if name is null, a named texture from the hash, or a new texture if the * given texture name is new. Increments its reference count, binds it, and @@ -851,7 +851,7 @@ _mesa_BindTexture( GLenum target, GLuint texName ) * * \sa glPrioritizeTextures(). * - * Looksup each texture in the hash, clamps the corresponding priority between + * Looks up each texture in the hash, clamps the corresponding priority between * 0.0 and 1.0, and calls dd_function_table::PrioritizeTexture. */ void @@ -896,7 +896,7 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName, * * \sa glAreTexturesResident(). * - * Looksup each texture in the hash and calls + * Looks up each texture in the hash and calls * dd_function_table::IsTextureResident. */ GLboolean diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index ca0b9d37ac..4d813cf819 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.87.4.3 2003/03/21 11:35:22 keithw Exp $ */ +/* $Id: texstate.c,v 1.87.4.4 2003/05/18 21:17:08 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -2830,7 +2830,7 @@ alloc_proxy_textures( GLcontext *ctx ) /** - * \brief Initalize a texture unit. + * \brief Initialize a texture unit. * * \param ctx GL context. * \param unit texture unit number to be initialized. diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h index 11cf04b386..c640d90a6f 100644 --- a/src/mesa/main/texstate.h +++ b/src/mesa/main/texstate.h @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: texstate.h,v 1.9.6.2 2003/03/22 16:49:59 jrfonseca Exp $ */ +/* $Id: texstate.h,v 1.9.6.3 2003/05/18 21:17:09 jrfonseca Exp $ */ #ifndef TEXSTATE_H @@ -173,7 +173,7 @@ _mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value); /** - * \name Initialization, state maintainance + * \name Initialization, state maintenance */ /*@{*/ diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 700c916b64..36db44e3cf 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -1,4 +1,4 @@ -/* $Id: texstore.c,v 1.47.4.2 2003/03/09 10:52:21 jrfonseca Exp $ */ +/* $Id: texstore.c,v 1.47.4.3 2003/05/18 21:17:09 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -445,7 +445,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions, * dstX/Y/Zoffset - as specified by glTexSubImage * dstRowStride - stride between dest rows in bytes * dstImageStride - stride between dest images in bytes - * srcFormat, srcType - incoming image format and datatype + * srcFormat, srcType - incoming image format and data type * srcAddr - source image address * srcPacking - packing params of source image * diff --git a/src/mesa/main/texutil_tmp.h b/src/mesa/main/texutil_tmp.h index 637dace107..c4d065a4d2 100644 --- a/src/mesa/main/texutil_tmp.h +++ b/src/mesa/main/texutil_tmp.h @@ -12,12 +12,12 @@ * * Macros which need to be defined before including this file: * - \c TAG(x) - the function name wrapper - * - \c DST_TYPE - the destination texel datatype (GLuint, GLushort, etc) - * - \c DST_TEXELS_PER_DWORD - number of dest texels that'll fit in 4 bytes - * - \c CONVERT_TEXEL - code to convert from source to dest texel + * - \c DST_TYPE - the destination texel data type (GLuint, GLushort, etc) + * - \c DST_TEXELS_PER_DWORD - number of destination texels that'll fit in 4 bytes + * - \c CONVERT_TEXEL - code to convert from source to destination texel * - \c CONVER_TEXEL_DWORD - if multiple texels fit in 4 bytes, this macros * will convert/store multiple texels at once - * - \c CONVERT_DIRECT - if defined, just memcpy texels from src to dest + * - \c CONVERT_DIRECT - if defined, just memcpy texels from source to destination * - \c SRC_TEXEL_BYTES - bytes per source texel * - \c PRESERVE_DST_TYPE - if defined, don't undefined these macros at end * @@ -48,7 +48,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: texutil_tmp.h,v 1.12.4.2 2003/03/23 14:58:08 jrfonseca Exp $ */ +/* $Id: texutil_tmp.h,v 1.12.4.3 2003/05/18 21:17:09 jrfonseca Exp $ */ #define DST_TEXEL_BYTES (4 / DST_TEXELS_PER_DWORD) diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c index 35a1482e24..7d153c734a 100644 --- a/src/mesa/math/m_matrix.c +++ b/src/mesa/math/m_matrix.c @@ -32,7 +32,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: m_matrix.c,v 1.14.4.4 2003/03/23 23:22:49 jrfonseca Exp $ */ +/* $Id: m_matrix.c,v 1.14.4.5 2003/05/18 21:17:19 jrfonseca Exp $ */ #include "glheader.h" @@ -105,7 +105,7 @@ static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b ) /** * \brief Multiply two matrices known to occupy only the top three rows, such - * as typical model matrices, and ortho matrices. + * as typical model matrices, and orthogonal matrices. * * \param a matrix. * \param b matrix. @@ -134,7 +134,7 @@ static void matmul34( GLfloat *product, const GLfloat *a, const GLfloat *b ) /** * \brief Multiply a matrix by an array of floats with known properties. * - * \param mat pointer to a GLmatrix structure containing the left mutiplication + * \param mat pointer to a GLmatrix structure containing the left multiplication * matrix, and that will receive the product result. * \param m right multiplication matrix array. * \param flags flags of the matrix \p m. @@ -220,7 +220,7 @@ static void print_matrix_floats( const GLfloat m[16] ) /** * \brief Dumps the contents of a GLmatrix structure. * - * \param m pointer to the GLmatrix strucure. + * \param m pointer to the GLmatrix structure. */ void _math_matrix_print( const GLmatrix *m ) @@ -280,7 +280,7 @@ _math_matrix_print( const GLmatrix *m ) * Code contributed by Jacques Leroy jle@star.be * * Calculates the inverse matrix by performing the gaussian matrix reduction - * with partial pivoting folloed by back/substitution with the loops manually + * with partial pivoting followed by back/substitution with the loops manually * unrolled. */ static GLboolean invert_matrix_general( GLmatrix *mat ) @@ -407,7 +407,7 @@ static GLboolean invert_matrix_general( GLmatrix *mat ) * \author Adapted from graphics gems II. * * Calculates the inverse of the upper left by first calculating its - * determinant and multiplying it to the simetric adjust matrix of each + * determinant and multiplying it to the symmetric adjust matrix of each * element. Finally deals with the translation part by transforming the * original translation vector using by the calculated submatrix inverse. */ @@ -984,7 +984,7 @@ _math_matrix_ortho( GLmatrix *mat, * \param z z axis scale factor. * * Multiplies in-place the elements of \p mat by the scale factors. Checks if - * the scales faactors are roughly the same, marking the MAT_FLAG_UNIFORM_SCALE + * the scales factors are roughly the same, marking the MAT_FLAG_UNIFORM_SCALE * flag, or MAT_FLAG_GENERAL_SCALE. Marks the MAT_DIRTY_TYPE and * MAT_DIRTY_INVERSE dirty flags. */ @@ -1033,12 +1033,12 @@ _math_matrix_translate( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z ) } /** - * \brief Set a matrix to the indentity matrix. + * \brief Set a matrix to the identity matrix. * * \param mat matrix. * * Copies ::Identity into \p GLmatrix::m, and into GLmatrix::inv if not NULL. - * Sets the matrix type to indentity, and clear the dirty flags. + * Sets the matrix type to identity, and clear the dirty flags. */ void _math_matrix_set_identity( GLmatrix *mat ) @@ -1217,7 +1217,7 @@ static void analyse_from_scratch( GLmatrix *mat ) } /** - * \brief Analyse a matrix given that its flags are accurate. + * \brief Analyze a matrix given that its flags are accurate. * * This is the more common operation, hopefully. */ @@ -1267,7 +1267,7 @@ static void analyse_from_flags( GLmatrix *mat ) * If the matrix type is dirty then calls either analyse_from_scratch() or * analyse_from_flags() to determine its type, according to whether the flags * are dirty or not, respectively. If the matrix has an inverse and it's dirty - * then calls matrix_invert(). Finally clears the firty flags. + * then calls matrix_invert(). Finally clears the dirty flags. */ void _math_matrix_analyse( GLmatrix *mat ) diff --git a/src/mesa/math/m_matrix.h b/src/mesa/math/m_matrix.h index a5c606d4f2..973231eb4c 100644 --- a/src/mesa/math/m_matrix.h +++ b/src/mesa/math/m_matrix.h @@ -27,7 +27,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: m_matrix.h,v 1.4.8.3 2003/03/22 16:49:59 jrfonseca Exp $ */ +/* $Id: m_matrix.h,v 1.4.8.4 2003/05/18 21:17:19 jrfonseca Exp $ */ #ifndef _M_MATRIX_H @@ -55,7 +55,7 @@ enum GLmatrixtype { MATRIX_GENERAL = 0, /**< \brief general 4x4 matrix */ MATRIX_IDENTITY = 1, /**< \brief identity matrix */ - MATRIX_3D_NO_ROT = 2, /**< \brief ortho projection and others... */ + MATRIX_3D_NO_ROT = 2, /**< \brief orthogonal projection and others... */ MATRIX_PERSPECTIVE = 3, /**< \brief perspective projection matrix */ MATRIX_2D = 4, /**< \brief 2-D transformation */ MATRIX_2D_NO_ROT = 5, /**< \brief 2-D scale & translate only */ @@ -69,8 +69,8 @@ enum GLmatrixtype { /*@{*/ #define MAT_FLAG_IDENTITY 0 /**< \brief is an identity matrix flag. - * (Not actualy used - the identity - * matrix is identified by the abcense + * (Not actually used - the identity + * matrix is identified by the absense / of all other flags.) */ #define MAT_FLAG_GENERAL 0x1 /**< \brief is a general matrix flag */ #define MAT_FLAG_ROTATION 0x2 /**< \brief is a rotation matrix flag */ diff --git a/src/mesa/math/mathmod.h b/src/mesa/math/mathmod.h index f6d3553e99..160b486102 100644 --- a/src/mesa/math/mathmod.h +++ b/src/mesa/math/mathmod.h @@ -1,4 +1,4 @@ -/* $Id: mathmod.h,v 1.3.8.1 2003/01/10 21:57:42 brianp Exp $ */ +/* $Id: mathmod.h,v 1.3.8.2 2003/05/18 21:17:19 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -29,7 +29,7 @@ * \mainpage Mesa Math Module * * This module contains math-related utility functions for transforming - * vertices, translating arrays of numbers from one datatype to another, + * vertices, translating arrays of numbers from one data type to another, * evaluating curved surfaces, etc. */ diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index a9cddf1fec..0a04a8cf06 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,4 +1,4 @@ -/* $Id: s_drawpix.c,v 1.39 2002/10/30 20:18:38 brianp Exp $ */ +/* $Id: s_drawpix.c,v 1.39.4.1 2003/05/18 21:17:20 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -540,7 +540,7 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y, /* - * Do glDrawPixels of stencil image. The image datatype may either + * Do glDrawPixels of stencil image. The image data type may either * be GLubyte or GLbitmap. */ static void diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index 1fb14dcd10..418a090f6f 100644 --- a/src/mesa/swrast/s_linetemp.h +++ b/src/mesa/swrast/s_linetemp.h @@ -1,4 +1,4 @@ -/* $Id: s_linetemp.h,v 1.14 2002/11/09 21:26:41 brianp Exp $ */ +/* $Id: s_linetemp.h,v 1.14.4.1 2003/05/18 21:17:20 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -44,7 +44,7 @@ * When one can directly address pixels in the color buffer the following * macros can be defined and used to directly compute pixel addresses during * rasterization (see pixelPtr): - * PIXEL_TYPE - the datatype of a pixel (GLubyte, GLushort, GLuint) + * PIXEL_TYPE - the data type of a pixel (GLubyte, GLushort, GLuint) * BYTES_PER_ROW - number of bytes per row in the color buffer * PIXEL_ADDRESS(X,Y) - returns the address of pixel at (X,Y) where * Y==0 at bottom of screen and increases upward. diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h index 38762112f0..5890dd93ff 100644 --- a/src/mesa/swrast/s_tritemp.h +++ b/src/mesa/swrast/s_tritemp.h @@ -1,10 +1,10 @@ -/* $Id: s_tritemp.h,v 1.41 2002/11/13 16:51:02 brianp Exp $ */ +/* $Id: s_tritemp.h,v 1.40.4.1 2003/05/18 21:17:21 jrfonseca Exp $ */ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 3.5 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -49,7 +49,7 @@ * When one can directly address pixels in the color buffer the following * macros can be defined and used to compute pixel addresses during * rasterization (see pRow): - * PIXEL_TYPE - the datatype of a pixel (GLubyte, GLushort, GLuint) + * PIXEL_TYPE - the data type of a pixel (GLubyte, GLushort, GLuint) * BYTES_PER_ROW - number of bytes per row in the color buffer * PIXEL_ADDRESS(X,Y) - returns the address of pixel at (X,Y) where * Y==0 at bottom of screen and increases upward. @@ -88,13 +88,10 @@ #define INTERP_FLOAT_SPEC #endif -#endif /* CHAN_TYPE == GL_FLOAT */ - +#endif -static void NAME(GLcontext *ctx, const SWvertex *v0, - const SWvertex *v1, - const SWvertex *v2 ) +/*void triangle( GLcontext *ctx, SWvertex *v0, SWvertex *v1, SWvertex *v2 )*/ { typedef struct { const SWvertex *v0, *v1; /* Y(v0) < Y(v1) */ @@ -1407,4 +1404,3 @@ static void NAME(GLcontext *ctx, const SWvertex *v0, #undef FixedToDepth #undef DO_OCCLUSION_TEST -#undef NAME diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index de7adfe7a1..b56bbb63e5 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -1,4 +1,4 @@ -/* $Id: t_context.h,v 1.43.6.1 2002/12/30 15:20:38 keithw Exp $ */ +/* $Id: t_context.h,v 1.43.6.2 2003/05/18 21:17:21 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -26,7 +26,7 @@ /** * \file t_context.h - * \brief TnL module datatypes and definitions. + * \brief TnL module data types and definitions. * \author Keith Whitwell */ diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c index 4076051c87..86031404df 100644 --- a/src/mesa/tnl/t_vtx_api.c +++ b/src/mesa/tnl/t_vtx_api.c @@ -331,7 +331,7 @@ static void _tnl_EvalCoord2fv( const GLfloat *v ) * dispatch slot for each value of 'index' or 'unit' in VertexAttribNV * and MultiTexCoordARB. Also need a mechnism for keeping this data * consistent with what's coming in via the Vertex/Normal/etc api - * above (where aliasing exists with the traditional entrypoints). + * above (where aliasing exists with the traditional entry points). * Note that MultiTexCoordARB aliases with TexCoord when unit==0. * * Need presence tracking for material components, too, but not size diff --git a/src/miniglx/dispatch.c b/src/miniglx/dispatch.c index a83f20a281..61b0e1ee7f 100644 --- a/src/miniglx/dispatch.c +++ b/src/miniglx/dispatch.c @@ -1,7 +1,7 @@ /** * \file miniglx/dispatch.c * - * \brief C-based dispatch of the OpenGL entrypoints (glAccum(), glBegin(), + * \brief C-based dispatch of the OpenGL entry points (glAccum(), glBegin(), * etc). * * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/src/miniglx/miniglx.c b/src/miniglx/miniglx.c index 158be0a530..8971ad6101 100644 --- a/src/miniglx/miniglx.c +++ b/src/miniglx/miniglx.c @@ -31,7 +31,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: miniglx.c,v 1.1.4.54 2003/05/18 12:36:26 jrfonseca Exp $ */ +/* $Id: miniglx.c,v 1.1.4.55 2003/05/18 21:17:19 jrfonseca Exp $ */ /** * \mainpage Mini GLX @@ -1646,7 +1646,7 @@ glXChooseVisual( Display *dpy, int screen, int *attribList ) * Returns the appropriate attribute of ::__GLXvisualConfig pointed by * MiniGLXVisualRec::glxConfig of XVisualInfo::visual. * - * \sa datatypes. + * \sa data types. */ int glXGetConfig( Display *dpy, XVisualInfo *vis, int attrib, int *value ) diff --git a/src/miniglx/miniglxP.h b/src/miniglx/miniglxP.h index 78aeff5eab..815d5ee756 100644 --- a/src/miniglx/miniglxP.h +++ b/src/miniglx/miniglxP.h @@ -1,6 +1,6 @@ /** * \file miniglxP.h - * \brief Define replacements for some X datatypes and define the DRI-related + * \brief Define replacements for some X data types and define the DRI-related * data structures. * * \note Cut down version of glxclient.h. @@ -268,12 +268,12 @@ struct DRIDriverRec { /** - * \brief Idle and shutdown hardware in preparation for a vt switch. + * \brief Idle and shutdown hardware in preparation for a VT switch. */ int (*shutdownHardware)( struct DRIDriverContextRec *dpy ); /** - * \brief Restore hardware state after regaining the vt. + * \brief Restore hardware state after regaining the VT. */ int (*restoreHardware)( struct DRIDriverContextRec *dpy ); @@ -372,8 +372,8 @@ struct MiniGLXConnection { int fd; /**< \brief file descriptor */ char readbuf[MINIGLX_BUF_SIZE]; /**< \brief read buffer */ char writebuf[MINIGLX_BUF_SIZE]; /**< \brief write buffer */ - int readbuf_count; /**< \brief counf of bytes waiting to be read */ - int writebuf_count; /**< \brief counf of bytes waiting to be written */ + int readbuf_count; /**< \brief count of bytes waiting to be read */ + int writebuf_count; /**< \brief count of bytes waiting to be written */ }; diff --git a/src/miniglx/miniglx_events.c b/src/miniglx/miniglx_events.c index a0457a5e39..6dd547509a 100644 --- a/src/miniglx/miniglx_events.c +++ b/src/miniglx/miniglx_events.c @@ -11,7 +11,7 @@ * A fairly complete client/server non-blocking communication * mechanism. Probably overkill given that none of our messages * currently exceed 1 byte in length and take place over the - * relatively benign channel provided by a unix domain socket. + * relatively benign channel provided by a Unix domain socket. */ /* @@ -38,7 +38,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: miniglx_events.c,v 1.1.2.12 2003/05/18 12:36:26 jrfonseca Exp $ */ +/* $Id: miniglx_events.c,v 1.1.2.13 2003/05/18 21:17:20 jrfonseca Exp $ */ #include <assert.h> @@ -83,7 +83,7 @@ enum msgs { * * \param dpy the display handle. * - * \return Pointer to the queued event struct or NULL on failure. + * \return Pointer to the queued event structure or NULL on failure. * * \internal * If there is space on the XEvent queue, return a pointer @@ -178,8 +178,8 @@ static void shut_fd( Display *dpy, int i ) * \param sz the size of the message * * \internal - * Copy the message to the writebuffer for the nominated connection. - * This will be actually sent to that file discriptor from + * Copy the message to the write buffer for the nominated connection. + * This will be actually sent to that file descriptor from * __miniglx_Select(). */ static int send_msg( Display *dpy, int i, @@ -217,7 +217,7 @@ static int send_char_msg( Display *dpy, int i, char msg ) * * \param dpy the display handle. * \param connection the index in dpy->fd of the socket connection. - * \param msg storage for the recieved message. + * \param msg storage for the received message. * \param msg_size the number of bytes to read. * * \internal @@ -316,7 +316,7 @@ static int welcome_message( Display *dpy, int i ) * * \return True on success or False on failure. * - * Acepts the connection, sets it in non-blocking operation, and finds a free + * Accepts the connection, sets it in non-blocking operation, and finds a free * slot in Display::fd for it. */ static int handle_new_client( Display *dpy ) @@ -372,8 +372,8 @@ static int handle_new_client( Display *dpy ) } /** - * This routine "puffs out" the very basic communciations between - * client & server to full-sized X Events that can be handled by the + * This routine "puffs out" the very basic communications between + * client and server to full-sized X Events that can be handled by the * application. * * \param dpy the display handle. @@ -518,7 +518,7 @@ handle_fifo_read( Display *dpy, int i ) * The VT switches is detected by comparing Display::haveVT and * Display::hwActive. When loosing the VT the hardware lock is acquired, the * hardware is shutdown via a call to DRIDriverRec::shutdownHardware(), and the - * VT released. When aquiring the VT back the hardware state is restored via a + * VT released. When acquiring the VT back the hardware state is restored via a * call to DRIDriverRec::restoreHardware() and the hardware lock released. */ static void __driHandleVtSignals( Display *dpy ) @@ -575,11 +575,11 @@ static void __driHandleVtSignals( Display *dpy ) * clients. * * \sa - * See select_tut in the linux manual pages for more discussion. + * See select_tut in the Linux manual pages for more discussion. * * \internal * Creates and initializes the file descriptor sets by inspecting Display::fd - * if these aren't passed in the function call. Calls select() and fullfill the + * if these aren't passed in the function call. Calls select() and fulfill the * demands by trying to fill MiniGLXConnection::readbuf and draining * MiniGLXConnection::writebuf. * The server fd[0] is handled specially for new connections, by calling @@ -708,7 +708,7 @@ __miniglx_Select( Display *dpy, int n, fd_set *rfds, fd_set *wfds, fd_set *xfds, * \brief Handle socket events. * * \param dpy the display handle. - * \param nonblock whether to return immediatly or wait for an event. + * \param nonblock whether to return immediately or wait for an event. * * \return True on success, False on failure. Aborts on critical error. * @@ -736,7 +736,7 @@ static int handle_fd_events( Display *dpy, int nonblock ) * * \return True on success or False on failure. * - * Allocates and initializes the Display::fd array and create a unix socket on + * Allocates and initializes the Display::fd array and create a Unix socket on * the first entry. For a server binds the socket to a filename and listen for * connections. For a client connects to the server and waits for a welcome * message. Sets the socket in nonblocking mode. @@ -762,7 +762,7 @@ int __miniglx_open_connections( Display *dpy ) } - /* Create a unix socket -- Note this is *not* a network connection! + /* Create a Unix socket -- Note this is *not* a network connection! */ dpy->fd[0].fd = socket(PF_UNIX, SOCK_STREAM, 0); if (dpy->fd[0].fd < 0) { @@ -821,7 +821,7 @@ int __miniglx_open_connections( Display *dpy ) /** - * Frees the connections initialzed by __miniglx_open_connections(). + * Frees the connections initialized by __miniglx_open_connections(). * * \param dpy the display handle. */ @@ -927,7 +927,7 @@ XUnmapWindow( Display *dpy, Window w ) * \brief Block and wait for next X event. * * \param dpy the display handle as returned by XOpenDisplay(). - * \param event_return a pointer to an XEvent struct for the returned data. + * \param event_return a pointer to an XEvent structure for the returned data. * * Wait until there is a new XEvent pending. */ @@ -946,7 +946,7 @@ int XNextEvent(Display *dpy, XEvent *event_return) * * \param dpy the display handle as returned by XOpenDisplay(). * \param event_mask ignored. - * \param event_return a pointer to an XEvent struct for the returned data. + * \param event_return a pointer to an XEvent structure for the returned data. * * Check if there is a new XEvent pending. Note that event_mask is * ignored and any pending event will be returned. |