From b8e6b03d3b677b8249a3342fb5dcaaee296b3887 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@haasn.dev>
Date: Mon, 17 Jul 2023 16:03:24 +0200
Subject: ra_pl: drop PL_API_VER compatibility paths

---
 video/out/placebo/ra_pl.c | 66 +----------------------------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c
index c7cf19efdc..7b15022367 100644
--- a/video/out/placebo/ra_pl.c
+++ b/video/out/placebo/ra_pl.c
@@ -45,17 +45,10 @@ struct ra *ra_create_pl(pl_gpu gpu, struct mp_log *log)
         ra->caps |= RA_CAP_COMPUTE | RA_CAP_NUM_GROUPS;
     if (gpu->limits.compute_queues > gpu->limits.fragment_queues)
         ra->caps |= RA_CAP_PARALLEL_COMPUTE;
-#if PL_API_VER >= 180
     if (gpu->limits.max_variable_comps)
         ra->caps |= RA_CAP_GLOBAL_UNIFORM;
-#else
-    if (gpu->limits.max_variables)
-        ra->caps |= RA_CAP_GLOBAL_UNIFORM;
-#endif
-#if PL_API_VER >= 234
     if (!gpu->limits.host_cached)
         ra->caps |= RA_CAP_SLOW_DR;
-#endif
 
     if (gpu->limits.max_tex_1d_dim)
         ra->caps |= RA_CAP_TEX_1D;
@@ -224,36 +217,7 @@ static bool tex_upload_pl(struct ra *ra, const struct ra_tex_upload_params *para
             };
         }
 
-#if PL_API_VER >= 168
         pl_params.row_pitch = params->stride;
-#else
-        // Older libplacebo uses texel-sized strides, so we have to manually
-        // compensate for possibly misaligned sources (typically rgb24).
-        size_t texel_size = tex->params.format->texel_size;
-        pl_params.stride_w = params->stride / texel_size;
-        size_t stride = pl_params.stride_w * texel_size;
-
-        if (stride != params->stride) {
-            // Fall back to uploading via a staging buffer prepared in CPU
-            int lines = params->rc ? pl_rect_h(pl_params.rc) : tex->params.h;
-            staging = pl_buf_create(gpu, &(struct pl_buf_params) {
-                .size = lines * stride,
-                .memory_type = PL_BUF_MEM_HOST,
-                .host_mapped = true,
-            });
-            if (!staging)
-                return false;
-
-            const uint8_t *src = params->buf ? params->buf->data : params->src;
-            assert(src);
-            for (int y = 0; y < lines; y++)
-                memcpy(staging->data + y * stride, src + y * params->stride, stride);
-
-            pl_params.ptr = NULL;
-            pl_params.buf = staging;
-            pl_params.buf_offset = 0;
-        }
-#endif
     }
 
     bool ok = pl_tex_upload(gpu, &pl_params);
@@ -268,33 +232,10 @@ static bool tex_download_pl(struct ra *ra, struct ra_tex_download_params *params
         .tex = tex,
         .ptr = params->dst,
         .timer = get_active_timer(ra),
+        .row_pitch = params->stride,
     };
 
-#if PL_API_VER >= 168
-    pl_params.row_pitch = params->stride;
     return pl_tex_download(get_gpu(ra), &pl_params);
-#else
-    size_t texel_size = tex->params.format->texel_size;
-    pl_params.stride_w = params->stride / texel_size;
-    size_t stride = pl_params.stride_w * texel_size;
-    uint8_t *staging = NULL;
-    if (stride != params->stride) {
-        staging = talloc_size(NULL, tex->params.h * stride);
-        pl_params.ptr = staging;
-    }
-
-    bool ok = pl_tex_download(get_gpu(ra), &pl_params);
-    if (ok && staging) {
-        for (int y = 0; y < tex->params.h; y++) {
-            memcpy((uint8_t *) params->dst + y * params->stride,
-                   staging + y * stride,
-                   stride);
-        }
-    }
-
-    talloc_free(staging);
-    return ok;
-#endif
 }
 
 static struct ra_buf *buf_create_pl(struct ra *ra,
@@ -520,12 +461,7 @@ static struct ra_renderpass *renderpass_create_pl(struct ra *ra,
         pl_params.vertex_type = PL_PRIM_TRIANGLE_LIST;
         pl_params.vertex_stride = params->vertex_stride;
         pl_params.load_target = !params->invalidate_target;
-
-#if PL_API_VER >= 169
         pl_params.target_format = params->target_format->priv;
-#else
-        pl_params.target_dummy.params.format = params->target_format->priv;
-#endif
 
         if (params->enable_blend) {
             pl_params.blend_params = &blend_params;
-- 
cgit v1.2.3