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

gpu: Move caching to the upload_texture() function

Browse Source 
So when uploading a texture, we will automatically put it into the cache
now.
This commit is contained in:
Benjamin Otte
2023-11-09 07:52:10 +01:00
parent f4879a0f2e
commit 6e76e8b56e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gsk/gpu/gskgpuframe.c
View File

@@ -363,7 +363,15 @@ GskGpuImage *
gsk_gpu_frame_upload_texture (GskGpuFrame *self,
GdkTexture *texture)
{
return GSK_GPU_FRAME_GET_CLASS (self)->upload_texture (self, texture);
GskGpuFramePrivate *priv = gsk_gpu_frame_get_instance_private (self);
GskGpuImage *image;
image = GSK_GPU_FRAME_GET_CLASS (self)->upload_texture (self, texture);
if (image)
gsk_gpu_device_cache_texture_image (priv->device, texture, priv->timestamp, image);
return image;
}
GskGpuDescriptors *

8
gsk/gpu/gskgpunodeprocessor.c
View File

@@ -516,11 +516,7 @@ gsk_gpu_get_node_as_image (GskGpuFrame *frame,
gint64 timestamp = gsk_gpu_frame_get_timestamp (frame);
result = gsk_gpu_device_lookup_texture_image (device, texture, timestamp);
if (result == NULL)
{
result = gsk_gpu_frame_upload_texture (frame, texture);
if (result)
gsk_gpu_device_cache_texture_image (device, texture, timestamp, result);
}
result = gsk_gpu_frame_upload_texture (frame, texture);
if (result)
{
@@ -1139,7 +1135,6 @@ gsk_gpu_node_processor_add_texture_node (GskGpuNodeProcessor *self,
gsk_gpu_node_processor_add_fallback_node (self, node);
return;
}
gsk_gpu_device_cache_texture_image (device, texture, timestamp, image);
}
descriptor = gsk_gpu_node_processor_add_image (self, image, GSK_GPU_SAMPLER_DEFAULT);
@@ -1174,7 +1169,6 @@ gsk_gpu_node_processor_create_texture_pattern (GskGpuPatternWriter *self,
image = gsk_gpu_frame_upload_texture (self->frame, texture);
if (image == NULL)
return FALSE;
gsk_gpu_device_cache_texture_image (device, texture, timestamp, image);
}
if (!gsk_gpu_pattern_writer_add_image (self, image, GSK_GPU_SAMPLER_DEFAULT, &descriptor))