From ea6253c1df01c5552d74899754fc7ea068fc7dfc Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 19 Jul 2024 17:25:03 +0200 Subject: [PATCH] gpu: Add a member in ShaderOpClass for number of textures This just puts the number from the header into a strcut where it can be accessed. --- gsk/gpu/gskgpublendmodeop.c | 1 + gsk/gpu/gskgpublurop.c | 1 + gsk/gpu/gskgpuborderop.c | 1 + gsk/gpu/gskgpuboxshadowop.c | 1 + gsk/gpu/gskgpucolorizeop.c | 1 + gsk/gpu/gskgpucolormatrixop.c | 1 + gsk/gpu/gskgpucolorop.c | 1 + gsk/gpu/gskgpuconicgradientop.c | 1 + gsk/gpu/gskgpuconvertop.c | 1 + gsk/gpu/gskgpucrossfadeop.c | 1 + gsk/gpu/gskgpulineargradientop.c | 1 + gsk/gpu/gskgpumaskop.c | 1 + gsk/gpu/gskgpuradialgradientop.c | 1 + gsk/gpu/gskgpuroundedcolorop.c | 1 + gsk/gpu/gskgpushaderopprivate.h | 1 + gsk/gpu/gskgputextureop.c | 1 + 16 files changed, 16 insertions(+) diff --git a/gsk/gpu/gskgpublendmodeop.c b/gsk/gpu/gskgpublendmodeop.c index e2cb81af97..e766e18f54 100644 --- a/gsk/gpu/gskgpublendmodeop.c +++ b/gsk/gpu/gskgpublendmodeop.c @@ -42,6 +42,7 @@ static const GskGpuShaderOpClass GSK_GPU_BLEND_MODE_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpublendmode", + gsk_gpu_blendmode_n_textures, sizeof (GskGpuBlendmodeInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_blendmode_info, diff --git a/gsk/gpu/gskgpublurop.c b/gsk/gpu/gskgpublurop.c index 0420d8aed2..425bebb631 100644 --- a/gsk/gpu/gskgpublurop.c +++ b/gsk/gpu/gskgpublurop.c @@ -43,6 +43,7 @@ static const GskGpuShaderOpClass GSK_GPU_BLUR_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpublur", + gsk_gpu_blur_n_textures, sizeof (GskGpuBlurInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_blur_info, diff --git a/gsk/gpu/gskgpuborderop.c b/gsk/gpu/gskgpuborderop.c index e89deb8254..d1f80fe778 100644 --- a/gsk/gpu/gskgpuborderop.c +++ b/gsk/gpu/gskgpuborderop.c @@ -84,6 +84,7 @@ static const GskGpuShaderOpClass GSK_GPU_BORDER_OP_CLASS = { gsk_gpu_border_op_gl_command }, "gskgpuborder", + gsk_gpu_border_n_textures, sizeof (GskGpuBorderInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_border_info, diff --git a/gsk/gpu/gskgpuboxshadowop.c b/gsk/gpu/gskgpuboxshadowop.c index 6e84509a70..45933e92ba 100644 --- a/gsk/gpu/gskgpuboxshadowop.c +++ b/gsk/gpu/gskgpuboxshadowop.c @@ -63,6 +63,7 @@ static const GskGpuShaderOpClass GSK_GPU_BOX_SHADOW_OP_CLASS = { gsk_gpu_box_shadow_op_gl_command }, "gskgpuboxshadow", + gsk_gpu_boxshadow_n_textures, sizeof (GskGpuBoxshadowInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_boxshadow_info, diff --git a/gsk/gpu/gskgpucolorizeop.c b/gsk/gpu/gskgpucolorizeop.c index 045e84495a..0bf1d8c6a7 100644 --- a/gsk/gpu/gskgpucolorizeop.c +++ b/gsk/gpu/gskgpucolorizeop.c @@ -39,6 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_COLORIZE_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpucolorize", + gsk_gpu_colorize_n_textures, sizeof (GskGpuColorizeInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_colorize_info, diff --git a/gsk/gpu/gskgpucolormatrixop.c b/gsk/gpu/gskgpucolormatrixop.c index 597a7b9e62..354e48bc35 100644 --- a/gsk/gpu/gskgpucolormatrixop.c +++ b/gsk/gpu/gskgpucolormatrixop.c @@ -38,6 +38,7 @@ static const GskGpuShaderOpClass GSK_GPU_COLOR_MATRIX_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpucolormatrix", + gsk_gpu_colormatrix_n_textures, sizeof (GskGpuColormatrixInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_colormatrix_info, diff --git a/gsk/gpu/gskgpucolorop.c b/gsk/gpu/gskgpucolorop.c index 06582ad019..78ab08bade 100644 --- a/gsk/gpu/gskgpucolorop.c +++ b/gsk/gpu/gskgpucolorop.c @@ -40,6 +40,7 @@ static const GskGpuShaderOpClass GSK_GPU_COLOR_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpucolor", + gsk_gpu_color_n_textures, sizeof (GskGpuColorInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_color_info, diff --git a/gsk/gpu/gskgpuconicgradientop.c b/gsk/gpu/gskgpuconicgradientop.c index f664c76096..372758780d 100644 --- a/gsk/gpu/gskgpuconicgradientop.c +++ b/gsk/gpu/gskgpuconicgradientop.c @@ -39,6 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_CONIC_GRADIENT_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpuconicgradient", + gsk_gpu_conicgradient_n_textures, sizeof (GskGpuConicgradientInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_conicgradient_info, diff --git a/gsk/gpu/gskgpuconvertop.c b/gsk/gpu/gskgpuconvertop.c index 900edd6a17..a420d03a14 100644 --- a/gsk/gpu/gskgpuconvertop.c +++ b/gsk/gpu/gskgpuconvertop.c @@ -44,6 +44,7 @@ static const GskGpuShaderOpClass GSK_GPU_CONVERT_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpuconvert", + gsk_gpu_convert_n_textures, sizeof (GskGpuConvertInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_convert_info, diff --git a/gsk/gpu/gskgpucrossfadeop.c b/gsk/gpu/gskgpucrossfadeop.c index 4c9e87f626..70ee9eb3f5 100644 --- a/gsk/gpu/gskgpucrossfadeop.c +++ b/gsk/gpu/gskgpucrossfadeop.c @@ -40,6 +40,7 @@ static const GskGpuShaderOpClass GSK_GPU_CROSS_FADE_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpucrossfade", + gsk_gpu_crossfade_n_textures, sizeof (GskGpuCrossfadeInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_crossfade_info, diff --git a/gsk/gpu/gskgpulineargradientop.c b/gsk/gpu/gskgpulineargradientop.c index a7b09ebff3..8e2d41c459 100644 --- a/gsk/gpu/gskgpulineargradientop.c +++ b/gsk/gpu/gskgpulineargradientop.c @@ -42,6 +42,7 @@ static const GskGpuShaderOpClass GSK_GPU_LINEAR_GRADIENT_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpulineargradient", + gsk_gpu_lineargradient_n_textures, sizeof (GskGpuLineargradientInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_lineargradient_info, diff --git a/gsk/gpu/gskgpumaskop.c b/gsk/gpu/gskgpumaskop.c index 6e36a5d24c..a6db7dbd1d 100644 --- a/gsk/gpu/gskgpumaskop.c +++ b/gsk/gpu/gskgpumaskop.c @@ -41,6 +41,7 @@ static const GskGpuShaderOpClass GSK_GPU_MASK_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpumask", + gsk_gpu_mask_n_textures, sizeof (GskGpuMaskInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_mask_info, diff --git a/gsk/gpu/gskgpuradialgradientop.c b/gsk/gpu/gskgpuradialgradientop.c index b9d2b3d498..621e06787d 100644 --- a/gsk/gpu/gskgpuradialgradientop.c +++ b/gsk/gpu/gskgpuradialgradientop.c @@ -42,6 +42,7 @@ static const GskGpuShaderOpClass GSK_GPU_RADIAL_GRADIENT_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpuradialgradient", + gsk_gpu_radialgradient_n_textures, sizeof (GskGpuRadialgradientInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_radialgradient_info, diff --git a/gsk/gpu/gskgpuroundedcolorop.c b/gsk/gpu/gskgpuroundedcolorop.c index f9e94d8b58..6b05ac5e75 100644 --- a/gsk/gpu/gskgpuroundedcolorop.c +++ b/gsk/gpu/gskgpuroundedcolorop.c @@ -39,6 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_ROUNDED_COLOR_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgpuroundedcolor", + gsk_gpu_roundedcolor_n_textures, sizeof (GskGpuRoundedcolorInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_roundedcolor_info, diff --git a/gsk/gpu/gskgpushaderopprivate.h b/gsk/gpu/gskgpushaderopprivate.h index 4bc7871793..1131c1eae8 100644 --- a/gsk/gpu/gskgpushaderopprivate.h +++ b/gsk/gpu/gskgpushaderopprivate.h @@ -35,6 +35,7 @@ struct _GskGpuShaderOpClass GskGpuOpClass parent_class; const char * shader_name; + gsize n_textures; gsize vertex_size; #ifdef GDK_RENDERING_VULKAN const VkPipelineVertexInputStateCreateInfo *vertex_input_state; diff --git a/gsk/gpu/gskgputextureop.c b/gsk/gpu/gskgputextureop.c index f54dc8cb1c..828c75d013 100644 --- a/gsk/gpu/gskgputextureop.c +++ b/gsk/gpu/gskgputextureop.c @@ -38,6 +38,7 @@ static const GskGpuShaderOpClass GSK_GPU_TEXTURE_OP_CLASS = { gsk_gpu_shader_op_gl_command }, "gskgputexture", + gsk_gpu_texture_n_textures, sizeof (GskGpuTextureInstance), #ifdef GDK_RENDERING_VULKAN &gsk_gpu_texture_info,