Browse Source

remove 'name_len' from GLUniformBLock struct

main
cinnaboot 5 years ago
parent
commit
b22b6f8b23
  1. 7
      src/shader.cpp
  2. 1
      src/shader.h

7
src/shader.cpp

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

1
src/shader.h

@ -46,7 +46,6 @@ struct GLUniformBlock
GLint binding_idx; GLint binding_idx;
GLuint num_uniforms; GLuint num_uniforms;
gl_uniform* uniforms; gl_uniform* uniforms;
GLsizei name_len;
char* name; char* name;
}; };

Loading…
Cancel
Save