Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmabuf: Refactor GPU renderer

Browse Source 
We don't want to ever try fallback uploads in the dmabuf path. So
refactor gdk_frame_upload_texture() to have a flag that turns that off.
This commit is contained in:
Benjamin Otte
2024-09-17 21:41:08 +02:00
parent a314143a83
commit f6b3f321a4
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gsk/gpu/gskgpuframe.c
View File

@@ -117,11 +117,7 @@ gsk_gpu_frame_default_upload_texture (GskGpuFrame *self,
gboolean with_mipmap,
GdkTexture *texture)
{
GskGpuImage *image;
image = gsk_gpu_upload_texture_op_try (self, with_mipmap, 0, GSK_SCALING_FILTER_NEAREST, texture);
return image;
return NULL;
}
static void
@@ -474,22 +470,34 @@ gsk_gpu_frame_get_last_op (GskGpuFrame *self)
return priv->last_op;
}
GskGpuImage *
gsk_gpu_frame_upload_texture (GskGpuFrame *self,
gboolean with_mipmap,
GdkTexture *texture)
static GskGpuImage *
gsk_gpu_frame_do_upload_texture (GskGpuFrame *self,
gboolean dmabuf_import,
gboolean with_mipmap,
GdkTexture *texture)
{
GskGpuFramePrivate *priv = gsk_gpu_frame_get_instance_private (self);
GskGpuImage *image;
image = GSK_GPU_FRAME_GET_CLASS (self)->upload_texture (self, with_mipmap, texture);
if (image == NULL && !dmabuf_import)
image = gsk_gpu_upload_texture_op_try (self, with_mipmap, 0, GSK_SCALING_FILTER_NEAREST, texture);
if (image)
gsk_gpu_cache_cache_texture_image (gsk_gpu_device_get_cache (priv->device), texture, image, NULL);
return image;
}
GskGpuImage *
gsk_gpu_frame_upload_texture (GskGpuFrame *self,
gboolean with_mipmap,
GdkTexture *texture)
{
return gsk_gpu_frame_do_upload_texture (self, FALSE, with_mipmap, texture);
}
static GskGpuBuffer *
gsk_gpu_frame_create_vertex_buffer (GskGpuFrame *self,
gsize size)
@@ -767,7 +775,8 @@ gsk_gpu_frame_download_texture (GskGpuFrame *self,
image = gsk_gpu_cache_lookup_texture_image (gsk_gpu_device_get_cache (priv->device), texture, NULL);
if (image == NULL)
image = gsk_gpu_frame_upload_texture (self, FALSE, texture);
image = gsk_gpu_frame_do_upload_texture (self, TRUE, FALSE, texture);
if (image == NULL)
{
g_critical ("Could not upload texture");