diff options
| author | Mat M <mathew1800@gmail.com> | 2018-03-16 11:59:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 11:59:14 -0400 |
| commit | 9f4d5122a2a1b2d0dbfd6164a616d1c859ef0d0b (patch) | |
| tree | b1abde9e2426fee186ef9ae114d76e03ebaeae3e /Source/Core/VideoCommon/VertexLoader.cpp | |
| parent | 1259370cdfcc23c0939bb72fb5dcf2e62096192f (diff) | |
| parent | 50a476c3714b3c423609ec04ce424c244bd2a1c1 (diff) | |
Merge pull request #6438 from lioncash/assert
Assert: Uppercase assertion macros
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 1db8deec0c..f89089049d 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -244,7 +244,7 @@ void VertexLoader::CompileVertexTranslator() WriteCall(Color_ReadDirect_32b_8888); break; default: - _assert_(0); + ASSERT(0); break; } break; @@ -271,7 +271,7 @@ void VertexLoader::CompileVertexTranslator() WriteCall(Color_ReadIndex8_32b_8888); break; default: - _assert_(0); + ASSERT(0); break; } break; @@ -298,7 +298,7 @@ void VertexLoader::CompileVertexTranslator() WriteCall(Color_ReadIndex16_32b_8888); break; default: - _assert_(0); + ASSERT(0); break; } break; @@ -325,12 +325,12 @@ void VertexLoader::CompileVertexTranslator() if (tc[i] != NOT_PRESENT) { - _assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, - "Invalid texture coordinates!\n(tc[i] = %d)", (u32)tc[i]); - _assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, - "Invalid texture coordinates format!\n(format = %d)", format); - _assert_msg_(VIDEO, 0 <= elements && elements <= 1, - "Invalid number of texture coordinates elements!\n(elements = %d)", elements); + ASSERT_MSG(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, + "Invalid texture coordinates!\n(tc[i] = %d)", (u32)tc[i]); + ASSERT_MSG(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, + "Invalid texture coordinates format!\n(format = %d)", format); + ASSERT_MSG(VIDEO, 0 <= elements && elements <= 1, + "Invalid number of texture coordinates elements!\n(elements = %d)", elements); components |= VB_HAS_UV0 << i; WriteCall(VertexLoader_TextCoord::GetFunction(tc[i], format, elements)); |