AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

vulkan: Add infrastructure for push constants

Browse Source 
THe code includes fragment push constants for colors, but that code is
so far unused.
This commit is contained in:
Benjamin Otte 2016-12-14 07:21:21 +01:00
parent 58b2c1d009
commit 62eb9d42aa
5 changed files with 188 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/Makefile.am
View File

@ -28,6 +28,7 @@ gsk_private_vulan_source_h = \
gskvulkanimageprivate.h \ gskvulkanimageprivate.h \
gskvulkanmemoryprivate.h \ gskvulkanmemoryprivate.h \
gskvulkanpipelineprivate.h \ gskvulkanpipelineprivate.h \
gskvulkanpushconstantsprivate.h \
gskvulkanrenderprivate.h \ gskvulkanrenderprivate.h \
gskvulkanrendererprivate.h \ gskvulkanrendererprivate.h \
gskvulkanrenderpassprivate.h \ gskvulkanrenderpassprivate.h \
@ -37,6 +38,7 @@ gsk_private_vulkan_source_c = \
gskvulkanimage.c \ gskvulkanimage.c \
gskvulkanmemory.c \ gskvulkanmemory.c \
gskvulkanpipeline.c \ gskvulkanpipeline.c \
gskvulkanpushconstants.c \
gskvulkanrender.c \ gskvulkanrender.c \
gskvulkanrenderer.c \ gskvulkanrenderer.c \
gskvulkanrenderpass.c \ gskvulkanrenderpass.c \

11
gsk/gskvulkanpipeline.c
View File

@ -2,6 +2,7 @@
#include "gskvulkanpipelineprivate.h" #include "gskvulkanpipelineprivate.h"
#include "gskvulkanpushconstantsprivate.h"
#include "gskvulkanshaderprivate.h" #include "gskvulkanshaderprivate.h"
#include <graphene.h> #include <graphene.h>
@ -96,14 +97,8 @@ gsk_vulkan_pipeline_new (GdkVulkanContext *context,
.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
.setLayoutCount = 1, .setLayoutCount = 1,
.pSetLayouts = &self->descriptor_set_layout, .pSetLayouts = &self->descriptor_set_layout,
.pushConstantRangeCount = 1, .pushConstantRangeCount = gst_vulkan_push_constants_get_range_count (),
.pPushConstantRanges = (VkPushConstantRange[1]) { .pPushConstantRanges = gst_vulkan_push_constants_get_ranges ()
{
.stageFlags = VK_SHADER_STAGE_VERTEX_BIT,
.offset = 0,
.size = sizeof (graphene_matrix_t)
}
}
}, },
NULL, NULL,
&self->pipeline_layout); &self->pipeline_layout);

101
gsk/gskvulkanpushconstants.c Normal file
View File

@ -0,0 +1,101 @@
#include "config.h"
#include "gskvulkanpushconstantsprivate.h"
#include <math.h>
void
gsk_vulkan_push_constants_init (GskVulkanPushConstants *constants,
const graphene_matrix_t *mvp)
{
GdkRGBA transparent = { 0, 0, 0, 0 };
gsk_vulkan_push_constants_set_mvp (constants, mvp);
gsk_vulkan_push_constants_set_color (constants, &transparent);
}
void
gsk_vulkan_push_constants_init_copy (GskVulkanPushConstants *self,
const GskVulkanPushConstants *src)
{
*self = *src;
}
void
gsk_vulkan_push_constants_set_mvp (GskVulkanPushConstants *self,
const graphene_matrix_t *mvp)
{
graphene_matrix_to_float (mvp, self->vertex.mvp);
}
void
gsk_vulkan_push_constants_multiply_mvp (GskVulkanPushConstants *self,
const graphene_matrix_t *transform)
{
graphene_matrix_t old_mvp, new_mvp;
graphene_matrix_init_from_float (&old_mvp, self->vertex.mvp);
graphene_matrix_multiply (transform, &old_mvp, &new_mvp);
gsk_vulkan_push_constants_set_mvp (self, &new_mvp);
}
void
gsk_vulkan_push_constants_set_color (GskVulkanPushConstants *self,
const GdkRGBA *color)
{
self->fragment.color[0] = pow (color->red, 2.2);
self->fragment.color[1] = pow (color->green, 2.2);
self->fragment.color[2] = pow (color->blue, 2.2);
self->fragment.color[3] = color->alpha;
}
void
gsk_vulkan_push_constants_push_vertex (GskVulkanPushConstants *self,
VkCommandBuffer command_buffer,
VkPipelineLayout pipeline_layout)
{
vkCmdPushConstants (command_buffer,
pipeline_layout,
VK_SHADER_STAGE_VERTEX_BIT,
G_STRUCT_OFFSET (GskVulkanPushConstants, vertex),
sizeof (self->vertex),
&self->vertex);
}
void
gsk_vulkan_push_constants_push_fragment (GskVulkanPushConstants *self,
VkCommandBuffer command_buffer,
VkPipelineLayout pipeline_layout)
{
vkCmdPushConstants (command_buffer,
pipeline_layout,
VK_SHADER_STAGE_FRAGMENT_BIT,
G_STRUCT_OFFSET (GskVulkanPushConstants, fragment),
sizeof (self->fragment),
&self->fragment);
}
uint32_t
gst_vulkan_push_constants_get_range_count (void)
{
return 2;
}
const VkPushConstantRange *
gst_vulkan_push_constants_get_ranges (void)
{
static const VkPushConstantRange ranges[2] = {
{
.stageFlags = VK_SHADER_STAGE_VERTEX_BIT,
.offset = G_STRUCT_OFFSET (GskVulkanPushConstants, vertex),
.size = sizeof (((GskVulkanPushConstants *) 0)->vertex)
},
{
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.offset = G_STRUCT_OFFSET (GskVulkanPushConstants, fragment),
.size = sizeof (((GskVulkanPushConstants *) 0)->fragment)
}
};
return ranges;
}

46
gsk/gskvulkanpushconstantsprivate.h Normal file
View File

@ -0,0 +1,46 @@
#ifndef __GSK_VULKAN_PUSH_CONSTANTS_PRIVATE_H__
#define __GSK_VULKAN_PUSH_CONSTANTS_PRIVATE_H__
#include <gdk/gdk.h>
#include <graphene.h>
G_BEGIN_DECLS
typedef struct _GskVulkanPushConstants GskVulkanPushConstants;
struct _GskVulkanPushConstants
{
struct {
float mvp[16];
} vertex;
struct {
float color[4];
} fragment;
};
const VkPushConstantRange *
gst_vulkan_push_constants_get_ranges (void) G_GNUC_PURE;
uint32_t gst_vulkan_push_constants_get_range_count (void) G_GNUC_PURE;
void gsk_vulkan_push_constants_init (GskVulkanPushConstants *constants,
const graphene_matrix_t *mvp);
void gsk_vulkan_push_constants_init_copy (GskVulkanPushConstants *self,
const GskVulkanPushConstants *src);
void gsk_vulkan_push_constants_set_mvp (GskVulkanPushConstants *self,
const graphene_matrix_t *mvp);
void gsk_vulkan_push_constants_multiply_mvp (GskVulkanPushConstants *self,
const graphene_matrix_t *transform);
void gsk_vulkan_push_constants_set_color (GskVulkanPushConstants *self,
const GdkRGBA *color);
void gsk_vulkan_push_constants_push_vertex (GskVulkanPushConstants *self,
VkCommandBuffer command_buffer,
VkPipelineLayout pipeline_layout);
void gsk_vulkan_push_constants_push_fragment (GskVulkanPushConstants *self,
VkCommandBuffer command_buffer,
VkPipelineLayout pipeline_layout);
G_END_DECLS
#endif /* __GSK_VULKAN_PUSH_CONSTANTS_PRIVATE_H__ */

64
gsk/gskvulkanrenderpass.c
View File

@ -5,6 +5,7 @@
#include "gskvulkanimageprivate.h" #include "gskvulkanimageprivate.h"
#include "gskrendernodeprivate.h" #include "gskrendernodeprivate.h"
#include "gskrenderer.h" #include "gskrenderer.h"
#include "gskvulkanpushconstantsprivate.h"
#include "gskvulkanrendererprivate.h" #include "gskvulkanrendererprivate.h"
typedef struct _GskVulkanRenderOp GskVulkanRenderOp; typedef struct _GskVulkanRenderOp GskVulkanRenderOp;
@ -13,7 +14,8 @@ typedef enum {
GSK_VULKAN_OP_FALLBACK, GSK_VULKAN_OP_FALLBACK,
GSK_VULKAN_OP_SURFACE, GSK_VULKAN_OP_SURFACE,
GSK_VULKAN_OP_TEXTURE, GSK_VULKAN_OP_TEXTURE,
GSK_VULKAN_OP_BIND_MVP GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS,
GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS
} GskVulkanOpType; } GskVulkanOpType;
struct _GskVulkanRenderOp struct _GskVulkanRenderOp
@ -21,7 +23,7 @@ struct _GskVulkanRenderOp
GskVulkanOpType type; GskVulkanOpType type;
GskRenderNode *node; /* node that's the source of this op */ GskRenderNode *node; /* node that's the source of this op */
GskVulkanImage *source; /* source image to render */ GskVulkanImage *source; /* source image to render */
graphene_matrix_t mvp; /* new mvp to set */ GskVulkanPushConstants constants; /* new constants to push */
gsize vertex_offset; /* offset into vertex buffer */ gsize vertex_offset; /* offset into vertex buffer */
gsize vertex_count; /* number of vertices */ gsize vertex_count; /* number of vertices */
gsize descriptor_set_index; /* index into descriptor sets array for the right descriptor set to bind */ gsize descriptor_set_index; /* index into descriptor sets array for the right descriptor set to bind */
@ -56,10 +58,10 @@ gsk_vulkan_render_pass_free (GskVulkanRenderPass *self)
} }
void void
gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self, gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self,
GskVulkanRender *render, GskVulkanRender *render,
const graphene_matrix_t *mvp, const GskVulkanPushConstants *constants,
GskRenderNode *node) GskRenderNode *node)
{ {
GskVulkanRenderOp op = { GskVulkanRenderOp op = {
.type = GSK_VULKAN_OP_FALLBACK, .type = GSK_VULKAN_OP_FALLBACK,
@ -93,7 +95,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self,
for (i = 0; i < gsk_container_node_get_n_children (node); i++) for (i = 0; i < gsk_container_node_get_n_children (node); i++)
{ {
gsk_vulkan_render_pass_add_node (self, render, mvp, gsk_container_node_get_child (node, i)); gsk_vulkan_render_pass_add_node (self, render, constants, gsk_container_node_get_child (node, i));
} }
} }
break; break;
@ -101,12 +103,13 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self,
{ {
graphene_matrix_t transform; graphene_matrix_t transform;
op.type = GSK_VULKAN_OP_BIND_MVP;
gsk_transform_node_get_transform (node, &transform); gsk_transform_node_get_transform (node, &transform);
graphene_matrix_multiply (&transform, mvp, &op.mvp); op.type = GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS;
gsk_vulkan_push_constants_init_copy (&op.constants, constants);
gsk_vulkan_push_constants_multiply_mvp (&op.constants, &transform);
g_array_append_val (self->render_ops, op); g_array_append_val (self->render_ops, op);
gsk_vulkan_render_pass_add_node (self, render, &op.mvp, gsk_transform_node_get_child (node)); gsk_vulkan_render_pass_add_node (self, render, &op.constants, gsk_transform_node_get_child (node));
graphene_matrix_init_from_matrix (&op.mvp, mvp); gsk_vulkan_push_constants_init_copy (&op.constants, constants);
g_array_append_val (self->render_ops, op); g_array_append_val (self->render_ops, op);
} }
break; break;
@ -120,14 +123,16 @@ gsk_vulkan_render_pass_add (GskVulkanRenderPass *self,
const graphene_matrix_t *mvp, const graphene_matrix_t *mvp,
GskRenderNode *node) GskRenderNode *node)
{ {
GskVulkanRenderOp op = { GskVulkanRenderOp op = { 0, };
.type = GSK_VULKAN_OP_BIND_MVP,
.mvp = *mvp
};
op.type = GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS;
gsk_vulkan_push_constants_init (&op.constants, mvp);
g_array_append_val (self->render_ops, op); g_array_append_val (self->render_ops, op);
gsk_vulkan_render_pass_add_node (self, render, mvp, node); op.type = GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS;
g_array_append_val (self->render_ops, op);
gsk_vulkan_render_pass_add_node (self, render, &op.constants, node);
} }
static void static void
@ -206,7 +211,8 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass *self,
default: default:
g_assert_not_reached (); g_assert_not_reached ();
case GSK_VULKAN_OP_BIND_MVP: case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
break; break;
} }
} }
@ -262,7 +268,8 @@ gsk_vulkan_render_pass_collect_vertices (GskVulkanRenderPass *self,
default: default:
g_assert_not_reached (); g_assert_not_reached ();
case GSK_VULKAN_OP_BIND_MVP: case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
op->vertex_offset = 0; op->vertex_offset = 0;
op->vertex_count = 0; op->vertex_count = 0;
break; break;
@ -296,7 +303,8 @@ gsk_vulkan_render_pass_reserve_descriptor_sets (GskVulkanRenderPass *self,
default: default:
g_assert_not_reached (); g_assert_not_reached ();
case GSK_VULKAN_OP_BIND_MVP: case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
break; break;
} }
} }
@ -309,7 +317,6 @@ gsk_vulkan_render_pass_draw (GskVulkanRenderPass *self,
VkCommandBuffer command_buffer) VkCommandBuffer command_buffer)
{ {
GskVulkanRenderOp *op; GskVulkanRenderOp *op;
float float_matrix[16];
guint i; guint i;
for (i = 0; i < self->render_ops->len; i++) for (i = 0; i < self->render_ops->len; i++)
@ -337,15 +344,16 @@ gsk_vulkan_render_pass_draw (GskVulkanRenderPass *self,
op->vertex_offset, 0); op->vertex_offset, 0);
break; break;
case GSK_VULKAN_OP_BIND_MVP: case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
graphene_matrix_to_float (&op->mvp, float_matrix); gsk_vulkan_push_constants_push_vertex (&op->constants,
vkCmdPushConstants (command_buffer, command_buffer,
gsk_vulkan_pipeline_get_pipeline_layout (pipeline), gsk_vulkan_pipeline_get_pipeline_layout (pipeline));
VK_SHADER_STAGE_VERTEX_BIT, break;
0,
sizeof (float_matrix),
&float_matrix);
case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
gsk_vulkan_push_constants_push_fragment (&op->constants,
command_buffer,
gsk_vulkan_pipeline_get_pipeline_layout (pipeline));
break; break;
default: default: