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

Added #version string to many shaders. Added a few to-be-implemented shader files

Browse Source
This commit is contained in:
Shyotl
2011-05-18 14:58:57 -05:00
parent 90c0ea63b1
commit 0193173e46
160 changed files with 419 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void default_lighting();

2
indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
attribute vec4 weight; //1

2
indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
mat4 getSkinnedTransform();

2
indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void default_lighting();

2
indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 calcLightingSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol);
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
mat4 getSkinnedTransform();

3
indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable
@@ -25,7 +27,6 @@ varying vec3 vary_pointlight_col;
uniform mat4 inv_proj;
vec4 getPosition(vec2 pos_screen)
{
float depth = texture2DRect(depthMap, pos_screen.xy).a;

2
indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/deferred/avatarAlphaV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
mat4 getSkinnedTransform();

2
indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/deferred/avatarShadowF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/deferred/avatarShadowV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
mat4 getSkinnedTransform();

2
indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
mat4 getSkinnedTransform();

2
indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

2
indra/newview/app_settings/shaders/class1/deferred/blurLightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec2 vary_fragcoord;
uniform vec2 screen_res;

2
indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;
uniform sampler2D bumpMap;

2
indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec3 vary_mat0;
varying vec3 vary_mat1;

2
indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $/LicenseInfo$
*/
#version 120
varying vec3 vary_normal;

2
indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

2
indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/deferred/giF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

2
indra/newview/app_settings/shaders/class1/deferred/giV.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
varying vec2 vary_fragcoord;

4
indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;
uniform sampler2D normalMap;
@@ -12,7 +14,7 @@ uniform sampler2D specularMap;
void main()
{
vec4 col = texture2D(diffuseMap, gl_TexCoord[0].xy);
gl_FragData[0] = vec4(col.rgb, col.a <= 0.5 ? 0.0 : 0.005);
gl_FragData[0] = vec4(col.rgb, col.a * 0.005);
gl_FragData[1] = texture2D(specularMap, gl_TexCoord[0].xy);
gl_FragData[2] = vec4(texture2D(normalMap, gl_TexCoord[0].xy).xyz, 0.0);
}

2
indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void main()
{

2
indra/newview/app_settings/shaders/class1/deferred/luminanceF.glsl
View File

@@ -5,6 +5,8 @@
* $/LicenseInfo$
*/
#version 120
uniform sampler2DRect diffuseMap;
varying vec2 vary_fragcoord;

3
indra/newview/app_settings/shaders/class1/deferred/luminanceV.glsl
View File

@@ -5,6 +5,9 @@
* $/LicenseInfo$
*/
#version 120
varying vec2 vary_fragcoord;
uniform vec2 screen_res;

2
indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect depthMap;

20
indra/newview/app_settings/shaders/class1/deferred/multiPointLightV.glsl Normal file
View File

@@ -0,0 +1,20 @@
/**
* @file multiPointLightV.glsl
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
varying vec4 vary_fragcoord;
void main()
{
//transform vertex
vec4 pos = gl_ModelViewProjectionMatrix * gl_Vertex;
vary_fragcoord = pos;
gl_Position = pos;
gl_FrontColor = gl_Color;
}

2
indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

2
indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl
View File

@@ -5,6 +5,8 @@
* $License$
*/
#version 120
varying vec4 vary_light;
varying vec4 vary_fragcoord;

2
indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

24
indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl Normal file
View File

@@ -0,0 +1,24 @@
/**
* @file postDeferredF.glsl
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable
uniform sampler2DRect diffuseRect;
uniform sampler2D bloomMap;
uniform vec2 screen_res;
varying vec2 vary_fragcoord;
void main()
{
vec4 diff = texture2DRect(diffuseRect, vary_fragcoord.xy);
vec4 bloom = texture2D(bloomMap, vary_fragcoord.xy/screen_res);
gl_FragColor = diff + bloom;
}

2
indra/newview/app_settings/shaders/class1/deferred/postDeferredV.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
varying vec2 vary_fragcoord;
uniform vec2 screen_res;

2
indra/newview/app_settings/shaders/class1/deferred/postgiF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
uniform sampler2DRect depthMap;
uniform sampler2DRect normalMap;

2
indra/newview/app_settings/shaders/class1/deferred/postgiV.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
varying vec2 vary_fragcoord;
uniform vec2 screen_res;

2
indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/deferred/shadowV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec4 post_pos;

2
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

2
indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform vec2 screen_res;

2
indra/newview/app_settings/shaders/class1/deferred/sunLightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
//class 1, no shadow, no SSAO, should never be called

4
indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable
@@ -13,8 +15,6 @@ uniform sampler2DRect depthMap;
uniform sampler2DRect normalMap;
uniform sampler2D noiseMap;
uniform sampler2D lightFunc;
// Inputs
uniform mat4 shadow_matrix[6];

2
indra/newview/app_settings/shaders/class1/deferred/sunLightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec4 vary_light;
varying vec2 vary_fragcoord;

2
indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D detail_0;
uniform sampler2D detail_1;

2
indra/newview/app_settings/shaders/class1/deferred/terrainV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec3 vary_normal;

2
indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/deferred/treeV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec3 vary_normal;

3
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
View File

@@ -4,8 +4,11 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable
vec3 scaleSoftClip(vec3 inColor);
vec3 atmosTransport(vec3 inColor);

2
indra/newview/app_settings/shaders/class1/deferred/waterV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void calcAtmospherics(vec3 inPositionEye);

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

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

1
indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl
View File

@@ -5,6 +5,7 @@
* $License$
*/
#version 120
void main()
{

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

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform vec2 glowDelta;

2
indra/newview/app_settings/shaders/class1/environment/terrainF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D detail0;
uniform sampler2D detail1;

2
indra/newview/app_settings/shaders/class1/environment/terrainV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);

2
indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
// this class1 shader is just a copy of terrainF

2
indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;
uniform sampler2D bumpMap;

2
indra/newview/app_settings/shaders/class1/environment/waterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec3 scaleSoftClip(vec3 inColor);
vec3 atmosTransport(vec3 inColor);

2
indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 applyWaterFog(vec4 color)
{

2
indra/newview/app_settings/shaders/class1/environment/waterV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/interface/highlightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void main()
{

2
indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/lighting/lightFullbrightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

17
indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl Normal file
View File

@@ -0,0 +1,17 @@
/**
* @file lightFullbrightShinyWaterF.glsl
*
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;
uniform samplerCube environmentMap;
void fullbright_shiny_lighting_water()
{
gl_FragColor = texture2D(diffuseMap, gl_TexCoord[0].xy);
}

2
indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl
View File

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

2
indra/newview/app_settings/shaders/class1/lighting/lightFuncSpecularV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
float calcDirectionalLight(vec3 n, vec3 l)
{

2
indra/newview/app_settings/shaders/class1/lighting/lightFuncV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
float calcDirectionalLight(vec3 n, vec3 l)

2
indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

2
indra/newview/app_settings/shaders/class1/lighting/lightSpecularV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
float calcDirectionalLight(vec3 n, vec3 l);

2
indra/newview/app_settings/shaders/class1/lighting/lightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
float calcDirectionalLight(vec3 n, vec3 l);

2
indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform sampler2D diffuseMap;

3
indra/newview/app_settings/shaders/class1/lighting/sumLightsSpecularV.glsl
View File

@@ -4,6 +4,9 @@
* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
float calcDirectionalLightSpecular(inout vec4 specular, vec3 view, vec3 n, vec3 l, vec3 lightCol, float da);
vec3 atmosAmbient(vec3 light);
vec3 atmosAffectDirectionalLight(float lightIntensity);

2
indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
float calcDirectionalLight(vec3 n, vec3 l);

2
indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void fullbright_lighting();

2
indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void fullbright_shiny_lighting();

2
indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void calcAtmospherics(vec3 inPositionEye);

15
indra/newview/app_settings/shaders/class1/objects/fullbrightShinyWaterF.glsl Normal file
View File

@@ -0,0 +1,15 @@
/**
* @file fullbrightShinyWaterF.glsl
*
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void fullbright_shiny_lighting_water();
void main()
{
fullbright_shiny_lighting_water();
}

2
indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void fullbright_lighting_water();

2
indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void shiny_lighting();

2
indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void shiny_lighting_water();

2
indra/newview/app_settings/shaders/class1/objects/simpleF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void default_lighting();

2
indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
void calcAtmospherics(vec3 inPositionEye);

2
indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void default_lighting_water();

2
indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec3 atmosLighting(vec3 light)
{

2
indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec3 atmosAmbient(vec3 light)
{

2
indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
void setPositionEye(vec3 v);

2
indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec3 vary_PositionEye;

2
indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
varying vec3 vary_PositionEye;

2
indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
uniform vec4 gamma;

2
indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec3 atmosTransport(vec3 light)
{

2
indra/newview/app_settings/shaders/class2/avatar/eyeballV.glsl
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
* $License$
*/
#version 120
vec4 calcLightingSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol);
void calcAtmospherics(vec3 inPositionEye);

3
indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable
@@ -26,7 +28,6 @@ varying vec3 vary_ambient;
varying vec3 vary_directional;
varying vec3 vary_fragcoord;
varying vec3 vary_position;
varying vec3 vary_light;
varying vec3 vary_pointlight_col;
uniform float shadow_bias;

10
indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
void calcAtmospherics(vec3 inPositionEye);
@@ -19,7 +21,6 @@ varying vec3 vary_ambient;
varying vec3 vary_directional;
varying vec3 vary_fragcoord;
varying vec3 vary_position;
varying vec3 vary_light;
varying vec3 vary_pointlight_col;
uniform float near_clip;
@@ -67,17 +68,16 @@ void main()
calcAtmospherics(pos.xyz);
//vec4 color = calcLighting(pos.xyz, norm, gl_Color, vec4(0.));
vec4 col = vec4(0.0, 0.0, 0.0, gl_Color.a);
// Collect normal lights
col.rgb += gl_LightSource[2].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[2].position, gl_LightSource[2].spotDirection.xyz, gl_LightSource[2].linearAttenuation, gl_LightSource[2].quadraticAttenuation, gl_LightSource[2].specular.a);
col.rgb += gl_LightSource[3].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[3].position, gl_LightSource[3].spotDirection.xyz, gl_LightSource[3].linearAttenuation, gl_LightSource[3].quadraticAttenuation, gl_LightSource[3].specular.a);
col.rgb += gl_LightSource[3].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[3].position, gl_LightSource[3].spotDirection.xyz, gl_LightSource[3].linearAttenuation, gl_LightSource[3].quadraticAttenuation ,gl_LightSource[3].specular.a);
col.rgb += gl_LightSource[4].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[4].position, gl_LightSource[4].spotDirection.xyz, gl_LightSource[4].linearAttenuation, gl_LightSource[4].quadraticAttenuation, gl_LightSource[4].specular.a);
col.rgb += gl_LightSource[5].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[5].position, gl_LightSource[5].spotDirection.xyz, gl_LightSource[5].linearAttenuation, gl_LightSource[5].quadraticAttenuation, gl_LightSource[5].specular.a);
col.rgb += gl_LightSource[6].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[6].position, gl_LightSource[6].spotDirection.xyz, gl_LightSource[6].linearAttenuation, gl_LightSource[6].quadraticAttenuation, gl_LightSource[6].specular.a);
col.rgb += gl_LightSource[7].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[7].position, gl_LightSource[7].spotDirection.xyz, gl_LightSource[7].linearAttenuation, gl_LightSource[7].quadraticAttenuation, gl_LightSource[7].specular.a);
vary_pointlight_col = col.rgb*gl_Color.rgb;
col.rgb = vec3(0,0,0);
@@ -85,8 +85,6 @@ void main()
// Add windlight lights
col.rgb = atmosAmbient(vec3(0.));
vary_light = gl_LightSource[0].position.xyz;
vary_ambient = col.rgb*gl_Color.rgb;
vary_directional.rgb = gl_Color.rgb*atmosAffectDirectionalLight(max(calcDirectionalLight(norm, gl_LightSource[0].position.xyz), (1.0-gl_Color.a)*(1.0-gl_Color.a)));

2
indra/newview/app_settings/shaders/class2/deferred/avatarAlphaV.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
mat4 getSkinnedTransform();

2
indra/newview/app_settings/shaders/class2/deferred/edgeF.glsl
View File

@@ -4,6 +4,8 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* $/LicenseInfo$
*/
#version 120
#extension GL_ARB_texture_rectangle : enable

Some files were not shown because too many files have changed in this diff Show More