Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable gl sync fence. Missed a vertexbuffer flush. moved LLMultiFloater out of llfloater.(h|cpp) and into its own header and source file, matching v2.

Browse Source
This commit is contained in:
Shyotl
2011-12-26 23:40:18 -06:00
parent e1cbeb7e02
commit ca96e00135
19 changed files with 696 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llvertexbuffer.cpp
View File

@@ -88,8 +88,6 @@ BOOL LLVertexBuffer::sPreferStreamDraw = FALSE;
const U32 FENCE_WAIT_TIME_NANOSECONDS = 10000; //1 ms
#undef GL_ARB_sync
class LLGLSyncFence : public LLGLFence
{
public:
@@ -2115,7 +2113,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
}
// virtual (default)
void LLVertexBuffer::setupVertexBuffer(U32 data_mask) const
void LLVertexBuffer::setupVertexBuffer(U32 data_mask)
{
LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
stop_glerror();