tweak raii shader constructors

This commit is contained in:
2020-03-09 00:16:30 -04:00
parent 0c4a6f5eff
commit e56896db9b
2 changed files with 31 additions and 37 deletions

View File

@@ -81,21 +81,21 @@ void run(GLFWwindow *window) {
// glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
auto defer = cgl::compile_shaderprogram_file(
auto defer = cgl::compile_shaderprogram(
GL_VERTEX_SHADER, "shaders/slice/deferred.vs.glsl");
auto direct_ortho = cgl::compile_shaderprogram_file(
auto direct_ortho = cgl::compile_shaderprogram(
GL_VERTEX_SHADER, "shaders/direct-ortho.vs.glsl");
auto direct_stereo = cgl::compile_shaderprogram_file(
auto direct_stereo = cgl::compile_shaderprogram(
GL_VERTEX_SHADER, "shaders/direct-stereo.vs.glsl");
auto slice = cgl::compile_shaderprogram_file(
auto slice = cgl::compile_shaderprogram(
GL_GEOMETRY_SHADER, "shaders/slice/slice.gm.glsl");
auto curve_stereo = cgl::compile_shaderprogram_file(
auto curve_stereo = cgl::compile_shaderprogram(
GL_GEOMETRY_SHADER, "shaders/curve-stereo.gm.glsl");
auto curve_ortho = cgl::compile_shaderprogram_file(
auto curve_ortho = cgl::compile_shaderprogram(
GL_GEOMETRY_SHADER, "shaders/curve-ortho.gm.glsl");
auto solid = cgl::compile_shaderprogram_file(
auto solid = cgl::compile_shaderprogram(
GL_FRAGMENT_SHADER, "shaders/solid.fs.glsl");
cgl::pipeline proj_pipe;