Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos in RenderSystems/ #274

Merged
merged 1 commit into from
Mar 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Components/Overlay/src/OgreFont.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ namespace Ogre
//---------------------------------------------------------------------
Font::~Font()
{
// have to call this here reather than in Resource destructor
// have to call this here rather than in Resource destructor
// since calling virtual methods in base destructors causes crash
unload();
}
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/include/OgreNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ namespace Ogre
virtual_l2 void rotate( const Vector3 &axis, const Radian &angle,
TransformSpace relativeTo = TS_LOCAL );

/** Rotate the node around an aritrary axis using a Quarternion.
/** Rotate the node around an arbitrary axis using a Quarternion.
*/
virtual_l2 void rotate( const Quaternion &q, TransformSpace relativeTo = TS_LOCAL );

Expand Down
2 changes: 1 addition & 1 deletion OgreMain/include/OgreOldNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ namespace Ogre
virtual void rotate( const Vector3 &axis, const Radian &angle,
TransformSpace relativeTo = TS_LOCAL );

/** Rotate the OldNode around an aritrary axis using a Quarternion.
/** Rotate the OldNode around an arbitrary axis using a Quarternion.
*/
virtual void rotate( const Quaternion &q, TransformSpace relativeTo = TS_LOCAL );

Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreMaterial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace Ogre
Material::~Material()
{
removeAllTechniques();
// have to call this here reather than in Resource destructor
// have to call this here rather than in Resource destructor
// since calling virtual methods in base destructors causes crash
unload();
}
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreMesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace Ogre
//-----------------------------------------------------------------------
Mesh::~Mesh()
{
// have to call this here reather than in Resource destructor
// have to call this here rather than in Resource destructor
// since calling virtual methods in base destructors causes crash
unload();
}
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreMesh2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace Ogre
//-----------------------------------------------------------------------
Mesh::~Mesh()
{
// have to call this here reather than in Resource destructor
// have to call this here rather than in Resource destructor
// since calling virtual methods in base destructors causes crash
unload();
}
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreSkeleton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace Ogre
//---------------------------------------------------------------------
Skeleton::~Skeleton()
{
// have to call this here reather than in Resource destructor
// have to call this here rather than in Resource destructor
// since calling virtual methods in base destructors causes crash
unload();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace Ogre
// If you use multiple rendering passes you can test only the first pass and all other passes don't
// have to be rendered if the first pass results has too few pixels visible.

// Be sure to render all occluder first and whats out so the RenderQue don't switch places on
// Be sure to render all occluder first and what's out so the RenderQue don't switch places on
// the occluding objects and the tested objects because it thinks it's more effective..

/**
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Direct3D11/include/OgreD3D11Prerequisites.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ namespace Ogre
typedef SharedPtr<D3D11HLSLProgram> D3D11HLSLProgramPtr;

//-------------------------------------------
// Windows setttings
// Windows settings
//-------------------------------------------
#if( OGRE_PLATFORM == OGRE_PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WINRT ) && \
!defined( OGRE_STATIC_LIB )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace Ogre

/** Creates a special D3D11TextureGpuWindow pointer, to be used by Ogre::Window.
The pointer can be freed by a regular OGRE_DELETE. We do not track this pointer.
If caller doesnt' delete it, it will leak.
If caller doesn't delete it, it will leak.
*/
TextureGpu *createTextureGpuWindow( bool fromFlipModeSwapchain, Window *window );
TextureGpu *createWindowDepthBuffer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ namespace Ogre

LogManager::getSingleton().logMessage(
"WARNING: Calling AsyncTextureTicket::queryIsTransferDone too "
"often with innacurate tracking in the same frame this transfer "
"often with inaccurate tracking in the same frame this transfer "
"was issued. Switching to accurate tracking. If this is an accident, "
"wait until you've rendered a few frames before checking if it's done. "
"If this is on purpose, consider calling AsyncTextureTicket::download()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace Ogre

void throwException()
{
String message = "D3D11 dosn't support assembly shaders. Shader name:" + mName + "\n";
String message = "D3D11 doesn't support assembly shaders. Shader name:" + mName + "\n";
OGRE_EXCEPT( Exception::ERR_RENDERINGAPI_ERROR, message,
"D3D11UnsupportedGpuProgram::loadFromSource" );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace Ogre
{
OGRE_EXCEPT( Exception::ERR_INVALIDPARAMS,
"Cannot mix RenderWindow colour texture with depth or stencil buffer "
"that aren't for RenderWindows, or viceversa",
"that aren't for RenderWindows, or vice-versa",
"D3D11RenderPassDescriptor::checkRenderWindowStatus" );
}

Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Direct3D11/src/OgreD3D11RenderSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ namespace Ogre
// to GL (which is measured in milliseconds per shader, instead of seconds).
// There's two possible reasons to disable this hack:
// 1. Easier debugging. Shader structs like "Material m[256];" get declared
// as "Material m[2];" which cause debuggers to show only 2 entires,
// as "Material m[2];" which cause debuggers to show only 2 entries,
// instead of all of them. Some debuggers (like RenderDoc) allow changing
// the amount of elements displayed and workaround it; nonetheless
// disabling it makes your life easier.
Expand Down
4 changes: 2 additions & 2 deletions RenderSystems/Direct3D11/src/Vao/OgreD3D11UavBufferPacked.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace Ogre
TexBufferPacked *retVal = OGRE_NEW D3D11TexBufferPacked(
mInternalBufferStart * mBytesPerElement, mNumElements, mBytesPerElement, 0, mBufferType,
(void *)0, false, (VaoManager *)0, bufferInterface, pixelFormat, true, mDevice );
// We were overriden by the BufferPacked we just created. Restore this back!
// We were overridden by the BufferPacked we just created. Restore this back!
bufferInterface->_notifyBuffer( this );

return retVal;
Expand All @@ -91,7 +91,7 @@ namespace Ogre
ReadOnlyBufferPacked *retVal = OGRE_NEW D3D11ReadOnlyBufferPacked(
mInternalBufferStart * mBytesPerElement, mNumElements, mBytesPerElement, 0, mBufferType,
(void *)0, false, (VaoManager *)0, bufferInterface, PFG_NULL, true, mDevice );
// We were overriden by the BufferPacked we just created. Restore this back!
// We were overridden by the BufferPacked we just created. Restore this back!
bufferInterface->_notifyBuffer( this );

return retVal;
Expand Down
4 changes: 2 additions & 2 deletions RenderSystems/Direct3D11/src/Vao/OgreD3D11VaoManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ namespace Ogre
assert( mVbos[i][j].empty() );

// 4096u is a sensible default because most Hlms implementations need 16 bytes per
// instance in a const buffer. HlmsBufferManager::mapNextConstBuffer purposedly clamps
// instance in a const buffer. HlmsBufferManager::mapNextConstBuffer purposely clamps
// its const buffers to 64kb, so that 64kb / 16 = 4096 and thus it can never exceed
// 4096 instances.
// However due to instanced stereo, we need twice that
Expand Down Expand Up @@ -808,7 +808,7 @@ namespace Ogre
"PERFORMANCE WARNING D3D11: Calling createAsyncTicket when there are "
"pending immutable buffers to be created. This will force Ogre to "
"create them immediately; which diminish our ability to batch meshes "
"toghether & could affect performance during rendering.\n"
"together & could affect performance during rendering.\n"
"You should call createAsyncTicket after all immutable meshes have "
"been loaded to ensure they get batched together. If you're already "
"doing this, you can ignore this warning.\n"
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/GL3Plus/include/GLSL/OgreGLSLPreprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace Ogre
* required. This is crucial if, say, GLSL compiler reports you an error
* with a line number.
* <li>#define: Parametrized and non-parametrized macros. Invoking a macro with
* less arguments than it takes assignes empty values to missing arguments.
* less arguments than it takes assigns empty values to missing arguments.
* <li>#undef: Forget defined macros
* <li>#ifdef/#ifndef/#else/#endif: Conditional suppression of parts of code.
* <li>#if: Supports numeric expression of any complexity, also supports the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace Ogre
// If you use multiple rendering passes you can test only the first pass and all other passes don't
// have to be rendered if the first pass result has too few pixels visible.

// Be sure to render all occluder first and whats out so the RenderQue don't switch places on
// Be sure to render all occluder first and what's out so the RenderQue don't switch places on
// the occluding objects and the tested objects because it thinks it's more effective..

/**
Expand Down
4 changes: 2 additions & 2 deletions RenderSystems/GL3Plus/include/OgreGL3PlusTextureGpuManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ namespace Ogre

/** Creates a special GL3PlusTextureGpuWindow pointer, to be used by Ogre::Window.
The pointer can be freed by a regular OGRE_DELETE. We do not track this pointer.
If caller doesnt' delete it, it will leak.
If caller doesn't delete it, it will leak.
*/
TextureGpu *createTextureGpuWindow( GL3PlusContext *context, Window *window );

/// See EglPBufferWindow. We do not track this pointer.
/// If caller doesnt' delete it, it will leak.
/// If caller doesn't delete it, it will leak.
TextureGpu *createTextureGpuHeadlessWindow( GL3PlusContext *context, Window *window );

GLuint getBlankTextureGlName( TextureTypes::TextureTypes textureType ) const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ namespace Ogre
{
// IMPORTANT: If you get a dangling pointer at currentUniform->mConstantDef
// (e.g. detected via ASAN) then see GLSLShader::MonolithicCacheStatus
// If you loaded -> unloaded -> modifed code -> loaded again
// If you loaded -> unloaded -> modified code -> loaded again
// then you need to set MCS_INVALIDATE (which is a workaround)
//
// The Monolithic cache is not from perfect and ideally should be moved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ namespace Ogre

LogManager::getSingleton().logMessage(
"WARNING: Calling AsyncTextureTicket::queryIsTransferDone too "
"often with innacurate tracking in the same frame this transfer "
"often with inaccurate tracking in the same frame this transfer "
"was issued. Switching to accurate tracking. If this is an accident, "
"wait until you've rendered a few frames before checking if it's done. "
"If this is on purpose, consider calling AsyncTextureTicket::download()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace Ogre
{
OGRE_EXCEPT( Exception::ERR_INVALIDPARAMS,
"Cannot mix RenderWindow colour texture with depth or stencil buffer "
"that aren't for RenderWindows, or viceversa",
"that aren't for RenderWindows, or vice-versa",
"GL3PlusRenderPassDescriptor::checkRenderWindowStatus" );
}

Expand Down
4 changes: 2 additions & 2 deletions RenderSystems/GL3Plus/src/Vao/OgreGL3PlusUavBufferPacked.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace Ogre
TexBufferPacked *retVal = OGRE_NEW GL3PlusTexBufferPacked(
mInternalBufferStart * mBytesPerElement, mNumElements, mBytesPerElement, 0, mBufferType,
(void *)0, false, (VaoManager *)0, bufferInterface, pixelFormat );
// We were overriden by the BufferPacked we just created. Restore this back!
// We were overridden by the BufferPacked we just created. Restore this back!
bufferInterface->_notifyBuffer( this );

return retVal;
Expand All @@ -72,7 +72,7 @@ namespace Ogre
ReadOnlyBufferPacked *retVal = OGRE_NEW GL3PlusReadOnlyUavBufferPacked(
mInternalBufferStart * mBytesPerElement, mNumElements, mBytesPerElement, 0, mBufferType,
(void *)0, false, (VaoManager *)0, bufferInterface, PFG_NULL );
// We were overriden by the BufferPacked we just created. Restore this back!
// We were overridden by the BufferPacked we just created. Restore this back!
bufferInterface->_notifyBuffer( this );

return retVal;
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/GL3Plus/src/Vao/OgreGL3PlusVaoManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ namespace Ogre
mSupportsBaseInstance = _supportsBaseInstance;

// 4096u is a sensible default because most Hlms implementations need 16 bytes per
// instance in a const buffer. HlmsBufferManager::mapNextConstBuffer purposedly clamps
// instance in a const buffer. HlmsBufferManager::mapNextConstBuffer purposely clamps
// its const buffers to 64kb, so that 64kb / 16 = 4096 and thus it can never exceed
// 4096 instances.
// However due to instanced stereo, we need twice that
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ void GTKGLSupport::end_context()

void GTKGLSupport::initialiseExtensions()
{
// XXX anythign to actually do here?
// XXX anything to actually do here?
}

bool GTKGLSupport::checkMinGLVersion( const String &v ) const
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/GLES2/include/GLES2/gl2ext.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extern "C" {
/* New types shared by several extensions */

#ifndef __gl3_h_
/* These are defineed with respect to <inttypes.h> in the
/* These are defined with respect to <inttypes.h> in the
* Apple extension spec, but they are also used by non-APPLE
* extensions, and in the Khronos header we use the Khronos
* portable types in khrplatform.h, which must be defined.
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/GLES2/include/OgreGLES2FBORenderTexture.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ namespace Ogre {
*/
GLuint getTemporaryFBO(size_t i);

/** Detects all supported fbo's and recreates the tempory fbo */
/** Detects all supported fbo's and recreates the temporary fbo */
void _reload();

private:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace Ogre {
// If you use multiple rendering passes you can test only the first pass and all other passes don't have to be rendered
// if the first pass result has too few pixels visible.

// Be sure to render all occluder first and whats out so the RenderQue don't switch places on
// Be sure to render all occluder first and what's out so the RenderQue don't switch places on
// the occluding objects and the tested objects because it thinks it's more effective..

class _OgreGLES2Export GLES2HardwareOcclusionQuery : public HardwareOcclusionQuery MANAGED_RESOURCE
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/GLES2/include/OgreGLES2PixelFormat.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace Ogre {
static PixelFormat getClosestOGREFormat(GLenum fmt, GLenum dataType);

/** Returns the maximum number of Mipmaps that can be generated until we reach
the mininum format possible. This does not count the base level.
the minimum format possible. This does not count the base level.
@param width
The width of the area
@param height
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace Ogre {
* required. This is crucial if, say, GLSL compiler reports you an error
* with a line number.
* <li>#define: Parametrized and non-parametrized macros. Invoking a macro with
* less arguments than it takes assignes empty values to missing arguments.
* less arguments than it takes assigns empty values to missing arguments.
* <li>#undef: Forget defined macros
* <li>#ifdef/#ifndef/#else/#endif: Conditional suppression of parts of code.
* <li>#if: Supports numeric expression of any complexity, also supports the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace Ogre
programs via the Open GL program pipeline.

Separable programs consist of shader objects which have been
individually linked. This allows for invidual shaders in a
individually linked. This allows for individual shaders in a
program pipeline to be swapped without recompiling the program
object, as would be necessary with monolithic programs. This
is especially useful in the common case of only entities which
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/GLES2/src/OgreGLES2RenderToVertexBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ namespace v1 {
//TODO : Implement more?
default:
OGRE_EXCEPT(Exception::ERR_RENDERINGAPI_ERROR,
"Unsupported vertex element sematic in render to vertex buffer",
"Unsupported vertex element semantic in render to vertex buffer",
"OgreGLES2RenderToVertexBuffer::getSemanticVaryingName");
}
}
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Metal/include/OgreMetalTextureGpuManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace Ogre

/** Creates a special MetalTextureGpuWindow pointer, to be used by Ogre::Window.
The pointer can be freed by a regular OGRE_DELETE. We do not track this pointer.
If caller doesnt' delete it, it will leak.
If caller doesn't delete it, it will leak.
*/
TextureGpu *createTextureGpuWindow( MetalWindow *window );
TextureGpu *createWindowDepthBuffer();
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Metal/src/OgreMetalAsyncTextureTicket.mm
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ of this software and associated documentation files (the "Software"), to deal

LogManager::getSingleton().logMessage(
"WARNING: Calling AsyncTextureTicket::queryIsTransferDone too "
"often with innacurate tracking in the same frame this transfer "
"often with inaccurate tracking in the same frame this transfer "
"was issued. Switching to accurate tracking. If this is an accident, "
"wait until you've rendered a few frames before checking if it's done. "
"If this is on purpose, consider calling AsyncTextureTicket::download()"
Expand Down
4 changes: 2 additions & 2 deletions RenderSystems/Metal/src/OgreMetalProgram.mm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ of this software and associated documentation files (the "Software"), to deal
mLibrary = nil;
mFunction = nil;

// Have to call this here reather than in Resource destructor
// Have to call this here rather than in Resource destructor
// since calling virtual methods in base destructors causes crash
if( isLoaded() )
{
Expand Down Expand Up @@ -248,7 +248,7 @@ of this software and associated documentation files (the "Software"), to deal
if( !mFunction )
{
mCompiled = false;
LogManager::getSingleton().logMessage( "Error retriving entry point '" + mEntryPoint +
LogManager::getSingleton().logMessage( "Error retrieving entry point '" + mEntryPoint +
"' in shader " + mName );
}

Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Metal/src/OgreMetalRenderPassDescriptor.mm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ of this software and associated documentation files (the "Software"), to deal
{
OGRE_EXCEPT( Exception::ERR_INVALIDPARAMS,
"Cannot mix RenderWindow colour texture with depth or stencil buffer "
"that aren't for RenderWindows, or viceversa",
"that aren't for RenderWindows, or vice-versa",
"MetalRenderPassDescriptor::checkRenderWindowStatus" );
}
}
Expand Down
Loading