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

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2012-01-12 23:30:17 -06:00
parent 21b6b89577 198e499798
commit ad3a16fd3b
82 changed files with 1172 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llrender/llimagegl.cpp
View File

@@ -65,9 +65,9 @@ LLImageGL* LLImageGL::sDefaultGLTexture = NULL ;
std::set<LLImageGL*> LLImageGL::sImageList;
//****************************************************************************************************
// ****************************************************************************************************
//The below for texture auditing use only
//****************************************************************************************************
// ****************************************************************************************************
//-----------------------
//debug use
BOOL gAuditTexture = FALSE ;
@@ -84,11 +84,11 @@ std::vector<S32> LLImageGL::sTextureMemByCategory;
std::vector<S32> LLImageGL::sTextureMemByCategoryBound ;
std::vector<S32> LLImageGL::sTextureCurMemByCategoryBound ;
//------------------------
//****************************************************************************************************
// ****************************************************************************************************
//End for texture auditing use only
//****************************************************************************************************
// ****************************************************************************************************
//**************************************************************************************
// **************************************************************************************
//below are functions for debug use
//do not delete them even though they are not currently being used.
void check_all_images()
@@ -167,7 +167,7 @@ void LLImageGL::checkTexSize(bool forced) const
}
}
//end of debug functions
//**************************************************************************************
// **************************************************************************************
//----------------------------------------------------------------------------
BOOL is_little_endian()

8
indra/llrender/llimagegl.h
View File

@@ -257,9 +257,9 @@ private:
//can be removed if we do not use that function at all.
static BOOL sAllowReadBackRaw ;
//
//****************************************************************************************************
// ****************************************************************************************************
//The below for texture auditing use only
//****************************************************************************************************
// ****************************************************************************************************
private:
S32 mCategory ;
public:
@@ -290,9 +290,9 @@ public:
static std::vector<S32> sTextureMemByCategoryBound ;
static std::vector<S32> sTextureCurMemByCategoryBound ;
//----------------------------------------
//****************************************************************************************************
// ****************************************************************************************************
//End of definitions for texture auditing use only
//****************************************************************************************************
// ****************************************************************************************************
};

2
indra/llrender/llpostprocess.cpp
View File

@@ -105,7 +105,7 @@ LLPostProcess::LLPostProcess(void) :
}
setSelectedEffect("default");
//*/
// */
}
LLPostProcess::~LLPostProcess(void)

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();

2
indra/llrender/llvertexbuffer.h
View File

@@ -192,7 +192,7 @@ protected:
virtual ~LLVertexBuffer(); // use unref()
virtual void setupVertexBuffer(U32 data_mask) const; // pure virtual, called from mapBuffer()
virtual void setupVertexBuffer(U32 data_mask); // pure virtual, called from mapBuffer()
void setupVertexArray();
void genBuffer(U32 size);