Skip to content

Linux platform updates - core profile support #1

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.

Sign up for GitHub

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

Open
kaydenl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Linux platform updates - core profile support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bb23bc
Switch the Linux build from GLEW to libepoxy.
kaydenl Jun 3, 2015
f305e9d
Delete empty initGLProcs() function.
kaydenl Jun 3, 2015
a2f3149
Use an OpenGL 3.2 Core Profile context on all platforms (not just App…
kaydenl Jun 3, 2015
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
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ LINKFLAGS := -pthread -lAntTweakBar $(shell sdl2-config --libs) $(shell freetype

ARCH = $(shell uname -s)
ifeq ($(ARCH),Linux)
LINKFLAGS += -lGLEW -lGL
LINKFLAGS += -lepoxy -lGL
else
ifeq ($(ARCH),Darwin)
LINKFLAGS += -framework OpenGL
Expand All @@ -74,7 +74,6 @@ OFILES=\
solid.o \
cloud.o \
final.o \
glprocs.o \
myTwEventSDL20.o \
icon.o \
widget.o \
Expand Down
60 changes: 0 additions & 60 deletions glprocs.cc
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions glprocs.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
#ifdef __APPLE__
#include <OpenGL/gl3.h>
#else
#include <GL/glew.h>
#include <epoxy/gl.h>
#endif

void initGLProcs();

#endif
11 changes: 1 addition & 10 deletions sdl_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,10 @@ static int go()
set_sdl_attr(SDL_GL_MULTISAMPLEBUFFERS, 1);
set_sdl_attr(SDL_GL_MULTISAMPLESAMPLES, 4);

#ifdef __APPLE__
// Apple defaults to an OpenGL 2.1 Compatibility context unless you
// specify otherwise.
// Use an OpenGL 3.2 Core Profile context.
set_sdl_attr(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
set_sdl_attr(SDL_GL_CONTEXT_MINOR_VERSION, 2);
set_sdl_attr(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
#endif

Viewport viewport(640, 480);

Expand All @@ -128,12 +125,6 @@ static int go()
exit(1);
}

//
// Get access to OpenGL functions
//

initGLProcs();

//
// Initialize orbital rendering pipeline
//
Expand Down