Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #464 from tribal-tec/master
Release 1.9 preparations
  • Loading branch information
tribal-tec committed Jul 7, 2015
2 parents 5f4402f + 69c17b7 commit a7f5cfa
Show file tree
Hide file tree
Showing 26 changed files with 212 additions and 389 deletions.
2 changes: 1 addition & 1 deletion .gitexternals
@@ -1,2 +1,2 @@
# -*- mode: cmake -*-
# CMake/common https://github.com/Eyescale/CMake.git df34a8b
# CMake/common https://github.com/Eyescale/CMake.git 2b5d7f2
12 changes: 6 additions & 6 deletions .gitsubprojects
@@ -1,8 +1,8 @@
# -*- mode: cmake -*-
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 67e94ce)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git d039511)
git_subproject(Pression https://github.com/Eyescale/Pression.git 5ddcaf3)
git_subproject(hwsd https://github.com/Eyescale/hwsd.git f88e2ff)
git_subproject(Collage https://github.com/Eyescale/Collage.git 1c08423)
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 1201da0)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 09b404a)
git_subproject(Pression https://github.com/Eyescale/Pression.git d0dcf84)
git_subproject(hwsd https://github.com/Eyescale/hwsd.git 4c30ad0)
git_subproject(Collage https://github.com/Eyescale/Collage.git 638557a)
git_subproject(GLStats https://github.com/Eyescale/GLStats.git 8ed3350)
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git b90fcd7)
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git e51d643)
2 changes: 1 addition & 1 deletion CMake/CPackConfig.cmake
Expand Up @@ -6,7 +6,7 @@
set(CPACK_PACKAGE_VENDOR "www.eyescale.ch")
set(CPACK_PACKAGE_CONTACT "Stefan Eilemann <eile@eyescale.ch>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Parallel Rendering Framework")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/doc/RelNotes.md)
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/doc/Changelog.md)
set(CPACK_RESOURCE_FILE_README ${CPACK_PACKAGE_DESCRIPTION_FILE})
set(CPACK_PACKAGE_LICENSE "LGPL")

Expand Down
4 changes: 2 additions & 2 deletions CMake/Equalizer.spec
@@ -1,13 +1,13 @@
Name: Equalizer
Version: 1.8.0
Version: 1.9.0
Release: 1%{?dist}
Summary: Middleware to create and deploy parallel OpenGL-based applications

Group: Development/Libraries
License: LGPLv2, examples are BSD licensed
URL: http://www.equalizergraphics.com/
Source0: http://www.equalizergraphics.com/downloads/%{name}-%{version}.tar.gz
Patch0: Equalizer-1.8.0-build-fix.patch
Patch0: Equalizer-1.9.0-build-fix.patch
BuildRequires: cmake bison flex
BuildRequires: boost-devel glew-devel
BuildRequires: libX11-devel mesa-libGL-devel
Expand Down
6 changes: 3 additions & 3 deletions CMake/GitExternal.cmake
Expand Up @@ -67,7 +67,7 @@ function(GIT_EXTERNAL DIR REPO TAG)
if(NOT OLD_TAG STREQUAL TAG)
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" PWD
"${CMAKE_CURRENT_SOURCE_DIR}")
message(STATUS "${DIR}: already configured with ${OLD_TAG}, ignoring requested ${TAG} in ${PWD}")
git_external_message("${DIR}: already configured with ${OLD_TAG}, ignoring requested ${TAG} in ${PWD}")
return()
endif()
else()
Expand Down Expand Up @@ -146,12 +146,12 @@ function(GIT_EXTERNAL DIR REPO TAG)
# update tag
git_external_message("git rebase FETCH_HEAD")
execute_process(COMMAND ${GIT_EXECUTABLE} rebase FETCH_HEAD
RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE OUTPUT
RESULT_VARIABLE RESULT ERROR_QUIET OUTPUT_QUIET
WORKING_DIRECTORY "${DIR}")
if(RESULT)
message(STATUS "git rebase failed, aborting ${DIR} merge")
execute_process(COMMAND ${GIT_EXECUTABLE} rebase --abort
WORKING_DIRECTORY "${DIR}")
WORKING_DIRECTORY "${DIR}" ERROR_QUIET OUTPUT_QUIET)
endif()

# checkout requested tag
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
Expand Up @@ -12,9 +12,9 @@ include(GitExternal)
include(SubProject)

set(VERSION_MAJOR "1")
set(VERSION_MINOR "8")
set(VERSION_MINOR "9")
set(VERSION_PATCH "0")
set(VERSION_ABI 180)
set(VERSION_ABI 190)
set(PROJECT_INCLUDE_NAME eq)

include(Common)
Expand Down Expand Up @@ -151,6 +151,9 @@ set(DOXYGEN_EXTRA_EXCLUDE "${CMAKE_INSTALL_PREFIX}/include/eq/admin {CMAKE_INSTA

include(CPackConfig)
include(PackageConfig)

set(DOXYGEN_MAINPAGE_MD README.md)
set(DOXYGEN_EXTRA_INPUT ${PROJECT_SOURCE_DIR}/README.md)
include(DoxygenRule) # must be after all targets

set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION}
Expand Down
79 changes: 67 additions & 12 deletions README.md
@@ -1,4 +1,6 @@
# Equalizer Parallel Rendering Framework
[TOC]

# Introduction {#Introduction}

Welcome to Equalizer, the standard middleware to create and deploy parallel,
scalable OpenGL applications. It enables applications to benefit from multiple
Expand All @@ -7,20 +9,73 @@ visual quality and display size. An Equalizer application runs unmodified on any
visualization system, from a simple workstation to large scale graphics
clusters, multi-GPU workstations and Virtual Reality installations.

# Building from source
## Linux, Mac OS X
```
mkdir build
cd build
cmake ..
make
```
## Windows
The Equalizer Programming and User Guide covers the basics of Equalizer
programming. The API documentation can be found on
[github](http://eyescale.github.com/).

As with any open source project, the available source code, in particular the
shipped examples provide a reference for developing or porting applications.

Technical questions can be posted to the eq-dev Mailing List, or
directly to info@equalizergraphics.com.

Commercial support, custom software development and porting services are
available from [Eyescale](http://www.eyescale.ch). Please contact
[info@eyescale.ch](mailto:info@eyescale.ch?subject=Equalizer%20support)
for further information.

# Features {#Features}

Equalizer provides the following major features to facilitate the development
and deployment of scalable OpenGL applications. A
[detailed feature list](http://www.equalizergraphics.com/features.html) can be
found on the [Equalizer website](http://www.equalizergraphics.com).

* Runtime Configurability: An Equalizer application is configured
automatically or manually at runtime and can be deployed on laptops,
multi-GPU workstations and large-scale visualization clusters without
recompilation.
* Runtime Scalability: An Equalizer application can benefit from
multiple graphics cards, processors and computers to scale rendering
performance, visual quality and display size.
* Distributed Execution: Equalizer applications can be written to
support cluster-based execution. Equalizer uses the
[Collage network library](http://www.libcollage.net), a cross-platform
C++ library for building heterogenous, distributed applications.
* Support for Stereo and Immersive Environments: Equalizer supports
stereo rendering head tracking, head-mounted displays and other
advanced features for immersive Virtual Reality installations.


# Building from source {#Building}

Equalizer is a cross-platform library, designed to run on any modern operating
system, including all Unix variants and the Windows operating system. Equalizer
requires at least [OpenGL 1.1](http://www.opengl.org), but uses newer OpenGL
features when available. Equalizer uses CMake to create a platform-specific
build environment. The following platforms and build environments are tested:

* Linux: Ubuntu 14.04, RHEL 6.6 (Makefile, Ninja)
* Windows: 7 (Visual Studio 2012)
* Mac OS X: 10.8 (Makefile, Ninja)

## Linux, Mac OS X {#Unix}

~~~
mkdir build
cd build
cmake ..
make
~~~

## Windows {#Windows}
If `CMake` and `git` are in PATH, run the following batch script to build using
Visual Studio 2013:
```

~~~
build.bat
```
~~~

## A note about BOOST + CMake on Windows
If your build fails with a `Could NOT find Boost` message, you may have a bad
environment setup for `Boost` and `CMake`. To remedy this, `CMake` requires you
Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
@@ -1,6 +1,6 @@
# Copyright (c) 2011-2013 Stefan Eilemann <eile@eyescale.ch>

file(GLOB READMES . README*)
install(FILES ${READMES} FAQ PLATFORMS RelNotes.md ../AUTHORS
install(FILES ${READMES} FAQ Changelog.md ../AUTHORS
../CHANGES.md ../ACKNOWLEDGEMENTS ../LGPL ../LICENSE.txt
DESTINATION share/Equalizer/doc COMPONENT doc)
91 changes: 91 additions & 0 deletions doc/Changelog.md
@@ -0,0 +1,91 @@
# Changelog

# Release 1.9 (07-07-2015) {#Release19}

* [462](https://github.com/Eyescale/Equalizer/pull/462):
Add eq::Client::addActiveLayout to tweak default autoconfigured layout
* [461](https://github.com/Eyescale/Equalizer/pull/461):
Allow custom filename for SATTR_DUMP_IMAGE, use OSG to write different image
formats
* [458](https://github.com/Eyescale/Equalizer/pull/458):
Add byteswap for unsigned int vectors
* [453](https://github.com/Eyescale/Equalizer/pull/453),
[440](https://github.com/Eyescale/Equalizer/pull/440):
Port to Qt5 using new GL classes
* [447](https://github.com/Eyescale/Equalizer/pull/447):
Sequel extensions for stardust
* [437](https://github.com/Eyescale/Equalizer/pull/437):
System window and example for CPU-based rendering.
* [434](https://github.com/Eyescale/Equalizer/pull/434):
#[60](https://github.com/Eyescale/Equalizer/issues/60):
Multisample FBO support
* [431](https://github.com/Eyescale/Equalizer/pull/431):
VGL_EXCLUDE for non-display GPUs
* [429](https://github.com/Eyescale/Equalizer/pull/429):
Remove channel FBO drawable; use window hint_drawable FBO instead
* [428](https://github.com/Eyescale/Equalizer/pull/428):
Implement support for OpenGL core context creation
#[156](https://github.com/Eyescale/Equalizer/issues/156)
* [426](https://github.com/Eyescale/Equalizer/pull/426):
EqGLLibraries: export correct GLEW_MX lib
* [425](https://github.com/Eyescale/Equalizer/pull/425):
Fix NPR in --eq-layout code
* [417](https://github.com/Eyescale/Equalizer/pull/417):
Improve auto placement on dual-screen setups
* [415](https://github.com/Eyescale/Equalizer/pull/415):
Add eq::ResultImageListener to intercept destination channel rendering
* [409](https://github.com/Eyescale/Equalizer/pull/409):
Switch to separated Deflect library
* [407](https://github.com/Eyescale/Equalizer/pull/407),
[405](https://github.com/Eyescale/Equalizer/pull/405),
[399](https://github.com/Eyescale/Equalizer/pull/399):
Denoise log outputs
* [405](https://github.com/Eyescale/Equalizer/pull/405),
[392](https://github.com/Eyescale/Equalizer/pull/392):
Fix async texture readback
* [400](https://github.com/Eyescale/Equalizer/pull/400):
Allow sharing with external/non-EQ managed QGLWidgets
* [397](https://github.com/Eyescale/Equalizer/pull/397):
Added ERROR_FRAMEBUFFER_INVALID_SIZE error when creating FBO with invalid size
* [395](https://github.com/Eyescale/Equalizer/pull/395):
Fix semantics of Config::update()
* [394](https://github.com/Eyescale/Equalizer/pull/394):
Allow set of entire window settings; can be useful to transfer settings in the
admin side
* [392](https://github.com/Eyescale/Equalizer/pull/392):
Add default connection for autoconfigured server
* [391](https://github.com/Eyescale/Equalizer/pull/391):
Complete instantiations for eq::admin::Config::find<>
* [390](https://github.com/Eyescale/Equalizer/pull/390):
Fix build w/ OpenCV
* [389](https://github.com/Eyescale/Equalizer/pull/389):
Server library no longer depends on client library, use local server directly
from server library rather than dlopen it
* [385](https://github.com/Eyescale/Equalizer/pull/385):
Fix offscreen Qt window: viewport and transfer window
* [383](https://github.com/Eyescale/Equalizer/pull/383):
Make discovery for resources, plugins and server library relocatable
* [382](https://github.com/Eyescale/Equalizer/pull/382):
Make DisplayCluster a View attribute that can be set by a global/env var.
* [381](https://github.com/Eyescale/Equalizer/pull/381):
Fix Win32 build w/ Qt, fix mouse buttons & wheel with WGL
* [380](https://github.com/Eyescale/Equalizer/pull/380):
Fix static initialization problem w/ Qt window system

# Release 1.8 (14-10-2014) {#Release18}

* Implemented Qt window system for onscreen windows. Issue
[21](https://github.com/Eyescale/Equalizer/issues/21) partially done.
* DisplayCluster streaming can be enabled with automatic configuration using new
global view attributes: EQ_VIEW_SATTR_DISPLAYCLUSTER and
EQ_VIEW_SATTR_PIXELSTREAM_NAME.
* New EqGLLibraries.cmake script for simpler OpenGL configuration in
downstream projects
* Compression is enabled for DisplayCluster streaming
* DisplayCluster streaming is now asynchronous

# Known Bugs {#Bugs}

Please refer to the
[github issue tracker](https://github.com/Eyescale/Equalizer/issues) for
fixed and open bugs, and to report new bugs.

0 comments on commit a7f5cfa

Please sign in to comment.