From: hgn <hgodden00@gmail.com>
Date: Thu, 1 Dec 2022 18:12:12 +0000 (+0000)
Subject: fscolour->blitcolour
X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;ds=inline;h=b528a849aba893cee8c8bfbaa01ff13cf59fb429;p=carveJwlIkooP6JGAAIwe30JlM.git

fscolour->blitcolour
---

diff --git a/menu.h b/menu.h
index 1b73bea..b8c5c8d 100644
--- 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 8ae85fc..ecbd6e0 100644
--- 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 d18c2c3..4e96d96 100644
--- 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?? */