d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-01-24 22:04:27 +00:00
Code Issues Projects Releases Wiki Activity

togl/togles: fpermissive fixes

Browse Source
This commit is contained in:
nillerusr 2022-10-02 01:03:52 +03:00
parent 7a26688494
commit 5ab75bf9ef
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
togl/linuxwin/cglmtex.cpp
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
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
{ {