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

Nuking some glsl warnings, and fixing relwithdebug compile(and prolly gcc too)

Browse Source
This commit is contained in:
Shyotl
2011-04-23 03:02:56 -05:00
parent c694d12c93
commit 41f42fc741
8 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/effects/glowF.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#version 120
uniform sampler2D diffuseMap;
uniform float glowStrength;

2
indra/newview/app_settings/shaders/class2/effects/blurF.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect RenderTexture;
uniform float bloomStrength;

2
indra/newview/app_settings/shaders/class2/effects/colorFilterF.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect RenderTexture;
uniform float brightness;
uniform float contrast;

2
indra/newview/app_settings/shaders/class2/effects/extractF.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect RenderTexture;
uniform float extractLow;
uniform float extractHigh;

3
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
View File

@@ -1,3 +1,6 @@
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect RenderTexture;
uniform int horizontalPass;

2
indra/newview/app_settings/shaders/class2/effects/nightVisionF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect RenderTexture;
uniform sampler2D NoiseTexture;

2
indra/newview/app_settings/shaders/class2/effects/simpleF.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect RenderTexture;
void main(void)

2
indra/newview/pipeline.cpp
View File

@@ -5892,7 +5892,7 @@ void LLPipeline::renderDeferredLighting()
bindDeferredShader(gDeferredBlurLightProgram);
static const LLCachedControl<LLVector3> go("RenderShadowGaussian",LLVector3(2.f,2.f,0.f));
static const LLCachedControl<F32> blur_size("RenderShadowBlurSize",.7);
static const LLCachedControl<F32> blur_size("RenderShadowBlurSize",.7f);
static const LLCachedControl<U32> blur_samples("RenderShadowBlurSamples",(U32)5);
U32 kern_length = llclamp(blur_samples.get(), (U32) 1, (U32) 16)*2 - 1;