SH-1521 update -- Lighting and Shadows grayed out on mac
* Disabled SSAO on macs with 8 or less texture units. * Slight cleanup of sunlight fragment shaders to remove unused texture units. Reviewed by davepmeow-7.2.2
parent
a52019d6d1
commit
4268700fcf
|
|
@ -15,8 +15,6 @@ uniform sampler2DRect depthMap;
|
|||
uniform sampler2DRect normalMap;
|
||||
uniform sampler2D noiseMap;
|
||||
|
||||
uniform sampler2D lightFunc;
|
||||
|
||||
|
||||
// Inputs
|
||||
uniform mat4 shadow_matrix[6];
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@ uniform sampler2DRectShadow shadowMap2;
|
|||
uniform sampler2DRectShadow shadowMap3;
|
||||
uniform sampler2DShadow shadowMap4;
|
||||
uniform sampler2DShadow shadowMap5;
|
||||
uniform sampler2D noiseMap;
|
||||
|
||||
uniform sampler2D lightFunc;
|
||||
|
||||
|
||||
// Inputs
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ uniform sampler2DShadow shadowMap4;
|
|||
uniform sampler2DShadow shadowMap5;
|
||||
uniform sampler2D noiseMap;
|
||||
|
||||
uniform sampler2D lightFunc;
|
||||
|
||||
// Inputs
|
||||
uniform mat4 shadow_matrix[6];
|
||||
uniform vec4 shadow_clip;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
version 22
|
||||
version 23
|
||||
|
||||
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
|
||||
// Should be combined into one table
|
||||
|
|
@ -278,6 +278,9 @@ RenderObjectBump 0 0
|
|||
list OpenGLPre15
|
||||
RenderVBOEnable 1 0
|
||||
|
||||
list TexUnit8orLess
|
||||
RenderDeferredSSAO 0 0
|
||||
|
||||
list Intel
|
||||
RenderAnisotropic 1 0
|
||||
RenderLocalLights 1 0
|
||||
|
|
|
|||
|
|
@ -753,6 +753,10 @@ void LLFeatureManager::applyBaseMasks()
|
|||
{
|
||||
maskFeatures("OpenGLPre30");
|
||||
}
|
||||
if (gGLManager.mNumTextureUnits <= 8)
|
||||
{
|
||||
maskFeatures("TexUnit8orLess");
|
||||
}
|
||||
|
||||
// now mask by gpu string
|
||||
// Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces
|
||||
|
|
|
|||
Loading…
Reference in New Issue