vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Removing stuff that should really go into r_postprocess from the GLSL

Browse source
This commit is contained in:
Marco Cawthorne 2019-08-18 12:01:57 -07:00
parent 02c7eeb671
commit 304d0969ad
9 changed files with 158 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
valve/data.pk3dir/glsl/default2d.glsl
View file

@ -1,12 +1,5 @@
!!ver 100-450 !!ver 100-450
!!samps 1 !!samps 1
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
//this shader is present for support for gles/gl3core contexts
//it is single-texture-with-vertex-colours, and doesn't do anything special.
//beware that a few things use this, including apparently fonts and bloom rescaling.
//its really not meant to do anything special.
varying vec2 tc; varying vec2 tc;
varying vec4 vc; varying vec4 vc;
@ -21,6 +14,7 @@ void main ()
gl_Position = ftetransform(); gl_Position = ftetransform();
} }
#endif #endif
#ifdef FRAGMENT_SHADER #ifdef FRAGMENT_SHADER
void main () void main ()
{ {
@ -30,15 +24,6 @@ void main ()
#endif #endif
f *= texture2D(s_t0, tc); f *= texture2D(s_t0, tc);
#if gl_fake16bit == 1
f.rgb = floor(f.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (f.r + f.g + f.b) / 3.0f;
f.rgb = vec3(m,m,m);
#endif
gl_FragColor = f; gl_FragColor = f;
} }
#endif #endif

22
valve/data.pk3dir/glsl/defaultadditivesprite.glsl
View file

@ -1,11 +1,5 @@
!!permu FOG !!permu FOG
!!samps 1 !!samps 1
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
!!cvardf gl_brighten=0
//meant to be used for additive stuff. presumably particles and sprites. though actually its only flashblend effects that use this at the time of writing.
//includes fog, apparently.
#include "sys/fog.h" #include "sys/fog.h"
#ifdef VERTEX_SHADER #ifdef VERTEX_SHADER
@ -20,6 +14,7 @@ void main ()
gl_Position = ftetransform(); gl_Position = ftetransform();
} }
#endif #endif
#ifdef FRAGMENT_SHADER #ifdef FRAGMENT_SHADER
varying vec2 tc; varying vec2 tc;
varying vec4 vc; varying vec4 vc;
@ -27,21 +22,6 @@ uniform vec4 e_colourident;
void main () void main ()
{ {
vec4 diffuse_f = texture2D(s_t0, tc); vec4 diffuse_f = texture2D(s_t0, tc);
#if gl_brighten == 1
diffuse_f.rgb += vec3(0.1f,0.1f,0.1f) * 0.9f;
#endif
#if gl_fake16bit == 1
diffuse_f.rgb = floor(diffuse_f.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0f;
diffuse_f.rgb = vec3(m,m,m);
#endif
gl_FragColor = fog4additive(diffuse_f * vc * e_colourident); gl_FragColor = fog4additive(diffuse_f * vc * e_colourident);
} }
#endif #endif

1
valve/data.pk3dir/glsl/defaultfill.glsl
View file

@ -1,5 +1,4 @@
!!ver 100-450 !!ver 100-450
!!cvardf gl_fake16bit=0
#ifdef VERTEX_SHADER #ifdef VERTEX_SHADER
attribute vec4 v_colour; attribute vec4 v_colour;

16
valve/data.pk3dir/glsl/defaultskin.glsl
View file

@ -4,9 +4,6 @@
!!permu FOG !!permu FOG
!!samps diffuse reflectcube !!samps diffuse reflectcube
!!cvardf gl_affinemodels=0 !!cvardf gl_affinemodels=0
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
!!cvardf gl_brighten=0
#include "sys/defs.h" #include "sys/defs.h"
@ -97,19 +94,6 @@ varying vec3 light;
#endif #endif
diffuse_f *= e_colourident; diffuse_f *= e_colourident;
#if gl_brighten == 1
diffuse_f.rgb += vec3(0.1f,0.1f,0.1f) * 0.9f;
#endif
#if gl_fake16bit == 1
diffuse_f.rgb = floor(diffuse_f.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0f;
diffuse_f.rgb = vec3(m,m,m);
#endif
gl_FragColor = diffuse_f * e_colourident; gl_FragColor = diffuse_f * e_colourident;
} }
#endif #endif

17
valve/data.pk3dir/glsl/defaultskybox.glsl
View file

@ -1,9 +1,6 @@
!!ver 110 !!ver 110
!!permu FOG !!permu FOG
!!samps reflectcube !!samps reflectcube
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
!!cvardf gl_brighten=0
#include "sys/defs.h" #include "sys/defs.h"
#include "sys/fog.h" #include "sys/fog.h"
@ -21,20 +18,6 @@ void main ()
void main () void main ()
{ {
vec4 skybox = textureCube(s_reflectcube, pos); vec4 skybox = textureCube(s_reflectcube, pos);
#if gl_brighten == 1
skybox.rgb += vec3(0.1f,0.1f,0.1f) * 0.9f;
#endif
#if gl_fake16bit == 1
skybox.rgb = floor(skybox.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (skybox.r + skybox.g + skybox.b) / 3.0f;
skybox.rgb = vec3(m,m,m);
#endif
gl_FragColor = vec4(fog3(skybox.rgb), 1.0); gl_FragColor = vec4(fog3(skybox.rgb), 1.0);
} }
#endif #endif

14
valve/data.pk3dir/glsl/defaultsprite.glsl
View file

@ -1,9 +1,5 @@
!!permu FOG !!permu FOG
!!samps 1 !!samps 1
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
//used by both particles and sprites.
//note the fog blending mode is all that differs from defaultadditivesprite
#include "sys/fog.h" #include "sys/fog.h"
#ifdef VERTEX_SHADER #ifdef VERTEX_SHADER
@ -18,6 +14,7 @@ void main ()
gl_Position = ftetransform(); gl_Position = ftetransform();
} }
#endif #endif
#ifdef FRAGMENT_SHADER #ifdef FRAGMENT_SHADER
varying vec2 tc; varying vec2 tc;
varying vec4 vc; varying vec4 vc;
@ -34,15 +31,6 @@ void main ()
col = fog4blend(col * vc * e_colourident * e_vlscale); col = fog4blend(col * vc * e_colourident * e_vlscale);
#if gl_fake16bit == 1
col.rgb = floor(col.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (col.r + col.g + col.b) / 3.0f;
col.rgb = vec3(m,m,m);
#endif
gl_FragColor = col; gl_FragColor = col;
} }
#endif #endif

15
valve/data.pk3dir/glsl/defaultwall.glsl
View file

@ -1,8 +1,5 @@
!!ver 110 !!ver 110
!!samps diffuse lightmap reflectcube normalmap !!samps diffuse lightmap reflectcube normalmap
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
!!cvardf gl_brighten=0
#include "sys/defs.h" #include "sys/defs.h"
@ -72,18 +69,6 @@ varying mat3 invsurface;
#endif #endif
diffuse_f *= e_colourident; diffuse_f *= e_colourident;
#if gl_brighten == 1
diffuse_f.rgb += vec3(0.1f,0.1f,0.1f) * 0.9f;
#endif
#if gl_fake16bit == 1
diffuse_f.rgb = floor(diffuse_f.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0f;
diffuse_f.rgb = vec3(m,m,m);
#endif
gl_FragColor = diffuse_f; gl_FragColor = diffuse_f;
} }

14
valve/data.pk3dir/glsl/defaultwarp.glsl
View file

@ -2,14 +2,9 @@
!!permu FOG !!permu FOG
!!cvarf r_wateralpha !!cvarf r_wateralpha
!!samps diffuse lightmap !!samps diffuse lightmap
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
#include "sys/defs.h" #include "sys/defs.h"
//this is the shader that's responsible for drawing default q1 turbulant water surfaces
//this is expected to be moderately fast.
#include "sys/fog.h" #include "sys/fog.h"
varying vec2 tc; varying vec2 tc;
#ifdef LIT #ifdef LIT
@ -46,15 +41,6 @@ void main ()
ts *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb; ts *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb;
#endif #endif
#if gl_fake16bit == 1
ts.rgb = floor(ts.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (ts.r + ts.g + ts.b) / 3.0f;
ts.rgb = vec3(m,m,m);
#endif
gl_FragColor = fog4(vec4(ts, USEALPHA) * e_colourident); gl_FragColor = fog4(vec4(ts, USEALPHA) * e_colourident);
} }
#endif #endif

10
valve/data.pk3dir/glsl/fullbright_reflect.glsl
View file

@ -1,7 +1,5 @@
!!ver 110 !!ver 110
!!samps diffuse reflectcube normalmap !!samps diffuse reflectcube normalmap
!!cvardf gl_fake16bit=0
!!cvardf gl_monochrome=0
#include "sys/defs.h" #include "sys/defs.h"
@ -59,14 +57,6 @@ varying mat3 invsurface;
out_f.rgb = mix( textureCube(s_reflectcube, cube_c ).rgb, diffuse_f.rgb, diffuse_f.a); out_f.rgb = mix( textureCube(s_reflectcube, cube_c ).rgb, diffuse_f.rgb, diffuse_f.a);
diffuse_f = out_f * e_colourident; diffuse_f = out_f * e_colourident;
#if gl_fake16bit == 1
diffuse_f.rgb = floor(diffuse_f.rgb * vec3(32,64,32))/vec3(32,64,32);
#endif
#if gl_monochrome == 1
float m = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0f;
diffuse_f.rgb = vec3(m,m,m);
#endif
gl_FragColor = diffuse_f; gl_FragColor = diffuse_f;
} }
#endif #endif