Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error on creating native GL object instead of panic #316

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Error on creating native GL object instead of panic #316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7bc40d
Error on creating native GL object instead of panic
sagudev Oct 22, 2024
f8ad8b0
fmt
sagudev Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 42 additions & 16 deletions src/native.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,18 @@ impl HasContext for Context {
let gl = &self.raw;
let mut name = 0;
gl.GenFramebuffers(1, &mut name);
Ok(NativeFramebuffer(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeFramebuffer)
.ok_or_else(|| String::from("Unable to create Framebuffer object"))
}

unsafe fn create_named_framebuffer(&self) -> Result<Self::Framebuffer, String> {
let gl = &self.raw;
let mut name = 0;
gl.CreateFramebuffers(1, &mut name);
Ok(NativeFramebuffer(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeFramebuffer)
.ok_or_else(|| String::from("Unable to create Framebuffer object"))
}

unsafe fn is_framebuffer(&self, framebuffer: Self::Framebuffer) -> bool {
Expand All @@ -245,14 +249,18 @@ impl HasContext for Context {
let gl = &self.raw;
let mut name = 0;
gl.GenQueries(1, &mut name);
Ok(NativeQuery(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeQuery)
.ok_or_else(|| String::from("Unable to create Query object"))
}

unsafe fn create_renderbuffer(&self) -> Result<Self::Renderbuffer, String> {
let gl = &self.raw;
let mut name = 0;
gl.GenRenderbuffers(1, &mut name);
Ok(NativeRenderbuffer(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeRenderbuffer)
.ok_or_else(|| String::from("Unable to create Renderbuffer object"))
}

unsafe fn is_renderbuffer(&self, renderbuffer: Self::Renderbuffer) -> bool {
Expand All @@ -264,14 +272,16 @@ impl HasContext for Context {
let gl = &self.raw;
let mut name = 0;
gl.GenSamplers(1, &mut name);
Ok(NativeSampler(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeSampler)
.ok_or_else(|| String::from("Unable to create Sampler object"))
}

unsafe fn create_shader(&self, shader_type: u32) -> Result<Self::Shader, String> {
let gl = &self.raw;
Ok(NativeShader(non_zero_gl_name(
gl.CreateShader(shader_type as u32),
)))
NonZeroU32::new(gl.CreateShader(shader_type as u32))
.map(NativeShader)
.ok_or_else(|| String::from("Unable to create Shader object"))
}

unsafe fn is_shader(&self, shader: Self::Shader) -> bool {
Expand All @@ -283,14 +293,18 @@ impl HasContext for Context {
let gl = &self.raw;
let mut name = 0;
gl.GenTextures(1, &mut name);
Ok(NativeTexture(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeTexture)
.ok_or_else(|| String::from("Unable to create Texture object"))
}

unsafe fn create_named_texture(&self, target: u32) -> Result<Self::Texture, String> {
let gl = &self.raw;
let mut name = 0;
gl.CreateTextures(target, 1, &mut name);
Ok(NativeTexture(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeTexture)
.ok_or_else(|| String::from("Unable to create Texture object"))
}

unsafe fn is_texture(&self, texture: Self::Texture) -> bool {
Expand Down Expand Up @@ -375,7 +389,9 @@ impl HasContext for Context {

unsafe fn create_program(&self) -> Result<Self::Program, String> {
let gl = &self.raw;
Ok(NativeProgram(non_zero_gl_name(gl.CreateProgram())))
NonZeroU32::new(gl.CreateProgram())
.map(NativeProgram)
.ok_or_else(|| String::from("Unable to create Program object"))
}

unsafe fn is_program(&self, program: Self::Program) -> bool {
Expand Down Expand Up @@ -1087,14 +1103,18 @@ impl HasContext for Context {
let gl = &self.raw;
let mut buffer = 0;
gl.GenBuffers(1, &mut buffer);
Ok(NativeBuffer(non_zero_gl_name(buffer)))
NonZeroU32::new(buffer)
.map(NativeBuffer)
.ok_or_else(|| String::from("Unable to create Buffer object"))
}

unsafe fn create_named_buffer(&self) -> Result<Self::Buffer, String> {
let gl = &self.raw;
let mut buffer = 0;
gl.CreateBuffers(1, &mut buffer);
Ok(NativeBuffer(non_zero_gl_name(buffer)))
NonZeroU32::new(buffer)
.map(NativeBuffer)
.ok_or_else(|| String::from("Unable to create Buffer object"))
}

unsafe fn is_buffer(&self, buffer: Self::Buffer) -> bool {
Expand Down Expand Up @@ -1211,14 +1231,18 @@ impl HasContext for Context {
let gl = &self.raw;
let mut vertex_array = 0;
gl.GenVertexArrays(1, &mut vertex_array);
Ok(NativeVertexArray(non_zero_gl_name(vertex_array)))
NonZeroU32::new(vertex_array)
.map(NativeVertexArray)
.ok_or_else(|| String::from("Unable to create VertexArray object"))
}

unsafe fn create_named_vertex_array(&self) -> Result<Self::VertexArray, String> {
let gl = &self.raw;
let mut vertex_array = 0;
gl.CreateVertexArrays(1, &mut vertex_array);
Ok(NativeVertexArray(non_zero_gl_name(vertex_array)))
NonZeroU32::new(vertex_array)
.map(NativeVertexArray)
.ok_or_else(|| String::from("Unable to create VertexArray object"))
}

unsafe fn delete_vertex_array(&self, vertex_array: Self::VertexArray) {
Expand Down Expand Up @@ -3986,7 +4010,9 @@ impl HasContext for Context {
let gl = &self.raw;
let mut name = 0;
gl.GenTransformFeedbacks(1, &mut name);
Ok(NativeTransformFeedback(non_zero_gl_name(name)))
NonZeroU32::new(name)
.map(NativeTransformFeedback)
.ok_or_else(|| String::from("Unable to create TransformFeedback object"))
}

unsafe fn delete_transform_feedback(&self, transform_feedback: Self::TransformFeedback) {
Expand Down
Loading