AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gl renderer: Rework once more

Browse Source 
Last time, I swear.
This commit is contained in:
Timm Bäder 2017-11-22 11:32:23 +01:00
parent dd1a9745db
commit 358c139a43
5 changed files with 991 additions and 858 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/widget-factory/widget-factory.ui
View File

@ -424,7 +424,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="margin">10</property>
<child>
<object class="GtkStack" id="toplevel_stack">
<property name="transition-duration">1000</property>
<property name="transition-duration">30000</property>
<child>
<object class="GtkBox" id="page1">
<property name="orientation">vertical</property>

45
gsk/gskgldriver.c
View File

@ -28,7 +28,8 @@ typedef struct {
GLuint uv_id;
GskQuadVertex *quads;
int n_quads;
gboolean in_use : 1;
guint in_use : 1;
guint permanent : 1;
} Vao;
typedef struct {
@ -267,10 +268,6 @@ gsk_gl_driver_end_frame (GskGLDriver *self)
g_return_if_fail (GSK_IS_GL_DRIVER (self));
g_return_if_fail (self->in_frame);
glBindTexture (GL_TEXTURE_2D, 0);
glUseProgram (0);
glBindVertexArray (0);
self->bound_source_texture = NULL;
self->bound_mask_texture = NULL;
self->bound_vao = NULL;
@ -570,6 +567,29 @@ find_vao (GHashTable *vaos,
return NULL;
}
void
gsk_gl_driver_create_permanent_vao_for_quad (GskGLDriver *driver,
int n_vertices,
const GskQuadVertex *quads,
int *out_vao_id,
int *out_vao_buffer_id)
{
GLuint vao_id, buffer_id;
glGenVertexArrays (1, &vao_id);
glBindVertexArray (vao_id);
glGenBuffers (1, &buffer_id);
glBindBuffer (GL_ARRAY_BUFFER, buffer_id);
glBufferData (GL_ARRAY_BUFFER, sizeof (GskQuadVertex) * n_vertices, quads, GL_STATIC_DRAW);
glBindBuffer (GL_ARRAY_BUFFER, 0);
glBindVertexArray (0);
*out_vao_id = buffer_id;
*out_vao_buffer_id = vao_id;
}
int
gsk_gl_driver_create_vao_for_quad (GskGLDriver *driver,
int position_id,
@ -599,10 +619,13 @@ gsk_gl_driver_create_vao_for_quad (GskGLDriver *driver,
glBindBuffer (GL_ARRAY_BUFFER, buffer_id);
glBufferData (GL_ARRAY_BUFFER, sizeof (GskQuadVertex) * n_vertices, quads, GL_STATIC_DRAW);
glEnableVertexAttribArray (position_id);
glVertexAttribPointer (position_id, 2, GL_FLOAT, GL_FALSE,
sizeof (GskQuadVertex),
(void *) G_STRUCT_OFFSET (GskQuadVertex, position));
if (position_id != -1)
{
glEnableVertexAttribArray (position_id);
glVertexAttribPointer (position_id, 2, GL_FLOAT, GL_FALSE,
sizeof (GskQuadVertex),
(void *) G_STRUCT_OFFSET (GskQuadVertex, position));
}
if (uv_id != -1)
{
@ -776,7 +799,9 @@ gsk_gl_driver_bind_vao (GskGLDriver *driver,
{
glBindVertexArray (v->vao_id);
glBindBuffer (GL_ARRAY_BUFFER, v->buffer_id);
glEnableVertexAttribArray (v->position_id);
if (v->position_id != -1)
glEnableVertexAttribArray (v->position_id);
if (v->uv_id != -1)
glEnableVertexAttribArray (v->uv_id);

5
gsk/gskgldriverprivate.h
View File

@ -38,6 +38,11 @@ int gsk_gl_driver_create_vao_for_quad (GskGLDriver *driver
int uv_id,
int n_vertices,
GskQuadVertex *vertices);
void gsk_gl_driver_create_permanent_vao_for_quad (GskGLDriver *driver,
int n_vertices,
const GskQuadVertex *quads,
int *out_vao_id,
int *out_vao_buffer_id);
int gsk_gl_driver_create_render_target (GskGLDriver *driver,
int texture_id,
gboolean add_depth_buffer,

1795
gsk/gskglrenderer.c
View File

File diff suppressed because it is too large Load Diff

2
gtk/theme/Adwaita/gtk-contained.css
View File

@ -48,7 +48,7 @@ flowbox flowboxchild:selected { outline-offset: -2px; }
.content-view .tile:disabled { background-color: transparent; }
label { caret-color: currentColor; }
label { caret-color: currentColor; border-radius: 99px;}
label.separator { color: #2e3436; }