Hi
On Tue, Mar 3, 2026 at 2:11 PM Akihiko Odaki
<odaki@rsg.ci.i.u-tokyo.ac.jp> wrote:
>
> include/ui/shader.h and include/ui/surface.h are included by files that
> do not depend on Epoxy so they shouldn't include epoxy/gl.h. Otherwise,
> compilations of these files can fail because the path to the directory
> containing epoxy/gl.h may not be passed to the compiler.
>
> Most variables with OpenGL types are removed. The remaining ones are
> GLuint and replaced with uint32_t, which we already use for texture
> names.
>
> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> Akihiko Odaki (3):
> ui/console: Unify pixman-OpenGL format mapping
> ui/console: Remove DisplaySurface::mem_obj
> ui/surface: Avoid including epoxy/gl.h in header files
>
> include/ui/console.h | 4 +--
> include/ui/shader.h | 2 --
> include/ui/spice-display.h | 1 +
> include/ui/surface.h | 6 +---
> ui/console-gl.c | 74 ++++++++++++++++++++++------------------------
> ui/shader.c | 1 +
> ui/spice-display.c | 9 +++++-
> 7 files changed, 48 insertions(+), 49 deletions(-)
> ---
> base-commit: ffcf1a7981793973ffbd8100a7c3c6042d02ae23
> change-id: 20250510-gl-e6d2c89816cf
>
> Best regards,
> --
> Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>
>
--
Marc-André Lureau