Browse Source

remove ambiguous data_size property from gl_buffer structure

main
cinnaboot 5 years ago
parent
commit
77f1c02781
  1. 3
      src/shader.cpp
  2. 1
      src/shader.h

3
src/shader.cpp

@ -161,7 +161,6 @@ initTransforms(memory_arena* arena,
glGenBuffers(1, &xform_ubo->id);
xform_ubo->target = GL_UNIFORM_BUFFER;
xform_ubo->data_type = GL_FLOAT;
xform_ubo->data_size = sizeof(*xforms);
xform_ubo->name = arenaCopyCStr(arena, "matrices");
glBindBuffer(xform_ubo->target, xform_ubo->id);
@ -313,8 +312,6 @@ parseUniform(memory_arena* arena, shader_program* s, u32 uniform_idx)
GL_UNIFORM_BLOCK_INDEX, &unif.block_idx);
unif.idx = uniform_idx;
unif.data_size = getGLTypeSize(unif.data_type);
assert(unif.data_size > 0);
unif.name = arenaCopyCStr(arena, unif_name);
unif.location = glGetUniformLocation(s->prog_id, unif.name);

1
src/shader.h

@ -13,7 +13,6 @@ struct gl_buffer
GLuint id;
GLenum target;
GLenum data_type;
GLuint data_size;
GLuint location; // NOTE: if used as backing for vertex attribute
GLuint binding_idx; // NOTE: if used as backing from unifor buffer object
char* name;

Loading…
Cancel
Save