21 files changed, 41 insertions, 1507 deletions

diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index ccff7c7a8c..26a8ff070f 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -23,7 +23,6 @@ set(llrender_SOURCE_FILES
     llglslshader.cpp
     llgltexture.cpp
     llimagegl.cpp
-    llpostprocess.cpp
     llrender.cpp
     llrender2dutils.cpp
     llrendernavprim.cpp
@@ -56,7 +55,6 @@ set(llrender_HEADER_FILES
     llgltexture.h
     llgltypes.h
     llimagegl.h
-    llpostprocess.h
     llrender.h
     llrender2dutils.h
     llrendernavprim.h
diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
deleted file mode 100644
index eef7193c92..0000000000
--- a/indra/llrender/llpostprocess.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-/**
- * @file llpostprocess.cpp
- * @brief LLPostProcess class implementation
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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 "llpostprocess.h"
-#include "llglslshader.h"
-#include "llsdserialize.h"
-#include "llrender.h"
-
-static LLStaticHashedString sRenderTexture("RenderTexture");
-static LLStaticHashedString sBrightness("brightness");
-static LLStaticHashedString sContrast("contrast");
-static LLStaticHashedString sContrastBase("contrastBase");
-static LLStaticHashedString sSaturation("saturation");
-static LLStaticHashedString sLumWeights("lumWeights");
-static LLStaticHashedString sNoiseTexture("NoiseTexture");
-static LLStaticHashedString sBrightMult("brightMult");
-static LLStaticHashedString sNoiseStrength("noiseStrength");
-static LLStaticHashedString sExtractLow("extractLow");
-static LLStaticHashedString sExtractHigh("extractHigh");
-static LLStaticHashedString sBloomStrength("bloomStrength");
-static LLStaticHashedString sTexelSize("texelSize");
-static LLStaticHashedString sBlurDirection("blurDirection");
-static LLStaticHashedString sBlurWidth("blurWidth");
-
-LLPostProcess * gPostProcess = NULL;
-
-static const unsigned int NOISE_SIZE = 512;
-
-LLPostProcess::LLPostProcess(void) :
-                    initialized(false),
-                    mAllEffects(LLSD::emptyMap()),
-                    screenW(1), screenH(1)
-{
-    mSceneRenderTexture = NULL ;
-    mNoiseTexture = NULL ;
-    mTempBloomTexture = NULL ;
-
-    noiseTextureScale = 1.0f;
-
-    /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
-    std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
-    LL_DEBUGS("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
-
-    llifstream effectsXML(pathName);
-
-    if (effectsXML)
-    {
-        LLPointer<LLSDParser> parser = new LLSDXMLParser();
-
-        parser->parse(effectsXML, mAllEffects, LLSDSerialize::SIZE_UNLIMITED);
-    }
-
-    if (!mAllEffects.has("default"))
-    {
-        LLSD & defaultEffect = (mAllEffects["default"] = LLSD::emptyMap());
-
-        defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
-        defaultEffect["enable_bloom"] = LLSD::Boolean(false);
-        defaultEffect["enable_color_filter"] = LLSD::Boolean(false);
-
-        /// NVG Defaults
-        defaultEffect["brightness_multiplier"] = 3.0;
-        defaultEffect["noise_size"] = 25.0;
-        defaultEffect["noise_strength"] = 0.4;
-
-        // TODO BTest potentially add this to tweaks?
-        noiseTextureScale = 1.0f;
-
-        /// Bloom Defaults
-        defaultEffect["extract_low"] = 0.95;
-        defaultEffect["extract_high"] = 1.0;
-        defaultEffect["bloom_width"] = 2.25;
-        defaultEffect["bloom_strength"] = 1.5;
-
-        /// Color Filter Defaults
-        defaultEffect["brightness"] = 1.0;
-        defaultEffect["contrast"] = 1.0;
-        defaultEffect["saturation"] = 1.0;
-
-        LLSD& contrastBase = (defaultEffect["contrast_base"] = LLSD::emptyArray());
-        contrastBase.append(1.0);
-        contrastBase.append(1.0);
-        contrastBase.append(1.0);
-        contrastBase.append(0.5);
-    }
-
-    setSelectedEffect("default");
-    */
-}
-
-LLPostProcess::~LLPostProcess(void)
-{
-    invalidate() ;
-}
-
-// static
-void LLPostProcess::initClass(void)
-{
-    //this will cause system to crash at second time login
-    //if first time login fails due to network connection --- bao
-    //***llassert_always(gPostProcess == NULL);
-    //replaced by the following line:
-    if(gPostProcess)
-        return ;
-
-
-    gPostProcess = new LLPostProcess();
-}
-
-// static
-void LLPostProcess::cleanupClass()
-{
-    delete gPostProcess;
-    gPostProcess = NULL;
-}
-
-void LLPostProcess::setSelectedEffect(std::string const & effectName)
-{
-    mSelectedEffectName = effectName;
-    static_cast<LLSD &>(tweaks) = mAllEffects[effectName];
-}
-
-void LLPostProcess::saveEffect(std::string const & effectName)
-{
-    /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
-    mAllEffects[effectName] = tweaks;
-
-    std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
-    //LL_INFOS() << "Saving PostProcess Effects settings to " << pathName << LL_ENDL;
-
-    llofstream effectsXML(pathName);
-
-    LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
-
-    formatter->format(mAllEffects, effectsXML);
-    */
-}
-void LLPostProcess::invalidate()
-{
-    mSceneRenderTexture = NULL ;
-    mNoiseTexture = NULL ;
-    mTempBloomTexture = NULL ;
-    initialized = false ;
-}
-
-void LLPostProcess::apply(unsigned int width, unsigned int height)
-{
-    if (!initialized || width != screenW || height != screenH){
-        initialize(width, height);
-    }
-    if (shadersEnabled()){
-        doEffects();
-    }
-}
-
-void LLPostProcess::initialize(unsigned int width, unsigned int height)
-{
-    screenW = width;
-    screenH = height;
-    createTexture(mSceneRenderTexture, screenW, screenH);
-    initialized = true;
-
-    checkError();
-    createNightVisionShader();
-    createBloomShader();
-    createColorFilterShader();
-    checkError();
-}
-
-inline bool LLPostProcess::shadersEnabled(void)
-{
-    return (tweaks.useColorFilter().asBoolean() ||
-            tweaks.useNightVisionShader().asBoolean() ||
-            tweaks.useBloomShader().asBoolean() );
-
-}
-
-void LLPostProcess::applyShaders(void)
-{
-    if (tweaks.useColorFilter()){
-        applyColorFilterShader();
-        checkError();
-    }
-    if (tweaks.useNightVisionShader()){
-        /// If any of the above shaders have been called update the frame buffer;
-        if (tweaks.useColorFilter())
-        {
-            U32 tex = mSceneRenderTexture->getTexName() ;
-            copyFrameBuffer(tex, screenW, screenH);
-        }
-        applyNightVisionShader();
-        checkError();
-    }
-    if (tweaks.useBloomShader()){
-        /// If any of the above shaders have been called update the frame buffer;
-        if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean())
-        {
-            U32 tex = mSceneRenderTexture->getTexName() ;
-            copyFrameBuffer(tex, screenW, screenH);
-        }
-        applyBloomShader();
-        checkError();
-    }
-}
-
-void LLPostProcess::applyColorFilterShader(void)
-{
-
-}
-
-void LLPostProcess::createColorFilterShader(void)
-{
-    /// Define uniform names
-    colorFilterUniforms[sRenderTexture] = 0;
-    colorFilterUniforms[sBrightness] = 0;
-    colorFilterUniforms[sContrast] = 0;
-    colorFilterUniforms[sContrastBase] = 0;
-    colorFilterUniforms[sSaturation] = 0;
-    colorFilterUniforms[sLumWeights] = 0;
-}
-
-void LLPostProcess::applyNightVisionShader(void)
-{
-
-}
-
-void LLPostProcess::createNightVisionShader(void)
-{
-    /// Define uniform names
-    nightVisionUniforms[sRenderTexture] = 0;
-    nightVisionUniforms[sNoiseTexture] = 0;
-    nightVisionUniforms[sBrightMult] = 0;
-    nightVisionUniforms[sNoiseStrength] = 0;
-    nightVisionUniforms[sLumWeights] = 0;
-
-    createNoiseTexture(mNoiseTexture);
-}
-
-void LLPostProcess::applyBloomShader(void)
-{
-
-}
-
-void LLPostProcess::createBloomShader(void)
-{
-    createTexture(mTempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
-
-    /// Create Bloom Extract Shader
-    bloomExtractUniforms[sRenderTexture] = 0;
-    bloomExtractUniforms[sExtractLow] = 0;
-    bloomExtractUniforms[sExtractHigh] = 0;
-    bloomExtractUniforms[sLumWeights] = 0;
-
-    /// Create Bloom Blur Shader
-    bloomBlurUniforms[sRenderTexture] = 0;
-    bloomBlurUniforms[sBloomStrength] = 0;
-    bloomBlurUniforms[sTexelSize] = 0;
-    bloomBlurUniforms[sBlurDirection] = 0;
-    bloomBlurUniforms[sBlurWidth] = 0;
-}
-
-void LLPostProcess::getShaderUniforms(glslUniforms & uniforms, GLuint & prog)
-{
-    /// Find uniform locations and insert into map
-    glslUniforms::iterator i;
-    for (i  = uniforms.begin(); i != uniforms.end(); ++i){
-        i->second = glGetUniformLocation(prog, i->first.String().c_str());
-    }
-}
-
-void LLPostProcess::doEffects(void)
-{
-    /// Save GL State
-    glPushAttrib(GL_ALL_ATTRIB_BITS);
-    glPushClientAttrib(GL_ALL_ATTRIB_BITS);
-
-    /// Copy the screen buffer to the render texture
-    {
-        U32 tex = mSceneRenderTexture->getTexName() ;
-        copyFrameBuffer(tex, screenW, screenH);
-    }
-
-    /// Clear the frame buffer.
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-    glClear(GL_COLOR_BUFFER_BIT);
-
-    /// Change to an orthogonal view
-    viewOrthogonal(screenW, screenH);
-
-    checkError();
-    applyShaders();
-
-    LLGLSLShader::unbind();
-    checkError();
-
-    /// Change to a perspective view
-    viewPerspective();
-
-    /// Reset GL State
-    glPopClientAttrib();
-    glPopAttrib();
-    checkError();
-}
-
-void LLPostProcess::copyFrameBuffer(U32 & texture, unsigned int width, unsigned int height)
-{
-    gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, texture);
-    glCopyTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA, 0, 0, width, height, 0);
-}
-
-void LLPostProcess::drawOrthoQuad(unsigned int width, unsigned int height, QuadType type)
-{
-
-}
-
-void LLPostProcess::viewOrthogonal(unsigned int width, unsigned int height)
-{
-    gGL.matrixMode(LLRender::MM_PROJECTION);
-    gGL.pushMatrix();
-    gGL.loadIdentity();
-    gGL.ortho( 0.f, (GLfloat) width , (GLfloat) height , 0.f, -1.f, 1.f );
-    gGL.matrixMode(LLRender::MM_MODELVIEW);
-    gGL.pushMatrix();
-    gGL.loadIdentity();
-}
-
-void LLPostProcess::viewPerspective(void)
-{
-    gGL.matrixMode(LLRender::MM_PROJECTION);
-    gGL.popMatrix();
-    gGL.matrixMode(LLRender::MM_MODELVIEW);
-    gGL.popMatrix();
-}
-
-void LLPostProcess::changeOrthogonal(unsigned int width, unsigned int height)
-{
-    viewPerspective();
-    viewOrthogonal(width, height);
-}
-
-void LLPostProcess::createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height)
-{
-    std::vector<GLubyte> data(width * height * 4, 0) ;
-
-    texture = new LLImageGL(false) ;
-    if(texture->createGLTexture())
-    {
-        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, texture->getTexName());
-        glTexImage2D(GL_TEXTURE_RECTANGLE, 0, 4, width, height, 0,
-            GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
-        gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
-        gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
-    }
-}
-
-void LLPostProcess::createNoiseTexture(LLPointer<LLImageGL>& texture)
-{
-    std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
-    for (unsigned int i = 0; i < NOISE_SIZE; i++){
-        for (unsigned int k = 0; k < NOISE_SIZE; k++){
-            buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
-        }
-    }
-
-    texture = new LLImageGL(false) ;
-    if(texture->createGLTexture())
-    {
-        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, texture->getTexName());
-        LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-        gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
-        gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
-    }
-}
-
-bool LLPostProcess::checkError(void)
-{
-    GLenum glErr;
-    bool    retCode = false;
-
-    glErr = glGetError();
-    while (glErr != GL_NO_ERROR)
-    {
-        // shaderErrorLog << (const char *) gluErrorString(glErr) << std::endl;
-        char const * err_str_raw = (const char *) gluErrorString(glErr);
-
-        if(err_str_raw == NULL)
-        {
-            std::ostringstream err_builder;
-            err_builder << "unknown error number " << glErr;
-            mShaderErrorString = err_builder.str();
-        }
-        else
-        {
-            mShaderErrorString = err_str_raw;
-        }
-
-        retCode = true;
-        glErr = glGetError();
-    }
-    return retCode;
-}
-
-void LLPostProcess::checkShaderError(GLuint shader)
-{
-    GLint infologLength = 0;
-    GLint charsWritten  = 0;
-    GLchar *infoLog;
-
-    checkError();  // Check for OpenGL errors
-
-    glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infologLength);
-
-    checkError();  // Check for OpenGL errors
-
-    if (infologLength > 0)
-    {
-        infoLog = (GLchar *)malloc(infologLength);
-        if (infoLog == NULL)
-        {
-            /// Could not allocate infolog buffer
-            return;
-        }
-       glGetProgramInfoLog(shader, infologLength, &charsWritten, infoLog);
-        // shaderErrorLog << (char *) infoLog << std::endl;
-        mShaderErrorString = (char *) infoLog;
-        free(infoLog);
-    }
-    checkError();  // Check for OpenGL errors
-}
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
deleted file mode 100644
index b5b7549efb..0000000000
--- a/indra/llrender/llpostprocess.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * @file llpostprocess.h
- * @brief LLPostProcess class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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$
- */
-
-#ifndef LL_POSTPROCESS_H
-#define LL_POSTPROCESS_H
-
-#include <map>
-#include <fstream>
-#include "llgl.h"
-#include "llglheaders.h"
-#include "llstaticstringtable.h"
-
-class LLPostProcess
-{
-public:
-
-    typedef enum _QuadType {
-        QUAD_NORMAL,
-        QUAD_NOISE,
-        QUAD_BLOOM_EXTRACT,
-        QUAD_BLOOM_COMBINE
-    } QuadType;
-
-    /// GLSL Shader Encapsulation Struct
-    typedef LLStaticStringTable<GLuint> glslUniforms;
-
-    struct PostProcessTweaks : public LLSD {
-        inline PostProcessTweaks() : LLSD(LLSD::emptyMap())
-        {
-        }
-
-        inline LLSD & brightMult() {
-            return (*this)["brightness_multiplier"];
-        }
-
-        inline LLSD & noiseStrength() {
-            return (*this)["noise_strength"];
-        }
-
-        inline LLSD & noiseSize() {
-            return (*this)["noise_size"];
-        }
-
-        inline LLSD & extractLow() {
-            return (*this)["extract_low"];
-        }
-
-        inline LLSD & extractHigh() {
-            return (*this)["extract_high"];
-        }
-
-        inline LLSD & bloomWidth() {
-            return (*this)["bloom_width"];
-        }
-
-        inline LLSD & bloomStrength() {
-            return (*this)["bloom_strength"];
-        }
-
-        inline LLSD & brightness() {
-            return (*this)["brightness"];
-        }
-
-        inline LLSD & contrast() {
-            return (*this)["contrast"];
-        }
-
-        inline LLSD & contrastBaseR() {
-            return (*this)["contrast_base"][0];
-        }
-
-        inline LLSD & contrastBaseG() {
-            return (*this)["contrast_base"][1];
-        }
-
-        inline LLSD & contrastBaseB() {
-            return (*this)["contrast_base"][2];
-        }
-
-        inline LLSD & contrastBaseIntensity() {
-            return (*this)["contrast_base"][3];
-        }
-
-        inline LLSD & saturation() {
-            return (*this)["saturation"];
-        }
-
-        inline LLSD & useNightVisionShader() {
-            return (*this)["enable_night_vision"];
-        }
-
-        inline LLSD & useBloomShader() {
-            return (*this)["enable_bloom"];
-        }
-
-        inline LLSD & useColorFilter() {
-            return (*this)["enable_color_filter"];
-        }
-
-
-        inline F32 getBrightMult() const {
-            return F32((*this)["brightness_multiplier"].asReal());
-        }
-
-        inline F32 getNoiseStrength() const {
-            return F32((*this)["noise_strength"].asReal());
-        }
-
-        inline F32 getNoiseSize() const {
-            return F32((*this)["noise_size"].asReal());
-        }
-
-        inline F32 getExtractLow() const {
-            return F32((*this)["extract_low"].asReal());
-        }
-
-        inline F32 getExtractHigh() const {
-            return F32((*this)["extract_high"].asReal());
-        }
-
-        inline F32 getBloomWidth() const {
-            return F32((*this)["bloom_width"].asReal());
-        }
-
-        inline F32 getBloomStrength() const {
-            return F32((*this)["bloom_strength"].asReal());
-        }
-
-        inline F32 getBrightness() const {
-            return F32((*this)["brightness"].asReal());
-        }
-
-        inline F32 getContrast() const {
-            return F32((*this)["contrast"].asReal());
-        }
-
-        inline F32 getContrastBaseR() const {
-            return F32((*this)["contrast_base"][0].asReal());
-        }
-
-        inline F32 getContrastBaseG() const {
-            return F32((*this)["contrast_base"][1].asReal());
-        }
-
-        inline F32 getContrastBaseB() const {
-            return F32((*this)["contrast_base"][2].asReal());
-        }
-
-        inline F32 getContrastBaseIntensity() const {
-            return F32((*this)["contrast_base"][3].asReal());
-        }
-
-        inline F32 getSaturation() const {
-            return F32((*this)["saturation"].asReal());
-        }
-
-    };
-
-    bool initialized;
-    PostProcessTweaks tweaks;
-
-    // the map of all availible effects
-    LLSD mAllEffects;
-
-private:
-    LLPointer<LLImageGL> mSceneRenderTexture ;
-    LLPointer<LLImageGL> mNoiseTexture ;
-    LLPointer<LLImageGL> mTempBloomTexture ;
-
-public:
-    LLPostProcess(void);
-
-    ~LLPostProcess(void);
-
-    void apply(unsigned int width, unsigned int height);
-    void invalidate() ;
-
-    /// Perform global initialization for this class.
-    static void initClass(void);
-
-    // Cleanup of global data that's only inited once per class.
-    static void cleanupClass();
-
-    void setSelectedEffect(std::string const & effectName);
-
-    inline std::string const & getSelectedEffect(void) const {
-        return mSelectedEffectName;
-    }
-
-    void saveEffect(std::string const & effectName);
-
-private:
-        /// read in from file
-    std::string mShaderErrorString;
-    unsigned int screenW;
-    unsigned int screenH;
-
-    float noiseTextureScale;
-
-    /// Shader Uniforms
-    glslUniforms nightVisionUniforms;
-    glslUniforms bloomExtractUniforms;
-    glslUniforms bloomBlurUniforms;
-    glslUniforms colorFilterUniforms;
-
-    // the name of currently selected effect in mAllEffects
-    // invariant: tweaks == mAllEffects[mSelectedEffectName]
-    std::string mSelectedEffectName;
-
-    /// General functions
-    void initialize(unsigned int width, unsigned int height);
-    void doEffects(void);
-    void applyShaders(void);
-    bool shadersEnabled(void);
-
-    /// Night Vision Functions
-    void createNightVisionShader(void);
-    void applyNightVisionShader(void);
-
-    /// Bloom Functions
-    void createBloomShader(void);
-    void applyBloomShader(void);
-
-    /// Color Filter Functions
-    void createColorFilterShader(void);
-    void applyColorFilterShader(void);
-
-    /// OpenGL Helper Functions
-    void getShaderUniforms(glslUniforms & uniforms, GLuint & prog);
-    void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height);
-    void copyFrameBuffer(U32 & texture, unsigned int width, unsigned int height);
-    void createNoiseTexture(LLPointer<LLImageGL>& texture);
-    bool checkError(void);
-    void checkShaderError(GLuint shader);
-    void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);
-    void viewOrthogonal(unsigned int width, unsigned int height);
-    void changeOrthogonal(unsigned int width, unsigned int height);
-    void viewPerspective(void);
-};
-
-extern LLPostProcess * gPostProcess;
-
-
-#endif // LL_POSTPROCESS_H
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 38bc5ff331..c72f8fa2ba 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -51,6 +51,7 @@ void check_framebuffer_status()
 }
 
 bool LLRenderTarget::sUseFBO = false;
+bool LLRenderTarget::sClearOnInvalidate = false;
 U32 LLRenderTarget::sCurFBO = 0;
 
 
@@ -473,6 +474,13 @@ void LLRenderTarget::clear(U32 mask_in)
     }
 }
 
+void LLRenderTarget::invalidate(U32 mask_in)
+{
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_DISPLAY;
+    if (!sClearOnInvalidate) { return; }
+    clear(mask_in);
+}
+
 U32 LLRenderTarget::getTexture(U32 attachment) const
 {
     if (attachment >= mTex.size())
@@ -584,7 +592,6 @@ void LLRenderTarget::swapFBORefs(LLRenderTarget& other)
     llassert(!other.isBoundInStack());
 
     // Must be same type
-    llassert(sUseFBO == other.sUseFBO);
     llassert(mResX == other.mResX);
     llassert(mResY == other.mResY);
     llassert(mInternalFormat == other.mInternalFormat);
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h
index cd3290cf66..f066534cf4 100644
--- a/indra/llrender/llrendertarget.h
+++ b/indra/llrender/llrendertarget.h
@@ -63,6 +63,7 @@ class LLRenderTarget
 public:
     // Whether or not to use FBO implementation
     static bool sUseFBO;
+    static bool sClearOnInvalidate;
     static U32 sBytesAllocated;
     static U32 sCurFBO;
     static U32 sCurResX;
@@ -128,11 +129,17 @@ public:
     //  Asserts that this target is not currently bound in the stack
     void bindTarget();
 
-    //clear render targer, clears depth buffer if present,
+    //clear render target, clears depth buffer if present,
     //uses scissor rect if in copy-to-texture mode
     // asserts that this target is currently bound
     void clear(U32 mask = 0xFFFFFFFF);
 
+    //same as clear, except may be a no-op depending on configuration
+    //useful to indicate the buffer is about to be overwritten and we
+    //don't care about its previous contents
+    //depending on the GPU, one may be more expensive than the other
+    void invalidate(U32 mask = 0xFFFFFFFF);
+
     //get applied viewport
     void getViewport(S32* viewport);
 
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index c8cde90032..ecac800def 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1594,9 +1594,7 @@ void LLTextEditor::cleanStringForPaste(LLWString & clean_string)
     }
 }
 
-
-template <>
-void LLTextEditor::pasteTextWithLinebreaks<LLWString>(const LLWString & clean_string)
+void LLTextEditor::pasteTextWithLinebreaksImpl(const LLWString & clean_string)
 {
     std::basic_string<llwchar>::size_type start = 0;
     std::basic_string<llwchar>::size_type pos = clean_string.find('\n',start);
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 765c88a933..fab46a00e3 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -313,10 +313,9 @@ public:
     template <typename STRINGTYPE>
     void            pasteTextWithLinebreaks(const STRINGTYPE& clean_string)
     {
-        pasteTextWithLinebreaks<LLWString>(ll_convert(clean_string));
+        pasteTextWithLinebreaksImpl(ll_convert(clean_string));
     }
-    template <>
-    void            pasteTextWithLinebreaks<LLWString>(const LLWString & clean_string);
+    void            pasteTextWithLinebreaksImpl(const LLWString & clean_string);
 
 private:
     void            onKeyStroke();
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 04ce88f0c6..29dbceedac 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -271,7 +271,6 @@ set(viewer_SOURCE_FILES
     llfloaterpay.cpp
     llfloaterperformance.cpp
     llfloaterperms.cpp
-    llfloaterpostprocess.cpp
     llfloaterprofile.cpp
     llfloaterpreference.cpp
     llfloaterpreferencesgraphicsadvanced.cpp
@@ -946,7 +945,6 @@ set(viewer_HEADER_FILES
     llfloaterpay.h
     llfloaterperformance.h
     llfloaterperms.h
-    llfloaterpostprocess.h
     llfloaterprofile.h
     llfloaterpreference.h
     llfloaterpreferencesgraphicsadvanced.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6fe13d4665..ce6d9148c6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7413,6 +7413,17 @@
     <key>Value</key>
     <integer>-1</integer>
   </map>
+  <key>RenderBufferClearOnInvalidate</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether to call glClear on render buffers that will be fully overwritten with new contents</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RenderCompressTextures</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 377fb4d486..521e6eee1a 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -184,7 +184,6 @@
 #include "lltracker.h"
 #include "llviewerparcelmgr.h"
 #include "llworldmapview.h"
-#include "llpostprocess.h"
 
 #include "lldebugview.h"
 #include "llconsole.h"
@@ -1972,8 +1971,6 @@ bool LLAppViewer::cleanup()
 
     SUBSYSTEM_CLEANUP(LLAvatarAppearance);
 
-    SUBSYSTEM_CLEANUP(LLPostProcess);
-
     LLTracker::cleanupInstance();
 
     // *FIX: This is handled in LLAppViewerWin32::cleanup().
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
deleted file mode 100644
index 616c13cdc7..0000000000
--- a/indra/newview/llfloaterpostprocess.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * @file llfloaterpostprocess.cpp
- * @brief LLFloaterPostProcess class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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 "llviewerprecompiledheaders.h"
-
-#include "llfloaterpostprocess.h"
-
-#include "llsliderctrl.h"
-#include "llcheckboxctrl.h"
-#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
-#include "llviewerdisplay.h"
-#include "llpostprocess.h"
-#include "llcombobox.h"
-#include "lllineeditor.h"
-#include "llviewerwindow.h"
-
-
-LLFloaterPostProcess::LLFloaterPostProcess(const LLSD& key)
-  : LLFloater(key)
-{
-}
-
-LLFloaterPostProcess::~LLFloaterPostProcess()
-{
-
-
-}
-bool LLFloaterPostProcess::postBuild()
-{
-    /// Color Filter Callbacks
-    childSetCommitCallback("ColorFilterToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_color_filter");
-    //childSetCommitCallback("ColorFilterGamma", &LLFloaterPostProcess::onFloatControlMoved, &(gPostProcess->tweaks.gamma()));
-    childSetCommitCallback("ColorFilterBrightness", &LLFloaterPostProcess::onFloatControlMoved, (char*)"brightness");
-    childSetCommitCallback("ColorFilterSaturation", &LLFloaterPostProcess::onFloatControlMoved, (char*)"saturation");
-    childSetCommitCallback("ColorFilterContrast", &LLFloaterPostProcess::onFloatControlMoved, (char*)"contrast");
-
-    childSetCommitCallback("ColorFilterBaseR", &LLFloaterPostProcess::onColorControlRMoved, (char*)"contrast_base");
-    childSetCommitCallback("ColorFilterBaseG", &LLFloaterPostProcess::onColorControlGMoved, (char*)"contrast_base");
-    childSetCommitCallback("ColorFilterBaseB", &LLFloaterPostProcess::onColorControlBMoved, (char*)"contrast_base");
-    childSetCommitCallback("ColorFilterBaseI", &LLFloaterPostProcess::onColorControlIMoved, (char*)"contrast_base");
-
-    /// Night Vision Callbacks
-    childSetCommitCallback("NightVisionToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_night_vision");
-    childSetCommitCallback("NightVisionBrightMult", &LLFloaterPostProcess::onFloatControlMoved, (char*)"brightness_multiplier");
-    childSetCommitCallback("NightVisionNoiseSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_size");
-    childSetCommitCallback("NightVisionNoiseStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_strength");
-
-    /// Bloom Callbacks
-    childSetCommitCallback("BloomToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_bloom");
-    childSetCommitCallback("BloomExtract", &LLFloaterPostProcess::onFloatControlMoved, (char*)"extract_low");
-    childSetCommitCallback("BloomSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_width");
-    childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength");
-
-    // Effect loading and saving.
-    LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
-    getChild<LLComboBox>("PPLoadEffect")->setCommitCallback(boost::bind(&LLFloaterPostProcess::onLoadEffect, this, comboBox));
-    comboBox->setCommitCallback(boost::bind(&LLFloaterPostProcess::onChangeEffectName, this, _1));
-
-    LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
-    getChild<LLComboBox>("PPSaveEffect")->setCommitCallback(boost::bind(&LLFloaterPostProcess::onSaveEffect, this, editBox));
-
-    syncMenu();
-    return true;
-}
-
-// Bool Toggle
-void LLFloaterPostProcess::onBoolToggle(LLUICtrl* ctrl, void* userData)
-{
-    char const * boolVariableName = (char const *)userData;
-
-    // check the bool
-    LLCheckBoxCtrl* cbCtrl = static_cast<LLCheckBoxCtrl*>(ctrl);
-    gPostProcess->tweaks[boolVariableName] = cbCtrl->getValue();
-}
-
-// Float Moved
-void LLFloaterPostProcess::onFloatControlMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlRMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][0] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlGMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][1] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlBMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][2] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][3] = sldrCtrl->getValue();
-}
-
-void LLFloaterPostProcess::onLoadEffect(LLComboBox* comboBox)
-{
-    LLSD::String effectName(comboBox->getSelectedValue().asString());
-
-    gPostProcess->setSelectedEffect(effectName);
-
-    syncMenu();
-}
-
-void LLFloaterPostProcess::onSaveEffect(LLLineEditor* editBox)
-{
-    std::string effectName(editBox->getValue().asString());
-
-    if (gPostProcess->mAllEffects.has(effectName))
-    {
-        LLSD payload;
-        payload["effect_name"] = effectName;
-        LLNotificationsUtil::add("PPSaveEffectAlert", LLSD(), payload, boost::bind(&LLFloaterPostProcess::saveAlertCallback, this, _1, _2));
-    }
-    else
-    {
-        gPostProcess->saveEffect(effectName);
-        syncMenu();
-    }
-}
-
-void LLFloaterPostProcess::onChangeEffectName(LLUICtrl* ctrl)
-{
-    // get the combo box and name
-    LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
-
-    // set the parameter's new name
-    editBox->setValue(ctrl->getValue());
-}
-
-bool LLFloaterPostProcess::saveAlertCallback(const LLSD& notification, const LLSD& response)
-{
-    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-
-    // if they choose save, do it.  Otherwise, don't do anything
-    if (option == 0)
-    {
-        gPostProcess->saveEffect(notification["payload"]["effect_name"].asString());
-
-        syncMenu();
-    }
-    return false;
-}
-
-void LLFloaterPostProcess::syncMenu()
-{
-    // add the combo boxe contents
-    LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
-
-    comboBox->removeall();
-
-    LLSD::map_const_iterator currEffect;
-    for(currEffect = gPostProcess->mAllEffects.beginMap();
-        currEffect != gPostProcess->mAllEffects.endMap();
-        ++currEffect)
-    {
-        comboBox->add(currEffect->first);
-    }
-
-    // set the current effect as selected.
-    comboBox->selectByValue(gPostProcess->getSelectedEffect());
-
-    /// Sync Color Filter Menu
-    getChild<LLUICtrl>("ColorFilterToggle")->setValue(gPostProcess->tweaks.useColorFilter());
-    //getChild<LLUICtrl>("ColorFilterGamma")->setValue(gPostProcess->tweaks.gamma());
-    getChild<LLUICtrl>("ColorFilterBrightness")->setValue(gPostProcess->tweaks.brightness());
-    getChild<LLUICtrl>("ColorFilterSaturation")->setValue(gPostProcess->tweaks.saturation());
-    getChild<LLUICtrl>("ColorFilterContrast")->setValue(gPostProcess->tweaks.contrast());
-    getChild<LLUICtrl>("ColorFilterBaseR")->setValue(gPostProcess->tweaks.contrastBaseR());
-    getChild<LLUICtrl>("ColorFilterBaseG")->setValue(gPostProcess->tweaks.contrastBaseG());
-    getChild<LLUICtrl>("ColorFilterBaseB")->setValue(gPostProcess->tweaks.contrastBaseB());
-    getChild<LLUICtrl>("ColorFilterBaseI")->setValue(gPostProcess->tweaks.contrastBaseIntensity());
-
-    /// Sync Night Vision Menu
-    getChild<LLUICtrl>("NightVisionToggle")->setValue(gPostProcess->tweaks.useNightVisionShader());
-    getChild<LLUICtrl>("NightVisionBrightMult")->setValue(gPostProcess->tweaks.brightMult());
-    getChild<LLUICtrl>("NightVisionNoiseSize")->setValue(gPostProcess->tweaks.noiseSize());
-    getChild<LLUICtrl>("NightVisionNoiseStrength")->setValue(gPostProcess->tweaks.noiseStrength());
-
-    /// Sync Bloom Menu
-    getChild<LLUICtrl>("BloomToggle")->setValue(LLSD(gPostProcess->tweaks.useBloomShader()));
-    getChild<LLUICtrl>("BloomExtract")->setValue(gPostProcess->tweaks.extractLow());
-    getChild<LLUICtrl>("BloomSize")->setValue(gPostProcess->tweaks.bloomWidth());
-    getChild<LLUICtrl>("BloomStrength")->setValue(gPostProcess->tweaks.bloomStrength());
-}
diff --git a/indra/newview/llfloaterpostprocess.h b/indra/newview/llfloaterpostprocess.h
deleted file mode 100644
index 50b48d8410..0000000000
--- a/indra/newview/llfloaterpostprocess.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file llfloaterpostprocess.h
- * @brief LLFloaterPostProcess class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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$
- */
-
-#ifndef LL_LLFLOATERPOSTPROCESS_H
-#define LL_LLFLOATERPOSTPROCESS_H
-
-#include "llfloater.h"
-
-class LLButton;
-class LLComboBox;
-class LLLineEditor;
-class LLSliderCtrl;
-class LLTabContainer;
-class LLPanelPermissions;
-class LLPanelObject;
-class LLPanelVolume;
-class LLPanelContents;
-class LLPanelFace;
-
-/**
- * Menu for adjusting the post process settings of the world
- */
-class LLFloaterPostProcess : public LLFloater
-{
-public:
-
-    LLFloaterPostProcess(const LLSD& key);
-    virtual ~LLFloaterPostProcess();
-    bool postBuild();
-
-    /// post process callbacks
-    static void onBoolToggle(LLUICtrl* ctrl, void* userData);
-    static void onFloatControlMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlRMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlGMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlBMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlIMoved(LLUICtrl* ctrl, void* userData);
-    void onLoadEffect(LLComboBox* comboBox);
-    void onSaveEffect(LLLineEditor* editBox);
-    void onChangeEffectName(LLUICtrl* ctrl);
-
-    /// prompts a user when overwriting an effect
-    bool saveAlertCallback(const LLSD& notification, const LLSD& response);
-
-    /// sync up sliders
-    void syncMenu();
-};
-
-#endif
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6e4a652989..83d6b57fa4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -181,7 +181,6 @@
 #include "llnamelistctrl.h"
 #include "llnamebox.h"
 #include "llnameeditor.h"
-#include "llpostprocess.h"
 #include "llagentlanguage.h"
 #include "llwearable.h"
 #include "llinventorybridge.h"
@@ -1292,10 +1291,6 @@ bool idle_startup()
         LLDrawable::initClass();
         display_startup();
 
-        // init the shader managers
-        LLPostProcess::initClass();
-        display_startup();
-
         LLAvatarAppearance::initClass("avatar_lad.xml","avatar_skeleton.xml");
         display_startup();
 
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index cd35de12c6..1f4502323c 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -55,7 +55,6 @@
 #include "llmemory.h"
 #include "llparcel.h"
 #include "llperfstats.h"
-#include "llpostprocess.h"
 #include "llrender.h"
 #include "llscenemonitor.h"
 #include "llsdjson.h"
diff --git a/indra/newview/llviewerdisplay.h b/indra/newview/llviewerdisplay.h
index 673f51600d..2ec02f09fd 100644
--- a/indra/newview/llviewerdisplay.h
+++ b/indra/newview/llviewerdisplay.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLVIEWERDISPLAY_H
 #define LL_LLVIEWERDISPLAY_H
 
-class LLPostProcess;
-
 void display_startup();
 void display_cleanup();
 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 8919e1f375..9d9961d51c 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -118,7 +118,6 @@
 #include "llfloaterpay.h"
 #include "llfloaterperformance.h"
 #include "llfloaterperms.h"
-#include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
 #include "llfloaterpreferencesgraphicsadvanced.h"
 #include "llfloaterpreferenceviewadvanced.h"
@@ -363,7 +362,6 @@ void LLViewerFloaterReg::registerFloaters()
 
     LLFloaterReg::add("emoji_picker", "floater_emoji_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiPicker>);
     LLFloaterReg::add("emoji_complete", "floater_emoji_complete.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiComplete>);
-    LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
 
     LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>);
     LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index af719293e6..2f5a302b3f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9354,17 +9354,6 @@ class LLWorldEnableEnvPreset : public view_listener_t
     }
 };
 
-
-/// Post-Process callbacks
-class LLWorldPostProcess : public view_listener_t
-{
-    bool handleEvent(const LLSD& userdata)
-    {
-        LLFloaterReg::showInstance("env_post_process");
-        return true;
-    }
-};
-
 class LLWorldCheckBanLines : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
@@ -9659,7 +9648,6 @@ void initialize_menus()
     view_listener_t::addMenu(new LLWorldEnableEnvSettings(), "World.EnableEnvSettings");
     view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset");
     view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset");
-    view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
     view_listener_t::addMenu(new LLWorldCheckBanLines() , "World.CheckBanLines");
     view_listener_t::addMenu(new LLWorldShowBanLines() , "World.ShowBanLines");
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 6456c98093..7741f1fbe7 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5241,8 +5241,7 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
     LLUUID mat_id = getRenderMaterialID(te);
     if (mat == nullptr && mat_id.notNull())
     {
-        mat = (LLFetchedGLTFMaterial*) gGLTFMaterialList.getMaterial(mat_id);
-        llassert(mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(gGLTFMaterialList.getMaterial(mat_id)) != nullptr);
+        mat = gGLTFMaterialList.getMaterial(mat_id);
         if (mat->isFetching())
         { // material is not loaded yet, rebuild draw info when the object finishes loading
             mat->onMaterialComplete([id=getID()]
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index bef667e3bb..c747319940 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -195,7 +195,6 @@
 #include "llviewerjoystick.h"
 #include "llviewermenufile.h" // LLFilePickerReplyThread
 #include "llviewernetwork.h"
-#include "llpostprocess.h"
 #include "llfloaterimnearbychat.h"
 #include "llagentui.h"
 #include "llwearablelist.h"
@@ -5762,11 +5761,6 @@ void LLViewerWindow::stopGL()
 
         gBox.cleanupGL();
 
-        if(gPostProcess)
-        {
-            gPostProcess->invalidate();
-        }
-
         gTextureList.destroyGL();
         stop_glerror();
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 3a811f893e..eb353beb11 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -576,6 +576,7 @@ void LLPipeline::init()
     connectRefreshCachedSettingsSafe("RenderScreenSpaceReflectionAdaptiveStepMultiplier");
     connectRefreshCachedSettingsSafe("RenderScreenSpaceReflectionGlossySamples");
     connectRefreshCachedSettingsSafe("RenderBufferVisualization");
+    connectRefreshCachedSettingsSafe("RenderBufferClearOnInvalidate");
     connectRefreshCachedSettingsSafe("RenderMirrors");
     connectRefreshCachedSettingsSafe("RenderHeroProbeUpdateRate");
     connectRefreshCachedSettingsSafe("RenderHeroProbeConservativeUpdateMultiplier");
@@ -1084,6 +1085,7 @@ void LLPipeline::refreshCachedSettings()
     RenderScreenSpaceReflectionAdaptiveStepMultiplier = gSavedSettings.getF32("RenderScreenSpaceReflectionAdaptiveStepMultiplier");
     RenderScreenSpaceReflectionGlossySamples = gSavedSettings.getS32("RenderScreenSpaceReflectionGlossySamples");
     RenderBufferVisualization = gSavedSettings.getS32("RenderBufferVisualization");
+    LLRenderTarget::sClearOnInvalidate = gSavedSettings.getBOOL("RenderBufferClearOnInvalidate");
     RenderMirrors = gSavedSettings.getBOOL("RenderMirrors");
     RenderHeroProbeUpdateRate = gSavedSettings.getS32("RenderHeroProbeUpdateRate");
     RenderHeroProbeConservativeUpdateMultiplier = gSavedSettings.getS32("RenderHeroProbeConservativeUpdateMultiplier");
@@ -7147,7 +7149,7 @@ void LLPipeline::copyScreenSpaceReflections(LLRenderTarget* src, LLRenderTarget*
         LLRenderTarget& depth_src = mRT->deferredScreen;
 
         dst->bindTarget();
-        dst->clear();
+        dst->invalidate();
         gCopyDepthProgram.bind();
 
         S32 diff_map = gCopyDepthProgram.getTextureChannel(LLShaderMgr::DIFFUSE_MAP);
@@ -7334,7 +7336,7 @@ void LLPipeline::applyFXAA(LLRenderTarget* src, LLRenderTarget* dst)
 
             // bake out texture2D with RGBL for FXAA shader
             mFXAAMap.bindTarget();
-            mFXAAMap.clear(GL_COLOR_BUFFER_BIT);
+            mFXAAMap.invalidate(GL_COLOR_BUFFER_BIT);
 
             shader = &gGlowCombineFXAAProgram;
             shader->bind();
@@ -7433,6 +7435,7 @@ void LLPipeline::generateSMAABuffers(LLRenderTarget* src)
             LLGLSLShader& edge_shader = gSMAAEdgeDetectProgram[fsaa_quality];
 
             dest.bindTarget();
+            // SMAA utilizes discard, so the background color matters
             dest.clear(GL_COLOR_BUFFER_BIT);
 
             edge_shader.bind();
@@ -7476,7 +7479,7 @@ void LLPipeline::generateSMAABuffers(LLRenderTarget* src)
             LLGLSLShader& blend_weights_shader = gSMAABlendWeightsProgram[fsaa_quality];
 
             dest.bindTarget();
-            dest.clear(GL_COLOR_BUFFER_BIT);
+            dest.invalidate(GL_COLOR_BUFFER_BIT);
 
             blend_weights_shader.bind();
             blend_weights_shader.uniform4fv(sSmaaRTMetrics, 1, rt_metrics);
@@ -7552,7 +7555,7 @@ void LLPipeline::applySMAA(LLRenderTarget* src, LLRenderTarget* dst)
             LLGLSLShader& blend_shader = gSMAANeighborhoodBlendProgram[fsaa_quality];
 
             bound_target->bindTarget();
-            bound_target->clear(GL_COLOR_BUFFER_BIT);
+            bound_target->invalidate(GL_COLOR_BUFFER_BIT);
 
             blend_shader.bind();
             blend_shader.uniform4fv(sSmaaRTMetrics, 1, rt_metrics);
@@ -8330,9 +8333,7 @@ void LLPipeline::renderDeferredLighting()
                 LLGLSLShader& sun_shader = gCubeSnapshot ? gDeferredSunProbeProgram : gDeferredSunProgram;
                 bindDeferredShader(sun_shader, deferred_light_target);
                 mScreenTriangleVB->setBuffer();
-                glClearColor(1, 1, 1, 1);
-                deferred_light_target->clear(GL_COLOR_BUFFER_BIT);
-                glClearColor(0, 0, 0, 0);
+                deferred_light_target->invalidate(GL_COLOR_BUFFER_BIT);
 
                 sun_shader.uniform2f(LLShaderMgr::DEFERRED_SCREEN_RES,
                                               (GLfloat)deferred_light_target->getWidth(),
@@ -8356,9 +8357,7 @@ void LLPipeline::renderDeferredLighting()
             LL_PROFILE_GPU_ZONE("soften shadow");
             // blur lightmap
             screen_target->bindTarget();
-            glClearColor(1, 1, 1, 1);
-            screen_target->clear(GL_COLOR_BUFFER_BIT);
-            glClearColor(0, 0, 0, 0);
+            screen_target->invalidate(GL_COLOR_BUFFER_BIT);
 
             bindDeferredShader(gDeferredBlurLightProgram);
 
@@ -8410,11 +8409,8 @@ void LLPipeline::renderDeferredLighting()
             deferred_light_target->flush();
             unbindDeferredShader(gDeferredBlurLightProgram);
         }
-
         screen_target->bindTarget();
-        // clear color buffer here - zeroing alpha (glow) is important or it will accumulate against sky
-        glClearColor(0, 0, 0, 0);
-        screen_target->clear(GL_COLOR_BUFFER_BIT);
+        screen_target->invalidate(GL_COLOR_BUFFER_BIT);
 
         if (RenderDeferredAtmospheric)
         {  // apply sunlight contribution
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
deleted file mode 100644
index 37339f79c8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_post_process.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="18"
- height="400"
- layout="topleft"
- name="Post-Process Floater"
- help_topic="post_process_floater"
- title="POST-PROCESS SETTINGS"
- width="400">
-    <tab_container
-     follows="left|top"
-     height="400"
-     layout="topleft"
-     left="0"
-     name="Post-Process Tabs"
-     tab_position="top"
-     top="0"
-     width="400">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Color Filter"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         help_topic="post_process_color_filter_tab"
-         name="wmiColorFilterPanel"
-         top="0"
-         width="398">
-            <check_box
-             control_name="wmiColorFilterToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiColorFilterToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterBrightnessText"
-             top_pad="4"
-             width="355">
-                Brightness
-            </text>
-            <slider
-             control_name="wmiColorFilterBrightness"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="4"
-             name="wmiColorFilterBrightness"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterSaturationText"
-             top_pad="4"
-             width="355">
-                Saturation
-            </text>
-            <slider
-             control_name="wmiColorFilterSaturation"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="2"
-             min_val="-1"
-             name="wmiColorFilterSaturation"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterContrastText"
-             top_pad="4"
-             width="355">
-                Contrast
-            </text>
-            <slider
-             control_name="wmiColorFilterContrast"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="4"
-             name="wmiColorFilterContrast"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterBaseText"
-             top_pad="4"
-             width="355">
-                Contrast Base Color
-            </text>
-            <slider
-             control_name="wmiColorFilterBaseR"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="R"
-             layout="topleft"
-             left_delta="4"
-             name="wmiColorFilterBaseR"
-             top_pad="20"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseG"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="G"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseG"
-             top_pad="10"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseB"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="B"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseB"
-             top_pad="10"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseI"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="I"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseI"
-             top_pad="10"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Night Vision"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="post_process_night_vision_tab"
-         name="wmiNightVisionPanel"
-         top_delta="-236"
-         width="398">
-            <check_box
-             control_name="wmiNightVisionToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiNightVisionToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionBrightMultText"
-             top_pad="5"
-             width="355">
-                Light Amplification Multiple
-            </text>
-            <slider
-             control_name="wmiNightVisionBrightMult"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="3.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="10"
-             min_val="1"
-             name="wmiNightVisionBrightMult"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionNoiseSizeText"
-             top_pad="4"
-             width="355">
-                Noise Size
-            </text>
-            <slider
-             control_name="wmiNightVisionNoiseSize"
-             follows="left"
-             height="10"
-             initial_value="1"
-             layout="topleft"
-             left_delta="4"
-             max_val="100"
-             min_val="1"
-             name="wmiNightVisionNoiseSize"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionNoiseStrengthText"
-             top_pad="4"
-             width="355">
-                Noise Strength
-            </text>
-            <slider
-             control_name="wmiNightVisionNoiseStrength"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.3"
-             layout="topleft"
-             left_delta="4"
-             name="wmiNightVisionNoiseStrength"
-             top_pad="20"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Bloom"
-         layout="topleft"
-         left_delta="0"
-         help_topic="post_process_bloom_tab"
-         name="wmiBloomPanel"
-         top_delta="-236"
-         width="398">
-            <check_box
-             control_name="wmiBloomToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiBloomToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomExtractText"
-             top_pad="5"
-             width="355">
-                Luminosity Extraction
-            </text>
-            <slider
-             control_name="wmiBloomExtract"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.9"
-             layout="topleft"
-             left_delta="4"
-             name="wmiBloomExtract"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomSizeText"
-             top_pad="4"
-             width="355">
-                Bloom Size
-            </text>
-            <slider
-             control_name="wmiBloomSize"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="3.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="20"
-             name="wmiBloomSize"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomStrengthText"
-             top_pad="4"
-             width="355">
-                Bloom Strength
-            </text>
-            <slider
-             control_name="wmiBloomStrength"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.2"
-             layout="topleft"
-             left_delta="4"
-             max_val="10"
-             name="wmiBloomStrength"
-             top_pad="20"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Extras"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="post_process_extras_tab"
-         name="Extras"
-         top_delta="-236"
-         width="398">
-            <button
-             height="20"
-             label="LoadEffect"
-             label_selected="LoadEffect"
-             layout="topleft"
-             left="15"
-             name="PPLoadEffect"
-             top="13"
-             width="100" />
-            <button
-             height="20"
-             label="SaveEffect"
-             label_selected="SaveEffect"
-             layout="topleft"
-             left_delta="0"
-             name="PPSaveEffect"
-             top_pad="7"
-             width="100" />
-            <combo_box
-             height="18"
-             layout="topleft"
-             left_delta="120"
-             name="PPEffectsCombo"
-             top="15"
-             width="150" />
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|right|bottom"
-             font="SansSerif"
-             height="20"
-             label="Effect Name"
-             layout="topleft"
-             left_delta="0"
-             max_length_bytes="40"
-             name="PPEffectNameEditor"
-             tab_group="1"
-             top_pad="22"
-             width="150" />
-        </panel>
-    </tab_container>
-</floater>