From 6c11443a042d77cd01f6ef9b515490b54c1130d8 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 30 Jan 2015 04:24:31 -0400 Subject: [PATCH] Fixed graphics initialization crashing love when OpenGL ES 2 is used. --HG-- branch : minor --- src/modules/graphics/opengl/OpenGL.cpp | 4 ++-- src/modules/window/sdl/Window.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index b5dcbae04..063e7bb72 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -139,7 +139,8 @@ void OpenGL::setupContext() state.lastProjectionMatrix.setTranslation(nan, nan); state.lastTransformMatrix.setTranslation(nan, nan); - glMatrixMode(GL_MODELVIEW); + if (GLAD_VERSION_1_0) + glMatrixMode(GL_MODELVIEW); contextInitialized = true; } @@ -568,7 +569,6 @@ void OpenGL::setTextureFilter(graphics::Texture::Filter &f) gmin = GL_LINEAR; } - switch (f.mag) { case Texture::FILTER_NEAREST: diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 0b2911e04..d555dbc05 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -32,7 +32,7 @@ #include #ifdef LOVE_WINDOWS -#include +#include #endif #ifndef APIENTRY