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

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

Browse Source
This commit is contained in:
Lirusaito
2019-07-18 02:52:18 -04:00
parent 6d2b530330 225d174ec6
commit 74d26eac86
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llrender/llgl.cpp
View File

@@ -106,6 +106,17 @@ void APIENTRY gl_debug_callback(GLenum source,
}
else if (severity == GL_DEBUG_SEVERITY_LOW_ARB)
{
if (type == GL_DEBUG_TYPE_OTHER_ARB)
{
if (id == 0x20004 || // Silence nvidia glClear noop messages
id == 0x20043 || // Silence nvidia CSAA messages.
id == 0x20084 // Silence nvidia texture mapping with no base level messages.
)
{
return;
}
}
LL_WARNS() << "----- GL WARNING LOW --------" << LL_ENDL;
}
else if (severity == 0x826b && id == 0x20071 && type == GL_DEBUG_TYPE_OTHER_ARB && source == GL_DEBUG_SOURCE_API_ARB)

2
indra/llrender/llrender.cpp
View File

@@ -455,7 +455,7 @@ void LLTexUnit::unbind(eTextureType type)
{
gGL.flush();
mCurrTexture = 0;
if (LLGLSLShader::sNoFixedFunction && type == LLTexUnit::TT_TEXTURE)
if (/*LLGLSLShader::sNoFixedFunction && */type == LLTexUnit::TT_TEXTURE)
{
//if (sWhiteTexture)
// validate_bind_texture(sWhiteTexture);

2
indra/llrender/llrender.h
View File

@@ -391,7 +391,7 @@ public:
Context() :
texUnit(0),
color{ 1.f,1.f,1.f,1.f },
colorMask{ true },
colorMask{ 0xf },
alphaFunc(CF_ALWAYS),
alphaVal(0.f),
blendColorSFactor(BF_ONE),

1
indra/llwindow/lldxhardware.cpp
View File

@@ -546,6 +546,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, S32Megabytes system_ram)
mVRAM -= ((S32)system_ram/2) + 1; // Ignore shared memory pool.
if (mVRAM <= 0)
{
LL_INFOS("AppInit") << "No dedicated VRAM. Using system memory instead." << LL_ENDL;
mVRAM = (S32)system_ram / 2; // Integrated graphics perhaps? Use half system ram.
}
LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;

4
indra/newview/llviewertexturelist.cpp
View File

@@ -1334,7 +1334,7 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl
LL_INFOS() << "system_ram: " << system_ram << LL_ENDL;
LL_INFOS() << "max_texmem: " << max_texmem << LL_ENDL;
if (get_recommended)
max_texmem = llmin(max_texmem, system_ram/2);
max_texmem = llmin(S32Megabytes(max_texmem * .7f), system_ram/2);
else
max_texmem = llmin(max_texmem, system_ram);
@@ -1348,7 +1348,7 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl
const S32Megabytes VIDEO_CARD_FRAMEBUFFER_MEM_MIN(12);
const S32Megabytes VIDEO_CARD_FRAMEBUFFER_MEM_MAX(512);
const S32Megabytes MIN_MEM_FOR_NON_TEXTURE(512);
const S32Megabytes MIN_MEM_FOR_NON_TEXTURE(16);
void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem)
{
// Initialize the image pipeline VRAM settings