Skip to content

Commit

Permalink
Spell check and add to CHANGELOG
Browse files Browse the repository at this point in the history
Signed-off-by: Hal Gentz <[email protected]>
  • Loading branch information
goddessfreya committed Jul 4, 2018
1 parent 2b49731 commit 76754c8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Unreleased
- ***BREAKING*** Headless contexts have been removed. Please instead use
`Context::new()` when trying to make a context without a visible window.

# Version 0.17.0 (2018-06-27)

Expand Down
4 changes: 2 additions & 2 deletions src/api/android/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ impl Context {
_el: &winit::EventsLoop,
pf_reqs: &PixelFormatRequirements,
gl_attr: &GlAttributes<&Context>,
shareable_with_windowed_contextes: bool,
shareable_with_windowed_contexts: bool,
) -> Result<Self, CreationError> {
assert!(shareable_with_windowed_contextes); // TODO: Implement if possible
assert!(shareable_with_windowed_contexts); // TODO: Implement if possible

let gl_attr = gl_attr.clone().map_sharing(|c| &c.0);
let context = EglContext::new(
Expand Down
16 changes: 8 additions & 8 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,9 @@ impl GlWindow {
/// Builds the given window along with the associated GL context, returning the pair as a
/// `GlWindow`.
///
/// The generated gl context is of course shareable with other contextes
/// The generated gl context is of course shareable with other contexts
/// made from this function. It is possible to also share it with a headless
/// context made with the shareable_with_windowed_contextes flag set to true.
/// context made with the shareable_with_windowed_contexts flag set to true.
///
/// Error should be very rare and only occur in case of permission denied,
/// incompatible system out of memory, etc.
Expand Down Expand Up @@ -417,23 +417,23 @@ impl GlContext for Context {
impl Context {
/// Builds the given GL context
///
/// Contextes made with the shareable_with_windowed_contextes flag set to
/// true can be both shared with other contextes made with that flag set to
/// true and with contextes made when creating a GlWindow. If the flag is
/// not set however, then the context can only be shared with other contextes
/// Contexts made with the shareable_with_windowed_contexts flag set to
/// true can be both shared with other contexts made with that flag set to
/// true and with contexts made when creating a GlWindow. If the flag is
/// not set however, then the context can only be shared with other contexts
/// made with that flag unset.
///
/// Error should be very rare and only occur in case of permission denied,
/// incompatible system, out of memory, etc.
pub fn new(
el: &winit::EventsLoop,
context_builder: ContextBuilder,
shareable_with_windowed_contextes: bool,
shareable_with_windowed_contexts: bool,
) -> Result<Self, CreationError>
{
let ContextBuilder { pf_reqs, gl_attr } = context_builder;
let gl_attr = gl_attr.map_sharing(|ctxt| &ctxt.context);
platform::Context::new_context(el, &pf_reqs, &gl_attr, shareable_with_windowed_contextes)
platform::Context::new_context(el, &pf_reqs, &gl_attr, shareable_with_windowed_contexts)
.map(|context| Context {
context: context,
})
Expand Down
4 changes: 2 additions & 2 deletions src/platform/emscripten/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ impl Context {
el: &winit::EventsLoop,
pf_reqs: &PixelFormatRequirements,
gl_attr: &GlAttributes<&Context>,
shareable_with_windowed_contextes: bool,
shareable_with_windowed_contexts: bool,
) -> Result<Self, CreationError> {
assert!(shareable_with_windowed_contextes); // TODO: Implement if possible
assert!(shareable_with_windowed_contexts); // TODO: Implement if possible
let wb = winit::WindowBuilder::new().with_visibility(false);
Self::new(wb, el, pf_reqs, gl_attr).map(|(w, c)| match c {
Context::Window(c) => Context::WindowedContext(w, c),
Expand Down
4 changes: 2 additions & 2 deletions src/platform/linux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ impl Context {
el: &winit::EventsLoop,
pf_reqs: &PixelFormatRequirements,
gl_attr: &GlAttributes<&Context>,
shareable_with_windowed_contextes: bool,
shareable_with_windowed_contexts: bool,
) -> Result<Self, CreationError>
{
if shareable_with_windowed_contextes {
if shareable_with_windowed_contexts {
let wb = winit::WindowBuilder::new().with_visibility(false);

if el.is_wayland() {
Expand Down

0 comments on commit 76754c8

Please sign in to comment.