Merge branch 'master' into malformed

Conflicts:
	llmr.gyp
This commit is contained in:
Mike Morris
2014-07-07 17:26:37 -07:00
7 changed files with 131 additions and 33 deletions

View File

@@ -29,13 +29,11 @@ test: build/test/Makefile
# Runs all test cases
run-tests: test
@for FILE in build/$(BUILDTYPE)/test_*; do \
$${FILE}; \
done
(cd build/${BUILDTYPE} && exec find . -maxdepth 1 -name "test_*" -exec {} \;)
test/%: build/test/Makefile
$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) $*
(cd build/$(BUILDTYPE) && ./test_$*)
(cd build/$(BUILDTYPE) && exec ./test_$*)
##### Makefile builds ##########################################################

View File

@@ -13,6 +13,7 @@ void notify_map_change(MapChange change) {
}
HeadlessView::HeadlessView() {
#if LLMR_USE_CGL
// TODO: test if OpenGL 4.1 with GL_ARB_ES2_compatibility is supported
// If it is, use kCGLOGLPVersion_3_2_Core and enable that extension.
CGLPixelFormatAttribute attributes[] = {
@@ -36,14 +37,47 @@ HeadlessView::HeadlessView() {
fprintf(stderr, "Error creating GL context object\n");
return;
}
#endif
make_active();
#if LLMR_USE_GLX
x_display = XOpenDisplay(0);
if (x_display == nullptr) {
throw std::runtime_error("Failed to open X display");
}
static int pixelFormat[] = {
GLX_RGBA,
GLX_DOUBLEBUFFER,
GLX_RED_SIZE, 8,
GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8,
GLX_ALPHA_SIZE, 8,
GLX_DEPTH_SIZE, 24,
GLX_STENCIL_SIZE, 8,
None
};
x_info = glXChooseVisual(x_display, DefaultScreen(x_display), pixelFormat);
if (x_info == nullptr) {
throw std::runtime_error("Error pixel format");
}
gl_context = glXCreateContext(x_display, x_info, 0, GL_TRUE);
if (gl_context == nullptr) {
throw std::runtime_error("Error creating GL context object");
}
#endif
}
void HeadlessView::resize(int width, int height) {
clear_buffers();
#if LLMR_USE_CGL
make_active();
// Create depth/stencil buffer
glGenRenderbuffersEXT(1, &fbo_depth_stencil);
glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, fbo_depth_stencil);
@@ -74,9 +108,19 @@ void HeadlessView::resize(int width, int height) {
}
return;
}
#endif
#if LLMR_USE_GLX
x_pixmap = XCreatePixmap(x_display, DefaultRootWindow(x_display), width, height, 32);
glx_pixmap = glXCreateGLXPixmap(x_display, x_info, x_pixmap);
make_active();
#endif
}
void HeadlessView::clear_buffers() {
#if LLMR_USE_CGL
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
if (fbo) {
@@ -93,24 +137,52 @@ void HeadlessView::clear_buffers() {
glDeleteRenderbuffersEXT(1, &fbo_depth_stencil);
fbo_depth_stencil = 0;
}
#endif
#if LLMR_USE_GLX
if (glx_pixmap) {
glXDestroyGLXPixmap(x_display, glx_pixmap);
glx_pixmap = 0;
}
if (x_pixmap) {
XFreePixmap(x_display, x_pixmap);
x_pixmap = 0;
}
#endif
}
HeadlessView::~HeadlessView() {
clear_buffers();
#if LLMR_USE_CGL
CGLDestroyContext(gl_context);
#endif
}
void HeadlessView::make_active() {
#if LLMR_USE_CGL
CGLError error = CGLSetCurrentContext(gl_context);
if (error) {
fprintf(stderr, "Switching OpenGL context failed\n");
}
#endif
#if LLMR_USE_GLX
if (!glXMakeCurrent(x_display, glx_pixmap, gl_context)) {
fprintf(stderr, "Switching OpenGL context failed\n");
}
#endif
}
void HeadlessView::swap() {}
unsigned int HeadlessView::root_fbo() {
#if LLMR_USE_CGL
return fbo;
#endif
return 0;
}
}

View File

@@ -1,6 +1,13 @@
#ifndef LLMR_COMMON_HEADLESS_CGL
#define LLMR_COMMON_HEADLESS_CGL
#ifdef __APPLE__
#define LLMR_USE_CGL 1
#else
#include <GL/glx.h>
#define LLMR_USE_GLX 1
#endif
#include <llmr/map/view.hpp>
#include <llmr/platform/gl.hpp>
@@ -22,10 +29,20 @@ private:
private:
#ifdef LLMR_USE_CGL
CGLContextObj gl_context;
GLuint fbo = 0;
GLuint fbo_depth_stencil = 0;
GLuint fbo_color = 0;
#endif
#ifdef LLMR_USE_GLX
GLXContext gl_context = nullptr;
XVisualInfo *x_info = nullptr;
Display *x_display = nullptr;
Pixmap x_pixmap = 0;
GLXPixmap glx_pixmap = 0;
#endif
};
}

View File

@@ -51,34 +51,9 @@
],
'dependencies': [
'../llmr.gyp:llmr-x86',
'default_stylesheet',
'certificate_bundle',
'../llmr.gyp:copy_default_stylesheet',
'../llmr.gyp:copy_certificate_bundle',
],
},
{
'target_name': 'default_stylesheet',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'../llmr.gyp:build_stylesheet'
],
'copies': [
{
'files': [ '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' ],
'destination': '<(PRODUCT_DIR)'
}
]
},
{
'target_name': 'certificate_bundle',
'type': 'none',
'hard_dependency': 1,
'copies': [
{
'files': [ '../common/ca-bundle.crt' ],
'destination': '<(PRODUCT_DIR)'
}
]
}
],
}

View File

@@ -77,6 +77,31 @@
],
}
},
{
'target_name': 'copy_default_stylesheet',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'build_stylesheet'
],
'copies': [
{
'files': [ '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' ],
'destination': '<(PRODUCT_DIR)'
}
]
},
{
'target_name': 'copy_certificate_bundle',
'type': 'none',
'hard_dependency': 1,
'copies': [
{
'files': [ 'common/ca-bundle.crt' ],
'destination': '<(PRODUCT_DIR)'
}
]
},
{
'target_name': 'llmr-x86',
'product_name': 'llmr-x86',

View File

@@ -22,6 +22,9 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
sudo apt-get -y install git build-essential zlib1g-dev automake libtool xutils-dev make cmake pkg-config
sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
# use g++ that supports c++11
if [[ ${CXX} == "g++" ]]; then
export CXX="g++-4.8" ;

View File

@@ -16,7 +16,12 @@
],
},
}, {
# TODO: add OpenGL link settings for linux
'link_settings': {
'libraries': [
'<@(glfw3_libraries)', # This is a hack since we're not actually using GLFW
'-lboost_regex',
],
},
}],
],
},
@@ -164,6 +169,8 @@
"../llmr.gyp:llmr-x86",
"link_gl",
"link_curl",
'../llmr.gyp:copy_default_stylesheet',
'../llmr.gyp:copy_certificate_bundle',
]
},
{
@@ -175,6 +182,7 @@
"variant",
"tile",
"functions",
"headless",
],
}
]