diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/render/gles2.h | 4 | ||||
-rw-r--r-- | include/render/pixman.h | 3 | ||||
-rw-r--r-- | include/render/vulkan.h | 2 | ||||
-rw-r--r-- | include/render/wlr_renderer.h | 8 | ||||
-rw-r--r-- | include/wlr/render/gles2.h | 4 | ||||
-rw-r--r-- | include/wlr/render/interface.h | 5 | ||||
-rw-r--r-- | include/wlr/render/pixman.h | 5 | ||||
-rw-r--r-- | include/wlr/render/vulkan.h | 2 | ||||
-rw-r--r-- | include/wlr/render/wlr_renderer.h | 14 |
9 files changed, 0 insertions, 47 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h index c4540a39..db301c6e 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -41,7 +41,6 @@ struct wlr_gles2_tex_shader { struct wlr_gles2_renderer { struct wlr_renderer wlr_renderer; - float projection[9]; struct wlr_egl *egl; int drm_fd; @@ -87,9 +86,6 @@ struct wlr_gles2_renderer { struct wl_list buffers; // wlr_gles2_buffer.link struct wl_list textures; // wlr_gles2_texture.link - - struct wlr_gles2_buffer *current_buffer; - uint32_t viewport_width, viewport_height; }; struct wlr_gles2_render_timer { diff --git a/include/render/pixman.h b/include/render/pixman.h index 24a27055..09842144 100644 --- a/include/render/pixman.h +++ b/include/render/pixman.h @@ -20,9 +20,6 @@ struct wlr_pixman_renderer { struct wl_list buffers; // wlr_pixman_buffer.link struct wl_list textures; // wlr_pixman_texture.link - struct wlr_pixman_buffer *current_buffer; - int32_t width, height; - struct wlr_drm_format_set drm_formats; }; diff --git a/include/render/vulkan.h b/include/render/vulkan.h index 90a9c4e7..a518ee4a 100644 --- a/include/render/vulkan.h +++ b/include/render/vulkan.h @@ -252,8 +252,6 @@ struct wlr_vk_renderer { VkSemaphore timeline_semaphore; uint64_t timeline_point; - struct wlr_vk_render_buffer *current_render_buffer; - size_t last_pool_size; struct wl_list descriptor_pools; // wlr_vk_descriptor_pool.link struct wl_list render_format_setups; // wlr_vk_render_format_setup.link diff --git a/include/render/wlr_renderer.h b/include/render/wlr_renderer.h index c55b3ac8..a8777bc0 100644 --- a/include/render/wlr_renderer.h +++ b/include/render/wlr_renderer.h @@ -8,14 +8,6 @@ */ struct wlr_renderer *renderer_autocreate_with_drm_fd(int drm_fd); /** - * Bind a buffer to the renderer. - * - * All subsequent rendering operations will operate on the supplied buffer. - * After rendering operations are done, the caller must unbind a buffer by - * calling renderer_bind_buffer with a NULL buffer. - */ -bool renderer_bind_buffer(struct wlr_renderer *r, struct wlr_buffer *buffer); -/** * Get the supported render formats. Buffers allocated with a format from this * list may be attached via wlr_renderer_begin_with_buffer. */ diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h index 740e2f2d..e096f4f3 100644 --- a/include/wlr/render/gles2.h +++ b/include/wlr/render/gles2.h @@ -33,10 +33,6 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl); struct wlr_egl *wlr_gles2_renderer_get_egl(struct wlr_renderer *renderer); bool wlr_gles2_renderer_check_ext(struct wlr_renderer *renderer, const char *ext); -/** - * Returns the OpenGL FBO of current buffer. - */ -GLuint wlr_gles2_renderer_get_current_fbo(struct wlr_renderer *wlr_renderer); struct wlr_gles2_texture_attribs { GLenum target; /* either GL_TEXTURE_2D or GL_TEXTURE_EXTERNAL_OES */ diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index a433ea2a..9cbf814f 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -20,11 +20,6 @@ struct wlr_box; struct wlr_fbox; struct wlr_renderer_impl { - bool (*bind_buffer)(struct wlr_renderer *renderer, - struct wlr_buffer *buffer); - bool (*begin)(struct wlr_renderer *renderer, uint32_t width, - uint32_t height); - void (*end)(struct wlr_renderer *renderer); const uint32_t *(*get_shm_texture_formats)( struct wlr_renderer *renderer, size_t *len); const struct wlr_drm_format_set *(*get_dmabuf_texture_formats)( diff --git a/include/wlr/render/pixman.h b/include/wlr/render/pixman.h index 7e19fa4e..436ff1a7 100644 --- a/include/wlr/render/pixman.h +++ b/include/wlr/render/pixman.h @@ -13,11 +13,6 @@ #include <wlr/render/wlr_renderer.h> struct wlr_renderer *wlr_pixman_renderer_create(void); -/** - * Returns the image of current buffer. - */ -pixman_image_t *wlr_pixman_renderer_get_current_image( - struct wlr_renderer *wlr_renderer); bool wlr_renderer_is_pixman(struct wlr_renderer *wlr_renderer); bool wlr_texture_is_pixman(struct wlr_texture *texture); diff --git a/include/wlr/render/vulkan.h b/include/wlr/render/vulkan.h index 04c877e4..50f8c558 100644 --- a/include/wlr/render/vulkan.h +++ b/include/wlr/render/vulkan.h @@ -24,8 +24,6 @@ VkInstance wlr_vk_renderer_get_instance(struct wlr_renderer *renderer); VkPhysicalDevice wlr_vk_renderer_get_physical_device(struct wlr_renderer *renderer); VkDevice wlr_vk_renderer_get_device(struct wlr_renderer *renderer); uint32_t wlr_vk_renderer_get_queue_family(struct wlr_renderer *renderer); -void wlr_vk_renderer_get_current_image_attribs(struct wlr_renderer *renderer, - struct wlr_vk_image_attribs *attribs); bool wlr_renderer_is_vk(struct wlr_renderer *wlr_renderer); bool wlr_texture_is_vk(struct wlr_texture *texture); diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h index 9c5011ec..08333a52 100644 --- a/include/wlr/render/wlr_renderer.h +++ b/include/wlr/render/wlr_renderer.h @@ -39,8 +39,6 @@ struct wlr_renderer { // private state const struct wlr_renderer_impl *impl; - - bool rendering; }; /** @@ -52,18 +50,6 @@ struct wlr_renderer { struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend); /** - * Start a render pass on the provided struct wlr_buffer. - * - * Compositors must call wlr_renderer_end() when they are done. - */ -bool wlr_renderer_begin_with_buffer(struct wlr_renderer *r, - struct wlr_buffer *buffer); -/** - * End a render pass. - */ -void wlr_renderer_end(struct wlr_renderer *r); - -/** * Get the shared-memory formats supporting import usage. Buffers allocated * with a format from this list may be imported via wlr_texture_from_pixels(). */ |