H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2024-12-22 14:16:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

materialsystem: unlock mat_picmip cvar again

Browse Source
This commit is contained in:
nillerusr 2022-08-03 16:30:27 +03:00
parent 48aa042ee1
commit a9c5da7d69
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
materialsystem/cmaterialsystem.cpp
View File

@ -444,7 +444,7 @@ void CMaterialSystem::CreateCompositorMaterials()
IMaterialInternal *pMatqf = assert_cast< IMaterialInternal* >( FindMaterial( pszMaterial, TEXTURE_GROUP_RUNTIME_COMPOSITE ) );
Assert( pMatqf );
Assert( !pMatqf->IsErrorMaterial() );
//Assert( !pMatqf->IsErrorMaterial() );
IMaterialInternal *pMatrt = pMatqf->GetRealTimeVersion();
Assert( pMatrt );
pMatrt->IncrementReferenceCount(); // Hold a ref.
@ -1769,12 +1769,7 @@ static ConVar mat_phong( "mat_phong", "1" );
static ConVar mat_parallaxmap( "mat_parallaxmap", "1", FCVAR_HIDDEN | FCVAR_ALLOWED_IN_COMPETITIVE );
static ConVar mat_reducefillrate( "mat_reducefillrate", "0", FCVAR_ALLOWED_IN_COMPETITIVE );
#if defined( OSX ) && !defined( STAGING_ONLY ) && !defined( _DEBUG )
// OSX users are currently running OOM. We limit them to texture quality high here, which avoids the problem while we come up with a real solution.
static ConVar mat_picmip( "mat_picmip", "1", FCVAR_ARCHIVE, "", true, 0, true, 4 );
#else
static ConVar mat_picmip( "mat_picmip", "0", FCVAR_ARCHIVE, "", true, -1, true, 4 );
#endif
static ConVar mat_picmip( "mat_picmip", "0", FCVAR_ARCHIVE, "", true, -32, true, 8 );
static ConVar mat_slopescaledepthbias_normal( "mat_slopescaledepthbias_normal", "0.0f", FCVAR_CHEAT );
static ConVar mat_depthbias_normal( "mat_depthbias_normal", "0.0f", FCVAR_CHEAT | FCVAR_ALLOWED_IN_COMPETITIVE );
static ConVar mat_slopescaledepthbias_decal( "mat_slopescaledepthbias_decal", "-0.5", FCVAR_CHEAT ); // Reciprocals of these biases sent to API

6
scripts/waifulib/xcompile.py
View File

@ -331,6 +331,10 @@ def configure(conf):
if values[0] not in valid_archs:
conf.fatal('Unknown arch: %s. Supported: %r' % (values[0], ', '.join(valid_archs)))
stlarch = values[0]
if values[0] == 'aarch64': stlarch = 'arm64-v8a'
conf.android = android = Android(conf, values[0], values[1], int(values[2]))
conf.environ['CC'] = android.cc()
conf.environ['CXX'] = android.cxx()
@ -339,7 +343,7 @@ def configure(conf):
conf.env.CXXFLAGS += android.cflags(True)
conf.env.LINKFLAGS += android.linkflags()
conf.env.LDFLAGS += android.ldflags()
conf.env.STLIBPATH += [os.path.abspath(os.path.join(android.ndk_home, 'sources','cxx-stl','stlport','libs',values[0]))]
conf.env.STLIBPATH += [os.path.abspath(os.path.join(android.ndk_home, 'sources','cxx-stl','stlport','libs',stlarch))]
conf.env.LDFLAGS += ['-lstlport_static']
conf.env.HAVE_M = True