eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 03:59:19 +02:00
Code Issues 150 Wiki Activity

Check that a vao still has its index buffer, and skip the draw if not

Browse Source 
Diagnostic for a crash in glDrawElementsInstancedBaseVertex, where the
nvidia driver read indices from a null client pointer. Logs to errors.txt;
meant to be reverted once the cause is confirmed.
This commit is contained in:
maj00r
2026-09-21 20:25:20 +02:00
parent 1d9c608396
commit b93a6d5e97
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rendering/opengl33geometrybank.cpp
View File

@@ -84,6 +84,14 @@ void opengl33_vaogeometrybank::setup_buffer()
throw std::bad_alloc();
}
m_vao->setup_ebo( *m_indexbuffer );
// debug: verify the index buffer really got attached to the vao
if( gl::vao::use_vao ) {
GLint boundebo { 0 };
::glGetIntegerv( GL_ELEMENT_ARRAY_BUFFER_BINDING, &boundebo );
if( boundebo != static_cast<GLint>( static_cast<GLuint>( *m_indexbuffer ) ) ) {
ErrorLog( "EBO check: vao has index buffer " + std::to_string( boundebo ) + ", expected " + std::to_string( static_cast<GLuint>( *m_indexbuffer ) ) );
}
}
}
else {
gl::buffer::unbind( gl::buffer::ELEMENT_ARRAY_BUFFER );
@@ -150,6 +158,7 @@ opengl33_vaogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stre
if( chunkrecord.index_count > 0 ) {
if (glDrawRangeElementsBaseVertex) {
m_vao->bind();
if( false == check_ebo( "draw" ) ) { return 0; }
::glDrawRangeElementsBaseVertex(
chunk.type,
0, chunkrecord.vertex_count,
@@ -158,6 +167,7 @@ opengl33_vaogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stre
}
else if (glDrawElementsBaseVertexOES) {
m_vao->bind();
if( false == check_ebo( "draw" ) ) { return 0; }
::glDrawElementsBaseVertexOES(
chunk.type,
chunkrecord.index_count, GL_UNSIGNED_INT, reinterpret_cast<void const *>( chunkrecord.index_offset * sizeof( gfx::basic_index ) ),
@@ -216,6 +226,7 @@ opengl33_vaogeometrybank::draw_instanced_( gfx::geometry_handle const &Geometry,
if( chunkrecord.index_count > 0 ) {
m_vao->bind();
if( false == check_ebo( "draw_instanced" ) ) { return 0; }
::glDrawElementsInstancedBaseVertex(
chunk.type,
chunkrecord.index_count, GL_UNSIGNED_INT,
@@ -245,6 +256,23 @@ opengl33_vaogeometrybank::release_() {
delete_buffer();
}
bool
opengl33_vaogeometrybank::check_ebo( char const *Where ) const {
if( false == gl::vao::use_vao ) { return true; }
GLint boundebo { 0 };
::glGetIntegerv( GL_ELEMENT_ARRAY_BUFFER_BINDING, &boundebo );
if( boundebo == static_cast<GLint>( static_cast<GLuint>( *m_indexbuffer ) ) ) { return true; }
// skip the draw rather than let the driver read indices from a null client pointer
static int reportcount { 0 };
if( reportcount < 50 ) {
++reportcount;
ErrorLog( std::string( "EBO check (" ) + Where + "): vao has index buffer " + std::to_string( boundebo ) + ", expected " + std::to_string( static_cast<GLuint>( *m_indexbuffer ) ) + ", draw skipped" );
}
return false;
}
void
opengl33_vaogeometrybank::delete_buffer() {

3
rendering/opengl33geometrybank.h
View File

@@ -67,6 +67,9 @@ private:
setup_userdata(size_t offset = 0);
void
delete_buffer();
// debug: true if the currently bound vao has our index buffer attached
bool
check_ebo( char const *Where ) const;
// members:
std::optional<gl::buffer> m_vertexbuffer; // vertex buffer data on the opengl end