From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 10/24] ui: remove gl_ctx_get_current
Date: Fri, 5 Feb 2021 07:56:06 +0100 [thread overview]
Message-ID: <20210205065620.1726554-11-kraxel@redhat.com> (raw)
In-Reply-To: <20210205065620.1726554-1-kraxel@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
There are no users left.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210204105232.834642-7-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/console.h | 2 --
include/ui/egl-context.h | 1 -
include/ui/sdl2.h | 1 -
ui/console.c | 6 ------
ui/egl-context.c | 5 -----
ui/egl-headless.c | 1 -
ui/gtk.c | 2 --
ui/sdl2-gl.c | 8 --------
ui/sdl2.c | 1 -
ui/spice-display.c | 1 -
10 files changed, 28 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 7a3fc11abf72..ce6c72e37c6b 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -201,7 +201,6 @@ typedef struct DisplayChangeListenerOps {
QEMUGLContext ctx);
int (*dpy_gl_ctx_make_current)(DisplayChangeListener *dcl,
QEMUGLContext ctx);
- QEMUGLContext (*dpy_gl_ctx_get_current)(DisplayChangeListener *dcl);
void (*dpy_gl_scanout_disable)(DisplayChangeListener *dcl);
void (*dpy_gl_scanout_texture)(DisplayChangeListener *dcl,
@@ -303,7 +302,6 @@ QEMUGLContext dpy_gl_ctx_create(QemuConsole *con,
QEMUGLParams *params);
void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext ctx);
int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx);
-QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con);
bool console_has_gl(QemuConsole *con);
bool console_has_gl_dmabuf(QemuConsole *con);
diff --git a/include/ui/egl-context.h b/include/ui/egl-context.h
index f004ce11a7bc..9374fe41e32b 100644
--- a/include/ui/egl-context.h
+++ b/include/ui/egl-context.h
@@ -9,6 +9,5 @@ QEMUGLContext qemu_egl_create_context(DisplayChangeListener *dcl,
void qemu_egl_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx);
int qemu_egl_make_context_current(DisplayChangeListener *dcl,
QEMUGLContext ctx);
-QEMUGLContext qemu_egl_get_current_context(DisplayChangeListener *dcl);
#endif /* EGL_CONTEXT_H */
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index 0875b8d56b7e..f85c117a78f2 100644
--- a/include/ui/sdl2.h
+++ b/include/ui/sdl2.h
@@ -70,7 +70,6 @@ QEMUGLContext sdl2_gl_create_context(DisplayChangeListener *dcl,
void sdl2_gl_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx);
int sdl2_gl_make_context_current(DisplayChangeListener *dcl,
QEMUGLContext ctx);
-QEMUGLContext sdl2_gl_get_current_context(DisplayChangeListener *dcl);
void sdl2_gl_scanout_disable(DisplayChangeListener *dcl);
void sdl2_gl_scanout_texture(DisplayChangeListener *dcl,
diff --git a/ui/console.c b/ui/console.c
index d80ce7037c32..c0b1a3689c3d 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1803,12 +1803,6 @@ int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx)
return con->gl->ops->dpy_gl_ctx_make_current(con->gl, ctx);
}
-QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con)
-{
- assert(con->gl);
- return con->gl->ops->dpy_gl_ctx_get_current(con->gl);
-}
-
void dpy_gl_scanout_disable(QemuConsole *con)
{
assert(con->gl);
diff --git a/ui/egl-context.c b/ui/egl-context.c
index 4aa1cbb50c25..368ffa49d82f 100644
--- a/ui/egl-context.c
+++ b/ui/egl-context.c
@@ -35,8 +35,3 @@ int qemu_egl_make_context_current(DisplayChangeListener *dcl,
return eglMakeCurrent(qemu_egl_display,
EGL_NO_SURFACE, EGL_NO_SURFACE, ctx);
}
-
-QEMUGLContext qemu_egl_get_current_context(DisplayChangeListener *dcl)
-{
- return eglGetCurrentContext();
-}
diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index fe2a0d1eab98..da377a74af69 100644
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -160,7 +160,6 @@ static const DisplayChangeListenerOps egl_ops = {
.dpy_gl_ctx_create = egl_create_context,
.dpy_gl_ctx_destroy = qemu_egl_destroy_context,
.dpy_gl_ctx_make_current = qemu_egl_make_context_current,
- .dpy_gl_ctx_get_current = qemu_egl_get_current_context,
.dpy_gl_scanout_disable = egl_scanout_disable,
.dpy_gl_scanout_texture = egl_scanout_texture,
diff --git a/ui/gtk.c b/ui/gtk.c
index e1ee0840b377..a0e6b60ac4f5 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -637,7 +637,6 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = {
.dpy_gl_ctx_create = gd_gl_area_create_context,
.dpy_gl_ctx_destroy = gd_gl_area_destroy_context,
.dpy_gl_ctx_make_current = gd_gl_area_make_current,
- .dpy_gl_ctx_get_current = gd_gl_area_get_current_context,
.dpy_gl_scanout_texture = gd_gl_area_scanout_texture,
.dpy_gl_update = gd_gl_area_scanout_flush,
};
@@ -654,7 +653,6 @@ static const DisplayChangeListenerOps dcl_egl_ops = {
.dpy_gl_ctx_create = gd_egl_create_context,
.dpy_gl_ctx_destroy = qemu_egl_destroy_context,
.dpy_gl_ctx_make_current = gd_egl_make_current,
- .dpy_gl_ctx_get_current = qemu_egl_get_current_context,
.dpy_gl_scanout_disable = gd_egl_scanout_disable,
.dpy_gl_scanout_texture = gd_egl_scanout_texture,
.dpy_gl_scanout_dmabuf = gd_egl_scanout_dmabuf,
diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index c73d273bf804..82139ba49e8f 100644
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -185,14 +185,6 @@ int sdl2_gl_make_context_current(DisplayChangeListener *dcl,
return SDL_GL_MakeCurrent(scon->real_window, sdlctx);
}
-QEMUGLContext sdl2_gl_get_current_context(DisplayChangeListener *dcl)
-{
- SDL_GLContext sdlctx;
-
- sdlctx = SDL_GL_GetCurrentContext();
- return (QEMUGLContext)sdlctx;
-}
-
void sdl2_gl_scanout_disable(DisplayChangeListener *dcl)
{
struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 5e49709283e5..a203cb0239e1 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -781,7 +781,6 @@ static const DisplayChangeListenerOps dcl_gl_ops = {
.dpy_gl_ctx_create = sdl2_gl_create_context,
.dpy_gl_ctx_destroy = sdl2_gl_destroy_context,
.dpy_gl_ctx_make_current = sdl2_gl_make_context_current,
- .dpy_gl_ctx_get_current = sdl2_gl_get_current_context,
.dpy_gl_scanout_disable = sdl2_gl_scanout_disable,
.dpy_gl_scanout_texture = sdl2_gl_scanout_texture,
.dpy_gl_update = sdl2_gl_scanout_flush,
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 3d3e3bcb2246..dccac4710a5e 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -1102,7 +1102,6 @@ static const DisplayChangeListenerOps display_listener_gl_ops = {
.dpy_gl_ctx_create = qemu_spice_gl_create_context,
.dpy_gl_ctx_destroy = qemu_egl_destroy_context,
.dpy_gl_ctx_make_current = qemu_egl_make_context_current,
- .dpy_gl_ctx_get_current = qemu_egl_get_current_context,
.dpy_gl_scanout_disable = qemu_spice_gl_scanout_disable,
.dpy_gl_scanout_texture = qemu_spice_gl_scanout_texture,
--
2.29.2
next prev parent reply other threads:[~2021-02-05 7:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 6:55 [PULL 00/24] Vga ui 20210205 patches Gerd Hoffmann
2021-02-05 6:55 ` [PULL 01/24] hw/display/qxl: Fix bad printf format specifiers Gerd Hoffmann
2021-02-05 6:55 ` [PULL 02/24] qxl: set qxl.ssd.dcl.con on secondary devices Gerd Hoffmann
2021-02-05 6:55 ` [PULL 03/24] qxl: also notify the rendering is done when skipping it Gerd Hoffmann
2021-02-05 6:56 ` [PULL 04/24] spice: delay starting until display are initialized Gerd Hoffmann
2021-02-05 6:56 ` [PULL 05/24] vhost-user-gpu: check backend for EDID support Gerd Hoffmann
2021-02-05 6:56 ` [PULL 06/24] vhost-user-gpu: handle vhost-user-gpu features in a callback Gerd Hoffmann
2021-02-05 6:56 ` [PULL 07/24] vhost-user-gpu: use an extandable state enum for commands Gerd Hoffmann
2021-02-05 6:56 ` [PULL 08/24] vhost-user-gpu: handle display-info in a callback Gerd Hoffmann
2021-02-05 6:56 ` [PULL 09/24] ui: remove extra #ifdef CONFIG_OPENGL Gerd Hoffmann
2021-02-05 6:56 ` Gerd Hoffmann [this message]
2021-02-05 6:56 ` [PULL 11/24] ui: add gd_gl_area_scanout_disable Gerd Hoffmann
2021-02-05 6:56 ` [PULL 12/24] ui: annotate DCLOps callback requirements Gerd Hoffmann
2021-02-05 6:56 ` [PULL 13/24] ui: remove console_has_gl_dmabuf() Gerd Hoffmann
2021-02-05 6:56 ` [PULL 14/24] vhost-user-gpu: add a configuration flag for dmabuf usage Gerd Hoffmann
2021-02-05 6:56 ` [PULL 15/24] ui: add an optional get_flags callback to GraphicHwOps Gerd Hoffmann
2021-02-05 6:56 ` [PULL 16/24] ui: add a DCLOps callback to check dmabuf support Gerd Hoffmann
2021-02-05 6:56 ` [PULL 17/24] ui: check hw requirements during DCL registration Gerd Hoffmann
2021-02-05 6:56 ` [PULL 18/24] ui: add qemu_egl_has_dmabuf helper Gerd Hoffmann
2021-02-05 6:56 ` [PULL 19/24] ui: check gtk-egl dmabuf support Gerd Hoffmann
2021-02-05 6:56 ` [PULL 20/24] ui: add egl dmabuf import to gtkglarea Gerd Hoffmann
2021-02-05 6:56 ` [PULL 21/24] virtio-gpu: avoid re-entering cmdq processing Gerd Hoffmann
2021-02-05 6:56 ` [PULL 22/24] display/ui: add a callback to indicate GL state is flushed Gerd Hoffmann
2021-02-05 6:56 ` [PULL 23/24] chardev: check if the chardev is registered for yanking Gerd Hoffmann
2021-02-05 6:56 ` [PULL 24/24] tests: add some virtio-gpu & vhost-user-gpu acceptance test Gerd Hoffmann
2021-02-05 11:56 ` [PULL 00/24] Vga ui 20210205 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205065620.1726554-11-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=crosa@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.