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: fpermissive fixes

pull/133/head
nillerusr 2 years ago
parent
7a26688494
commit
5ab75bf9ef
2 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. 6
      togl/linuxwin/cglmtex.cpp
  2. 6
      togles/linuxwin/cglmtex.cpp

6
togl/linuxwin/cglmtex.cpp
Unescape View File

@ -1149,7 +1149,7 @@ GLubyte *CGLMTex::ReadTexels( GLMTexLockDesc *desc, bool readWholeSlice, bool re
if( readOnly ) if( readOnly )
{ {
data = m_backing + m_layout->m_slices[ desc->m_sliceIndex ].m_storageOffset; // this would change for PBO data = (GLubyte*)(m_backing + m_layout->m_slices[ desc->m_sliceIndex ].m_storageOffset); // this would change for PBO
//int sliceSize = m_layout->m_slices[ desc->m_sliceIndex ].m_storageSize; //int sliceSize = m_layout->m_slices[ desc->m_sliceIndex ].m_storageSize;
// interestingly enough, we can use the same path for both 2D and 3D fetch // interestingly enough, we can use the same path for both 2D and 3D fetch
@ -1668,10 +1668,10 @@ void CGLMTex::Lock( GLMTexLockParams *params, char** addressOut, int* yStrideOut
if ( copyout && ( (m_layout->m_key.m_texFlags & kGLMTexDynamic) || params->m_readonly ) ) if ( copyout && ( (m_layout->m_key.m_texFlags & kGLMTexDynamic) || params->m_readonly ) )
{ {
*addressOut = ReadTexels( desc, true, params->m_readonly ); *addressOut = (char*)ReadTexels( desc, true, params->m_readonly );
if( !params->m_readonly ) if( !params->m_readonly )
m_mapped = *addressOut; m_mapped = (GLubyte*)*addressOut;
} }
else else
{ {

6
togles/linuxwin/cglmtex.cpp
Unescape View File

@ -1153,7 +1153,7 @@ GLubyte *CGLMTex::ReadTexels( GLMTexLockDesc *desc, bool readWholeSlice, bool re
if( readOnly ) if( readOnly )
{ {
data = m_backing + m_layout->m_slices[ desc->m_sliceIndex ].m_storageOffset; // this would change for PBO data = (GLubyte*)(m_backing + m_layout->m_slices[ desc->m_sliceIndex ].m_storageOffset); // this would change for PBO
//int sliceSize = m_layout->m_slices[ desc->m_sliceIndex ].m_storageSize; //int sliceSize = m_layout->m_slices[ desc->m_sliceIndex ].m_storageSize;
// interestingly enough, we can use the same path for both 2D and 3D fetch // interestingly enough, we can use the same path for both 2D and 3D fetch
@ -3944,10 +3944,10 @@ void CGLMTex::Lock( GLMTexLockParams *params, char** addressOut, int* yStrideOut
{ {
// read the whole slice // read the whole slice
// (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 = ReadTexels( desc, true, params->m_readonly ); *addressOut = (char*)ReadTexels( desc, true, params->m_readonly );
if( !params->m_readonly ) if( !params->m_readonly )
m_mapped = *addressOut; m_mapped = (GLubyte*)*addressOut;
} }
else else
{ {

Write Preview
Loading…
Cancel
Save