vrend: Move GL blitter forward declaration to vrend_blitter.h

It just seems to make more sense there.
Related: https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/125

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Corentin Noël <corentin.noel@collabora.com>.

src/vrend_blitter.c

@@ -320,7 +320,7 @@ static GLuint blit_get_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
                                     int pipe_tex_target,
                                     unsigned nr_samples,
                                     const struct vrend_format_table *src_entry,
-                                    uint8_t swizzle[static 4])
+                                    const uint8_t swizzle[static 4])
 {
    assert(pipe_tex_target < PIPE_MAX_TEXTURE_TYPES);
 
@@ -702,7 +702,7 @@ static void vrend_set_vertex_param(GLuint prog_id)
 void vrend_renderer_blit_gl(ASSERTED struct vrend_context *ctx,
                             struct vrend_resource *src_res,
                             struct vrend_resource *dst_res,
-                            struct vrend_blit_info *info)
+                            const struct vrend_blit_info *info)
 {
    struct vrend_blitter_ctx *blit_ctx = &vrend_blit_ctx;
    GLuint buffers;

src/vrend_blitter.h

@@ -24,6 +24,9 @@
 #ifndef VREND_BLITTER_H
 #define VREND_BLITTER_H
 
+#include "util/os_misc.h"
+#include "util/macros.h"
+
 /* shaders for blitting */
 
 #define HEADER_GL                               \
@@ -126,9 +129,18 @@
    "}\n"
 
 
+struct vrend_context;
+struct vrend_resource;
+struct vrend_blit_info;
 #define FS_TEXFETCH_DS_MSAA_GL HEADER_GL FS_TEXFETCH_DS_MSAA_BODY
 #define FS_TEXFETCH_DS_MSAA_GLES HEADER_GLES FS_TEXFETCH_DS_MSAA_BODY_GLES
 #define FS_TEXFETCH_DS_MSAA_ARRAY_GLES HEADER_GLES_MS_ARRAY FS_TEXFETCH_DS_MSAA_BODY_GLES
 
+/* implement blitting using OpenGL. */
+void vrend_renderer_blit_gl(ASSERTED struct vrend_context *ctx,
+                            struct vrend_resource *src_res,
+                            struct vrend_resource *dst_res,
+                            const struct vrend_blit_info *info);
+void vrend_blitter_fini(void);
 
 #endif

src/vrend_renderer.c

@@ -44,6 +44,7 @@
 #include "vrend_shader.h"
 
 #include "vrend_renderer.h"
+#include "vrend_blitter.h"
 #include "vrend_debug.h"
 #include "vrend_winsys.h"
 #include "vrend_blitter.h"

src/vrend_renderer.h

@@ -488,13 +488,6 @@ bool vrend_format_is_bgra(enum virgl_formats format);
 boolean format_is_copy_compatible(enum virgl_formats src, enum virgl_formats dst,
                                   unsigned int flags);
 
-/* blitter interface */
-void vrend_renderer_blit_gl(struct vrend_context *ctx,
-                            struct vrend_resource *src_res,
-                            struct vrend_resource *dst_res,
-                            struct vrend_blit_info *info);
-void vrend_blitter_fini(void);
-
 void vrend_renderer_prepare_reset(void);
 void vrend_renderer_reset(void);
 int vrend_renderer_get_poll_fd(void);