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