citrun

watch C/C++ source code execute
Log | Files | Refs | LICENSE

commit aec36c62176d2a43c47cf8a2a022cba93e254011
parent fbf395541a5c1e625573cd1f6456da920eb10bdd
Author: Kyle Milz <kyle@0x30.net>
Date:   Tue, 10 Oct 2017 00:55:47 -0600

bin: rename glsl files

Diffstat:
Mbin/Jamfile | 6+++---
Rbin/demo_atlas.glsl -> bin/gl_atlas.glsl | 0
Rbin/demo_fshader.glsl -> bin/gl_fshader.glsl | 0
Mbin/gl_shader.cc | 13++++++-------
Rbin/demo_vshader.glsl -> bin/gl_vshader.glsl | 0
5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bin/Jamfile b/bin/Jamfile @@ -68,9 +68,9 @@ GL_SRCS = Library gl_common : $(GL_SRCS) ; -Stringize demo_atlas_glsl.h : demo_atlas.glsl ; -Stringize demo_vshader_glsl.h : demo_vshader.glsl ; -Stringize demo_fshader_glsl.h : demo_fshader.glsl ; +Stringize gl_atlas_glsl.h : gl_atlas.glsl ; +Stringize gl_vshader_glsl.h : gl_vshader.glsl ; +Stringize gl_fshader_glsl.h : gl_fshader.glsl ; ObjectC++Flags gl.cc gltest.cc $(GL_SRCS) : `pkg-config --cflags glfw3 glew freetype2` ; diff --git a/bin/demo_atlas.glsl b/bin/gl_atlas.glsl diff --git a/bin/demo_fshader.glsl b/bin/gl_fshader.glsl diff --git a/bin/gl_shader.cc b/bin/gl_shader.cc @@ -19,10 +19,9 @@ #include <GL/glew.h> #include "gl_shader.h" - -#include "demo_atlas_glsl.h" -#include "demo_vshader_glsl.h" -#include "demo_fshader_glsl.h" +#include "gl_atlas_glsl.h" +#include "gl_vshader_glsl.h" +#include "gl_fshader_glsl.h" citrun::gl_shader::gl_shader() @@ -197,14 +196,14 @@ citrun::gl_shader::create_program() GLuint vshader, fshader, program; const GLchar *vshader_sources[] = {GLSL_HEADER_STRING, - demo_vshader_glsl}; + gl_vshader_glsl}; vshader = compile_shader (GL_VERTEX_SHADER, ARRAY_LEN (vshader_sources), vshader_sources); const GLchar *fshader_sources[] = {GLSL_HEADER_STRING, - demo_atlas_glsl, + gl_atlas_glsl, glyphy_common_shader_source (), "#define GLYPHY_SDF_PSEUDO_DISTANCE 1\n", glyphy_sdf_shader_source (), - demo_fshader_glsl}; + gl_fshader_glsl}; fshader = compile_shader (GL_FRAGMENT_SHADER, ARRAY_LEN (fshader_sources), fshader_sources); program = link_program (vshader, fshader); diff --git a/bin/demo_vshader.glsl b/bin/gl_vshader.glsl