alex/baseview
1
0
Fork 0
Code Activity

Implement the OpenGL context on Windows

Browse source
This commit is contained in:
Robbert van der Helm 2022-02-07 22:36:37 +01:00
parent 2f7f177be8
commit fe107ab378
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/win/window.rs
View file

@ -16,7 +16,7 @@ use winapi::um::winuser::{
}; };
use std::cell::RefCell; use std::cell::RefCell;
use std::ffi::OsStr; use std::ffi::{c_void, OsStr};
use std::marker::PhantomData; use std::marker::PhantomData;
use std::os::windows::ffi::OsStrExt; use std::os::windows::ffi::OsStrExt;
use std::ptr::null_mut; use std::ptr::null_mut;
@ -35,7 +35,7 @@ use crate::{
use super::keyboard::KeyboardState; use super::keyboard::KeyboardState;
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
use crate::gl::GlContext; use crate::{gl::GlContext, window::RawWindowHandleWrapper};
unsafe fn generate_guid() -> String { unsafe fn generate_guid() -> String {
let mut guid: GUID = std::mem::zeroed(); let mut guid: GUID = std::mem::zeroed();
@ -84,7 +84,7 @@ unsafe impl HasRawWindowHandle for WindowHandle {
fn raw_window_handle(&self) -> RawWindowHandle { fn raw_window_handle(&self) -> RawWindowHandle {
if let Some(hwnd) = self.hwnd { if let Some(hwnd) = self.hwnd {
let mut handle = Win32Handle::empty(); let mut handle = Win32Handle::empty();
handle.hwnd = hwnd as *mut std::ffi::c_void; handle.hwnd = hwnd as *mut c_void;
RawWindowHandle::Win32(handle) RawWindowHandle::Win32(handle)
} else { } else {
@ -483,8 +483,13 @@ impl Window {
// todo: manage error ^ // todo: manage error ^
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
let gl_context: Arc<Option<GlContext>> = let gl_context: Arc<Option<GlContext>> = Arc::new(options.gl_config.map(|gl_config| {
Arc::new(todo!("Create the Windows OpenGL context")); let mut handle = Win32Handle::empty();
handle.hwnd = hwnd as *mut c_void;
let handle = RawWindowHandleWrapper { handle: RawWindowHandle::Win32(handle) };
GlContext::create(&handle, gl_config).expect("Could not create OpenGL context")
}));
#[cfg(not(feature = "opengl"))] #[cfg(not(feature = "opengl"))]
let handler = Box::new(build(&mut crate::Window::new(&mut Window { hwnd }))); let handler = Box::new(build(&mut crate::Window::new(&mut Window { hwnd })));
@ -583,7 +588,7 @@ impl Window {
unsafe impl HasRawWindowHandle for Window { unsafe impl HasRawWindowHandle for Window {
fn raw_window_handle(&self) -> RawWindowHandle { fn raw_window_handle(&self) -> RawWindowHandle {
let mut handle = Win32Handle::empty(); let mut handle = Win32Handle::empty();
handle.hwnd = self.hwnd as *mut std::ffi::c_void; handle.hwnd = self.hwnd as *mut c_void;
RawWindowHandle::Win32(handle) RawWindowHandle::Win32(handle)
} }

6
src/x11/window.rs
View file

@ -11,7 +11,6 @@ use xcb::ffi::xcb_screen_t;
use xcb::StructPtr; use xcb::StructPtr;
use super::XcbConnection; use super::XcbConnection;
use crate::window::RawWindowHandleWrapper;
use crate::{ use crate::{
Event, MouseButton, MouseCursor, MouseEvent, PhyPoint, PhySize, ScrollDelta, WindowEvent, Event, MouseButton, MouseCursor, MouseEvent, PhyPoint, PhySize, ScrollDelta, WindowEvent,
WindowHandler, WindowInfo, WindowOpenOptions, WindowScalePolicy, WindowHandler, WindowInfo, WindowOpenOptions, WindowScalePolicy,
@ -20,7 +19,10 @@ use crate::{
use super::keyboard::{convert_key_press_event, convert_key_release_event}; use super::keyboard::{convert_key_press_event, convert_key_release_event};
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
use crate::gl::{platform, GlContext}; use crate::{
gl::{platform, GlContext},
window::RawWindowHandleWrapper,
};
pub struct WindowHandle { pub struct WindowHandle {
raw_window_handle: Option<RawWindowHandle>, raw_window_handle: Option<RawWindowHandle>,