X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=3141f8d2c5eb388aec128f31b6218c06c0b1bb8d;hp=29428aad3e09ed0a1a66a660125433a7db6a3313;hb=2fd06b9c44225d1e740cb2de08a9dfa5c9cd0031;hpb=54d47f65e9abac77229636fbaaefea8caf34a4d4 diff --git a/util.cpp b/util.cpp index 29428aa..3141f8d 100644 --- a/util.cpp +++ b/util.cpp @@ -272,6 +272,21 @@ template void combine_two_samples(float w1, float w2, float pos1, float pos2, float num_subtexels, float inv_num_subtexels, fp16_int_t *offset, fp16_int_t *total_weight, float *sum_sq_error); +GLuint generate_vbo(GLint size, GLenum type, GLsizeiptr data_size, const GLvoid *data) +{ + GLuint vbo; + glGenBuffers(1, &vbo); + check_error(); + glBindBuffer(GL_ARRAY_BUFFER, vbo); + check_error(); + glBufferData(GL_ARRAY_BUFFER, data_size, data, GL_STATIC_DRAW); + check_error(); + glBindBuffer(GL_ARRAY_BUFFER, 0); + check_error(); + + return vbo; +} + GLuint fill_vertex_attribute(GLuint glsl_program_num, const string &attribute_name, GLint size, GLenum type, GLsizeiptr data_size, const GLvoid *data) { int attrib = glGetAttribLocation(glsl_program_num, attribute_name.c_str()); @@ -279,13 +294,10 @@ GLuint fill_vertex_attribute(GLuint glsl_program_num, const string &attribute_na return -1; } - GLuint vbo; - glGenBuffers(1, &vbo); - check_error(); + GLuint vbo = generate_vbo(size, type, data_size, data); + glBindBuffer(GL_ARRAY_BUFFER, vbo); check_error(); - glBufferData(GL_ARRAY_BUFFER, data_size, data, GL_STATIC_DRAW); - check_error(); glEnableVertexAttribArray(attrib); check_error(); glVertexAttribPointer(attrib, size, type, GL_FALSE, 0, BUFFER_OFFSET(0));