kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: set rust edition to 2024

Browse source
This commit is contained in:
Julian Orth 2025-02-21 10:44:29 +01:00
parent 02a18f620b
commit 3338909170
515 changed files with 1225 additions and 1187 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gfx_apis/gl/egl.rs
View file

@ -1,14 +1,14 @@
use {
crate::gfx_apis::gl::{
RenderError,
egl::sys::{
EGLAttrib, EGLLabelKHR, EGLenum, EGLint, EGL_DEBUG_MSG_CRITICAL_KHR,
EGL_DEBUG_MSG_ERROR_KHR, EGL_DEBUG_MSG_INFO_KHR, EGL_DEBUG_MSG_WARN_KHR, EGL_NONE,
EGL_OPENGL_ES_API, EGL_TRUE,
EGL_DEBUG_MSG_CRITICAL_KHR, EGL_DEBUG_MSG_ERROR_KHR, EGL_DEBUG_MSG_INFO_KHR,
EGL_DEBUG_MSG_WARN_KHR, EGL_NONE, EGL_OPENGL_ES_API, EGL_TRUE, EGLAttrib, EGLLabelKHR,
EGLenum, EGLint,
},
ext::{get_client_ext, ClientExt, EXT_PLATFORM_BASE, KHR_DEBUG, KHR_PLATFORM_GBM},
ext::{ClientExt, EXT_PLATFORM_BASE, KHR_DEBUG, KHR_PLATFORM_GBM, get_client_ext},
proc::ExtProc,
sys::EGL,
RenderError,
},
bstr::ByteSlice,
log::Level,

6
src/gfx_apis/gl/egl/context.rs
View file

@ -2,16 +2,16 @@ use {
crate::{
gfx_api::{GfxFormat, ResetStatus},
gfx_apis::gl::{
RenderError,
egl::{
display::EglDisplay,
sys::{EGLContext, EGLSurface, EGL_FALSE, EGL_TRUE},
sys::{EGL_FALSE, EGL_TRUE, EGLContext, EGLSurface},
},
ext::{GlExt, EXT_CREATE_CONTEXT_ROBUSTNESS},
ext::{EXT_CREATE_CONTEXT_ROBUSTNESS, GlExt},
sys::{
GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB,
GL_UNKNOWN_CONTEXT_RESET_ARB,
},
RenderError,
},
},
ahash::AHashMap,

24
src/gfx_apis/gl/egl/display.rs
View file

@ -1,13 +1,14 @@
use {
crate::{
format::{formats, Format},
format::{Format, formats},
gfx_api::{GfxFormat, GfxWriteModifier},
gfx_apis::gl::{
RenderError,
egl::{
PROCS,
context::EglContext,
image::EglImage,
sys::{
EGLClientBuffer, EGLConfig, EGLContext, EGLDisplay, EGLint,
EGL_CONTEXT_CLIENT_VERSION, EGL_DMA_BUF_PLANE0_FD_EXT,
EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
EGL_DMA_BUF_PLANE0_OFFSET_EXT, EGL_DMA_BUF_PLANE0_PITCH_EXT,
@ -20,24 +21,23 @@ use {
EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, EGL_DMA_BUF_PLANE3_OFFSET_EXT,
EGL_DMA_BUF_PLANE3_PITCH_EXT, EGL_HEIGHT, EGL_IMAGE_PRESERVED_KHR,
EGL_LINUX_DMA_BUF_EXT, EGL_LINUX_DRM_FOURCC_EXT, EGL_NONE, EGL_TRUE, EGL_WIDTH,
EGLClientBuffer, EGLConfig, EGLContext, EGLDisplay, EGLint,
},
PROCS,
},
ext::{
get_display_ext, get_gl_ext, DisplayExt, GlExt, ANDROID_NATIVE_FENCE_SYNC,
EXT_CREATE_CONTEXT_ROBUSTNESS, EXT_IMAGE_DMA_BUF_IMPORT_MODIFIERS,
GL_OES_EGL_IMAGE, GL_OES_EGL_IMAGE_EXTERNAL, KHR_FENCE_SYNC, KHR_IMAGE_BASE,
KHR_NO_CONFIG_CONTEXT, KHR_SURFACELESS_CONTEXT, KHR_WAIT_SYNC,
MESA_CONFIGLESS_CONTEXT,
ANDROID_NATIVE_FENCE_SYNC, DisplayExt, EXT_CREATE_CONTEXT_ROBUSTNESS,
EXT_IMAGE_DMA_BUF_IMPORT_MODIFIERS, GL_OES_EGL_IMAGE, GL_OES_EGL_IMAGE_EXTERNAL,
GlExt, KHR_FENCE_SYNC, KHR_IMAGE_BASE, KHR_NO_CONFIG_CONTEXT,
KHR_SURFACELESS_CONTEXT, KHR_WAIT_SYNC, MESA_CONFIGLESS_CONTEXT, get_display_ext,
get_gl_ext,
},
proc::ExtProc,
sys::{
Egl, GlesV2, EGL, EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT,
EGL_LOSE_CONTEXT_ON_RESET_EXT, EGL_PLATFORM_GBM_KHR, GLESV2,
EGL, EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT,
EGL_LOSE_CONTEXT_ON_RESET_EXT, EGL_PLATFORM_GBM_KHR, Egl, GLESV2, GlesV2,
},
RenderError,
},
video::{dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice, Modifier, INVALID_MODIFIER},
video::{INVALID_MODIFIER, Modifier, dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice},
},
ahash::AHashMap,
indexmap::{IndexMap, IndexSet},

2
src/gfx_apis/gl/egl/image.rs
View file

@ -2,7 +2,7 @@ use {
crate::{
gfx_apis::gl::egl::{
display::EglDisplay,
sys::{EGLImageKHR, EGL_FALSE},
sys::{EGL_FALSE, EGLImageKHR},
},
video::dmabuf::DmaBuf,
},

4
src/gfx_apis/gl/ext.rs
View file

@ -1,9 +1,9 @@
use {
crate::gfx_apis::gl::{
egl::sys::{EGLDisplay, EGL_EXTENSIONS},
RenderError,
egl::sys::{EGL_EXTENSIONS, EGLDisplay},
gl::sys::GL_EXTENSIONS,
sys::{EGL, GLESV2},
RenderError,
},
ahash::AHashSet,
bstr::ByteSlice,

4
src/gfx_apis/gl/gl/program.rs
View file

@ -1,11 +1,11 @@
use {
crate::gfx_apis::gl::{
RenderError,
egl::context::EglContext,
gl::{
shader::GlShader,
sys::{GLint, GLuint, GL_FALSE, GL_FRAGMENT_SHADER, GL_LINK_STATUS, GL_VERTEX_SHADER},
sys::{GL_FALSE, GL_FRAGMENT_SHADER, GL_LINK_STATUS, GL_VERTEX_SHADER, GLint, GLuint},
},
RenderError,
},
std::{ffi::CStr, rc::Rc},
};

6
src/gfx_apis/gl/gl/render_buffer.rs
View file

@ -2,15 +2,15 @@ use {
crate::{
format::Format,
gfx_apis::gl::{
RenderError,
egl::{context::EglContext, image::EglImage},
gl::{
frame_buffer::GlFrameBuffer,
sys::{
GLeglImageOES, GLuint, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER,
GL_FRAMEBUFFER_COMPLETE, GL_RENDERBUFFER,
GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER, GL_FRAMEBUFFER_COMPLETE, GL_RENDERBUFFER,
GLeglImageOES, GLuint,
},
},
RenderError,
},
},
std::rc::Rc,

6
src/gfx_apis/gl/gl/shader.rs
View file

@ -1,9 +1,9 @@
use {
crate::gfx_apis::gl::{
egl::context::EglContext,
gl::sys::{GLenum, GLuint, GL_COMPILE_STATUS, GL_FALSE},
sys::GLint,
RenderError,
egl::context::EglContext,
gl::sys::{GL_COMPILE_STATUS, GL_FALSE, GLenum, GLuint},
sys::GLint,
},
std::rc::Rc,
};

8
src/gfx_apis/gl/gl/texture.rs
View file

@ -2,14 +2,14 @@ use {
crate::{
format::Format,
gfx_apis::gl::{
RenderError,
egl::{context::EglContext, image::EglImage},
ext::GL_OES_EGL_IMAGE_EXTERNAL,
gl::sys::{
GLint, GLuint, GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_TEXTURE_WRAP_T, GL_UNPACK_ROW_LENGTH_EXT,
GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T,
GL_UNPACK_ROW_LENGTH_EXT, GLint, GLuint,
},
sys::{GLeglImageOES, GLenum, GL_TEXTURE_EXTERNAL_OES},
RenderError,
sys::{GL_TEXTURE_EXTERNAL_OES, GLeglImageOES, GLenum},
},
},
std::{cell::Cell, rc::Rc},

6
src/gfx_apis/gl/renderer/context.rs
View file

@ -8,24 +8,24 @@ use {
GfxImage, GfxInternalFramebuffer, ResetStatus, ShmGfxTexture,
},
gfx_apis::gl::{
GfxGlState, RenderError, Texture,
egl::{context::EglContext, display::EglDisplay, image::EglImage},
ext::GL_OES_EGL_IMAGE_EXTERNAL,
gl::{
program::GlProgram, render_buffer::GlRenderBuffer, sys::GLint, texture::GlTexture,
},
renderer::{framebuffer::Framebuffer, image::Image},
GfxGlState, RenderError, Texture,
},
rect::Rect,
video::{
dmabuf::DmaBuf,
drm::{sync_obj::SyncObjCtx, Drm},
drm::{Drm, sync_obj::SyncObjCtx},
gbm::GbmDevice,
},
},
ahash::AHashMap,
jay_config::video::GfxApi,
linearize::{static_map, Linearize, StaticMap},
linearize::{Linearize, StaticMap, static_map},
std::{
cell::{Cell, RefCell},
ffi::CString,

2
src/gfx_apis/gl/renderer/framebuffer.rs
View file

@ -7,6 +7,7 @@ use {
SyncFile,
},
gfx_apis::gl::{
RenderError,
gl::{
frame_buffer::GlFrameBuffer,
sys::{GL_COLOR_BUFFER_BIT, GL_FRAMEBUFFER},
@ -15,7 +16,6 @@ use {
renderer::context::GlRenderContext,
run_ops,
sys::{GL_ONE, GL_ONE_MINUS_SRC_ALPHA},
RenderError,
},
rect::Region,
theme::Color,

4
src/gfx_apis/gl/renderer/image.rs
View file

@ -2,8 +2,8 @@ use {
crate::{
gfx_api::{GfxError, GfxFramebuffer, GfxImage, GfxTexture},
gfx_apis::gl::{
egl::image::EglImage, gl::texture::GlTexture, Framebuffer, GlRenderContext,
RenderError, Texture,
Framebuffer, GlRenderContext, RenderError, Texture, egl::image::EglImage,
gl::texture::GlTexture,
},
},
std::rc::Rc,

6
src/gfx_apis/gl/renderer/sync.rs
View file

@ -1,12 +1,12 @@
use {
crate::{
gfx_apis::gl::{
RenderError,
egl::context::EglContext,
sys::{
EGLBoolean, EGLSyncKHR, EGL_NONE, EGL_SYNC_NATIVE_FENCE_ANDROID,
EGL_SYNC_NATIVE_FENCE_FD_ANDROID, EGL_TRUE,
EGL_NONE, EGL_SYNC_NATIVE_FENCE_ANDROID, EGL_SYNC_NATIVE_FENCE_FD_ANDROID,
EGL_TRUE, EGLBoolean, EGLSyncKHR,
},
RenderError,
},
utils::errorfmt::ErrorFmt,
},

6
src/gfx_apis/gl/renderer/texture.rs
View file

@ -6,13 +6,13 @@ use {
PendingShmTransfer, ShmGfxTexture, ShmMemory,
},
gfx_apis::gl::{
RenderError,
gl::texture::GlTexture,
renderer::context::GlRenderContext,
sys::{
GLint, GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T,
GL_UNPACK_ROW_LENGTH_EXT,
GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T,
GL_UNPACK_ROW_LENGTH_EXT, GLint,
},
RenderError,
},
rect::Region,
video::dmabuf::DmaBuf,