[gtk/wip/chergert/glproto: 381/526] set framebuffer on attachment state directly
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/chergert/glproto: 381/526] set framebuffer on attachment state directly
- Date: Tue, 16 Feb 2021 01:14:35 +0000 (UTC)
commit 87b33673420785a7a45b1f9374492f1af562409a
Author: Christian Hergert <chergert redhat com>
Date: Mon Feb 1 10:05:42 2021 -0800
set framebuffer on attachment state directly
gsk/next/gskglcommandqueue.c | 9 ---------
gsk/next/gskglcommandqueueprivate.h | 9 +++++++--
2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/gsk/next/gskglcommandqueue.c b/gsk/next/gskglcommandqueue.c
index 1fe456b4eb..866a20790e 100644
--- a/gsk/next/gskglcommandqueue.c
+++ b/gsk/next/gskglcommandqueue.c
@@ -1058,15 +1058,6 @@ gsk_gl_command_queue_create_framebuffer (GskGLCommandQueue *self)
return fbo_id;
}
-void
-gsk_gl_command_queue_bind_framebuffer (GskGLCommandQueue *self,
- guint framebuffer)
-{
- g_return_if_fail (GSK_IS_GL_COMMAND_QUEUE (self));
-
- gsk_gl_attachment_state_bind_framebuffer (self->attachments, framebuffer);
-}
-
int
gsk_gl_command_queue_upload_texture (GskGLCommandQueue *self,
GdkTexture *texture,
diff --git a/gsk/next/gskglcommandqueueprivate.h b/gsk/next/gskglcommandqueueprivate.h
index 9f9171a133..15df41a981 100644
--- a/gsk/next/gskglcommandqueueprivate.h
+++ b/gsk/next/gskglcommandqueueprivate.h
@@ -146,8 +146,6 @@ gboolean gsk_gl_command_queue_create_render_target (GskGLCommandQueue
guint *out_texture_id);
void gsk_gl_command_queue_delete_program (GskGLCommandQueue *self,
guint program_id);
-void gsk_gl_command_queue_bind_framebuffer (GskGLCommandQueue *self,
- guint framebuffer);
void gsk_gl_command_queue_clear (GskGLCommandQueue *self,
guint clear_bits,
const graphene_rect_t *viewport);
@@ -161,6 +159,13 @@ void gsk_gl_command_queue_end_draw (GskGLCommandQueue
GskGLDrawVertex *gsk_gl_command_queue_add_vertices (GskGLCommandQueue *self,
const GskGLDrawVertex
vertices[GSK_GL_N_VERTICES]);
+static inline void
+gsk_gl_command_queue_bind_framebuffer (GskGLCommandQueue *self,
+ guint framebuffer)
+{
+ gsk_gl_attachment_state_bind_framebuffer (self->attachments, framebuffer);
+}
+
static inline void
gsk_gl_command_queue_set_uniform1ui (GskGLCommandQueue *self,
guint program,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]