AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-08 09:40:10 +00:00
Code Issues Projects Releases Wiki Activity

memoryformat: Add linear/nearest choice for mipmaping

Browse Source 
linear will average all the pixels for the lod, nearest will just pick
one (using the same method as OpenGL/Vulkan, picking bottom right
center).

This doesn't really make linear/nearest filtering work as it should
(because it's still a form of mipmaps), but it has 2 advantages:

1. it gets closer to the desired effect

2. it is a lot faster

Because only 1 pixel is chosen from the original image, instead of
averaging all pixels, a lot less memory needs to be accessed, and
because memory access is the bottleneck for large images, the speedup is
almost linear with the number of pixels not accessed.
And that means that even for lot level 3, aka 1/8th scale, only 1/64 of
the pixels need to be accessed, and everything is 50x faster.

Switching gtk4-demo --run=image_scaling to linear/nearest makes all the
lag go away for me, even with a 64k x 64k image.
This commit is contained in:
Benjamin Otte 2024-09-03 06:12:03 +02:00 committed by Matthias Clasen
parent 5498b077fd
commit 896ea5b753
8 changed files with 199 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
gdk/gdkmemoryformat.c
View File

@ -315,13 +315,40 @@ ADD_ALPHA_FUNC(r8g8b8_to_a8b8g8r8, 0, 1, 2, 3, 2, 1, 0)
#define MIPMAP_FUNC(SumType, DataType, n_units) \
static void \
gdk_mipmap_ ## DataType ## _ ## n_units (guchar *dest, \
gsize dest_stride, \
const guchar *src, \
gsize src_stride, \
gsize src_width, \
gsize src_height, \
guint lod_level) \
gdk_mipmap_ ## DataType ## _ ## n_units ## _nearest (guchar *dest, \
gsize dest_stride, \
const guchar *src, \
gsize src_stride, \
gsize src_width, \
gsize src_height, \
guint lod_level) \
{ \
gsize y, x, i; \
gsize n = 1 << lod_level; \
\
for (y = 0; y < src_height; y += n) \
{ \
DataType *dest_data = (DataType *) dest; \
for (x = 0; x < src_width; x += n) \
{ \
const DataType *src_data = (const DataType *) (src + (y + MIN (n / 2, src_height - y)) * src_stride); \
\
for (i = 0; i < n_units; i++) \
*dest_data++ = src_data[n_units * (x + MIN (n / 2, src_width - n_units)) + i]; \
} \
dest += dest_stride; \
src += src_stride * n; \
} \
} \
\
static void \
gdk_mipmap_ ## DataType ## _ ## n_units ## _linear (guchar *dest, \
gsize dest_stride, \
const guchar *src, \
gsize src_stride, \
gsize src_width, \
gsize src_height, \
guint lod_level) \
{ \
gsize y_dest, y, x_dest, x, i; \
gsize n = 1 << lod_level; \
@ -401,7 +428,8 @@ struct _GdkMemoryFormatDescription
/* no premultiplication going on here */
void (* to_float) (float (*)[4], const guchar*, gsize);
void (* from_float) (guchar *, const float (*)[4], gsize);
void (* mipmap) (guchar *, gsize, const guchar *, gsize, gsize, gsize, guint);
void (* mipmap_nearest) (guchar *, gsize, const guchar *, gsize, gsize, gsize, guint);
void (* mipmap_linear) (guchar *, gsize, const guchar *, gsize, gsize, gsize, guint);
};
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
@ -443,7 +471,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = b8g8r8a8_premultiplied_to_float,
.from_float = b8g8r8a8_premultiplied_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_A8R8G8B8_PREMULTIPLIED] = {
.name = "ARGB8(p)",
@ -475,7 +504,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a8r8g8b8_premultiplied_to_float,
.from_float = a8r8g8b8_premultiplied_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_R8G8B8A8_PREMULTIPLIED] = {
.name = "RGBA8(p)",
@ -506,7 +536,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r8g8b8a8_premultiplied_to_float,
.from_float = r8g8b8a8_premultiplied_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_A8B8G8R8_PREMULTIPLIED] = {
.name = "ABGR8(p)",
@ -538,7 +569,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a8b8g8r8_premultiplied_to_float,
.from_float = a8b8g8r8_premultiplied_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_B8G8R8A8] = {
.name = "BGRA8",
@ -570,7 +602,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = b8g8r8a8_to_float,
.from_float = b8g8r8a8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_A8R8G8B8] = {
.name = "ARGB8",
@ -602,7 +635,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a8r8g8b8_to_float,
.from_float = a8r8g8b8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_R8G8B8A8] = {
.name = "RGBA8",
@ -633,7 +667,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r8g8b8a8_to_float,
.from_float = r8g8b8a8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_A8B8G8R8] = {
.name = "ABGR8",
@ -665,7 +700,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a8b8g8r8_to_float,
.from_float = a8b8g8r8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_B8G8R8X8] = {
.name = "BGRX8",
@ -698,7 +734,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = b8g8r8x8_to_float,
.from_float = b8g8r8x8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_X8R8G8B8] = {
.name = "XRGB8",
@ -731,7 +768,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = x8r8g8b8_to_float,
.from_float = x8r8g8b8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_R8G8B8X8] = {
.name = "RGBX8",
@ -763,7 +801,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r8g8b8x8_to_float,
.from_float = r8g8b8x8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_X8B8G8R8] = {
.name = "XBGR8",
@ -796,7 +835,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = x8b8g8r8_to_float,
.from_float = x8b8g8r8_from_float,
.mipmap = gdk_mipmap_guint8_4,
.mipmap_nearest = gdk_mipmap_guint8_4_nearest,
.mipmap_linear = gdk_mipmap_guint8_4_linear,
},
[GDK_MEMORY_R8G8B8] = {
.name = "RGB8",
@ -828,7 +868,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r8g8b8_to_float,
.from_float = r8g8b8_from_float,
.mipmap = gdk_mipmap_guint8_3,
.mipmap_nearest = gdk_mipmap_guint8_3_nearest,
.mipmap_linear = gdk_mipmap_guint8_3_linear,
},
[GDK_MEMORY_B8G8R8] = {
.name = "BGR8",
@ -861,7 +902,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = b8g8r8_to_float,
.from_float = b8g8r8_from_float,
.mipmap = gdk_mipmap_guint8_3,
.mipmap_nearest = gdk_mipmap_guint8_3_nearest,
.mipmap_linear = gdk_mipmap_guint8_3_linear,
},
[GDK_MEMORY_R16G16B16] = {
.name = "RGB16",
@ -896,7 +938,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r16g16b16_to_float,
.from_float = r16g16b16_from_float,
.mipmap = gdk_mipmap_guint16_3,
.mipmap_nearest = gdk_mipmap_guint16_3_nearest,
.mipmap_linear = gdk_mipmap_guint16_3_linear,
},
[GDK_MEMORY_R16G16B16A16_PREMULTIPLIED] = {
.name = "RGBA16(p)",
@ -930,7 +973,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r16g16b16a16_to_float,
.from_float = r16g16b16a16_from_float,
.mipmap = gdk_mipmap_guint16_4,
.mipmap_nearest = gdk_mipmap_guint16_4_nearest,
.mipmap_linear = gdk_mipmap_guint16_4_linear,
},
[GDK_MEMORY_R16G16B16A16] = {
.name = "RGBA16",
@ -964,7 +1008,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r16g16b16a16_to_float,
.from_float = r16g16b16a16_from_float,
.mipmap = gdk_mipmap_guint16_4,
.mipmap_nearest = gdk_mipmap_guint16_4_nearest,
.mipmap_linear = gdk_mipmap_guint16_4_linear,
},
[GDK_MEMORY_R16G16B16_FLOAT] = {
.name = "RGBA16f",
@ -998,7 +1043,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r16g16b16_float_to_float,
.from_float = r16g16b16_float_from_float,
.mipmap = gdk_mipmap_half_float_3,
.mipmap_nearest = gdk_mipmap_half_float_3_nearest,
.mipmap_linear = gdk_mipmap_half_float_3_linear,
},
[GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] = {
.name = "RGBA16f(p)",
@ -1031,7 +1077,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r16g16b16a16_float_to_float,
.from_float = r16g16b16a16_float_from_float,
.mipmap = gdk_mipmap_half_float_4,
.mipmap_nearest = gdk_mipmap_half_float_4_nearest,
.mipmap_linear = gdk_mipmap_half_float_4_linear,
},
[GDK_MEMORY_R16G16B16A16_FLOAT] = {
.name = "RGBA16f",
@ -1064,7 +1111,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r16g16b16a16_float_to_float,
.from_float = r16g16b16a16_float_from_float,
.mipmap = gdk_mipmap_half_float_4,
.mipmap_nearest = gdk_mipmap_half_float_4_nearest,
.mipmap_linear = gdk_mipmap_half_float_4_linear,
},
[GDK_MEMORY_R32G32B32_FLOAT] = {
.name = "RGB32f",
@ -1098,7 +1146,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r32g32b32_float_to_float,
.from_float = r32g32b32_float_from_float,
.mipmap = gdk_mipmap_float_3,
.mipmap_nearest = gdk_mipmap_float_3_nearest,
.mipmap_linear = gdk_mipmap_float_3_linear,
},
[GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] = {
.name = "RGBA32f(p)",
@ -1131,7 +1180,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r32g32b32a32_float_to_float,
.from_float = r32g32b32a32_float_from_float,
.mipmap = gdk_mipmap_float_4,
.mipmap_nearest = gdk_mipmap_float_4_nearest,
.mipmap_linear = gdk_mipmap_float_4_linear,
},
[GDK_MEMORY_R32G32B32A32_FLOAT] = {
.name = "RGBA32f",
@ -1164,7 +1214,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = r32g32b32a32_float_to_float,
.from_float = r32g32b32a32_float_from_float,
.mipmap = gdk_mipmap_float_4,
.mipmap_nearest = gdk_mipmap_float_4_nearest,
.mipmap_linear = gdk_mipmap_float_4_linear,
},
[GDK_MEMORY_G8A8_PREMULTIPLIED] = {
.name = "GA8(p)",
@ -1196,7 +1247,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = g8a8_premultiplied_to_float,
.from_float = g8a8_premultiplied_from_float,
.mipmap = gdk_mipmap_guint8_2,
.mipmap_nearest = gdk_mipmap_guint8_2_nearest,
.mipmap_linear = gdk_mipmap_guint8_2_linear,
},
[GDK_MEMORY_G8A8] = {
.name = "GA8",
@ -1228,7 +1280,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = g8a8_to_float,
.from_float = g8a8_from_float,
.mipmap = gdk_mipmap_guint8_2,
.mipmap_nearest = gdk_mipmap_guint8_2_nearest,
.mipmap_linear = gdk_mipmap_guint8_2_linear,
},
[GDK_MEMORY_G8] = {
.name = "G8",
@ -1260,7 +1313,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = g8_to_float,
.from_float = g8_from_float,
.mipmap = gdk_mipmap_guint8_1,
.mipmap_nearest = gdk_mipmap_guint8_1_nearest,
.mipmap_linear = gdk_mipmap_guint8_1_linear,
},
[GDK_MEMORY_G16A16_PREMULTIPLIED] = {
.name = "GA16(p)",
@ -1295,7 +1349,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = g16a16_premultiplied_to_float,
.from_float = g16a16_premultiplied_from_float,
.mipmap = gdk_mipmap_guint16_2,
.mipmap_nearest = gdk_mipmap_guint16_2_nearest,
.mipmap_linear = gdk_mipmap_guint16_2_linear,
},
[GDK_MEMORY_G16A16] = {
.name = "GA16",
@ -1330,7 +1385,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = g16a16_to_float,
.from_float = g16a16_from_float,
.mipmap = gdk_mipmap_guint16_2,
.mipmap_nearest = gdk_mipmap_guint16_2_nearest,
.mipmap_linear = gdk_mipmap_guint16_2_linear,
},
[GDK_MEMORY_G16] = {
.name = "G16",
@ -1365,7 +1421,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = g16_to_float,
.from_float = g16_from_float,
.mipmap = gdk_mipmap_guint16_1,
.mipmap_nearest = gdk_mipmap_guint16_1_nearest,
.mipmap_linear = gdk_mipmap_guint16_1_linear,
},
[GDK_MEMORY_A8] = {
.name = "A8",
@ -1397,7 +1454,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a8_to_float,
.from_float = a8_from_float,
.mipmap = gdk_mipmap_guint8_1,
.mipmap_nearest = gdk_mipmap_guint8_1_nearest,
.mipmap_linear = gdk_mipmap_guint8_1_linear,
},
[GDK_MEMORY_A16] = {
.name = "A16",
@ -1432,7 +1490,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a16_to_float,
.from_float = a16_from_float,
.mipmap = gdk_mipmap_guint16_1,
.mipmap_nearest = gdk_mipmap_guint16_1_nearest,
.mipmap_linear = gdk_mipmap_guint16_1_linear,
},
[GDK_MEMORY_A16_FLOAT] = {
.name = "A16f",
@ -1466,7 +1525,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a16_float_to_float,
.from_float = a16_float_from_float,
.mipmap = gdk_mipmap_half_float_1,
.mipmap_nearest = gdk_mipmap_half_float_1_nearest,
.mipmap_linear = gdk_mipmap_half_float_1_linear,
},
[GDK_MEMORY_A32_FLOAT] = {
.name = "A32f",
@ -1500,7 +1560,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
#endif
.to_float = a32_float_to_float,
.from_float = a32_float_from_float,
.mipmap = gdk_mipmap_float_1,
.mipmap_nearest = gdk_mipmap_float_1_nearest,
.mipmap_linear = gdk_mipmap_float_1_linear,
}
};
@ -2400,12 +2461,13 @@ struct _MipmapData
gsize src_width;
gsize src_height;
guint lod_level;
gboolean linear;
gint rows_done;
};
static void
gdk_memory_mipmap_same_format (gpointer data)
gdk_memory_mipmap_same_format_nearest (gpointer data)
{
MipmapData *mipmap = data;
const GdkMemoryFormatDescription *desc = &memory_formats[mipmap->src_format];
@ -2420,10 +2482,33 @@ gdk_memory_mipmap_same_format (gpointer data)
guchar *dest = mipmap->dest + (y >> mipmap->lod_level) * mipmap->dest_stride;
const guchar *src = mipmap->src + y * mipmap->src_stride;
desc->mipmap (dest, mipmap->dest_stride,
src, mipmap->src_stride,
mipmap->src_width, MIN (n, mipmap->src_height - y),
mipmap->lod_level);
desc->mipmap_nearest (dest, mipmap->dest_stride,
src, mipmap->src_stride,
mipmap->src_width, MIN (n, mipmap->src_height - y),
mipmap->lod_level);
}
}
static void
gdk_memory_mipmap_same_format_linear (gpointer data)
{
MipmapData *mipmap = data;
const GdkMemoryFormatDescription *desc = &memory_formats[mipmap->src_format];
gsize n, y;
n = 1 << mipmap->lod_level;
for (y = g_atomic_int_add (&mipmap->rows_done, n);
y < mipmap->src_height;
y = g_atomic_int_add (&mipmap->rows_done, n))
{
guchar *dest = mipmap->dest + (y >> mipmap->lod_level) * mipmap->dest_stride;
const guchar *src = mipmap->src + y * mipmap->src_stride;
desc->mipmap_linear (dest, mipmap->dest_stride,
src, mipmap->src_stride,
mipmap->src_width, MIN (n, mipmap->src_height - y),
mipmap->lod_level);
}
}
@ -2451,10 +2536,16 @@ gdk_memory_mipmap_generic (gpointer data)
guchar *dest = mipmap->dest + (y >> mipmap->lod_level) * mipmap->dest_stride;
const guchar *src = mipmap->src + y * mipmap->src_stride;
desc->mipmap (tmp, (size + 7) & 7,
src, mipmap->src_stride,
mipmap->src_width, MIN (n, mipmap->src_height - y),
mipmap->lod_level);
if (mipmap->linear)
desc->mipmap_linear (tmp, (size + 7) & 7,
src, mipmap->src_stride,
mipmap->src_width, MIN (n, mipmap->src_height - y),
mipmap->lod_level);
else
desc->mipmap_nearest (tmp, (size + 7) & 7,
src, mipmap->src_stride,
mipmap->src_width, MIN (n, mipmap->src_height - y),
mipmap->lod_level);
if (func)
func (dest, tmp, dest_width);
else
@ -2476,7 +2567,8 @@ gdk_memory_mipmap (guchar *dest,
GdkMemoryFormat src_format,
gsize src_width,
gsize src_height,
guint lod_level)
guint lod_level,
gboolean linear)
{
MipmapData mipmap = {
.dest = dest,
@ -2488,6 +2580,7 @@ gdk_memory_mipmap (guchar *dest,
.src_width = src_width,
.src_height = src_height,
.lod_level = lod_level,
.linear = linear,
.rows_done = 0,
};
@ -2495,7 +2588,10 @@ gdk_memory_mipmap (guchar *dest,
if (dest_format == src_format)
{
gdk_parallel_task_run (gdk_memory_mipmap_same_format, &mipmap);
if (linear)
gdk_parallel_task_run (gdk_memory_mipmap_same_format_linear, &mipmap);
else
gdk_parallel_task_run (gdk_memory_mipmap_same_format_nearest, &mipmap);
}
else
{

3
gdk/gdkmemoryformatprivate.h
View File

@ -118,7 +118,8 @@ void gdk_memory_mipmap (guchar
GdkMemoryFormat src_format,
gsize src_width,
gsize src_height,
guint lod_level);
guint lod_level,
gboolean linear);
G_END_DECLS

42
gsk/gpu/gskgpucache.c
View File

@ -538,6 +538,7 @@ struct _GskGpuCachedTile
GdkTexture *texture;
guint lod_level;
gboolean lod_linear;
gsize tile_id;
/* atomic */ int use_count; /* We count the use by the cache (via the linked
@ -631,7 +632,10 @@ gsk_gpu_cached_tile_hash (gconstpointer data)
{
const GskGpuCachedTile *self = data;
return g_direct_hash (self->texture) ^ self->tile_id ^ (self->lod_level << 24);
return g_direct_hash (self->texture) ^
self->tile_id ^
(self->lod_level << 24) ^
(self->lod_linear << 31);
}
static gboolean
@ -643,6 +647,7 @@ gsk_gpu_cached_tile_equal (gconstpointer data_a,
return a->texture == b->texture &&
a->lod_level == b->lod_level &&
a->lod_linear == b->lod_linear &&
a->tile_id == b->tile_id;
}
@ -650,6 +655,7 @@ static GskGpuCachedTile *
gsk_gpu_cached_tile_new (GskGpuCache *cache,
GdkTexture *texture,
guint lod_level,
gboolean lod_linear,
guint tile_id,
GskGpuImage *image,
GdkColorState *color_state)
@ -659,6 +665,7 @@ gsk_gpu_cached_tile_new (GskGpuCache *cache,
self = gsk_gpu_cached_new (cache, &GSK_GPU_CACHED_TILE_CLASS);
self->texture = texture;
self->lod_level = lod_level;
self->lod_linear = lod_linear;
self->tile_id = tile_id;
self->image = g_object_ref (image);
self->color_state = gdk_color_state_ref (color_state);
@ -677,16 +684,18 @@ gsk_gpu_cached_tile_new (GskGpuCache *cache,
}
GskGpuImage *
gsk_gpu_cache_lookup_tile (GskGpuCache *self,
GdkTexture *texture,
guint lod_level,
gsize tile_id,
GdkColorState **out_color_state)
gsk_gpu_cache_lookup_tile (GskGpuCache *self,
GdkTexture *texture,
guint lod_level,
GskScalingFilter lod_filter,
gsize tile_id,
GdkColorState **out_color_state)
{
GskGpuCachedTile *tile;
GskGpuCachedTile lookup = {
.texture = texture,
.lod_level = lod_level,
.lod_linear = lod_filter == GSK_SCALING_FILTER_TRILINEAR,
.tile_id = tile_id
};
@ -705,16 +714,23 @@ gsk_gpu_cache_lookup_tile (GskGpuCache *self,
}
void
gsk_gpu_cache_cache_tile (GskGpuCache *self,
GdkTexture *texture,
guint lod_level,
gsize tile_id,
GskGpuImage *image,
GdkColorState *color_state)
gsk_gpu_cache_cache_tile (GskGpuCache *self,
GdkTexture *texture,
guint lod_level,
GskScalingFilter lod_filter,
gsize tile_id,
GskGpuImage *image,
GdkColorState *color_state)
{
GskGpuCachedTile *tile;
tile = gsk_gpu_cached_tile_new (self, texture, lod_level, tile_id, image, color_state);
tile = gsk_gpu_cached_tile_new (self,
texture,
lod_level,
lod_filter == GSK_SCALING_FILTER_TRILINEAR,
tile_id,
image,
color_state);
gsk_gpu_cached_use (self, (GskGpuCached *) tile);
}

2
gsk/gpu/gskgpucacheprivate.h
View File

@ -78,11 +78,13 @@ void gsk_gpu_cache_cache_texture_image (GskGpuC
GskGpuImage * gsk_gpu_cache_lookup_tile (GskGpuCache *self,
GdkTexture *texture,
guint lod_level,
GskScalingFilter lod_filter,
gsize tile_id,
GdkColorState **out_color_state);
void gsk_gpu_cache_cache_tile (GskGpuCache *self,
GdkTexture *texture,
guint lod_level,
GskScalingFilter lod_filter,
gsize tile_id,
GskGpuImage *image,
GdkColorState *color_state);

2
gsk/gpu/gskgpuframe.c
View File

@ -107,7 +107,7 @@ gsk_gpu_frame_default_upload_texture (GskGpuFrame *self,
{
GskGpuImage *image;
image = gsk_gpu_upload_texture_op_try (self, with_mipmap, 0, texture);
image = gsk_gpu_upload_texture_op_try (self, with_mipmap, 0, GSK_SCALING_FILTER_NEAREST, texture);
return image;
}

8
gsk/gpu/gskgpunodeprocessor.c
View File

@ -2002,7 +2002,7 @@ gsk_gpu_node_processor_draw_texture_tiles (GskGpuNodeProcessor *self,
!gsk_rect_intersects (&clip_bounds, &tile_rect))
continue;
tile = gsk_gpu_cache_lookup_tile (cache, texture, lod_level, y * n_width + x, &tile_cs);
tile = gsk_gpu_cache_lookup_tile (cache, texture, lod_level, scaling_filter, y * n_width + x, &tile_cs);
if (tile == NULL)
{
@ -2013,7 +2013,7 @@ gsk_gpu_node_processor_draw_texture_tiles (GskGpuNodeProcessor *self,
y * tile_size,
MIN (tile_size, width - x * tile_size),
MIN (tile_size, height - y * tile_size));
tile = gsk_gpu_upload_texture_op_try (self->frame, need_mipmap, lod_level, subtex);
tile = gsk_gpu_upload_texture_op_try (self->frame, need_mipmap, lod_level, scaling_filter, subtex);
g_object_unref (subtex);
if (tile == NULL)
{
@ -2029,7 +2029,7 @@ gsk_gpu_node_processor_draw_texture_tiles (GskGpuNodeProcessor *self,
g_assert (tile_cs);
}
gsk_gpu_cache_cache_tile (cache, texture, lod_level, y * n_width + x, tile, tile_cs);
gsk_gpu_cache_cache_tile (cache, texture, lod_level, scaling_filter, y * n_width + x, tile, tile_cs);
}
if (need_mipmap &&
@ -2037,7 +2037,7 @@ gsk_gpu_node_processor_draw_texture_tiles (GskGpuNodeProcessor *self,
{
tile = gsk_gpu_copy_image (self->frame, self->ccs, tile, tile_cs, TRUE);
tile_cs = self->ccs;
gsk_gpu_cache_cache_tile (cache, texture, lod_level, y * n_width + x, tile, tile_cs);
gsk_gpu_cache_cache_tile (cache, texture, lod_level, scaling_filter, y * n_width + x, tile, tile_cs);
}
if (need_mipmap && !(gsk_gpu_image_get_flags (tile) & GSK_GPU_IMAGE_MIPMAP))
gsk_gpu_mipmap_op (self->frame, tile);

18
gsk/gpu/gskgpuuploadop.c
View File

@ -215,6 +215,7 @@ struct _GskGpuUploadTextureOp
GskGpuBuffer *buffer;
GdkTexture *texture;
guint lod_level;
GskScalingFilter lod_filter;
};
static void
@ -238,7 +239,9 @@ gsk_gpu_upload_texture_op_print (GskGpuOp *op,
gsk_gpu_print_op (string, indent, "upload-texture");
gsk_gpu_print_image (string, self->image);
if (self->lod_level > 0)
g_string_append_printf (string, " @%ux ", 1 << self->lod_level);
g_string_append_printf (string, " @%ux %s",
1 << self->lod_level,
self->lod_filter == GSK_SCALING_FILTER_TRILINEAR ? "linear" : "nearest");
gsk_gpu_print_newline (string);
}
@ -272,7 +275,8 @@ gsk_gpu_upload_texture_op_draw (GskGpuOp *op,
gdk_texture_get_format (self->texture),
gdk_texture_get_width (self->texture),
gdk_texture_get_height (self->texture),
self->lod_level);
self->lod_level,
self->lod_filter == GSK_SCALING_FILTER_TRILINEAR ? TRUE : FALSE);
g_bytes_unref (bytes);
}
gdk_texture_downloader_free (downloader);
@ -320,10 +324,11 @@ static const GskGpuOpClass GSK_GPU_UPLOAD_TEXTURE_OP_CLASS = {
};
GskGpuImage *
gsk_gpu_upload_texture_op_try (GskGpuFrame *frame,
gboolean with_mipmap,
guint lod_level,
GdkTexture *texture)
gsk_gpu_upload_texture_op_try (GskGpuFrame *frame,
gboolean with_mipmap,
guint lod_level,
GskScalingFilter lod_filter,
GdkTexture *texture)
{
GskGpuUploadTextureOp *self;
GskGpuImage *image;
@ -369,6 +374,7 @@ gsk_gpu_upload_texture_op_try (GskGpuFrame *frame,
self->texture = g_object_ref (texture);
self->lod_level = lod_level;
self->lod_filter = lod_filter;
self->image = image;
return g_object_ref (self->image);

1
gsk/gpu/gskgpuuploadopprivate.h
View File

@ -12,6 +12,7 @@ typedef void (* GskGpuCairoFunc) (gpointe
GskGpuImage * gsk_gpu_upload_texture_op_try (GskGpuFrame *frame,
gboolean with_mipmap,
guint lod_level,
GskScalingFilter lod_filter,
GdkTexture *texture);
GskGpuImage * gsk_gpu_upload_cairo_op (GskGpuFrame *frame,