summaryrefslogtreecommitdiff
path: root/advanced_opengl/3.blending
diff options
context:
space:
mode:
Diffstat (limited to 'advanced_opengl/3.blending')
-rw-r--r--advanced_opengl/3.blending/blending.c4
-rwxr-xr-xadvanced_opengl/3.blending/build (renamed from advanced_opengl/3.blending/build.sh)0
2 files changed, 2 insertions, 2 deletions
diff --git a/advanced_opengl/3.blending/blending.c b/advanced_opengl/3.blending/blending.c
index 8142ab3..dcc189f 100644
--- a/advanced_opengl/3.blending/blending.c
+++ b/advanced_opengl/3.blending/blending.c
@@ -43,8 +43,8 @@ int main(void)
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- U32 shader = create_shader_program("shaders/blending.vert", "shaders/blending.frag");
- U32 grass_shader = create_shader_program("shaders/blending.vert", "shaders/grass.frag");
+ U32 shader = load_shader("shaders/blending.vert", "shaders/blending.frag");
+ U32 grass_shader = load_shader("shaders/blending.vert", "shaders/grass.frag");
U32 marble_texture = load_texture("../../data/textures/marble.jpg");
U32 metal_texture = load_texture("../../data/textures/metal.png");
U32 grass_texture = load_texture("../../data/textures/grass.png");
diff --git a/advanced_opengl/3.blending/build.sh b/advanced_opengl/3.blending/build
index 51f3629..51f3629 100755
--- a/advanced_opengl/3.blending/build.sh
+++ b/advanced_opengl/3.blending/build