Skip to content

backends/opengl3: Always validate texture before uploading data #9043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −2
Open

backends/opengl3: Always validate texture before uploading data #9043

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions backends/imgui_impl_opengl3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,11 @@ static void ImGui_ImplOpenGL3_DestroyTexture(ImTextureData* tex)

void ImGui_ImplOpenGL3_UpdateTexture(ImTextureData* tex)
{
if (tex->Status == ImTextureStatus_WantDestroy && tex->UnusedFrames > 0) {
ImGui_ImplOpenGL3_DestroyTexture(tex);
return;
}

// FIXME: Consider backing up and restoring
if (tex->Status == ImTextureStatus_WantCreate || tex->Status == ImTextureStatus_WantUpdates)
{
Expand Down Expand Up @@ -770,6 +775,15 @@ void ImGui_ImplOpenGL3_UpdateTexture(ImTextureData* tex)
GL_CALL(glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture));

GLuint gl_tex_id = (GLuint)(intptr_t)tex->TexID;

GLint is_texture = 0;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &is_texture);
if (!glIsTexture(gl_tex_id)) {
// Texture was destroyed, mark for recreation
tex->SetStatus(ImTextureStatus_WantCreate);
return;
}

GL_CALL(glBindTexture(GL_TEXTURE_2D, gl_tex_id));
#if GL_UNPACK_ROW_LENGTH // Not on WebGL/ES
GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH, tex->Width));
Expand All @@ -793,8 +807,6 @@ void ImGui_ImplOpenGL3_UpdateTexture(ImTextureData* tex)
tex->SetStatus(ImTextureStatus_OK);
GL_CALL(glBindTexture(GL_TEXTURE_2D, last_texture)); // Restore state
}
else if (tex->Status == ImTextureStatus_WantDestroy && tex->UnusedFrames > 0)
ImGui_ImplOpenGL3_DestroyTexture(tex);
}

// If you get an error please report on github. You may try different GL context version or GLSL version. See GL<>GLSL version table at the top of this file.
Expand Down