alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 23:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from tomaka/update-glrs

Browse source 
Update for changes in gl-rs
This commit is contained in:
tomaka 2014-11-05 15:39:20 +01:00
parent 2e44edea60 7ce851dad9
commit c63511e9e6
4 changed files with 59 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
examples/support/mod.rs
View file

@ -31,7 +31,7 @@ pub struct Context {
}
pub fn load(window: &glutin::Window) -> Context {
let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol));
let gl = gl::Gl::load(window);
let version = {
use std::c_str::CString;
@ -46,42 +46,46 @@ pub fn load(window: &glutin::Window) -> Context {
impl Context {
#[cfg(not(target_os = "android"))]
pub fn draw_frame(&self, color: (f32, f32, f32, f32)) {
self.gl.ClearColor(color.0, color.1, color.2, color.3);
self.gl.Clear(gl::COLOR_BUFFER_BIT);
unsafe {
self.gl.ClearColor(color.0, color.1, color.2, color.3);
self.gl.Clear(gl::COLOR_BUFFER_BIT);
self.gl.Begin(gl::TRIANGLES);
self.gl.Color3f(1.0, 0.0, 0.0);
self.gl.Vertex2f(-0.5, -0.5);
self.gl.Color3f(0.0, 1.0, 0.0);
self.gl.Vertex2f(0.0, 0.5);
self.gl.Color3f(0.0, 0.0, 1.0);
self.gl.Vertex2f(0.5, -0.5);
self.gl.End();
self.gl.Begin(gl::TRIANGLES);
self.gl.Color3f(1.0, 0.0, 0.0);
self.gl.Vertex2f(-0.5, -0.5);
self.gl.Color3f(0.0, 1.0, 0.0);
self.gl.Vertex2f(0.0, 0.5);
self.gl.Color3f(0.0, 0.0, 1.0);
self.gl.Vertex2f(0.5, -0.5);
self.gl.End();
self.gl.Flush();
self.gl.Flush();
}
}
#[cfg(target_os = "android")]
pub fn draw_frame(&self, color: (f32, f32, f32, f32)) {
self.gl.ClearColor(color.0, color.1, color.2, color.3);
self.gl.Clear(gl::COLOR_BUFFER_BIT);
self.gl.EnableClientState(gl::VERTEX_ARRAY);
self.gl.EnableClientState(gl::COLOR_ARRAY);
unsafe {
use std::mem;
self.gl.VertexPointer(2, gl::FLOAT, (mem::size_of::<f32>() * 5) as i32,
mem::transmute(VERTEX_DATA.as_slice().as_ptr()));
self.gl.ColorPointer(3, gl::FLOAT, (mem::size_of::<f32>() * 5) as i32,
mem::transmute(VERTEX_DATA.as_slice().as_ptr().offset(2)));
}
self.gl.ClearColor(color.0, color.1, color.2, color.3);
self.gl.Clear(gl::COLOR_BUFFER_BIT);
self.gl.DrawArrays(gl::TRIANGLES, 0, 3);
self.gl.DisableClientState(gl::VERTEX_ARRAY);
self.gl.DisableClientState(gl::COLOR_ARRAY);
self.gl.Flush();
self.gl.EnableClientState(gl::VERTEX_ARRAY);
self.gl.EnableClientState(gl::COLOR_ARRAY);
unsafe {
use std::mem;
self.gl.VertexPointer(2, gl::FLOAT, (mem::size_of::<f32>() * 5) as i32,
mem::transmute(VERTEX_DATA.as_slice().as_ptr()));
self.gl.ColorPointer(3, gl::FLOAT, (mem::size_of::<f32>() * 5) as i32,
mem::transmute(VERTEX_DATA.as_slice().as_ptr().offset(2)));
}
self.gl.DrawArrays(gl::TRIANGLES, 0, 3);
self.gl.DisableClientState(gl::VERTEX_ARRAY);
self.gl.DisableClientState(gl::COLOR_ARRAY);
self.gl.Flush();
}
}
}

16
src/lib.rs
View file

@ -31,6 +31,8 @@
#[phase(plugin)] extern crate compile_msg;
#[phase(plugin)] extern crate gl_generator;
extern crate gl_common;
extern crate libc;
#[cfg(target_os = "macos")]
@ -397,6 +399,13 @@ impl Window {
}
}
#[cfg(feature = "window")]
impl gl_common::GlFunctionsSource for Window {
fn get_proc_addr(&self, addr: &str) -> *const libc::c_void {
self.get_proc_address(addr)
}
}
/// Represents a headless OpenGL context.
#[cfg(feature = "headless")]
pub struct HeadlessContext {
@ -421,6 +430,13 @@ impl HeadlessContext {
}
}
#[cfg(feature = "headless")]
impl gl_common::GlFunctionsSource for HeadlessContext {
fn get_proc_addr(&self, addr: &str) -> *const libc::c_void {
self.get_proc_address(addr)
}
}
/// An iterator for the `poll_events` function.
// Implementation note: we retreive the list once, then serve each element by one by one.
// This may change in the future.

2
src/win32/init.rs
View file

@ -350,7 +350,7 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
if builder_vsync {
if extra_functions.SwapIntervalEXT.is_loaded() {
unsafe { ffi::wgl::MakeCurrent(hdc, context) };
if extra_functions.SwapIntervalEXT(1) == 0 {
if unsafe { extra_functions.SwapIntervalEXT(1) } == 0 {
tx.send(Err(format!("wglSwapIntervalEXT failed")));
unsafe { ffi::wgl::DeleteContext(context); }
unsafe { ffi::DestroyWindow(real_window); }

16
tests/headless.rs
View file

@ -24,12 +24,14 @@ fn main() {
let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol));
gl.ClearColor(0.0, 1.0, 0.0, 1.0);
gl.Clear(gl::COLOR_BUFFER_BIT);
unsafe {
gl.ClearColor(0.0, 1.0, 0.0, 1.0);
gl.Clear(gl::COLOR_BUFFER_BIT);
let mut value: (u8, u8, u8, u8) = unsafe { std::mem::uninitialized() };
unsafe { gl.ReadPixels(0, 0, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, std::mem::transmute(&mut value)) };
assert!(value == (0, 255, 0, 255) || value == (0, 64, 0, 255) ||
value == (0, 64, 0, 255) || value == (0, 64, 0, 0));
let mut value: (u8, u8, u8, u8) = std::mem::uninitialized();
gl.ReadPixels(0, 0, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, std::mem::transmute(&mut value));
assert!(value == (0, 255, 0, 255) || value == (0, 64, 0, 255) ||
value == (0, 64, 0, 255) || value == (0, 64, 0, 0));
}
}