From nobody Sat May 18 14:01:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683790993; cv=none; d=zohomail.com; s=zohoarc; b=NArx0JiALFHsbf4rpKDyn17DL+mVZQqQgs3Qk6HkHEALqLtR3gn/Ouw79WhV2LlomuEc5Sj2F8phzZx0GG/KCDF5fwpCr0SI6mBNpNbNdqCLGSSUsk9WcaOAZpWKU/fqO+Y309XyAJY8uirxPaPisMbbXzD/DS/uhK0t8y0yCf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683790993; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Je6TdesZd9lBeTPL+NNfjcLworc+rDnoCvRANzYzZ90=; b=kumt2UFDV1MbgSKipy4z4NwVR0qFS5LK0wHqGlqefdIY0dJYhARo78OSBAD6E8lV+x08bcedX7uLx/yFilg0fnbm2Uu4GLITQqZamGOpIl/A1XOnNUa7/42wsYbeb42XQDmqUkVSeRVVE/sXy05KJGn41LA92h5Im3XqNy5jWOo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168379099329882.28334597745891; Thu, 11 May 2023 00:43:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px0wW-0000Oi-2E; Thu, 11 May 2023 03:42:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px0wV-0000OZ-21 for qemu-devel@nongnu.org; Thu, 11 May 2023 03:42:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px0wT-0005W7-2a for qemu-devel@nongnu.org; Thu, 11 May 2023 03:42:26 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-281-xL-P_JBeOBCeQ76PmIjJZg-1; Thu, 11 May 2023 03:42:21 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B839867941 for ; Thu, 11 May 2023 07:42:21 +0000 (UTC) Received: from localhost (unknown [10.39.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7414492C13; Thu, 11 May 2023 07:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683790943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Je6TdesZd9lBeTPL+NNfjcLworc+rDnoCvRANzYzZ90=; b=FpMwSDuoZMRFpytQZWuYTNWjxKzYcUJhgySgHlNwBBbLFz7k/qbOfhUyj21utDcJqVRe0Y 0ftD8CkuOfvH2By8W3VOS00fj9/T6OerwKRob3C7BYJ/IYe9csdQ4IbOzJhnYizkemVCl7 PbBNW/e+VMgi49iqeTGI2WVWvF5xk34= X-MC-Unique: xL-P_JBeOBCeQ76PmIjJZg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, thuth@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH] ui/sdl2: fix surface_gl_update_texture: Assertion 'gls' failed Date: Thu, 11 May 2023 11:42:17 +0400 Message-Id: <20230511074217.4171842-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683790995466100001 From: Marc-Andr=C3=A9 Lureau Before sdl2_gl_update() is called, sdl2_gl_switch() may decide to destroy the console window and its associated shaders. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1644 Fixes: commit c84ab0a5 ("ui/console: optionally update after gfx switch") Signed-off-by: Marc-Andr=C3=A9 Lureau Tested-by: Bin Meng --- ui/sdl2-gl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index b36ba6415a..cc83c98349 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -67,6 +67,10 @@ void sdl2_gl_update(DisplayChangeListener *dcl, =20 assert(scon->opengl); =20 + if (!scon->real_window) { + return; + } + SDL_GL_MakeCurrent(scon->real_window, scon->winctx); surface_gl_update_texture(scon->gls, scon->surface, x, y, w, h); scon->updates++; --=20 2.40.1