|
|
|
@ -1149,7 +1149,7 @@ GLubyte *CGLMTex::ReadTexels( GLMTexLockDesc *desc, bool readWholeSlice, bool re
@@ -1149,7 +1149,7 @@ GLubyte *CGLMTex::ReadTexels( GLMTexLockDesc *desc, bool readWholeSlice, bool re
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
// 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
@@ -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 ) ) |
|
|
|
|
{ |
|
|
|
|
*addressOut = ReadTexels( desc, true, params->m_readonly ); |
|
|
|
|
*addressOut = (char*)ReadTexels( desc, true, params->m_readonly ); |
|
|
|
|
|
|
|
|
|
if( !params->m_readonly ) |
|
|
|
|
m_mapped = *addressOut; |
|
|
|
|
m_mapped = (GLubyte*)*addressOut; |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|