OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vl: rename/ifdef the x11 kopper functionality

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31240>
This commit is contained in:
Mike Blumenkrantz
2024-09-18 15:08:25 -04:00
committed by Marge Bot
parent 62d93a53b4
commit f294b8262b
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/auxiliary/vl/vl_winsys.h
View File

@@ -99,12 +99,12 @@ vl_dri2_screen_create(void *display, int screen) { return NULL; };
struct vl_screen * struct vl_screen *
vl_dri3_screen_create(Display *display, int screen); vl_dri3_screen_create(Display *display, int screen);
struct vl_screen * struct vl_screen *
vl_kopper_screen_create(Display *display, int screen); vl_kopper_screen_create_x11(Display *display, int screen);
#else #else
static inline struct vl_screen * static inline struct vl_screen *
vl_dri3_screen_create(void *display, int screen) { return NULL; }; vl_dri3_screen_create(void *display, int screen) { return NULL; };
static inline struct vl_screen * static inline struct vl_screen *
vl_kopper_screen_create(void *display, int screen) { return NULL; }; vl_kopper_screen_create_x11(void *display, int screen) { return NULL; };
#endif #endif
#ifdef _WIN32 #ifdef _WIN32

54
src/gallium/auxiliary/vl/vl_winsys_kopper.c
View File

@@ -26,26 +26,30 @@
#include "pipe-loader/pipe_loader.h" #include "pipe-loader/pipe_loader.h"
#include "pipe/p_screen.h" #include "pipe/p_screen.h"
#include <X11/Xlib-xcb.h>
#include "util/u_memory.h" #include "util/u_memory.h"
#include "vl/vl_winsys.h" #include "vl/vl_winsys.h"
#include "loader.h" #include "loader.h"
#include "x11/loader_x11.h"
#include "pipe-loader/pipe_loader.h" #include "pipe-loader/pipe_loader.h"
#include "vl/vl_compositor.h" #include "vl/vl_compositor.h"
#include "gallium/drivers/zink/zink_kopper.h" #if defined(HAVE_X11_PLATFORM) && defined(HAVE_LIBDRM)
#include <X11/Xlib-xcb.h>
#include <vulkan/vulkan_xcb.h> #include <vulkan/vulkan_xcb.h>
#include "x11/loader_x11.h"
#include "gallium/drivers/zink/zink_kopper.h"
#endif
struct vl_kopper_screen struct vl_kopper_screen
{ {
struct vl_screen base; struct vl_screen base;
struct pipe_context *pipe; struct pipe_context *pipe;
#if defined(HAVE_X11_PLATFORM) && defined(HAVE_LIBDRM)
xcb_connection_t *conn; xcb_connection_t *conn;
bool is_different_gpu; bool is_different_gpu;
int screen;
int fd; int fd;
struct u_rect dirty_area; struct u_rect dirty_area;
struct pipe_resource *drawable_texture; struct pipe_resource *drawable_texture;
#endif
int screen;
}; };
static void static void
@@ -63,6 +67,27 @@ vl_screen_destroy(struct vl_screen *vscreen)
FREE(vscreen); FREE(vscreen);
} }
static void
vl_kopper_screen_destroy(struct vl_screen *vscreen)
{
if (vscreen == NULL)
return;
struct vl_kopper_screen *scrn = (struct vl_kopper_screen *) vscreen;
#if defined(HAVE_X11_PLATFORM) && defined(HAVE_LIBDRM)
close(scrn->fd);
if (scrn->drawable_texture)
pipe_resource_reference(&scrn->drawable_texture, NULL);
#endif
if (scrn->pipe)
scrn->pipe->destroy(scrn->pipe);
vl_screen_destroy(&scrn->base);
}
#if defined(HAVE_X11_PLATFORM) && defined(HAVE_LIBDRM)
static void * static void *
vl_kopper_get_private(struct vl_screen *vscreen) vl_kopper_get_private(struct vl_screen *vscreen)
{ {
@@ -76,24 +101,6 @@ vl_kopper_get_dirty_area(struct vl_screen *vscreen)
return &scrn->dirty_area; return &scrn->dirty_area;
} }
static void
vl_kopper_screen_destroy(struct vl_screen *vscreen)
{
if (vscreen == NULL)
return;
struct vl_kopper_screen *scrn = (struct vl_kopper_screen *) vscreen;
close(scrn->fd);
if (scrn->drawable_texture)
pipe_resource_reference(&scrn->drawable_texture, NULL);
if (scrn->pipe)
scrn->pipe->destroy(scrn->pipe);
vl_screen_destroy(&scrn->base);
}
static struct pipe_resource * static struct pipe_resource *
vl_kopper_texture_from_drawable(struct vl_screen *vscreen, void *d) vl_kopper_texture_from_drawable(struct vl_screen *vscreen, void *d)
{ {
@@ -154,7 +161,7 @@ vl_kopper_texture_from_drawable(struct vl_screen *vscreen, void *d)
} }
struct vl_screen * struct vl_screen *
vl_kopper_screen_create(Display *display, int screen) vl_kopper_screen_create_x11(Display *display, int screen)
{ {
xcb_get_geometry_cookie_t geom_cookie; xcb_get_geometry_cookie_t geom_cookie;
xcb_get_geometry_reply_t *geom_reply; xcb_get_geometry_reply_t *geom_reply;
@@ -222,3 +229,4 @@ error:
return NULL; return NULL;
} }
#endif