Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch). Put in nSight debug support.master
Graham Linden graham@lindenlab.com
parent
528ccdc97f
commit
0d7fa932d5
|
|
@ -64,9 +64,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>7111aa4198ff296b56e63f62facc14f2</string>
|
||||
<string>b701ad7c573a79e4684345c3ad1e7b9b</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14660/93991/libatmosphere-1.0.0.100-darwin-513164.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16995/112878/libatmosphere-1.0.0.100-darwin-514680.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -76,9 +76,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>7e81995a02ba99d406bcedf33cda3e95</string>
|
||||
<string>df40032b237843f1a9d46d0881961341</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14659/93990/libatmosphere-1.0.0.100-darwin64-513164.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16994/112877/libatmosphere-1.0.0.100-darwin64-514680.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
@ -88,9 +88,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>738c6399c0c9e939f59998b15bb8cdeb</string>
|
||||
<string>d3727abd5d423a64231706fafdfe771a</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14661/93999/libatmosphere-1.0.0.100-windows-513164.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16996/112886/libatmosphere-1.0.0.100-windows-514680.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
@ -100,9 +100,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>226ab55f8020fc3749b75418cc3cc2ce</string>
|
||||
<string>03789c65de3d569a980d52a6c64b39cf</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14657/93975/libatmosphere-1.0.0.100-windows64-513164.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16997/112892/libatmosphere-1.0.0.100-windows64-514680.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows64</string>
|
||||
|
|
|
|||
|
|
@ -1577,8 +1577,13 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
|
|||
}
|
||||
alpha_data = new U8[width * height];
|
||||
mAlphaCache[cache_index] = alpha_data;
|
||||
|
||||
// nSight doesn't support use of glReadPixels
|
||||
if (!LLRender::sNsightDebugSupport)
|
||||
{
|
||||
glReadPixels(x, y, width, height, GL_ALPHA, GL_UNSIGNED_BYTE, alpha_data);
|
||||
}
|
||||
}
|
||||
|
||||
getTexLayerSet()->getAvatarAppearance()->dirtyMesh();
|
||||
|
||||
|
|
|
|||
|
|
@ -2191,6 +2191,12 @@ BOOL LLVolume::generate()
|
|||
LLVector4a* end_profile = profile+sizeT;
|
||||
LLVector4a offset = mPathp->mPath[s].mPos;
|
||||
|
||||
if (!offset.isFinite3())
|
||||
{ // MAINT-5660; don't know why this happens, does not affect Release builds
|
||||
LL_WARNS() << "LLVolume using path with non-finite points. Resetting them to 0,0,0" << LL_ENDL;
|
||||
offset.clear();
|
||||
}
|
||||
|
||||
LLVector4a tmp;
|
||||
|
||||
// Run along the profile.
|
||||
|
|
@ -2198,7 +2204,7 @@ BOOL LLVolume::generate()
|
|||
{
|
||||
rot_mat.rotate(*profile++, tmp);
|
||||
dst->setAdd(tmp,offset);
|
||||
llassert(dst->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds
|
||||
|
||||
++dst;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,105 +1,105 @@
|
|||
/**
|
||||
* @file llatmosphere.cpp
|
||||
* @brief LLAtmosphere integration impl
|
||||
*
|
||||
* $LicenseInfo:firstyear=2018&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2018, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#include "linden_common.h"
|
||||
|
||||
#include "llatmosphere.h"
|
||||
#include "llfasttimer.h"
|
||||
#include "llsys.h"
|
||||
#include "llglheaders.h"
|
||||
#include "llrender.h"
|
||||
#include "llshadermgr.h"
|
||||
#include "llglslshader.h"
|
||||
|
||||
LLAtmosphere* gAtmosphere = nullptr;
|
||||
|
||||
// Values from "Reference Solar Spectral Irradiance: ASTM G-173", ETR column
|
||||
// (see http://rredc.nrel.gov/solar/spectra/am1.5/ASTMG173/ASTMG173.html),
|
||||
// summed and averaged in each bin (e.g. the value for 360nm is the average
|
||||
// of the ASTM G-173 values for all wavelengths between 360 and 370nm).
|
||||
// Values in W.m^-2.
|
||||
const int kLambdaMin = 360;
|
||||
const int kLambdaMax = 830;
|
||||
const double kSolarIrradiance[48] = {
|
||||
1.11776, 1.14259, 1.01249, 1.14716, 1.72765, 1.73054, 1.6887, 1.61253,
|
||||
1.91198, 2.03474, 2.02042, 2.02212, 1.93377, 1.95809, 1.91686, 1.8298,
|
||||
1.8685, 1.8931, 1.85149, 1.8504, 1.8341, 1.8345, 1.8147, 1.78158, 1.7533,
|
||||
1.6965, 1.68194, 1.64654, 1.6048, 1.52143, 1.55622, 1.5113, 1.474, 1.4482,
|
||||
1.41018, 1.36775, 1.34188, 1.31429, 1.28303, 1.26758, 1.2367, 1.2082,
|
||||
1.18737, 1.14683, 1.12362, 1.1058, 1.07124, 1.04992
|
||||
};
|
||||
|
||||
// Values from http://www.iup.uni-bremen.de/gruppen/molspec/databases/
|
||||
// referencespectra/o3spectra2011/index.html for 233K, summed and averaged in
|
||||
// each bin (e.g. the value for 360nm is the average of the original values
|
||||
// for all wavelengths between 360 and 370nm). Values in m^2.
|
||||
const double kOzoneCrossSection[48] = {
|
||||
1.18e-27, 2.182e-28, 2.818e-28, 6.636e-28, 1.527e-27, 2.763e-27, 5.52e-27,
|
||||
8.451e-27, 1.582e-26, 2.316e-26, 3.669e-26, 4.924e-26, 7.752e-26, 9.016e-26,
|
||||
1.48e-25, 1.602e-25, 2.139e-25, 2.755e-25, 3.091e-25, 3.5e-25, 4.266e-25,
|
||||
4.672e-25, 4.398e-25, 4.701e-25, 5.019e-25, 4.305e-25, 3.74e-25, 3.215e-25,
|
||||
2.662e-25, 2.238e-25, 1.852e-25, 1.473e-25, 1.209e-25, 9.423e-26, 7.455e-26,
|
||||
6.566e-26, 5.105e-26, 4.15e-26, 4.228e-26, 3.237e-26, 2.451e-26, 2.801e-26,
|
||||
2.534e-26, 1.624e-26, 1.465e-26, 2.078e-26, 1.383e-26, 7.105e-27
|
||||
};
|
||||
|
||||
// From https://en.wikipedia.org/wiki/Dobson_unit, in molecules.m^-2.
|
||||
const double kDobsonUnit = 2.687e20;
|
||||
// Maximum number density of ozone molecules, in m^-3 (computed so at to get
|
||||
// 300 Dobson units of ozone - for this we divide 300 DU by the integral of
|
||||
// the ozone density profile defined below, which is equal to 15km).
|
||||
const double kMaxOzoneNumberDensity = 300.0 * kDobsonUnit / 15000.0;
|
||||
const double kRayleigh = 1.24062e-6;
|
||||
const double kRayleighScaleHeight = 8000.0;
|
||||
const double kMieScaleHeight = 1200.0;
|
||||
const double kMieAngstromAlpha = 0.0;
|
||||
const double kMieAngstromBeta = 5.328e-3;
|
||||
const double kMieSingleScatteringAlbedo = 0.9;
|
||||
const double max_sun_zenith_angle = F_PI * 2.0 / 3.0;
|
||||
|
||||
AtmosphericModelSettings::AtmosphericModelSettings()
|
||||
: m_skyBottomRadius(6360.0f)
|
||||
, m_skyTopRadius(6420.0f)
|
||||
, m_sunArcRadians(0.00045f)
|
||||
, m_mieAnisotropy(0.8f)
|
||||
{
|
||||
atmosphere::DensityProfileLayer rayleigh_density(0.0, 1.0, -1.0 / kRayleighScaleHeight, 0.0, 0.0);
|
||||
atmosphere::DensityProfileLayer mie_density(0.0, 1.0, -1.0 / kMieScaleHeight, 0.0, 0.0);
|
||||
|
||||
m_rayleighProfile.push_back(rayleigh_density);
|
||||
m_mieProfile.push_back(mie_density);
|
||||
|
||||
// Density profile increasing linearly from 0 to 1 between 10 and 25km, and
|
||||
// decreasing linearly from 1 to 0 between 25 and 40km. This is an approximate
|
||||
// profile from http://www.kln.ac.lk/science/Chemistry/Teaching_Resources/
|
||||
// Documents/Introduction%20to%20atmospheric%20chemistry.pdf (page 10).
|
||||
m_absorptionProfile.push_back(atmosphere::DensityProfileLayer(25000.0, 0.0, 0.0, 1.0 / 15000.0, -2.0 / 3.0));
|
||||
m_absorptionProfile.push_back(atmosphere::DensityProfileLayer(0.0, 0.0, 0.0, -1.0 / 15000.0, 8.0 / 3.0));
|
||||
}
|
||||
|
||||
/**
|
||||
* @file llatmosphere.cpp
|
||||
* @brief LLAtmosphere integration impl
|
||||
*
|
||||
* $LicenseInfo:firstyear=2018&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2018, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#include "linden_common.h"
|
||||
|
||||
#include "llatmosphere.h"
|
||||
#include "llfasttimer.h"
|
||||
#include "llsys.h"
|
||||
#include "llglheaders.h"
|
||||
#include "llrender.h"
|
||||
#include "llshadermgr.h"
|
||||
#include "llglslshader.h"
|
||||
|
||||
LLAtmosphere* gAtmosphere = nullptr;
|
||||
|
||||
// Values from "Reference Solar Spectral Irradiance: ASTM G-173", ETR column
|
||||
// (see http://rredc.nrel.gov/solar/spectra/am1.5/ASTMG173/ASTMG173.html),
|
||||
// summed and averaged in each bin (e.g. the value for 360nm is the average
|
||||
// of the ASTM G-173 values for all wavelengths between 360 and 370nm).
|
||||
// Values in W.m^-2.
|
||||
const int kLambdaMin = 360;
|
||||
const int kLambdaMax = 830;
|
||||
const double kSolarIrradiance[48] = {
|
||||
1.11776, 1.14259, 1.01249, 1.14716, 1.72765, 1.73054, 1.6887, 1.61253,
|
||||
1.91198, 2.03474, 2.02042, 2.02212, 1.93377, 1.95809, 1.91686, 1.8298,
|
||||
1.8685, 1.8931, 1.85149, 1.8504, 1.8341, 1.8345, 1.8147, 1.78158, 1.7533,
|
||||
1.6965, 1.68194, 1.64654, 1.6048, 1.52143, 1.55622, 1.5113, 1.474, 1.4482,
|
||||
1.41018, 1.36775, 1.34188, 1.31429, 1.28303, 1.26758, 1.2367, 1.2082,
|
||||
1.18737, 1.14683, 1.12362, 1.1058, 1.07124, 1.04992
|
||||
};
|
||||
|
||||
// Values from http://www.iup.uni-bremen.de/gruppen/molspec/databases/
|
||||
// referencespectra/o3spectra2011/index.html for 233K, summed and averaged in
|
||||
// each bin (e.g. the value for 360nm is the average of the original values
|
||||
// for all wavelengths between 360 and 370nm). Values in m^2.
|
||||
const double kOzoneCrossSection[48] = {
|
||||
1.18e-27, 2.182e-28, 2.818e-28, 6.636e-28, 1.527e-27, 2.763e-27, 5.52e-27,
|
||||
8.451e-27, 1.582e-26, 2.316e-26, 3.669e-26, 4.924e-26, 7.752e-26, 9.016e-26,
|
||||
1.48e-25, 1.602e-25, 2.139e-25, 2.755e-25, 3.091e-25, 3.5e-25, 4.266e-25,
|
||||
4.672e-25, 4.398e-25, 4.701e-25, 5.019e-25, 4.305e-25, 3.74e-25, 3.215e-25,
|
||||
2.662e-25, 2.238e-25, 1.852e-25, 1.473e-25, 1.209e-25, 9.423e-26, 7.455e-26,
|
||||
6.566e-26, 5.105e-26, 4.15e-26, 4.228e-26, 3.237e-26, 2.451e-26, 2.801e-26,
|
||||
2.534e-26, 1.624e-26, 1.465e-26, 2.078e-26, 1.383e-26, 7.105e-27
|
||||
};
|
||||
|
||||
// From https://en.wikipedia.org/wiki/Dobson_unit, in molecules.m^-2.
|
||||
const double kDobsonUnit = 2.687e20;
|
||||
// Maximum number density of ozone molecules, in m^-3 (computed so at to get
|
||||
// 300 Dobson units of ozone - for this we divide 300 DU by the integral of
|
||||
// the ozone density profile defined below, which is equal to 15km).
|
||||
const double kMaxOzoneNumberDensity = 300.0 * kDobsonUnit / 15000.0;
|
||||
const double kRayleigh = 1.24062e-6;
|
||||
const double kRayleighScaleHeight = 8000.0;
|
||||
const double kMieScaleHeight = 1200.0;
|
||||
const double kMieAngstromAlpha = 0.0;
|
||||
const double kMieAngstromBeta = 5.328e-3;
|
||||
const double kMieSingleScatteringAlbedo = 0.9;
|
||||
const double max_sun_zenith_angle = F_PI * 2.0 / 3.0;
|
||||
|
||||
AtmosphericModelSettings::AtmosphericModelSettings()
|
||||
: m_skyBottomRadius(6360.0f)
|
||||
, m_skyTopRadius(6420.0f)
|
||||
, m_sunArcRadians(0.00045f)
|
||||
, m_mieAnisotropy(0.8f)
|
||||
{
|
||||
atmosphere::DensityProfileLayer rayleigh_density(0.0, 1.0, -1.0 / kRayleighScaleHeight, 0.0, 0.0);
|
||||
atmosphere::DensityProfileLayer mie_density(0.0, 1.0, -1.0 / kMieScaleHeight, 0.0, 0.0);
|
||||
|
||||
m_rayleighProfile.push_back(rayleigh_density);
|
||||
m_mieProfile.push_back(mie_density);
|
||||
|
||||
// Density profile increasing linearly from 0 to 1 between 10 and 25km, and
|
||||
// decreasing linearly from 1 to 0 between 25 and 40km. This is an approximate
|
||||
// profile from http://www.kln.ac.lk/science/Chemistry/Teaching_Resources/
|
||||
// Documents/Introduction%20to%20atmospheric%20chemistry.pdf (page 10).
|
||||
m_absorptionProfile.push_back(atmosphere::DensityProfileLayer(25000.0, 0.0, 0.0, 1.0 / 15000.0, -2.0 / 3.0));
|
||||
m_absorptionProfile.push_back(atmosphere::DensityProfileLayer(0.0, 0.0, 0.0, -1.0 / 15000.0, 8.0 / 3.0));
|
||||
}
|
||||
|
||||
AtmosphericModelSettings::AtmosphericModelSettings(
|
||||
DensityProfile& rayleighProfile,
|
||||
DensityProfile& mieProfile,
|
||||
|
|
@ -130,159 +130,159 @@ AtmosphericModelSettings::AtmosphericModelSettings(
|
|||
, m_sunArcRadians(sunArcRadians)
|
||||
, m_mieAnisotropy(mieAniso)
|
||||
{
|
||||
}
|
||||
|
||||
void LLAtmosphere::initClass()
|
||||
{
|
||||
if (!gAtmosphere)
|
||||
{
|
||||
gAtmosphere = new LLAtmosphere;
|
||||
}
|
||||
}
|
||||
|
||||
void LLAtmosphere::cleanupClass()
|
||||
{
|
||||
if(gAtmosphere)
|
||||
{
|
||||
delete gAtmosphere;
|
||||
}
|
||||
gAtmosphere = NULL;
|
||||
}
|
||||
|
||||
LLAtmosphere::LLAtmosphere()
|
||||
{
|
||||
for (int l = kLambdaMin; l <= kLambdaMax; l += 10)
|
||||
{
|
||||
double lambda = static_cast<double>(l) * 1e-3; // micro-meters
|
||||
double mie = kMieAngstromBeta / kMieScaleHeight * pow(lambda, -kMieAngstromAlpha);
|
||||
m_wavelengths.push_back(l);
|
||||
m_solar_irradiance.push_back(kSolarIrradiance[(l - kLambdaMin) / 10]);
|
||||
m_rayleigh_scattering.push_back(kRayleigh * pow(lambda, -4));
|
||||
m_mie_scattering.push_back(mie * kMieSingleScatteringAlbedo);
|
||||
m_mie_extinction.push_back(mie);
|
||||
m_absorption_extinction.push_back(kMaxOzoneNumberDensity * kOzoneCrossSection[(l - kLambdaMin) / 10]);
|
||||
m_ground_albedo.push_back(0.6f);
|
||||
}
|
||||
|
||||
AtmosphericModelSettings defaults;
|
||||
configureAtmosphericModel(defaults);
|
||||
}
|
||||
|
||||
LLAtmosphere::~LLAtmosphere()
|
||||
{
|
||||
// Cease referencing textures from atmosphere::model from our LLGLTextures wrappers for same.
|
||||
if (m_transmittance)
|
||||
{
|
||||
m_transmittance->setTexName(0);
|
||||
}
|
||||
|
||||
if (m_scattering)
|
||||
{
|
||||
m_scattering->setTexName(0);
|
||||
}
|
||||
|
||||
if (m_mie_scatter_texture)
|
||||
{
|
||||
m_mie_scatter_texture->setTexName(0);
|
||||
}
|
||||
|
||||
delete m_model;
|
||||
m_model = nullptr;
|
||||
}
|
||||
|
||||
bool LLAtmosphere::configureAtmosphericModel(AtmosphericModelSettings& settings)
|
||||
{
|
||||
// Advanced Atmospherics TODO
|
||||
// Make this store a hash of the precomputed data
|
||||
// and avoid redundant calcs for identical settings
|
||||
|
||||
if (m_model)
|
||||
{
|
||||
delete m_model;
|
||||
}
|
||||
m_model = nullptr;
|
||||
getTransmittance()->setTexName(0);
|
||||
getScattering()->setTexName(0);
|
||||
getMieScattering()->setTexName(0);
|
||||
|
||||
// Init libatmosphere model
|
||||
m_config.num_scattering_orders = 4;
|
||||
|
||||
m_model = new atmosphere::Model(
|
||||
m_wavelengths,
|
||||
m_solar_irradiance,
|
||||
settings.m_sunArcRadians,
|
||||
settings.m_skyBottomRadius * 1000.0f,
|
||||
settings.m_skyTopRadius * 1000.0f,
|
||||
settings.m_rayleighProfile,
|
||||
m_rayleigh_scattering,
|
||||
settings.m_mieProfile,
|
||||
m_mie_scattering,
|
||||
m_mie_extinction,
|
||||
settings.m_mieAnisotropy,
|
||||
settings.m_absorptionProfile,
|
||||
m_absorption_extinction,
|
||||
m_ground_albedo,
|
||||
max_sun_zenith_angle,
|
||||
1000.0,
|
||||
15,
|
||||
false,
|
||||
true);
|
||||
|
||||
if (m_model)
|
||||
{
|
||||
m_model->Init(m_config, m_textures);
|
||||
getTransmittance()->setTexName(m_textures.transmittance_texture);
|
||||
getScattering()->setTexName(m_textures.transmittance_texture);
|
||||
getMieScattering()->setTexName(m_textures.transmittance_texture);
|
||||
}
|
||||
|
||||
return m_model != nullptr;
|
||||
}
|
||||
|
||||
LLGLTexture* LLAtmosphere::getTransmittance()
|
||||
{
|
||||
if (!m_transmittance)
|
||||
{
|
||||
m_transmittance = new LLGLTexture;
|
||||
m_transmittance->generateGLTexture();
|
||||
m_transmittance->setAddressMode(LLTexUnit::eTextureAddressMode::TAM_CLAMP);
|
||||
m_transmittance->setFilteringOption(LLTexUnit::eTextureFilterOptions::TFO_BILINEAR);
|
||||
m_transmittance->setExplicitFormat(GL_RGB16F_ARB, GL_RGB, GL_FLOAT);
|
||||
m_transmittance->setTarget(GL_TEXTURE_2D, LLTexUnit::TT_TEXTURE);
|
||||
}
|
||||
return m_transmittance;
|
||||
}
|
||||
|
||||
LLGLTexture* LLAtmosphere::getScattering()
|
||||
{
|
||||
if (!m_scattering)
|
||||
{
|
||||
m_scattering = new LLGLTexture;
|
||||
m_scattering->generateGLTexture();
|
||||
m_scattering->setAddressMode(LLTexUnit::eTextureAddressMode::TAM_CLAMP);
|
||||
m_scattering->setFilteringOption(LLTexUnit::eTextureFilterOptions::TFO_BILINEAR);
|
||||
m_scattering->setExplicitFormat(GL_RGB16F_ARB, GL_RGB, GL_FLOAT);
|
||||
m_scattering->setTarget(GL_TEXTURE_3D, LLTexUnit::TT_TEXTURE_3D);
|
||||
}
|
||||
return m_scattering;
|
||||
}
|
||||
|
||||
LLGLTexture* LLAtmosphere::getMieScattering()
|
||||
{
|
||||
if (!m_mie_scatter_texture)
|
||||
{
|
||||
m_mie_scatter_texture = new LLGLTexture;
|
||||
m_mie_scatter_texture->generateGLTexture();
|
||||
m_mie_scatter_texture->setAddressMode(LLTexUnit::eTextureAddressMode::TAM_CLAMP);
|
||||
m_mie_scatter_texture->setFilteringOption(LLTexUnit::eTextureFilterOptions::TFO_BILINEAR);
|
||||
m_mie_scatter_texture->setExplicitFormat(GL_RGB16F_ARB, GL_RGB, GL_FLOAT);
|
||||
m_mie_scatter_texture->setTarget(GL_TEXTURE_3D, LLTexUnit::TT_TEXTURE_3D);
|
||||
}
|
||||
return m_mie_scatter_texture;
|
||||
}
|
||||
|
||||
GLhandleARB LLAtmosphere::getAtmosphericShaderForLink() const
|
||||
{
|
||||
return m_model ? m_model->GetShader() : 0;
|
||||
}
|
||||
}
|
||||
|
||||
void LLAtmosphere::initClass()
|
||||
{
|
||||
if (!gAtmosphere)
|
||||
{
|
||||
gAtmosphere = new LLAtmosphere;
|
||||
}
|
||||
}
|
||||
|
||||
void LLAtmosphere::cleanupClass()
|
||||
{
|
||||
if(gAtmosphere)
|
||||
{
|
||||
delete gAtmosphere;
|
||||
}
|
||||
gAtmosphere = NULL;
|
||||
}
|
||||
|
||||
LLAtmosphere::LLAtmosphere()
|
||||
{
|
||||
for (int l = kLambdaMin; l <= kLambdaMax; l += 10)
|
||||
{
|
||||
double lambda = static_cast<double>(l) * 1e-3; // micro-meters
|
||||
double mie = kMieAngstromBeta / kMieScaleHeight * pow(lambda, -kMieAngstromAlpha);
|
||||
m_wavelengths.push_back(l);
|
||||
m_solar_irradiance.push_back(kSolarIrradiance[(l - kLambdaMin) / 10]);
|
||||
m_rayleigh_scattering.push_back(kRayleigh * pow(lambda, -4));
|
||||
m_mie_scattering.push_back(mie * kMieSingleScatteringAlbedo);
|
||||
m_mie_extinction.push_back(mie);
|
||||
m_absorption_extinction.push_back(kMaxOzoneNumberDensity * kOzoneCrossSection[(l - kLambdaMin) / 10]);
|
||||
m_ground_albedo.push_back(0.6f);
|
||||
}
|
||||
|
||||
AtmosphericModelSettings defaults;
|
||||
configureAtmosphericModel(defaults);
|
||||
}
|
||||
|
||||
LLAtmosphere::~LLAtmosphere()
|
||||
{
|
||||
// Cease referencing textures from atmosphere::model from our LLGLTextures wrappers for same.
|
||||
if (m_transmittance)
|
||||
{
|
||||
m_transmittance->setTexName(0);
|
||||
}
|
||||
|
||||
if (m_scattering)
|
||||
{
|
||||
m_scattering->setTexName(0);
|
||||
}
|
||||
|
||||
if (m_mie_scatter_texture)
|
||||
{
|
||||
m_mie_scatter_texture->setTexName(0);
|
||||
}
|
||||
|
||||
delete m_model;
|
||||
m_model = nullptr;
|
||||
}
|
||||
|
||||
bool LLAtmosphere::configureAtmosphericModel(AtmosphericModelSettings& settings)
|
||||
{
|
||||
// Advanced Atmospherics TODO
|
||||
// Make this store a hash of the precomputed data
|
||||
// and avoid redundant calcs for identical settings
|
||||
|
||||
if (m_model)
|
||||
{
|
||||
delete m_model;
|
||||
}
|
||||
m_model = nullptr;
|
||||
getTransmittance()->setTexName(0);
|
||||
getScattering()->setTexName(0);
|
||||
getMieScattering()->setTexName(0);
|
||||
|
||||
// Init libatmosphere model
|
||||
m_config.num_scattering_orders = 4;
|
||||
|
||||
m_model = new atmosphere::Model(
|
||||
m_wavelengths,
|
||||
m_solar_irradiance,
|
||||
settings.m_sunArcRadians,
|
||||
settings.m_skyBottomRadius * 1000.0f,
|
||||
settings.m_skyTopRadius * 1000.0f,
|
||||
settings.m_rayleighProfile,
|
||||
m_rayleigh_scattering,
|
||||
settings.m_mieProfile,
|
||||
m_mie_scattering,
|
||||
m_mie_extinction,
|
||||
settings.m_mieAnisotropy,
|
||||
settings.m_absorptionProfile,
|
||||
m_absorption_extinction,
|
||||
m_ground_albedo,
|
||||
max_sun_zenith_angle,
|
||||
1000.0,
|
||||
15,
|
||||
false,
|
||||
true);
|
||||
|
||||
if (m_model)
|
||||
{
|
||||
m_model->Init(m_config, m_textures);
|
||||
getTransmittance()->setTexName(m_textures.transmittance_texture);
|
||||
getScattering()->setTexName(m_textures.scattering_texture);
|
||||
getMieScattering()->setTexName(m_textures.single_mie_scattering_texture);
|
||||
}
|
||||
|
||||
return m_model != nullptr;
|
||||
}
|
||||
|
||||
LLGLTexture* LLAtmosphere::getTransmittance()
|
||||
{
|
||||
if (!m_transmittance)
|
||||
{
|
||||
m_transmittance = new LLGLTexture;
|
||||
m_transmittance->generateGLTexture();
|
||||
m_transmittance->setAddressMode(LLTexUnit::eTextureAddressMode::TAM_CLAMP);
|
||||
m_transmittance->setFilteringOption(LLTexUnit::eTextureFilterOptions::TFO_BILINEAR);
|
||||
m_transmittance->setExplicitFormat(GL_RGB16F_ARB, GL_RGB, GL_FLOAT);
|
||||
m_transmittance->setTarget(GL_TEXTURE_2D, LLTexUnit::TT_TEXTURE);
|
||||
}
|
||||
return m_transmittance;
|
||||
}
|
||||
|
||||
LLGLTexture* LLAtmosphere::getScattering()
|
||||
{
|
||||
if (!m_scattering)
|
||||
{
|
||||
m_scattering = new LLGLTexture;
|
||||
m_scattering->generateGLTexture();
|
||||
m_scattering->setAddressMode(LLTexUnit::eTextureAddressMode::TAM_CLAMP);
|
||||
m_scattering->setFilteringOption(LLTexUnit::eTextureFilterOptions::TFO_BILINEAR);
|
||||
m_scattering->setExplicitFormat(GL_RGB16F_ARB, GL_RGB, GL_FLOAT);
|
||||
m_scattering->setTarget(GL_TEXTURE_3D, LLTexUnit::TT_TEXTURE_3D);
|
||||
}
|
||||
return m_scattering;
|
||||
}
|
||||
|
||||
LLGLTexture* LLAtmosphere::getMieScattering()
|
||||
{
|
||||
if (!m_mie_scatter_texture)
|
||||
{
|
||||
m_mie_scatter_texture = new LLGLTexture;
|
||||
m_mie_scatter_texture->generateGLTexture();
|
||||
m_mie_scatter_texture->setAddressMode(LLTexUnit::eTextureAddressMode::TAM_CLAMP);
|
||||
m_mie_scatter_texture->setFilteringOption(LLTexUnit::eTextureFilterOptions::TFO_BILINEAR);
|
||||
m_mie_scatter_texture->setExplicitFormat(GL_RGB16F_ARB, GL_RGB, GL_FLOAT);
|
||||
m_mie_scatter_texture->setTarget(GL_TEXTURE_3D, LLTexUnit::TT_TEXTURE_3D);
|
||||
}
|
||||
return m_mie_scatter_texture;
|
||||
}
|
||||
|
||||
GLhandleARB LLAtmosphere::getAtmosphericShaderForLink() const
|
||||
{
|
||||
return m_model ? m_model->GetShader() : 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@
|
|||
#include "OpenGL/OpenGL.h"
|
||||
#endif
|
||||
|
||||
#pragma optimize("", off)
|
||||
|
||||
#ifdef LL_RELEASE_FOR_DOWNLOAD
|
||||
#define UNIFORM_ERRS LL_WARNS_ONCE("Shader")
|
||||
#else
|
||||
|
|
@ -1306,8 +1308,8 @@ void LLShaderMgr::initAttribsAndUniforms()
|
|||
|
||||
mReservedUniforms.push_back("transmittance_texture");
|
||||
mReservedUniforms.push_back("scattering_texture");
|
||||
mReservedUniforms.push_back("irradiance_texture");
|
||||
mReservedUniforms.push_back("single_mie_scattering_texture");
|
||||
mReservedUniforms.push_back("irradiance_texture");
|
||||
|
||||
llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS);
|
||||
|
||||
|
|
|
|||
|
|
@ -229,8 +229,8 @@ public:
|
|||
// precomputed textures from libatmosphere
|
||||
TRANSMITTANCE_TEX,
|
||||
SCATTER_TEX,
|
||||
ILLUMINANCE_TEX,
|
||||
SINGLE_MIE_SCATTER_TEX,
|
||||
ILLUMINANCE_TEX,
|
||||
|
||||
END_RESERVED_UNIFORMS
|
||||
} eGLSLReservedUniforms;
|
||||
|
|
|
|||
|
|
@ -1545,7 +1545,10 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
|
|||
(LLRender::sGLCoreProfile ? " core" : " compatibility") << " context." << LL_ENDL;
|
||||
done = true;
|
||||
|
||||
if (LLRender::sGLCoreProfile)
|
||||
// force sNoFixedFunction iff we're trying to use nsight debugging which does not support many legacy API uses
|
||||
|
||||
// nSight doesn't support use of legacy API funcs in the fixed function pipe
|
||||
if (LLRender::sGLCoreProfile || LLRender::sNsightDebugSupport)
|
||||
{
|
||||
LLGLSLShader::sNoFixedFunction = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8631,7 +8631,19 @@
|
|||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
|
||||
<key>RenderNsightDebugSupport</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>
|
||||
Disable features which prevent nVidia nSight from being usable with SL. Requires restart.
|
||||
</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>RenderLocalLights</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -12268,7 +12280,9 @@
|
|||
<key>Comment</key>
|
||||
<string>If TRUE, always load textures at full resolution (discard = 0)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<!-- we don't want this to be persistent as people who enable it with low GPU mem cards
|
||||
can get into a situation where login becomes impossible -->
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* @file WLSkyF.glsl
|
||||
* @file class1/deferred/skyF.glsl
|
||||
*
|
||||
* $LicenseInfo:firstyear=2005&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* @file WLSkyF.glsl
|
||||
* @file class2/windlight/skyF.glsl
|
||||
*
|
||||
* $LicenseInfo:firstyear=2005&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ uniform vec2 sun_size;
|
|||
uniform sampler2D cloud_noise_texture;
|
||||
uniform sampler2D transmittance_texture;
|
||||
uniform sampler3D scattering_texture;
|
||||
uniform sampler3D mie_scattering_texture;
|
||||
uniform sampler3D single_mie_scattering_texture;
|
||||
uniform sampler2D irradiance_texture;
|
||||
|
||||
vec3 GetSolarLuminance();
|
||||
vec3 GetSkyLuminance(vec3 camPos, vec3 view_dir, float shadow_length, vec3 sun_dir, out vec3 transmittance);
|
||||
|
|
@ -53,8 +54,6 @@ void main()
|
|||
vec3 transmittance;
|
||||
vec3 radiance = GetSkyLuminance(camPos, view_direction, 0.0f, sun_direction, transmittance);
|
||||
|
||||
//radiance *= transmittance;
|
||||
|
||||
// If the view ray intersects the Sun, add the Sun radiance.
|
||||
if (dot(view_direction, sun_direction) >= sun_size.y)
|
||||
{
|
||||
|
|
@ -65,7 +64,6 @@ void main()
|
|||
color = pow(color, vec3(1.0 / 2.2));
|
||||
|
||||
frag_color.rgb = color;
|
||||
|
||||
frag_color.a = 1.0;
|
||||
}
|
||||
|
||||
|
|
@ -580,6 +580,7 @@ static void settings_to_globals()
|
|||
LLSurface::setTextureSize(gSavedSettings.getU32("RegionTextureSize"));
|
||||
|
||||
LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLCoreProfile");
|
||||
LLRender::sNsightDebugSupport = gSavedSettings.getBOOL("RenderNsightDebugSupport");
|
||||
LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO");
|
||||
LLImageGL::sGlobalUseAnisotropic = gSavedSettings.getBOOL("RenderAnisotropic");
|
||||
LLImageGL::sCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures");
|
||||
|
|
|
|||
|
|
@ -435,6 +435,9 @@ void LLFastTimerView::onClose(bool app_quitting)
|
|||
|
||||
void saveChart(const std::string& label, const char* suffix, LLImageRaw* scratch)
|
||||
{
|
||||
// disable use of glReadPixels which messes up nVidia nSight graphics debugging
|
||||
if (!LLRender::sNsightDebugSupport)
|
||||
{
|
||||
//read result back into raw image
|
||||
glReadPixels(0, 0, 1024, 512, GL_RGB, GL_UNSIGNED_BYTE, scratch->getData());
|
||||
|
||||
|
|
@ -447,6 +450,7 @@ void saveChart(const std::string& label, const char* suffix, LLImageRaw* scratch
|
|||
|
||||
std::string out_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, filename);
|
||||
result->save(out_file);
|
||||
}
|
||||
}
|
||||
|
||||
//static
|
||||
|
|
|
|||
Loading…
Reference in New Issue