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

gl: More renamings

Browse Source 
This commit renames some common things such as PROP_FOO enum values
or properties[] arrays to be uniquly named for each source file.
There are also a number of naming conflicts between gsk/gl and
gsk/gpu, which are addressed at the same time.
This commit is contained in:
Matthias Clasen
2024-09-08 21:34:15 -04:00
parent f341455364
commit 491e980ec6
10 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gsk/gl/gskglbuffer.c
View File

@@ -29,12 +29,12 @@
* @target: the target buffer such as %GL_ARRAY_BUFFER or %GL_UNIFORM_BUFFER
* @element_size: the size of elements within the buffer
*
* Creates a new `GskGLBuffer` which can be used to deliver data to shaders
* Creates a new `GskGLBuffer1` which can be used to deliver data to shaders
* within a GLSL program. You can use this to store vertices such as with
* %GL_ARRAY_BUFFER or uniform data with %GL_UNIFORM_BUFFER.
*/
void
gsk_gl_buffer_init (GskGLBuffer *self,
gsk_gl_buffer1_init (GskGLBuffer1 *self,
GLenum target,
guint element_size)
{
@@ -48,7 +48,7 @@ gsk_gl_buffer_init (GskGLBuffer *self,
}
GLuint
gsk_gl_buffer_submit (GskGLBuffer *buffer)
gsk_gl_buffer1_submit (GskGLBuffer1 *buffer)
{
GLuint id;
@@ -63,7 +63,7 @@ gsk_gl_buffer_submit (GskGLBuffer *buffer)
}
void
gsk_gl_buffer_destroy (GskGLBuffer *buffer)
gsk_gl_buffer1_destroy (GskGLBuffer1 *buffer)
{
g_clear_pointer (&buffer->buffer, g_free);
}

24
gsk/gl/gskglbufferprivate.h
View File

@@ -24,7 +24,7 @@
G_BEGIN_DECLS
typedef struct _GskGLBuffer
typedef struct _GskGLBuffer1
{
guint8 *buffer;
gsize buffer_pos;
@@ -32,17 +32,17 @@ typedef struct _GskGLBuffer
guint count;
GLenum target;
gsize element_size;
} GskGLBuffer;
} GskGLBuffer1;
void gsk_gl_buffer_init (GskGLBuffer *self,
GLenum target,
guint element_size);
void gsk_gl_buffer_destroy (GskGLBuffer *buffer);
GLuint gsk_gl_buffer_submit (GskGLBuffer *buffer);
void gsk_gl_buffer1_init (GskGLBuffer1 *self,
GLenum target,
guint element_size);
void gsk_gl_buffer1_destroy (GskGLBuffer1 *buffer);
GLuint gsk_gl_buffer1_submit (GskGLBuffer1 *buffer);
static inline gpointer
gsk_gl_buffer_advance (GskGLBuffer *buffer,
guint count)
gsk_gl_buffer1_advance (GskGLBuffer1 *buffer,
guint count)
{
gpointer ret;
gsize to_alloc = count * buffer->element_size;
@@ -63,15 +63,15 @@ gsk_gl_buffer_advance (GskGLBuffer *buffer,
}
static inline void
gsk_gl_buffer_retract (GskGLBuffer *buffer,
guint count)
gsk_gl_buffer1_retract (GskGLBuffer1 *buffer,
guint count)
{
buffer->buffer_pos -= count * buffer->element_size;
buffer->count -= count;
}
static inline guint
gsk_gl_buffer_get_offset (GskGLBuffer *buffer)
gsk_gl_buffer1_get_offset (GskGLBuffer1 *buffer)
{
return buffer->count;
}

8
gsk/gl/gskglcommandqueue.c
View File

@@ -434,7 +434,7 @@ gsk_gl_command_queue_dispose (GObject *object)
gsk_gl_command_uniforms_clear (&self->batch_uniforms);
gsk_gl_syncs_clear (&self->syncs);
gsk_gl_buffer_destroy (&self->vertices);
gsk_gl_buffer1_destroy (&self->vertices);
G_OBJECT_CLASS (gsk_gl_command_queue_parent_class)->dispose (object);
}
@@ -457,7 +457,7 @@ gsk_gl_command_queue_init (GskGLCommandQueue *self)
gsk_gl_command_uniforms_init (&self->batch_uniforms, 2048);
gsk_gl_syncs_init (&self->syncs, 10);
gsk_gl_buffer_init (&self->vertices, GL_ARRAY_BUFFER, sizeof (GskGLDrawVertex));
gsk_gl_buffer1_init (&self->vertices, GL_ARRAY_BUFFER, sizeof (GskGLDrawVertex));
}
GskGLCommandQueue *
@@ -619,7 +619,7 @@ gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self,
batch->draw.bind_count = 0;
batch->draw.bind_offset = self->batch_binds.len;
batch->draw.vbo_count = 0;
batch->draw.vbo_offset = gsk_gl_buffer_get_offset (&self->vertices);
batch->draw.vbo_offset = gsk_gl_buffer1_get_offset (&self->vertices);
self->fbo_max = MAX (self->fbo_max, batch->draw.framebuffer);
@@ -1081,7 +1081,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self,
glBindVertexArray (vao_id);
}
vbo_id = gsk_gl_buffer_submit (&self->vertices);
vbo_id = gsk_gl_buffer1_submit (&self->vertices);
/* 0 = position location */
glEnableVertexAttribArray (0);

8
gsk/gl/gskglcommandqueueprivate.h
View File

@@ -199,7 +199,7 @@ struct _GskGLCommandQueue
* to the GL driver. We can also tweak this to use double buffered arrays
* if we find that to be faster on some hardware and/or drivers.
*/
GskGLBuffer vertices;
GskGLBuffer1 vertices;
/* The GskGLAttachmentState contains information about our FBO and texture
* attachments as we process incoming operations. We snapshot them into
@@ -363,7 +363,7 @@ static inline GskGLDrawVertex *
gsk_gl_command_queue_add_vertices (GskGLCommandQueue *self)
{
gsk_gl_command_queue_get_batch (self)->draw.vbo_count += GSK_GL_N_VERTICES;
return gsk_gl_buffer_advance (&self->vertices, GSK_GL_N_VERTICES);
return gsk_gl_buffer1_advance (&self->vertices, GSK_GL_N_VERTICES);
}
static inline GskGLDrawVertex *
@@ -374,7 +374,7 @@ gsk_gl_command_queue_add_n_vertices (GskGLCommandQueue *self,
* it does *not* add the count to .draw.vbo_count as the caller is responsible
* for that.
*/
return gsk_gl_buffer_advance (&self->vertices, GSK_GL_N_VERTICES * count);
return gsk_gl_buffer1_advance (&self->vertices, GSK_GL_N_VERTICES * count);
}
static inline void
@@ -384,7 +384,7 @@ gsk_gl_command_queue_retract_n_vertices (GskGLCommandQueue *self,
/* Like gsk_gl_command_queue_add_n_vertices(), this does not tweak
* the draw vbo_count.
*/
gsk_gl_buffer_retract (&self->vertices, GSK_GL_N_VERTICES * count);
gsk_gl_buffer1_retract (&self->vertices, GSK_GL_N_VERTICES * count);
}
static inline guint

18
gsk/gl/gskglcompiler.c
View File

@@ -427,8 +427,8 @@ gsk_gl_compiler_set_suffix_from_resource (GskGLCompiler *self,
}
static void
prepend_line_numbers (char *code,
GString *s)
gl_prepend_line_numbers (char *code,
GString *s)
{
char *p;
int line;
@@ -475,7 +475,7 @@ check_shader_error (int shader_id,
glGetShaderSource (shader_id, code_len, NULL, code);
s = g_string_new ("");
prepend_line_numbers (code, s);
gl_prepend_line_numbers (code, s);
g_set_error (error,
GDK_GL_ERROR,
@@ -497,9 +497,9 @@ check_shader_error (int shader_id,
}
static void
print_shader_info (const char *prefix,
int shader_id,
const char *name)
gl_print_shader_info (const char *prefix,
int shader_id,
const char *name)
{
if (GSK_DEBUG_CHECK(SHADERS))
{
@@ -516,7 +516,7 @@ print_shader_info (const char *prefix,
glGetShaderSource (shader_id, code_len, NULL, code);
s = g_string_new (NULL);
prepend_line_numbers (code, s);
gl_prepend_line_numbers (code, s);
g_message ("%s %d, %s:\n%s",
prefix, shader_id,
@@ -611,7 +611,7 @@ gsk_gl_compiler_compile (GskGLCompiler *self,
return NULL;
}
print_shader_info ("Vertex shader", vertex_id, name);
gl_print_shader_info ("Vertex shader", vertex_id, name);
fragment_id = glCreateShader (GL_FRAGMENT_SHADER);
glShaderSource (fragment_id,
@@ -645,7 +645,7 @@ gsk_gl_compiler_compile (GskGLCompiler *self,
return NULL;
}
print_shader_info ("Fragment shader", fragment_id, name);
gl_print_shader_info ("Fragment shader", fragment_id, name);
program_id = glCreateProgram ();
glAttachShader (program_id, vertex_id);

6
gsk/gl/gskglrenderer.c
View File

@@ -263,8 +263,8 @@ gsk_gl_renderer_unrealize (GskRenderer *renderer)
}
static cairo_region_t *
get_render_region (GdkSurface *surface,
GdkGLContext *context)
gl_get_render_region (GdkSurface *surface,
GdkGLContext *context)
{
const cairo_region_t *damage;
GdkRectangle whole_surface;
@@ -338,7 +338,7 @@ gsk_gl_renderer_render (GskRenderer *renderer,
gdk_gl_context_make_current (self->context);
/* Must be called *AFTER* gdk_draw_context_begin_frame() */
render_region = get_render_region (surface, self->context);
render_region = gl_get_render_region (surface, self->context);
gsk_gl_driver_begin_frame (self->driver, self->command_queue);
job = gsk_gl_render_job_new (self->driver, &viewport, scale, render_region, 0, TRUE);

1
gsk/gl/gskglrenderer.h
View File

@@ -50,5 +50,6 @@ GSK_INCLUDE_WARNING(GDK_AVAILABLE_IN_ALL)
GType gsk_ngl_renderer_get_type (void) G_GNUC_CONST;
GSK_INCLUDE_WARNING(GDK_AVAILABLE_IN_ALL)
GskRenderer *gsk_ngl_renderer_new (void);
G_END_DECLS

28
gsk/gl/gskglrenderjob.c
View File

@@ -870,8 +870,8 @@ gsk_gl_render_job_transform_rounded_rect (GskGLRenderJob *job,
}
static inline void
rounded_rect_get_inner (const GskRoundedRect *rect,
graphene_rect_t *inner)
gl_rounded_rect_get_inner (const GskRoundedRect *rect,
graphene_rect_t *inner)
{
float left = MAX (rect->corner[GSK_CORNER_TOP_LEFT].width, rect->corner[GSK_CORNER_BOTTOM_LEFT].width);
float right = MAX (rect->corner[GSK_CORNER_TOP_RIGHT].width, rect->corner[GSK_CORNER_BOTTOM_RIGHT].width);
@@ -886,8 +886,8 @@ rounded_rect_get_inner (const GskRoundedRect *rect,
}
static inline gboolean
interval_contains (float p1, float w1,
float p2, float w2)
gl_interval_contains (float p1, float w1,
float p2, float w2)
{
if (p2 < p1)
return FALSE;
@@ -938,12 +938,12 @@ gsk_gl_render_job_update_clip (GskGLRenderJob *job,
{
graphene_rect_t inner;
rounded_rect_get_inner (&job->current_clip->rect, &inner);
gl_rounded_rect_get_inner (&job->current_clip->rect, &inner);
if (interval_contains (inner.origin.x, inner.size.width,
transformed_bounds.origin.x, transformed_bounds.size.width) ||
interval_contains (inner.origin.y, inner.size.height,
transformed_bounds.origin.y, transformed_bounds.size.height))
if (gl_interval_contains (inner.origin.x, inner.size.width,
transformed_bounds.origin.x, transformed_bounds.size.width) ||
gl_interval_contains (inner.origin.y, inner.size.height,
transformed_bounds.origin.y, transformed_bounds.size.height))
rect_clip = TRUE;
}
@@ -1446,7 +1446,7 @@ blur_node (GskGLRenderJob *job,
*max_y = job->offset_y + node->bounds.origin.y + node->bounds.size.height + half_blur_extra;
}
#define ATLAS_SIZE 512
#define GL_ATLAS_SIZE 512
static void
get_color_node_color_as_srgb (const GskRenderNode *node,
@@ -1493,10 +1493,10 @@ gsk_gl_render_job_visit_color_node (GskGLRenderJob *job,
* having to choose any particular atlas texture.
*/
offscreen.was_offscreen = FALSE;
offscreen.area.x = 1.f / ATLAS_SIZE;
offscreen.area.y = 1.f / ATLAS_SIZE;
offscreen.area.x2 = 2.f / ATLAS_SIZE;
offscreen.area.y2 = 2.f / ATLAS_SIZE;
offscreen.area.x = 1.f / GL_ATLAS_SIZE;
offscreen.area.y = 1.f / GL_ATLAS_SIZE;
offscreen.area.x2 = 2.f / GL_ATLAS_SIZE;
offscreen.area.y2 = 2.f / GL_ATLAS_SIZE;
gsk_gl_render_job_draw_offscreen_with_color (job,
&node->bounds,

17
gsk/gl/gskglshadowlibrary.c
View File

@@ -45,12 +45,13 @@ typedef struct _Shadow
G_DEFINE_TYPE (GskGLShadowLibrary, gsk_gl_shadow_library, G_TYPE_OBJECT)
enum {
PROP_0,
PROP_DRIVER,
N_PROPS
GL_SHADOW_LIBRARY_PROP_0,
GL_SHADOW_LIBRARY_PROP_DRIVER,
GL_SHADOW_LIBRARY_N_PROPS
};
static GParamSpec *properties [N_PROPS];
static GParamSpec *gl_shadow_library_properties [GL_SHADOW_LIBRARY_N_PROPS];
GskGLShadowLibrary *
gsk_gl_shadow_library_new (GskGLDriver *driver)
@@ -89,7 +90,7 @@ gsk_gl_shadow_library_get_property (GObject *object,
switch (prop_id)
{
case PROP_DRIVER:
case GL_SHADOW_LIBRARY_PROP_DRIVER:
g_value_set_object (value, self->driver);
break;
@@ -108,7 +109,7 @@ gsk_gl_shadow_library_set_property (GObject *object,
switch (prop_id)
{
case PROP_DRIVER:
case GL_SHADOW_LIBRARY_PROP_DRIVER:
self->driver = g_value_dup_object (value);
break;
@@ -126,12 +127,12 @@ gsk_gl_shadow_library_class_init (GskGLShadowLibraryClass *klass)
object_class->get_property = gsk_gl_shadow_library_get_property;
object_class->set_property = gsk_gl_shadow_library_set_property;
properties [PROP_DRIVER] =
gl_shadow_library_properties[GL_SHADOW_LIBRARY_PROP_DRIVER] =
g_param_spec_object ("driver", NULL, NULL,
GSK_TYPE_GL_DRIVER,
(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, N_PROPS, properties);
g_object_class_install_properties (object_class, GL_SHADOW_LIBRARY_N_PROPS, gl_shadow_library_properties);
}
static void

2
gsk/gl/gskgltypesprivate.h
View File

@@ -30,7 +30,7 @@ G_BEGIN_DECLS
#define GSK_GL_N_VERTICES 6
typedef struct _GskGLAttachmentState GskGLAttachmentState;
typedef struct _GskGLBuffer GskGLBuffer;
typedef struct _GskGLBuffer1 GskGLBuffer1;
typedef struct _GskGLCommandQueue GskGLCommandQueue;
typedef struct _GskGLCompiler GskGLCompiler;
typedef struct _GskGLDrawVertex GskGLDrawVertex;