josh/glcxx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do not keep Shader objects around after building the Program

Browse Source
This commit is contained in:
Josh Holtrop 2015-06-13 23:36:58 -04:00
parent 4096a53edc
commit cf06b6a945
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/test.cpp
View File

@ -10,10 +10,6 @@ using namespace std;
shared_ptr<glcxx::Array> array1; shared_ptr<glcxx::Array> array1;
shared_ptr<glcxx::Array> array2; shared_ptr<glcxx::Array> array2;
shared_ptr<glcxx::Shader> vs;
shared_ptr<glcxx::Shader> vs2;
shared_ptr<glcxx::Shader> fs;
shared_ptr<glcxx::Shader> fs2;
shared_ptr<glcxx::Program> program; shared_ptr<glcxx::Program> program;
shared_ptr<glcxx::Program> program2; shared_ptr<glcxx::Program> program2;
shared_ptr<glcxx::Buffer> buffer; shared_ptr<glcxx::Buffer> buffer;
@ -28,13 +24,16 @@ bool init(void)
array1 = make_shared<glcxx::Array>(); array1 = make_shared<glcxx::Array>();
array2 = make_shared<glcxx::Array>(); array2 = make_shared<glcxx::Array>();
vs = glcxx::Shader::create_from_file(GL_VERTEX_SHADER, "test/vert.glsl"); program = glcxx::Program::create(
fs = glcxx::Shader::create_from_file(GL_FRAGMENT_SHADER, "test/frag.glsl"); glcxx::Shader::create_from_file(GL_VERTEX_SHADER, "test/vert.glsl"),
program = glcxx::Program::create(vs, fs, "position", 0); glcxx::Shader::create_from_file(GL_FRAGMENT_SHADER, "test/frag.glsl"),
"position", 0);
vs2 = glcxx::Shader::create_from_file(GL_VERTEX_SHADER, "test/vert2.glsl"); program2 = glcxx::Program::create(
fs2 = glcxx::Shader::create_from_file(GL_FRAGMENT_SHADER, "test/frag2.glsl"); glcxx::Shader::create_from_file(GL_VERTEX_SHADER, "test/vert2.glsl"),
program2 = glcxx::Program::create(vs2, fs2, "position", 0, "color", 1); glcxx::Shader::create_from_file(GL_FRAGMENT_SHADER, "test/frag2.glsl"),
"position", 0,
"color", 1);
GLfloat coords[] = { GLfloat coords[] = {
-0.5, -0.5, -0.5, -0.5,