From 07dbadc0bc5d430a9a8ec23bfe5caf9df256d8ec Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 16 Jan 2019 16:49:08 +0000 Subject: [PATCH] Remove unneeded common v2f code --- util/test/demos/gl/gl_mip_gen_rt.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/util/test/demos/gl/gl_mip_gen_rt.cpp b/util/test/demos/gl/gl_mip_gen_rt.cpp index a9108644a..c2a38a634 100644 --- a/util/test/demos/gl/gl_mip_gen_rt.cpp +++ b/util/test/demos/gl/gl_mip_gen_rt.cpp @@ -29,20 +29,8 @@ struct GL_Mip_Gen_RT : OpenGLGraphicsTest static constexpr const char *Description = "Tests rendering from one mip to another to do a downsample chain"; - std::string common = R"EOSHADER( - -#version 420 core - -#define v2f v2f_block \ -{ \ - vec4 pos; \ - vec4 col; \ - vec4 uv; \ -} - -)EOSHADER"; - std::string vertex = R"EOSHADER( +#version 420 core out vec2 uv; @@ -58,6 +46,7 @@ void main() )EOSHADER"; std::string pixel = R"EOSHADER( +#version 420 core in vec2 uv; @@ -94,7 +83,7 @@ void main() glEnableVertexAttribArray(1); glEnableVertexAttribArray(2); - GLuint program = MakeProgram(common + vertex, common + pixel); + GLuint program = MakeProgram(vertex, pixel); glObjectLabel(GL_PROGRAM, program, -1, "Full program"); GLuint tex = MakeTexture();