libplacebo: provide typedefs for all object types

Apart from significantly cutting down amount the typing the user needs
to perform, I decided the past justification for keeping these as `const
struct` rather than typedef'd names no longer makes sense due to the way
libplacebo objects tend to have private parts hidden from the user.

Bite the bullet and refactor all the things. Should be backwards
compatible, but I decided to bump the major version to signal the
significance of this API change.

Author: haasn

demos/plplay.c

@@ -39,8 +39,8 @@ struct plplay {
 
     // libplacebo
     pl_log log;
-    struct pl_renderer *renderer;
-    struct pl_queue *queue;
+    pl_renderer renderer;
+    pl_queue queue;
 
     // libav*
     AVFormatContext *format;
@@ -172,7 +172,7 @@ static bool init_codec(struct plplay *p)
     return true;
 }
 
-static bool map_frame(const struct pl_gpu *gpu, const struct pl_tex **tex,
+static bool map_frame(pl_gpu gpu, pl_tex *tex,
                       const struct pl_source_frame *src,
                       struct pl_frame *out_frame)
 {
@@ -183,7 +183,7 @@ static bool map_frame(const struct pl_gpu *gpu, const struct pl_tex **tex,
     return true;
 }
 
-static void unmap_frame(const struct pl_gpu *gpu, struct pl_frame *frame,
+static void unmap_frame(pl_gpu gpu, struct pl_frame *frame,
                         const struct pl_source_frame *src)
 {
     av_frame_free((AVFrame **) &src->frame_data);

demos/sdlimage.c

@@ -22,11 +22,11 @@ static pl_log logger;
 static struct window *win;
 
 // For rendering
-static const struct pl_tex *img_tex;
-static const struct pl_tex *osd_tex;
+static pl_tex img_tex;
+static pl_tex osd_tex;
 static struct pl_plane img_plane;
 static struct pl_plane osd_plane;
-static struct pl_renderer *renderer;
+static pl_renderer renderer;
 static struct pl_custom_lut *lut;
 
 struct file
@@ -97,7 +97,7 @@ static void uninit(int ret)
     exit(ret);
 }
 
-static bool upload_plane(const SDL_Surface *img, const struct pl_tex **tex,
+static bool upload_plane(const SDL_Surface *img, pl_tex *tex,
                          struct pl_plane *plane)
 {
     if (!img)
@@ -133,7 +133,7 @@ static bool upload_plane(const SDL_Surface *img, const struct pl_tex **tex,
 
 static bool render_frame(const struct pl_swapchain_frame *frame)
 {
-    const struct pl_tex *img = img_plane.texture;
+    pl_tex img = img_plane.texture;
     struct pl_frame image = {
         .num_planes = 1,
         .planes     = { img_plane },

demos/ui.c

@@ -13,18 +13,18 @@ struct ui_vertex {
 #define NUM_VERTEX_ATTRIBS 3
 
 struct ui {
-    const struct pl_gpu *gpu;
-    struct pl_dispatch *dp;
+    pl_gpu gpu;
+    pl_dispatch dp;
     struct nk_context nk;
     struct nk_font_atlas atlas;
     struct nk_buffer cmds, verts, idx;
-    const struct pl_tex *font_tex;
+    pl_tex font_tex;
     struct pl_vertex_attrib attribs_pl[NUM_VERTEX_ATTRIBS];
     struct nk_draw_vertex_layout_element attribs_nk[NUM_VERTEX_ATTRIBS+1];
     struct nk_convert_config convert_cfg;
 };
 
-struct ui *ui_create(const struct pl_gpu *gpu)
+struct ui *ui_create(pl_gpu gpu)
 {
     struct ui *ui = malloc(sizeof(struct ui));
     if (!ui)
@@ -154,7 +154,7 @@ bool ui_draw(struct ui *ui, const struct pl_swapchain_frame *frame)
         if (!cmd->elem_count)
             continue;
 
-        struct pl_shader *sh = pl_dispatch_begin(ui->dp);
+        pl_shader sh = pl_dispatch_begin(ui->dp);
         pl_shader_custom(sh, &(struct pl_custom_shader) {
             .body = "color = texture(ui_tex, coord).r * vcolor;",
             .output = PL_SHADER_SIG_COLOR,

demos/ui.h

@@ -15,7 +15,7 @@
 
 struct ui;
 
-struct ui *ui_create(const struct pl_gpu *gpu);
+struct ui *ui_create(pl_gpu gpu);
 void ui_destroy(struct ui **ui);
 
 // Update/Logic/Draw cycle

demos/video-filtering.c

@@ -171,29 +171,29 @@ void image_unlock(struct image *img);
 #define PARALLELISM 8
 
 struct entry {
-    const struct pl_buf *buf; // to stream the download
-    const struct pl_tex *tex_in[MAX_PLANES];
-    const struct pl_tex *tex_out[MAX_PLANES];
+    pl_buf buf; // to stream the download
+    pl_tex tex_in[MAX_PLANES];
+    pl_tex tex_out[MAX_PLANES];
     struct image image;
 
     // For entries that are associated with a held image, so we can unlock them
     // as soon as possible
     struct image *held_image;
-    const struct pl_buf *held_buf;
+    pl_buf held_buf;
 };
 
 // For both APIs:
 struct priv {
     pl_log log;
-    const struct pl_vulkan *vk;
-    const struct pl_gpu *gpu;
-    struct pl_dispatch *dp;
-    struct pl_shader_obj *dither_state;
+    pl_vulkan vk;
+    pl_gpu gpu;
+    pl_dispatch dp;
+    pl_shader_obj dither_state;
 
     // Timer objects
-    struct pl_timer *render_timer;
-    struct pl_timer *upload_timer;
-    struct pl_timer *download_timer;
+    pl_timer render_timer;
+    pl_timer upload_timer;
+    pl_timer download_timer;
     uint64_t render_sum;
     uint64_t upload_sum;
     uint64_t download_sum;
@@ -202,8 +202,8 @@ struct priv {
     int download_count;
 
     // API #1: A simple pair of input and output textures
-    const struct pl_tex *tex_in[MAX_PLANES];
-    const struct pl_tex *tex_out[MAX_PLANES];
+    pl_tex tex_in[MAX_PLANES];
+    pl_tex tex_out[MAX_PLANES];
 
     // API #2: A ring buffer of textures/buffers for streaming
     int idx_in;  // points the next free entry
@@ -305,7 +305,7 @@ static void setup_plane_data(const struct image *img,
 
         // For API 2 (direct rendering)
         if (img->associated_buf) {
-            const struct pl_buf *buf = img->associated_buf->priv;
+            pl_buf buf = img->associated_buf->priv;
             out[i].pixels = NULL;
             out[i].buf = buf;
             out[i].buf_offset = (uintptr_t) plane->data - (uintptr_t) buf->data;
@@ -319,13 +319,13 @@ static void setup_plane_data(const struct image *img,
     }
 }
 
-static bool do_plane(struct priv *p, const struct pl_tex *dst, const struct pl_tex *src)
+static bool do_plane(struct priv *p, pl_tex dst, pl_tex src)
 {
     int new_depth = dst->params.format->component_depth[0];
 
     // Do some debanding, and then also make sure to dither to the new depth
     // so that our debanded gradients are actually preserved well
-    struct pl_shader *sh = pl_dispatch_begin(p->dp);
+    pl_shader sh = pl_dispatch_begin(p->dp);
     pl_shader_deband(sh, &(struct pl_sample_src){ .tex = src }, NULL);
     pl_shader_dither(sh, new_depth, &p->dither_state, NULL);
     return pl_dispatch_finish(p->dp, &(struct pl_dispatch_params) {
@@ -369,7 +369,7 @@ bool api1_reconfig(void *priv, const struct image *proxy)
     setup_plane_data(proxy, data);
 
     for (int i = 0; i < proxy->num_planes; i++) {
-        const struct pl_fmt *fmt = pl_plane_find_fmt(p->gpu, NULL, &data[i]);
+        pl_fmt fmt = pl_plane_find_fmt(p->gpu, NULL, &data[i]);
         if (!fmt) {
             fprintf(stderr, "Failed configuring filter: no good texture format!\n");
             return false;
@@ -478,7 +478,7 @@ static enum api2_status submit_work(struct priv *p, struct entry *e,
     setup_plane_data(img, data);
 
     for (int i = 0; i < img->num_planes; i++) {
-        const struct pl_fmt *fmt = pl_plane_find_fmt(p->gpu, NULL, &data[i]);
+        pl_fmt fmt = pl_plane_find_fmt(p->gpu, NULL, &data[i]);
         if (!fmt)
             return API2_ERR_FMT;
 
@@ -614,7 +614,7 @@ bool api2_alloc(void *priv, size_t size, struct api2_buf *out)
 {
     struct priv *p = priv;
 
-    const struct pl_buf *buf = pl_buf_create(p->gpu, &(struct pl_buf_params) {
+    pl_buf buf = pl_buf_create(p->gpu, &(struct pl_buf_params) {
         .size = size,
         .host_mapped = true,
     });
@@ -633,7 +633,7 @@ bool api2_alloc(void *priv, size_t size, struct api2_buf *out)
 void api2_free(void *priv, const struct api2_buf *buf)
 {
     struct priv *p = priv;
-    const struct pl_buf *plbuf = buf->priv;
+    pl_buf plbuf = buf->priv;
     pl_buf_destroy(p->gpu, &plbuf);
 }
 

demos/window.h

@@ -5,8 +5,8 @@
 
 struct window {
     const struct window_impl *impl;
-    const struct pl_swapchain *swapchain;
-    const struct pl_gpu *gpu;
+    pl_swapchain swapchain;
+    pl_gpu gpu;
     bool window_lost;
 };
 

demos/window_glfw.c

@@ -38,12 +38,12 @@ struct priv {
 
 #ifdef USE_VK
     VkSurfaceKHR surf;
-    const struct pl_vulkan *vk;
-    const struct pl_vk_inst *vk_inst;
+    pl_vulkan vk;
+    pl_vk_inst vk_inst;
 #endif
 
 #ifdef USE_GL
-    const struct pl_opengl *gl;
+    pl_opengl gl;
 #endif
 
     float scroll_dx, scroll_dy;

demos/window_sdl.c

@@ -38,13 +38,13 @@ struct priv {
 
 #ifdef USE_VK
     VkSurfaceKHR surf;
-    const struct pl_vulkan *vk;
-    const struct pl_vk_inst *vk_inst;
+    pl_vulkan vk;
+    pl_vk_inst vk_inst;
 #endif
 
 #ifdef USE_GL
     SDL_GLContext gl_ctx;
-    const struct pl_opengl *gl;
+    pl_opengl gl;
 #endif
 
     int scroll_dx, scroll_dy;

meson.build

@@ -2,7 +2,7 @@ project('libplacebo', ['c', 'cpp'],
   license: 'LGPL2.1+',
   default_options: ['c_std=c99', 'cpp_std=c++11', 'warning_level=2'],
   meson_version: '>=0.51',
-  version: '3.129.0',
+  version: '4.130.0',
 )
 
 # Version number

src/colorspace.c

@@ -128,8 +128,7 @@ static struct pl_bit_encoding pl_bit_encoding_merge(const struct pl_bit_encoding
     };
 }
 
-void pl_color_repr_merge(struct pl_color_repr *orig,
-                         const struct pl_color_repr *new)
+void pl_color_repr_merge(struct pl_color_repr *orig, const struct pl_color_repr *new)
 {
     *orig = (struct pl_color_repr) {
         .sys    = PL_DEF(orig->sys,    new->sys),