fscolour->blitcolour

diff --git a/menu.h b/menu.h
index 1b73beab3e35777b03c55cb3825d6b2517818d74..b8c5c8dbe2c5ed62bc0701f4c7a147e2c02bc408 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -769,8 +769,8 @@ VG_STATIC void menu_render( camera *cam )
    glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
    glBlendEquation(GL_FUNC_ADD);
 
-   shader_fscolour_use();
-   shader_fscolour_uColour( (v4f){ 0.1f, 0.1f, 0.3f, menu_opacity*0.5f } );
+   shader_blitcolour_use();
+   shader_blitcolour_uColour( (v4f){ 0.1f, 0.1f, 0.3f, menu_opacity*0.5f } );
    render_fsquad();
 
    glEnable( GL_DEPTH_TEST );

diff --git a/world.h b/world.h
index 8ae85fcf2e4e689d56a11c9be6575bde243e2a12..ecbd6e0044503063c2ebfde108076db8b95f6dd2 100644 (file)
--- a/world.h
+++ b/world.h
@@ -25,7 +25,7 @@ VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #include "shaders/standard.h"
 #include "shaders/vblend.h"
 #include "shaders/gpos.h"
-#include "shaders/fscolour.h"
+#include "shaders/blitcolour.h"
 #include "shaders/alphatest.h"
 
 typedef struct teleport_gate teleport_gate;
@@ -428,7 +428,7 @@ VG_STATIC void world_init(void)
    shader_sky_register();
    shader_planeinf_register();
    shader_gpos_register();
-   shader_fscolour_register();
+   shader_blitcolour_register();
    shader_alphatest_register();
 
    vg_info( "Loading world resources\n" );

diff --git a/world_gen.h b/world_gen.h
index d18c2c387e70680679ec95e1bc5bb1ad0e87d91e..4e96d96be15bda08408deff3205afe498e2bf5e2 100644 (file)
--- a/world_gen.h
+++ b/world_gen.h
@@ -546,8 +546,8 @@ VG_STATIC void world_post_process(void)
       glDisable(GL_CULL_FACE);
       glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_depthmap );
       glViewport( 0, 0, 1024, 1024 );
-      shader_fscolour_use();
-      shader_fscolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
+      shader_blitcolour_use();
+      shader_blitcolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
       render_fsquad();
 
       /* todo: hmm?? */