mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-14 20:51:07 +00:00
96b800fa0c
If glBufferStorage() is available, we can replace our usage of glBufferSubData() with persistently mapped storage via glMappedBufferRange(). This has 1 disadvantage: 1. It's not supported everywhere, it requires GL 4.4 or GL_EXT_buffer_storage. But every GPU of the last 10 years should implement it. So we check for it and keep the old code. The old code can also be forced via GDK_GL_DISABLE=buffer-storage. But it has 2 advantages: 1. It is what Vulkan does, so it unifies the two renderers' buffer handling. 2. It is a significant performance boost in use cases with large vertex buffers. Those are pretty rare, but do happen with lots of text at a small font size. An example would be a small font in a maximized VTE terminal or the overview in gnome-text-editor. A custom benchmark tailored for this problem can be created with: tests/rendernode-create-tests 1000000 text.node This creates a node file called "text.node" that draws 1 million text nodes. (Creating that test takes a minute or so. A smaller number may be useful on less powerful hardware than my Intel Tigerlake laptop.) The difference can then be compared via: tools/gtk4-rendernode-tool benchmark --runs=20 text.node and GDK_GL_DISABLE=buffer-storage tools/gtk4-rendernode-tool benchmark --runs=20 text.node For my laptop, the difference is: before: 1.1s after: 0.8s Related: !7021
209 lines
4.3 KiB
C
209 lines
4.3 KiB
C
#include "config.h"
|
|
|
|
#include "gskglbufferprivate.h"
|
|
|
|
/* {{{ GskGLBuffer */
|
|
|
|
struct _GskGLBuffer
|
|
{
|
|
GskGpuBuffer parent_instance;
|
|
|
|
GLenum target;
|
|
GLuint buffer_id;
|
|
guchar *data;
|
|
};
|
|
|
|
G_DEFINE_TYPE (GskGLBuffer, gsk_gl_buffer, GSK_TYPE_GPU_BUFFER)
|
|
|
|
static void
|
|
gsk_gl_buffer_finalize (GObject *object)
|
|
{
|
|
GskGLBuffer *self = GSK_GL_BUFFER (object);
|
|
|
|
glDeleteBuffers (1, &self->buffer_id);
|
|
|
|
G_OBJECT_CLASS (gsk_gl_buffer_parent_class)->finalize (object);
|
|
}
|
|
|
|
static guchar *
|
|
gsk_gl_buffer_map (GskGpuBuffer *buffer)
|
|
{
|
|
GskGLBuffer *self = GSK_GL_BUFFER (buffer);
|
|
|
|
return self->data;
|
|
}
|
|
|
|
static void
|
|
gsk_gl_buffer_unmap (GskGpuBuffer *buffer,
|
|
gsize used)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gsk_gl_buffer_class_init (GskGLBufferClass *klass)
|
|
{
|
|
GskGpuBufferClass *buffer_class = GSK_GPU_BUFFER_CLASS (klass);
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
buffer_class->map = gsk_gl_buffer_map;
|
|
buffer_class->unmap = gsk_gl_buffer_unmap;
|
|
|
|
gobject_class->finalize = gsk_gl_buffer_finalize;
|
|
}
|
|
|
|
static void
|
|
gsk_gl_buffer_init (GskGLBuffer *self)
|
|
{
|
|
}
|
|
|
|
void
|
|
gsk_gl_buffer_bind (GskGLBuffer *self)
|
|
{
|
|
glBindBuffer (self->target, self->buffer_id);
|
|
}
|
|
|
|
void
|
|
gsk_gl_buffer_bind_base (GskGLBuffer *self,
|
|
GLuint index)
|
|
{
|
|
glBindBufferBase (self->target, index, self->buffer_id);
|
|
}
|
|
|
|
static void
|
|
gsk_gl_buffer_setup (GskGLBuffer *self,
|
|
GLenum target,
|
|
gsize size)
|
|
{
|
|
gsk_gpu_buffer_setup (GSK_GPU_BUFFER (self), size);
|
|
|
|
self->target = target;
|
|
|
|
glGenBuffers (1, &self->buffer_id);
|
|
}
|
|
|
|
/* }}} */
|
|
/* {{{ GskGLMappedBuffer */
|
|
|
|
struct _GskGLMappedBuffer
|
|
{
|
|
GskGLBuffer parent_instance;
|
|
};
|
|
|
|
G_DEFINE_TYPE (GskGLMappedBuffer, gsk_gl_mapped_buffer, GSK_TYPE_GL_BUFFER)
|
|
|
|
static void
|
|
gsk_gl_mapped_buffer_finalize (GObject *object)
|
|
{
|
|
GskGLBuffer *self = GSK_GL_BUFFER (object);
|
|
|
|
gsk_gl_buffer_bind (self);
|
|
glUnmapBuffer (self->target);
|
|
|
|
G_OBJECT_CLASS (gsk_gl_mapped_buffer_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
gsk_gl_mapped_buffer_class_init (GskGLMappedBufferClass *klass)
|
|
{
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
gobject_class->finalize = gsk_gl_mapped_buffer_finalize;
|
|
}
|
|
|
|
static void
|
|
gsk_gl_mapped_buffer_init (GskGLMappedBuffer *self)
|
|
{
|
|
}
|
|
|
|
GskGpuBuffer *
|
|
gsk_gl_mapped_buffer_new (GLenum target,
|
|
gsize size)
|
|
{
|
|
GskGLBuffer *self;
|
|
|
|
self = g_object_new (GSK_TYPE_GL_MAPPED_BUFFER, NULL);
|
|
|
|
gsk_gl_buffer_setup (self, target, size);
|
|
gsk_gl_buffer_bind (self);
|
|
|
|
glBufferStorage (target,
|
|
size,
|
|
NULL,
|
|
GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
|
|
self->data = glMapBufferRange (target,
|
|
0,
|
|
size,
|
|
GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
|
|
|
|
return GSK_GPU_BUFFER (self);
|
|
}
|
|
|
|
/* }}} */
|
|
/* {{{ GskGLCopiedBuffer */
|
|
|
|
struct _GskGLCopiedBuffer
|
|
{
|
|
GskGLBuffer parent_instance;
|
|
};
|
|
|
|
G_DEFINE_TYPE (GskGLCopiedBuffer, gsk_gl_copied_buffer, GSK_TYPE_GL_BUFFER)
|
|
|
|
static void
|
|
gsk_gl_copied_buffer_finalize (GObject *object)
|
|
{
|
|
GskGLBuffer *self = GSK_GL_BUFFER (object);
|
|
|
|
g_free (self->data);
|
|
|
|
G_OBJECT_CLASS (gsk_gl_copied_buffer_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
gsk_gl_copied_buffer_unmap (GskGpuBuffer *buffer,
|
|
gsize used)
|
|
{
|
|
GskGLBuffer *self = GSK_GL_BUFFER (buffer);
|
|
|
|
if (used == 0)
|
|
return;
|
|
|
|
gsk_gl_buffer_bind (self);
|
|
|
|
glBufferSubData (self->target, 0, used, self->data);
|
|
}
|
|
|
|
static void
|
|
gsk_gl_copied_buffer_class_init (GskGLCopiedBufferClass *klass)
|
|
{
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
GskGpuBufferClass *buffer_class = GSK_GPU_BUFFER_CLASS (klass);
|
|
|
|
gobject_class->finalize = gsk_gl_copied_buffer_finalize;
|
|
|
|
buffer_class->unmap = gsk_gl_copied_buffer_unmap;
|
|
}
|
|
|
|
static void
|
|
gsk_gl_copied_buffer_init (GskGLCopiedBuffer *self)
|
|
{
|
|
}
|
|
|
|
GskGpuBuffer *
|
|
gsk_gl_copied_buffer_new (GLenum target,
|
|
gsize size)
|
|
{
|
|
GskGLBuffer *self;
|
|
|
|
self = g_object_new (GSK_TYPE_GL_COPIED_BUFFER, NULL);
|
|
|
|
gsk_gl_buffer_setup (self, target, size);
|
|
gsk_gl_buffer_bind (self);
|
|
|
|
glBufferData (target, size, NULL, GL_STATIC_DRAW);
|
|
self->data = malloc (size);
|
|
|
|
return GSK_GPU_BUFFER (self);
|
|
}
|
|
|
|
/* }}} */
|