Skip to content

Verify the texture buffer for tex_image_2d() call. #122

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Verify the texture buffer for tex_image_2d() call. #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 7 additions & 13 deletions src/gl_fns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,19 +353,13 @@ impl Gl for GlFns {
format: GLenum,
ty: GLenum,
opt_data: Option<&[u8]>) {
match opt_data {
Some(data) => {
unsafe {
self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
data.as_ptr() as *const GLvoid);
}
}
None => {
unsafe {
self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
ptr::null());
}
}
let ptr = match opt_data {
Some(data) if !data.is_empty() => data.as_ptr(),
_ => ptr::null(),
};
unsafe {
self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
ptr as *const GLvoid);
}
}

Expand Down
20 changes: 7 additions & 13 deletions src/gles_fns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,19 +331,13 @@ impl Gl for GlesFns {
format: GLenum,
ty: GLenum,
opt_data: Option<&[u8]>) {
match opt_data {
Some(data) => {
unsafe {
self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
data.as_ptr() as *const GLvoid);
}
}
None => {
unsafe {
self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
ptr::null());
}
}
let ptr = match opt_data {
Some(data) if !data.is_empty() => data.as_ptr(),
_ => ptr::null(),
};
unsafe {
self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
ptr as *const GLvoid);
}
}

Expand Down