d4708
/
source-engine
mirror of https://github.com/nillerusr/source-engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

togl/togles: fix PBO usage

pull/133/head
nillerusr 2 years ago
parent
e5eaf0fa9e
commit
091b49e29c
4 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      togl/linuxwin/cglmtex.cpp
  2. 2
      togl/linuxwin/dxabstract.cpp
  3. 4
      togles/linuxwin/cglmtex.cpp
  4. 2
      togles/linuxwin/dxabstract.cpp

4
togl/linuxwin/cglmtex.cpp
Unescape View File

@ -1670,7 +1670,7 @@ void CGLMTex::Lock( GLMTexLockParams *params, char** addressOut, int* yStrideOut
{ {
*addressOut = (char*)ReadTexels( desc, true, params->m_readonly ); *addressOut = (char*)ReadTexels( desc, true, params->m_readonly );
if( !params->m_readonly ) if( params->m_readonly == false )
m_mapped = (GLubyte*)*addressOut; m_mapped = (GLubyte*)*addressOut;
} }
else else
@ -1763,7 +1763,7 @@ void CGLMTex::Unlock( GLMTexLockParams *params )
// fullyDirty |= (m_sliceFlags[ desc->m_sliceIndex ] & kSliceStorageValid); // fullyDirty |= (m_sliceFlags[ desc->m_sliceIndex ] & kSliceStorageValid);
if( m_layout->m_key.m_texFlags & kGLMTexDynamic ) if( m_layout->m_key.m_texFlags & kGLMTexDynamic && m_mapped )
{ {
gGL->glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); gGL->glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);

2
togl/linuxwin/dxabstract.cpp
Unescape View File

@ -1041,7 +1041,7 @@ HRESULT IDirect3DSurface9::LockRect(D3DLOCKED_RECT* pLockedRect,CONST RECT* pRec
lockreq.m_readback = true; lockreq.m_readback = true;
} }
lockreq.m_readonly = Flags & D3DLOCK_READONLY; lockreq.m_readonly = (Flags & D3DLOCK_READONLY) ? true : false;
char *lockAddress; char *lockAddress;
int yStride; int yStride;

4
togles/linuxwin/cglmtex.cpp
Unescape View File

@ -3946,7 +3946,7 @@ void CGLMTex::Lock( GLMTexLockParams *params, char** addressOut, int* yStrideOut
// (odds are we'll never request anything but a whole slice to be read..) // (odds are we'll never request anything but a whole slice to be read..)
*addressOut = (char*)ReadTexels( desc, true, params->m_readonly ); *addressOut = (char*)ReadTexels( desc, true, params->m_readonly );
if( !params->m_readonly ) if( params->m_readonly == false )
m_mapped = (GLubyte*)*addressOut; m_mapped = (GLubyte*)*addressOut;
} }
else else
@ -4039,7 +4039,7 @@ void CGLMTex::Unlock( GLMTexLockParams *params )
// fullyDirty |= (m_sliceFlags[ desc->m_sliceIndex ] & kSliceStorageValid); // fullyDirty |= (m_sliceFlags[ desc->m_sliceIndex ] & kSliceStorageValid);
if( m_layout->m_key.m_texFlags & kGLMTexDynamic ) if( m_layout->m_key.m_texFlags & kGLMTexDynamic && m_mapped )
{ {
gGL->glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); gGL->glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);

2
togles/linuxwin/dxabstract.cpp
Unescape View File

@ -1041,7 +1041,7 @@ HRESULT IDirect3DSurface9::LockRect(D3DLOCKED_RECT* pLockedRect,CONST RECT* pRec
lockreq.m_readback = true; lockreq.m_readback = true;
} }
lockreq.m_readonly = Flags & D3DLOCK_READONLY; lockreq.m_readonly = (Flags & D3DLOCK_READONLY) ? true : false;
char *lockAddress; char *lockAddress;
int yStride; int yStride;

Write Preview
Loading…
Cancel
Save