Small changes to allow the clang compilation of meshlab
This commit is contained in:
parent
0207d2b0c5
commit
49f49efaf3
|
@ -65,7 +65,7 @@ namespace vcg
|
|||
|
||||
ATT_NAMES(unsigned int att)
|
||||
{
|
||||
if ((att < ATT_VERTPOSITION) || (att >= ATT_NAMES::enumArity()))
|
||||
if (att >= ATT_NAMES::enumArity())
|
||||
throw Exception("Out of range value\n");
|
||||
else
|
||||
_val = att;
|
||||
|
@ -429,4 +429,4 @@ namespace vcg
|
|||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -880,7 +880,8 @@ namespace vcg
|
|||
|
||||
if (attributestobeupdated[INT_ATT_NAMES::ATT_VERTINDICES])
|
||||
{
|
||||
size_t tsz = _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType() * chunksize;
|
||||
|
||||
//size_t tsz = _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType() * chunksize;
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_bohandle);
|
||||
glBufferSubData(GL_ELEMENT_ARRAY_BUFFER,chunkingpu * facechunk * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType(),_bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType() * chunksize,&ti[0]);
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
||||
|
|
|
@ -113,7 +113,7 @@ namespace vcg
|
|||
vcg::NotThreadSafeGLMeshAttributesMultiViewerBOManager<MESH_TYPE,UNIQUE_VIEW_ID_TYPE,GL_OPTIONS_DERIVED_TYPE>::setDebugMode(activatedebugmodality);
|
||||
}
|
||||
|
||||
void getLog(DebugInfo& info)
|
||||
void getLog(GLMeshAttributesInfo::DebugInfo& info)
|
||||
{
|
||||
QWriteLocker locker(&_lock);
|
||||
vcg::NotThreadSafeGLMeshAttributesMultiViewerBOManager<MESH_TYPE,UNIQUE_VIEW_ID_TYPE,GL_OPTIONS_DERIVED_TYPE>::getLog(info);
|
||||
|
|
Loading…
Reference in New Issue