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.

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

build(deps): bump glow from 0.10.0 to 0.11.0 #594

Merged
merged 4 commits into from
Sep 2, 2021
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Revert "gl: remove Default in glow newtypes"
This reverts commit e3f3196.
  • Loading branch information
iceiix committed Sep 2, 2021
commit 594046dbc16b53a62c7a0050af87188fd81f3f47
6 changes: 6 additions & 0 deletions src/gl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ pub const NEAREST_MIPMAP_LINEAR: TextureValue = gl::NEAREST_MIPMAP_LINEAR as Tex
pub const CLAMP_TO_EDGE: TextureValue = gl::CLAMP_TO_EDGE as TextureValue;

/// `Texture` is a buffer of data used by fragment shaders.
#[derive(Default)]
pub struct Texture(glow::Texture);

impl Texture {
Expand Down Expand Up @@ -458,6 +459,7 @@ pub type ShaderParameter = u32;
pub const COMPILE_STATUS: ShaderParameter = gl::COMPILE_STATUS;
pub const INFO_LOG_LENGTH: ShaderParameter = gl::INFO_LOG_LENGTH;

#[derive(Default)]
pub struct Program(glow::Program);

impl Program {
Expand Down Expand Up @@ -647,6 +649,7 @@ impl Attribute {
// VertexArray is used to store state needed to render vertices.
// This includes buffers, the format of the buffers and enabled
// attributes.
#[derive(Default)]
pub struct VertexArray(glow::VertexArray);

impl VertexArray {
Expand Down Expand Up @@ -674,6 +677,7 @@ impl Drop for VertexArray {
unsafe {
glow_context().delete_vertex_array(self.0);
}
self.0 = glow::VertexArray::default();
}
}

Expand Down Expand Up @@ -706,6 +710,7 @@ pub const READ_ONLY: Access = gl::READ_ONLY;
pub const WRITE_ONLY: Access = gl::WRITE_ONLY;

/// `Buffer` is a storage for vertex data.
#[derive(Default)]
pub struct Buffer(glow::Buffer);

impl Buffer {
Expand Down Expand Up @@ -804,6 +809,7 @@ pub const COLOR_ATTACHMENT_1: Attachment = gl::COLOR_ATTACHMENT1;
pub const COLOR_ATTACHMENT_2: Attachment = gl::COLOR_ATTACHMENT2;
pub const DEPTH_ATTACHMENT: Attachment = gl::DEPTH_ATTACHMENT;

#[derive(Default)]
pub struct Framebuffer(glow::Framebuffer);

pub fn check_framebuffer_status() {
Expand Down