Skip to content

Commit a7f5cfa

Browse files
dnachbaurdnachbaur
committed
Merge pull request #464 from tribal-tec/master
Release 1.9 preparations
2 parents 5f4402f + 69c17b7 commit a7f5cfa

26 files changed

+212
-389
lines changed

‎.gitexternals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# -*- mode: cmake -*-
2-
# CMake/common https://github.com/Eyescale/CMake.git df34a8b
2+
# CMake/common https://github.com/Eyescale/CMake.git 2b5d7f2

‎.gitsubprojects

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# -*- mode: cmake -*-
2-
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 67e94ce)
3-
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git d039511)
4-
git_subproject(Pression https://github.com/Eyescale/Pression.git 5ddcaf3)
5-
git_subproject(hwsd https://github.com/Eyescale/hwsd.git f88e2ff)
6-
git_subproject(Collage https://github.com/Eyescale/Collage.git 1c08423)
2+
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 1201da0)
3+
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 09b404a)
4+
git_subproject(Pression https://github.com/Eyescale/Pression.git d0dcf84)
5+
git_subproject(hwsd https://github.com/Eyescale/hwsd.git 4c30ad0)
6+
git_subproject(Collage https://github.com/Eyescale/Collage.git 638557a)
77
git_subproject(GLStats https://github.com/Eyescale/GLStats.git 8ed3350)
8-
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git b90fcd7)
8+
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git e51d643)

‎CMake/CPackConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
set(CPACK_PACKAGE_VENDOR "www.eyescale.ch")
77
set(CPACK_PACKAGE_CONTACT "Stefan Eilemann <[email protected]>")
88
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Parallel Rendering Framework")
9-
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/doc/RelNotes.md)
9+
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/doc/Changelog.md)
1010
set(CPACK_RESOURCE_FILE_README ${CPACK_PACKAGE_DESCRIPTION_FILE})
1111
set(CPACK_PACKAGE_LICENSE "LGPL")
1212

‎CMake/Equalizer.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Name: Equalizer
2-
Version: 1.8.0
2+
Version: 1.9.0
33
Release: 1%{?dist}
44
Summary: Middleware to create and deploy parallel OpenGL-based applications
55

66
Group: Development/Libraries
77
License: LGPLv2, examples are BSD licensed
88
URL: http://www.equalizergraphics.com/
99
Source0: http://www.equalizergraphics.com/downloads/%{name}-%{version}.tar.gz
10-
Patch0: Equalizer-1.8.0-build-fix.patch
10+
Patch0: Equalizer-1.9.0-build-fix.patch
1111
BuildRequires: cmake bison flex
1212
BuildRequires: boost-devel glew-devel
1313
BuildRequires: libX11-devel mesa-libGL-devel

‎CMake/GitExternal.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function(GIT_EXTERNAL DIR REPO TAG)
6767
if(NOT OLD_TAG STREQUAL TAG)
6868
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" PWD
6969
"${CMAKE_CURRENT_SOURCE_DIR}")
70-
message(STATUS "${DIR}: already configured with ${OLD_TAG}, ignoring requested ${TAG} in ${PWD}")
70+
git_external_message("${DIR}: already configured with ${OLD_TAG}, ignoring requested ${TAG} in ${PWD}")
7171
return()
7272
endif()
7373
else()
@@ -146,12 +146,12 @@ function(GIT_EXTERNAL DIR REPO TAG)
146146
# update tag
147147
git_external_message("git rebase FETCH_HEAD")
148148
execute_process(COMMAND ${GIT_EXECUTABLE} rebase FETCH_HEAD
149-
RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE OUTPUT
149+
RESULT_VARIABLE RESULT ERROR_QUIET OUTPUT_QUIET
150150
WORKING_DIRECTORY "${DIR}")
151151
if(RESULT)
152152
message(STATUS "git rebase failed, aborting ${DIR} merge")
153153
execute_process(COMMAND ${GIT_EXECUTABLE} rebase --abort
154-
WORKING_DIRECTORY "${DIR}")
154+
WORKING_DIRECTORY "${DIR}" ERROR_QUIET OUTPUT_QUIET)
155155
endif()
156156

157157
# checkout requested tag

‎CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ include(GitExternal)
1212
include(SubProject)
1313

1414
set(VERSION_MAJOR "1")
15-
set(VERSION_MINOR "8")
15+
set(VERSION_MINOR "9")
1616
set(VERSION_PATCH "0")
17-
set(VERSION_ABI 180)
17+
set(VERSION_ABI 190)
1818
set(PROJECT_INCLUDE_NAME eq)
1919

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

152152
include(CPackConfig)
153153
include(PackageConfig)
154+
155+
set(DOXYGEN_MAINPAGE_MD README.md)
156+
set(DOXYGEN_EXTRA_INPUT ${PROJECT_SOURCE_DIR}/README.md)
154157
include(DoxygenRule) # must be after all targets
155158

156159
set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION}

‎README.md

Lines changed: 67 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Equalizer Parallel Rendering Framework
1+
[TOC]
2+
3+
# Introduction {#Introduction}
24

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

10-
# Building from source
11-
## Linux, Mac OS X
12-
```
13-
mkdir build
14-
cd build
15-
cmake ..
16-
make
17-
```
18-
## Windows
12+
The Equalizer Programming and User Guide covers the basics of Equalizer
13+
programming. The API documentation can be found on
14+
[github](http://eyescale.github.com/).
15+
16+
As with any open source project, the available source code, in particular the
17+
shipped examples provide a reference for developing or porting applications.
18+
19+
Technical questions can be posted to the eq-dev Mailing List, or
20+
directly to [email protected].
21+
22+
Commercial support, custom software development and porting services are
23+
available from [Eyescale](http://www.eyescale.ch). Please contact
24+
[[email protected]](mailto:[email protected]?subject=Equalizer%20support)
25+
for further information.
26+
27+
# Features {#Features}
28+
29+
Equalizer provides the following major features to facilitate the development
30+
and deployment of scalable OpenGL applications. A
31+
[detailed feature list](http://www.equalizergraphics.com/features.html) can be
32+
found on the [Equalizer website](http://www.equalizergraphics.com).
33+
34+
* Runtime Configurability: An Equalizer application is configured
35+
automatically or manually at runtime and can be deployed on laptops,
36+
multi-GPU workstations and large-scale visualization clusters without
37+
recompilation.
38+
* Runtime Scalability: An Equalizer application can benefit from
39+
multiple graphics cards, processors and computers to scale rendering
40+
performance, visual quality and display size.
41+
* Distributed Execution: Equalizer applications can be written to
42+
support cluster-based execution. Equalizer uses the
43+
[Collage network library](http://www.libcollage.net), a cross-platform
44+
C++ library for building heterogenous, distributed applications.
45+
* Support for Stereo and Immersive Environments: Equalizer supports
46+
stereo rendering head tracking, head-mounted displays and other
47+
advanced features for immersive Virtual Reality installations.
48+
49+
50+
# Building from source {#Building}
51+
52+
Equalizer is a cross-platform library, designed to run on any modern operating
53+
system, including all Unix variants and the Windows operating system. Equalizer
54+
requires at least [OpenGL 1.1](http://www.opengl.org), but uses newer OpenGL
55+
features when available. Equalizer uses CMake to create a platform-specific
56+
build environment. The following platforms and build environments are tested:
57+
58+
* Linux: Ubuntu 14.04, RHEL 6.6 (Makefile, Ninja)
59+
* Windows: 7 (Visual Studio 2012)
60+
* Mac OS X: 10.8 (Makefile, Ninja)
61+
62+
## Linux, Mac OS X {#Unix}
63+
64+
~~~
65+
mkdir build
66+
cd build
67+
cmake ..
68+
make
69+
~~~
70+
71+
## Windows {#Windows}
1972
If `CMake` and `git` are in PATH, run the following batch script to build using
2073
Visual Studio 2013:
21-
```
74+
75+
~~~
2276
build.bat
23-
```
77+
~~~
78+
2479
## A note about BOOST + CMake on Windows
2580
If your build fails with a `Could NOT find Boost` message, you may have a bad
2681
environment setup for `Boost` and `CMake`. To remedy this, `CMake` requires you

‎doc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2011-2013 Stefan Eilemann <[email protected]>
22

33
file(GLOB READMES . README*)
4-
install(FILES ${READMES} FAQ PLATFORMS RelNotes.md ../AUTHORS
4+
install(FILES ${READMES} FAQ Changelog.md ../AUTHORS
55
../CHANGES.md ../ACKNOWLEDGEMENTS ../LGPL ../LICENSE.txt
66
DESTINATION share/Equalizer/doc COMPONENT doc)

‎doc/Changelog.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Changelog
2+
3+
# Release 1.9 (07-07-2015) {#Release19}
4+
5+
* [462](https://github.com/Eyescale/Equalizer/pull/462):
6+
Add eq::Client::addActiveLayout to tweak default autoconfigured layout
7+
* [461](https://github.com/Eyescale/Equalizer/pull/461):
8+
Allow custom filename for SATTR_DUMP_IMAGE, use OSG to write different image
9+
formats
10+
* [458](https://github.com/Eyescale/Equalizer/pull/458):
11+
Add byteswap for unsigned int vectors
12+
* [453](https://github.com/Eyescale/Equalizer/pull/453),
13+
[440](https://github.com/Eyescale/Equalizer/pull/440):
14+
Port to Qt5 using new GL classes
15+
* [447](https://github.com/Eyescale/Equalizer/pull/447):
16+
Sequel extensions for stardust
17+
* [437](https://github.com/Eyescale/Equalizer/pull/437):
18+
System window and example for CPU-based rendering.
19+
* [434](https://github.com/Eyescale/Equalizer/pull/434):
20+
#[60](https://github.com/Eyescale/Equalizer/issues/60):
21+
Multisample FBO support
22+
* [431](https://github.com/Eyescale/Equalizer/pull/431):
23+
VGL_EXCLUDE for non-display GPUs
24+
* [429](https://github.com/Eyescale/Equalizer/pull/429):
25+
Remove channel FBO drawable; use window hint_drawable FBO instead
26+
* [428](https://github.com/Eyescale/Equalizer/pull/428):
27+
Implement support for OpenGL core context creation
28+
#[156](https://github.com/Eyescale/Equalizer/issues/156)
29+
* [426](https://github.com/Eyescale/Equalizer/pull/426):
30+
EqGLLibraries: export correct GLEW_MX lib
31+
* [425](https://github.com/Eyescale/Equalizer/pull/425):
32+
Fix NPR in --eq-layout code
33+
* [417](https://github.com/Eyescale/Equalizer/pull/417):
34+
Improve auto placement on dual-screen setups
35+
* [415](https://github.com/Eyescale/Equalizer/pull/415):
36+
Add eq::ResultImageListener to intercept destination channel rendering
37+
* [409](https://github.com/Eyescale/Equalizer/pull/409):
38+
Switch to separated Deflect library
39+
* [407](https://github.com/Eyescale/Equalizer/pull/407),
40+
[405](https://github.com/Eyescale/Equalizer/pull/405),
41+
[399](https://github.com/Eyescale/Equalizer/pull/399):
42+
Denoise log outputs
43+
* [405](https://github.com/Eyescale/Equalizer/pull/405),
44+
[392](https://github.com/Eyescale/Equalizer/pull/392):
45+
Fix async texture readback
46+
* [400](https://github.com/Eyescale/Equalizer/pull/400):
47+
Allow sharing with external/non-EQ managed QGLWidgets
48+
* [397](https://github.com/Eyescale/Equalizer/pull/397):
49+
Added ERROR_FRAMEBUFFER_INVALID_SIZE error when creating FBO with invalid size
50+
* [395](https://github.com/Eyescale/Equalizer/pull/395):
51+
Fix semantics of Config::update()
52+
* [394](https://github.com/Eyescale/Equalizer/pull/394):
53+
Allow set of entire window settings; can be useful to transfer settings in the
54+
admin side
55+
* [392](https://github.com/Eyescale/Equalizer/pull/392):
56+
Add default connection for autoconfigured server
57+
* [391](https://github.com/Eyescale/Equalizer/pull/391):
58+
Complete instantiations for eq::admin::Config::find<>
59+
* [390](https://github.com/Eyescale/Equalizer/pull/390):
60+
Fix build w/ OpenCV
61+
* [389](https://github.com/Eyescale/Equalizer/pull/389):
62+
Server library no longer depends on client library, use local server directly
63+
from server library rather than dlopen it
64+
* [385](https://github.com/Eyescale/Equalizer/pull/385):
65+
Fix offscreen Qt window: viewport and transfer window
66+
* [383](https://github.com/Eyescale/Equalizer/pull/383):
67+
Make discovery for resources, plugins and server library relocatable
68+
* [382](https://github.com/Eyescale/Equalizer/pull/382):
69+
Make DisplayCluster a View attribute that can be set by a global/env var.
70+
* [381](https://github.com/Eyescale/Equalizer/pull/381):
71+
Fix Win32 build w/ Qt, fix mouse buttons & wheel with WGL
72+
* [380](https://github.com/Eyescale/Equalizer/pull/380):
73+
Fix static initialization problem w/ Qt window system
74+
75+
# Release 1.8 (14-10-2014) {#Release18}
76+
77+
* Implemented Qt window system for onscreen windows. Issue
78+
[21](https://github.com/Eyescale/Equalizer/issues/21) partially done.
79+
* DisplayCluster streaming can be enabled with automatic configuration using new
80+
global view attributes: EQ_VIEW_SATTR_DISPLAYCLUSTER and
81+
EQ_VIEW_SATTR_PIXELSTREAM_NAME.
82+
* New EqGLLibraries.cmake script for simpler OpenGL configuration in
83+
downstream projects
84+
* Compression is enabled for DisplayCluster streaming
85+
* DisplayCluster streaming is now asynchronous
86+
87+
# Known Bugs {#Bugs}
88+
89+
Please refer to the
90+
[github issue tracker](https://github.com/Eyescale/Equalizer/issues) for
91+
fixed and open bugs, and to report new bugs.

0 commit comments

Comments
 (0)