|
|
|
|
@ -238,11 +238,10 @@ parseUniformBlocks(memory_arena* arena, shader_program* s, GLContext* gl_ctx)
|
|
|
|
|
ub.block_id = i; |
|
|
|
|
|
|
|
|
|
GLchar block_name[256] = {0}; |
|
|
|
|
GLsizei name_len = 0; |
|
|
|
|
glGetActiveUniformBlockName( |
|
|
|
|
s->prog_id, i, 256, &ub.name_len, block_name); |
|
|
|
|
ub.name_len++; // NOTE: space for null term
|
|
|
|
|
ub.name = (char*) arenaAllocateBlock(arena, ub.name_len * sizeof(char)); |
|
|
|
|
std::strncpy(ub.name, block_name, ub.name_len); |
|
|
|
|
s->prog_id, i, 256, &name_len, block_name); |
|
|
|
|
ub.name = arenaCopyCStr(arena, block_name); |
|
|
|
|
|
|
|
|
|
glGetActiveUniformBlockiv(s->prog_id, i, |
|
|
|
|
GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS, (GLint*) &ub.num_uniforms); |
|
|
|
|
|