bilbo/love-demo2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: use glBindVertexBuffer

Browse Source
This commit is contained in:
Zack Buhman 2026-03-06 23:58:02 -06:00
parent 094847caca
commit 75bafe50af
1 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/test.cpp
View File

@ -123,58 +123,31 @@ void load_index_buffer()
void load_vertex_attributes(int i) void load_vertex_attributes(int i)
{ {
glBindBuffer(GL_ARRAY_BUFFER, per_vertex_buffer); glBindVertexBuffer(0, per_vertex_buffer, 0, per_vertex_size);
glBindVertexBuffer(1, vertex_buffers[i], 0, vertex_size);
glVertexAttribPointer(location.attrib.position, glVertexBindingDivisor(0, 0);
3, glVertexBindingDivisor(1, 1);
GL_HALF_FLOAT,
GL_FALSE,
per_vertex_size,
(void*)(0)
);
glVertexAttribPointer(location.attrib.normal,
3,
GL_HALF_FLOAT,
GL_FALSE,
per_vertex_size,
(void*)(6)
);
glVertexAttribPointer(location.attrib.texture,
2,
GL_HALF_FLOAT,
GL_FALSE,
per_vertex_size,
(void*)(12)
);
glEnableVertexAttribArray(location.attrib.position); glEnableVertexAttribArray(location.attrib.position);
glVertexAttribFormat(location.attrib.position, 3, GL_HALF_FLOAT, GL_FALSE, 0);
glVertexAttribBinding(location.attrib.position, 0);
glEnableVertexAttribArray(location.attrib.normal); glEnableVertexAttribArray(location.attrib.normal);
glVertexAttribFormat(location.attrib.normal, 3, GL_HALF_FLOAT, GL_FALSE, 6);
glVertexAttribBinding(location.attrib.normal, 0);
glEnableVertexAttribArray(location.attrib.texture); glEnableVertexAttribArray(location.attrib.texture);
glVertexAttribDivisor(location.attrib.position, 0); glVertexAttribFormat(location.attrib.texture, 2, GL_HALF_FLOAT, GL_FALSE, 12);
glVertexAttribDivisor(location.attrib.normal, 0); glVertexAttribBinding(location.attrib.texture, 0);
glVertexAttribDivisor(location.attrib.texture, 0);
glBindBuffer(GL_ARRAY_BUFFER, vertex_buffers[i]);
glVertexAttribPointer(location.attrib.block_position,
3,
GL_SHORT,
GL_FALSE,
vertex_size,
(void*)(0)
);
glVertexAttribPointer(location.attrib.block_id,
1,
GL_UNSIGNED_BYTE,
GL_FALSE,
vertex_size,
(void*)(6)
);
glEnableVertexAttribArray(location.attrib.block_position); glEnableVertexAttribArray(location.attrib.block_position);
glVertexAttribFormat(location.attrib.block_position, 3, GL_SHORT, GL_FALSE, 0);
glVertexAttribBinding(location.attrib.block_position, 1);
glEnableVertexAttribArray(location.attrib.block_id); glEnableVertexAttribArray(location.attrib.block_id);
glVertexAttribDivisor(location.attrib.block_position, 1); glVertexAttribFormat(location.attrib.block_id, 1, GL_UNSIGNED_BYTE, GL_FALSE, 6);
glVertexAttribDivisor(location.attrib.block_id, 1); glVertexAttribBinding(location.attrib.block_id, 1);
} }
void load_instance_cfg(int i) void load_instance_cfg(int i)
@ -202,6 +175,8 @@ void load_buffers()
load_vertex_buffer(i); load_vertex_buffer(i);
load_vertex_attributes(i); load_vertex_attributes(i);
load_instance_cfg(i); load_instance_cfg(i);
glBindVertexArray(0);
} }
// index buffer // index buffer
@ -325,6 +300,7 @@ void draw()
for (int region_index = 0; region_index < region_count; region_index++) { for (int region_index = 0; region_index < region_count; region_index++) {
glBindVertexArray(vertex_array_objects[region_index]); glBindVertexArray(vertex_array_objects[region_index]);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer);
for (int configuration = 1; configuration < 64; configuration++) { for (int configuration = 1; configuration < 64; configuration++) {
int element_count = 6 * popcount(configuration); int element_count = 6 * popcount(configuration);
const void * indices = (void *)((ptrdiff_t)index_buffer_configuration_offsets[configuration]); // index into configuration.idx const void * indices = (void *)((ptrdiff_t)index_buffer_configuration_offsets[configuration]); // index into configuration.idx