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

Fix Issue 1654 based on Shyotl's notes and work in Alchemy.

Browse Source 
That's the Intel HD 3000 on Windows can't do ALM bug, by the way.

#close SV-1654
This commit is contained in:
Lirusaito
2016-02-22 20:51:22 -05:00
parent ac03994861
commit 6a95f3b692
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llrender/llgl.cpp
View File

@@ -604,6 +604,9 @@ bool LLGLManager::initGL()
LLImageGL::sCompressTextures = false; LLImageGL::sCompressTextures = false;
} }
#if LL_WINDOWS
bool mIsHD3K(false);
#endif
// Trailing space necessary to keep "nVidia Corpor_ati_on" cards // Trailing space necessary to keep "nVidia Corpor_ati_on" cards
// from being recognized as ATI. // from being recognized as ATI.
if (mGLVendor.substr(0,4) == "ATI ") if (mGLVendor.substr(0,4) == "ATI ")
@@ -675,6 +678,14 @@ bool LLGLManager::initGL()
{ {
mGLVendorShort = "INTEL"; mGLVendorShort = "INTEL";
mIsIntel = TRUE; mIsIntel = TRUE;
#if LL_WINDOWS
if (mGLRenderer.find("HD") != std::string::npos
&& ((mGLRenderer.find("2000") != std::string::npos || mGLRenderer.find("3000") != std::string::npos)
|| (mGLVersion == 3.1f && mGLRenderer.find("INTEL(R) HD GRAPHICS") != std::string::npos)))
{
mIsHD3K = TRUE;
}
#endif
} }
else else
{ {
@@ -721,6 +732,11 @@ bool LLGLManager::initGL()
if (mHasVertexShader) if (mHasVertexShader)
{ {
//According to the spec, the resulting value should never be less than 512. We need at least 1024 to use skinned shaders. //According to the spec, the resulting value should never be less than 512. We need at least 1024 to use skinned shaders.
#if LL_WINDOWS
if (mIsHD3K)
mGLMaxVertexUniformComponents = 4096;
else
#endif
glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &mGLMaxVertexUniformComponents); glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &mGLMaxVertexUniformComponents);
} }