From d82e74bd1077649db932e238826f31876296d734 Mon Sep 17 00:00:00 2001 From: ktyl Date: Mon, 2 Aug 2021 19:43:05 +0100 Subject: [PATCH] remove redundant directory --- makefile | 5 ++--- {res/shader => shader}/include/sphere.glsl | 0 {res/shader => shader}/quad/shader.frag | 0 {res/shader => shader}/quad/shader.vert | 0 {res/shader => shader}/root/rt.glsl | 0 src/main.c | 6 +++--- 6 files changed, 5 insertions(+), 6 deletions(-) rename {res/shader => shader}/include/sphere.glsl (100%) rename {res/shader => shader}/quad/shader.frag (100%) rename {res/shader => shader}/quad/shader.vert (100%) rename {res/shader => shader}/root/rt.glsl (100%) diff --git a/makefile b/makefile index 7eff1c0..04775bb 100644 --- a/makefile +++ b/makefile @@ -1,12 +1,11 @@ SRC_DIR = src BIN_DIR = bin -RES_DIR = res +SHADER_DIR = shader -SHADER_DIR = $(RES_DIR)/shader SHADER_QUAD_DIR = $(SHADER_DIR)/quad SHADER_ROOT_DIR = $(SHADER_DIR)/root SHADER_INCLUDE_DIR = $(SHADER_DIR)/include -SHADER_TARGET_DIR = $(BIN_DIR)/$(RES_DIR) +SHADER_TARGET_DIR = $(BIN_DIR) # find files in SHADER_ROOT_DIR # top level compute shader programs diff --git a/res/shader/include/sphere.glsl b/shader/include/sphere.glsl similarity index 100% rename from res/shader/include/sphere.glsl rename to shader/include/sphere.glsl diff --git a/res/shader/quad/shader.frag b/shader/quad/shader.frag similarity index 100% rename from res/shader/quad/shader.frag rename to shader/quad/shader.frag diff --git a/res/shader/quad/shader.vert b/shader/quad/shader.vert similarity index 100% rename from res/shader/quad/shader.vert rename to shader/quad/shader.vert diff --git a/res/shader/root/rt.glsl b/shader/root/rt.glsl similarity index 100% rename from res/shader/root/rt.glsl rename to shader/root/rt.glsl diff --git a/src/main.c b/src/main.c index f98bb17..45f249b 100644 --- a/src/main.c +++ b/src/main.c @@ -26,10 +26,10 @@ int main() // compile shader programs unsigned int computeProgram = compileComputeShaderProgram( - "bin/res/rt.compute"); + "bin/rt.compute"); unsigned int quadProgram = compileQuadShaderProgram( - "bin/res/shader.vert", - "bin/res/shader.frag"); + "bin/shader.vert", + "bin/shader.frag"); // initialise quad initBuffers();