From 115382d8f0f86bd3393437be198a5ea8061516d6 Mon Sep 17 00:00:00 2001 From: chyyran Date: Fri, 10 Feb 2023 23:31:10 -0500 Subject: [PATCH] gl: rename capi Framebuffer handle to 'fbo' to make it more clear. --- include/librashader.h | 2 +- librashader-capi/src/runtime/gl/filter_chain.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/librashader.h b/include/librashader.h index 6ffaded..917c005 100644 --- a/include/librashader.h +++ b/include/librashader.h @@ -190,7 +190,7 @@ typedef struct libra_viewport_t { /// OpenGL parameters for the output framebuffer. typedef struct libra_output_framebuffer_gl_t { /// A framebuffer GLuint to the output framebuffer. - uint32_t handle; + uint32_t fbo; /// A texture GLuint to the logical buffer of the output framebuffer. uint32_t texture; /// The format of the output framebuffer. diff --git a/librashader-capi/src/runtime/gl/filter_chain.rs b/librashader-capi/src/runtime/gl/filter_chain.rs index 2c2331f..8cd525f 100644 --- a/librashader-capi/src/runtime/gl/filter_chain.rs +++ b/librashader-capi/src/runtime/gl/filter_chain.rs @@ -3,7 +3,7 @@ use crate::ctypes::{ }; use crate::error::{assert_non_null, assert_some_ptr, LibrashaderError}; use crate::ffi::extern_fn; -use librashader::runtime::gl::{Framebuffer, GLImage}; +use librashader::runtime::gl::{GLFramebuffer, GLImage}; use std::ffi::CStr; use std::ffi::{c_char, c_void, CString}; use std::mem::MaybeUninit; @@ -36,7 +36,7 @@ pub struct libra_source_image_gl_t { #[repr(C)] pub struct libra_output_framebuffer_gl_t { /// A framebuffer GLuint to the output framebuffer. - pub handle: u32, + pub fbo: u32, /// A texture GLuint to the logical buffer of the output framebuffer. pub texture: u32, /// The format of the output framebuffer. @@ -189,7 +189,7 @@ extern_fn! { }; let opt = opt.map(FromUninit::from_uninit); - let framebuffer = Framebuffer::new_from_raw(out.texture, out.handle, out.format, Size::new(viewport.width, viewport.height), 1); + let framebuffer = GLFramebuffer::new_from_raw(out.texture, out.fbo, out.format, Size::new(viewport.width, viewport.height), 1); let viewport = Viewport { x: viewport.x, y: viewport.y,