Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 20:46:03 +08:00
Code Activity

Update CUtlMemory EXTERNAL_* flags handling

Browse Source
This commit is contained in:
GAMMACASE
2023-09-23 16:29:50 +03:00
committed by Nicholas Hastings
parent d107389982
commit de31558103
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/tier1/utlmemory.h
View File

@ -132,7 +132,7 @@ protected:
void ValidateGrowSize() void ValidateGrowSize()
{ {
#ifdef _X360 #ifdef _X360
if ( m_nGrowSize && m_nGrowSize != EXTERNAL_BUFFER_MARKER ) if ( m_nGrowSize && (m_nGrowSize & EXTERNAL_BUFFER_MARKER) == 0 )
{ {
// Max grow size at 128 bytes on XBOX // Max grow size at 128 bytes on XBOX
const int MAX_GROW = 128; const int MAX_GROW = 128;
@ -146,8 +146,8 @@ protected:
enum enum
{ {
EXTERNAL_BUFFER_MARKER = -1, EXTERNAL_CONST_BUFFER_MARKER = (1 << 30),
EXTERNAL_CONST_BUFFER_MARKER = -2, EXTERNAL_BUFFER_MARKER = (1 << 31),
}; };
T* m_pMemory; T* m_pMemory;
@ -579,7 +579,7 @@ inline const T& CUtlMemory<T,I>::Element( I i ) const
template< class T, class I > template< class T, class I >
bool CUtlMemory<T,I>::IsExternallyAllocated() const bool CUtlMemory<T,I>::IsExternallyAllocated() const
{ {
return (m_nGrowSize < 0); return (m_nGrowSize & (EXTERNAL_CONST_BUFFER_MARKER | EXTERNAL_BUFFER_MARKER)) != 0;
} }
@ -589,7 +589,7 @@ bool CUtlMemory<T,I>::IsExternallyAllocated() const
template< class T, class I > template< class T, class I >
bool CUtlMemory<T,I>::IsReadOnly() const bool CUtlMemory<T,I>::IsReadOnly() const
{ {
return (m_nGrowSize == EXTERNAL_CONST_BUFFER_MARKER); return (m_nGrowSize & EXTERNAL_CONST_BUFFER_MARKER) != 0;
} }
@ -905,7 +905,7 @@ CUtlMemoryAligned<T, nAlignment>::CUtlMemoryAligned( int nGrowSize, int nInitAll
// Alignment must be a power of two // Alignment must be a power of two
COMPILE_TIME_ASSERT( (nAlignment & (nAlignment-1)) == 0 ); COMPILE_TIME_ASSERT( (nAlignment & (nAlignment-1)) == 0 );
Assert( (nGrowSize >= 0) && (nGrowSize != CUtlMemory<T>::EXTERNAL_BUFFER_MARKER) ); Assert( (nGrowSize >= 0) && (nGrowSize & CUtlMemory<T>::EXTERNAL_BUFFER_MARKER) == 0 );
if ( CUtlMemory<T>::m_nAllocationCount ) if ( CUtlMemory<T>::m_nAllocationCount )
{ {
UTLMEMORY_TRACK_ALLOC(); UTLMEMORY_TRACK_ALLOC();