Branch: refs/heads/tiles
Home: https://github.com/Eyescale/Equalizer
Commit: 247011d3b6e4b6c1d9d783d226c552d4977a83f8
https://github.com/Eyescale/Equalizer/commit/247011d3b6e4b6c1d9d783d226c552d4977a83f8
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M libs/eq/client/wgl/window.cpp
M libs/eq/client/window.cpp
Log Message:
-----------
Closes #29: NV swap barrier with affinity context does not work (svn rev 5829)
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: bec0b5fc025156c9c7329fee8ed1767d7a8adcea
https://github.com/Eyescale/Equalizer/commit/bec0b5fc025156c9c7329fee8ed1767d7a8adcea
Author: Lucas Peetz Dulley <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M libs/co/base/thread.cpp
Log Message:
-----------
Fix. Calls "_listenerLock()" in "Thread::start()" to make lock creation safer.
Commit: a0f16024ec99e16193999ff4db393640eb4da9f5
https://github.com/Eyescale/Equalizer/commit/a0f16024ec99e16193999ff4db393640eb4da9f5
Author: Lucas Peetz Dulley <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M examples/CMakeLists.in.txt
M libs/GLEW/CMakeLists.txt
M libs/co/object.h
M libs/eq/client/configure.cmake
M libs/eq/fabric/CMakeLists.txt
M libs/eq/fabric/canvas.h
M libs/eq/fabric/canvas.ipp
M libs/eq/fabric/config.ipp
M libs/eq/fabric/files.cmake
M libs/eq/fabric/object.h
M libs/eq/fabric/segment.h
M libs/eq/fabric/segment.ipp
A libs/eq/fabric/swapBarrier.cpp
A libs/eq/fabric/swapBarrier.h
M libs/eq/fabric/types.h
M libs/eq/server/CMakeLists.txt
M libs/eq/server/canvas.cpp
M libs/eq/server/canvas.h
M libs/eq/server/compound.cpp
M libs/eq/server/compound.h
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/loader.y
R libs/eq/server/swapBarrier.cpp
R libs/eq/server/swapBarrier.h
M libs/eq/server/types.h
M libs/eq/server/window.cpp
M libs/eq/server/window.h
M tests/CMakeLists.txt
M tools/CMakeLists.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/tribal-tec/Equalizer
Commit: d556b7ff8ef38fc2a8c6c4b0af49ae4333e27cc2
https://github.com/Eyescale/Equalizer/commit/d556b7ff8ef38fc2a8c6c4b0af49ae4333e27cc2
Author: Lucas Peetz Dulley <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M libs/co/base/thread.cpp
Log Message:
-----------
Cosmetic. Tab space fix
Commit: 45884414dbd9cc893fd9eb53e8fd1aaea8644b48
https://github.com/Eyescale/Equalizer/commit/45884414dbd9cc893fd9eb53e8fd1aaea8644b48
Author: Lucas Peetz Dulley <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M libs/co/base/thread.cpp
Log Message:
-----------
Fix. Calls "_listenerLock()" in "Thread::start()" to make lock creation safer.
Commit: 6766104e7356c376a5c63e2ed4f09284d491f595
https://github.com/Eyescale/Equalizer/commit/6766104e7356c376a5c63e2ed4f09284d491f595
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M AUTHORS
M libs/co/base/thread.cpp
Log Message:
-----------
Cleanup on last cherry-pick
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: cd968707926e373481028c80c7da80fdf62438fd
https://github.com/Eyescale/Equalizer/commit/cd968707926e373481028c80c7da80fdf62438fd
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M AUTHORS
M libs/co/base/thread.cpp
M libs/eq/client/wgl/window.cpp
M libs/eq/client/window.cpp
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Conflicts:
libs/co/base/thread.cpp
Commit: 0c28424669c83ee878c5ae89b7970d197c58176a
https://github.com/Eyescale/Equalizer/commit/0c28424669c83ee878c5ae89b7970d197c58176a
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-20 (Sat, 20 Aug 2011)
Changed paths:
M libs/eq/client/frameData.cpp
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.cpp
Log Message:
-----------
Comments on @bug and TODO
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 3b8cf3caae26364490400170f8884c878cf55e49
https://github.com/Eyescale/Equalizer/commit/3b8cf3caae26364490400170f8884c878cf55e49
Author: Carsten Rohn <[email protected]>
Date: 2011-08-21 (Sun, 21 Aug 2011)
Changed paths:
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/equalizers/tileEqualizer.cpp
Log Message:
-----------
Closes #30: tile eq tile size is now actually considered
Commit: 9edc811d2447c98a9fe15c870fd489c47700b02b
https://github.com/Eyescale/Equalizer/commit/9edc811d2447c98a9fe15c870fd489c47700b02b
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-21 (Sun, 21 Aug 2011)
Changed paths:
M libs/co/dataIStream.h
M libs/co/localNode.cpp
M libs/co/localNode.h
M libs/co/object.h
Log Message:
-----------
#28: Remaining API definition for Object::psh
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[x] New Feature
[ ] Cleanup
[ ] Optimization
[x] Documentation
Commit: 2c6908647c011b88b5376efe567e698b68f27f82
https://github.com/Eyescale/Equalizer/commit/2c6908647c011b88b5376efe567e698b68f27f82
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/co/base/refPtr.h
M tests/test.h
Log Message:
-----------
Minor cleanups
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 39a84eefa18bbd688b995b7bb6731573fa29444d
https://github.com/Eyescale/Equalizer/commit/39a84eefa18bbd688b995b7bb6731573fa29444d
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M .gitignore
M CMakeLists.txt
R examples/CMakeLists.in.txt
A examples/CMakeLists.txt
Log Message:
-----------
Clean up examples CMakeLists handling
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 83a940783dc849daa310adcf407a9f206c2548a0
https://github.com/Eyescale/Equalizer/commit/83a940783dc849daa310adcf407a9f206c2548a0
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
R CMake/doxygen.cmake
M CMakeLists.txt
A doc/CMakeLists.txt
Log Message:
-----------
Clean up doc CMakeLists
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 39ab68cba0a12521a3d7cb02c3984faea0e3832b
https://github.com/Eyescale/Equalizer/commit/39ab68cba0a12521a3d7cb02c3984faea0e3832b
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M doc/Doxyfile.co
M doc/Doxyfile.ext
M doc/Doxyfile.seq
Log Message:
-----------
Fix doxygen generation
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 546e7feb3926148660612f23b1b27f2d54a4a662
https://github.com/Eyescale/Equalizer/commit/546e7feb3926148660612f23b1b27f2d54a4a662
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M CMake/CPackConfig.cmake
M CMake/UploadPPA.cmake
Log Message:
-----------
CMake cleanups
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: bf1069e9ea48744652b3a4eb86f642eb64933fe1
https://github.com/Eyescale/Equalizer/commit/bf1069e9ea48744652b3a4eb86f642eb64933fe1
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M doc/Doxyfile.co
M doc/Doxyfile.ext
M doc/Doxyfile.seq
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Commit: 876b0a61905267d8427a9a516e8bfb4e2753184a
https://github.com/Eyescale/Equalizer/commit/876b0a61905267d8427a9a516e8bfb4e2753184a
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/co/plugins/compressorTypes.h
M libs/eq/client/channel.cpp
M libs/eq/client/frame.cpp
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/image.cpp
M libs/eq/client/image.h
Log Message:
-----------
#31: Design and sample implementation for image compression selection
[ ] May break build
[ ] Breaks existing applications
[ ] Bugfix
[x] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: bd56aecfa760fd3236a749532cafaba8690fd86c
https://github.com/Eyescale/Equalizer/commit/bd56aecfa760fd3236a749532cafaba8690fd86c
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/eq/client/frameData.cpp
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/equalizers/tileEqualizer.cpp
Log Message:
-----------
Merge branch 'master' of https://github.com/tribal-tec/Equalizer
Commit: 85b2a1094b5b0f06cbb2041aa9207cd3f4a8215b
https://github.com/Eyescale/Equalizer/commit/85b2a1094b5b0f06cbb2041aa9207cd3f4a8215b
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M .gitignore
M CMake/CPackConfig.cmake
M CMake/UploadPPA.cmake
R CMake/doxygen.cmake
M CMakeLists.txt
A doc/CMakeLists.txt
M doc/Doxyfile.co
M doc/Doxyfile.ext
M doc/Doxyfile.seq
R examples/CMakeLists.in.txt
A examples/CMakeLists.txt
M libs/co/base/refPtr.h
M libs/co/dataIStream.h
M libs/co/localNode.cpp
M libs/co/localNode.h
M libs/co/object.h
M tests/test.h
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Commit: 94c0bfe13e12a13bf3134ee58b9563f351b604b3
https://github.com/Eyescale/Equalizer/commit/94c0bfe13e12a13bf3134ee58b9563f351b604b3
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/eq/client/frameData.cpp
M libs/eq/client/image.cpp
M libs/eq/client/pixelData.cpp
Log Message:
-----------
#31: Cleanup on last commit
[ ] May break build
[ ] Breaks existing applications
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: b5ad3bfbcebb21721de01b51add38d66f6da6297
https://github.com/Eyescale/Equalizer/commit/b5ad3bfbcebb21721de01b51add38d66f6da6297
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/GLEW/CMakeLists.txt
M libs/eq/client/configure.cmake
Log Message:
-----------
Add GLEW_NO_GLU definition for compatibility
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: f81f336f0e37fc9e271c4c12700124e6b77d6325
https://github.com/Eyescale/Equalizer/commit/f81f336f0e37fc9e271c4c12700124e6b77d6325
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M CMake/CPackConfig.cmake
M CMake/UploadPPA.cmake
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Commit: 827ff29b48a3380bd746bf5f1813ce2b45e7f8ef
https://github.com/Eyescale/Equalizer/commit/827ff29b48a3380bd746bf5f1813ce2b45e7f8ef
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/eq/client/frameData.cpp
Log Message:
-----------
#31: Fixed compressor selection for custom readbacks
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: ba9403708aefcda248cf220bc02dd3b4f5538b26
https://github.com/Eyescale/Equalizer/commit/ba9403708aefcda248cf220bc02dd3b4f5538b26
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/co/plugins/compressorTypes.h
M libs/eq/client/channel.cpp
M libs/eq/client/frame.cpp
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/image.cpp
M libs/eq/client/image.h
Log Message:
-----------
Fix cherry-pick conflicts
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 61516a94da8f934e58fd4e2d93794712ed3e731e
https://github.com/Eyescale/Equalizer/commit/61516a94da8f934e58fd4e2d93794712ed3e731e
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/eq/client/frameData.cpp
M libs/eq/client/image.cpp
M libs/eq/client/pixelData.cpp
Log Message:
-----------
Fix cherry-pick conflicts
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 8770f25d95aa3b77ac6ea807a06ef454f1401f9e
https://github.com/Eyescale/Equalizer/commit/8770f25d95aa3b77ac6ea807a06ef454f1401f9e
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/eq/client/frameData.cpp
Log Message:
-----------
#31: Fixed compressor selection for custom readbacks
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 285acb88de26173a653140a85d5e895f462c3f6d
https://github.com/Eyescale/Equalizer/commit/285acb88de26173a653140a85d5e895f462c3f6d
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/co/plugins/compressorTypes.h
Log Message:
-----------
#31: Don't break binary compatibility
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 8e371503977cd0a66844e2bb19b1e15bbef178f3
https://github.com/Eyescale/Equalizer/commit/8e371503977cd0a66844e2bb19b1e15bbef178f3
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/eqPly.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/image.h
Log Message:
-----------
Cleanups on last cherry-pick
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: c3ce6c7efea945eed0b5dadb42cb5ae01872239f
https://github.com/Eyescale/Equalizer/commit/c3ce6c7efea945eed0b5dadb42cb5ae01872239f
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-22 (Mon, 22 Aug 2011)
Changed paths:
M libs/co/localNode.h
M libs/co/masterCM.cpp
M libs/co/masterCM.h
M libs/co/objectStore.cpp
Log Message:
-----------
#28: Cleanups in preparation of Object::commit
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: acf8d6dd8750f4ea5a66d6066c16840ac54cd24f
https://github.com/Eyescale/Equalizer/commit/acf8d6dd8750f4ea5a66d6066c16840ac54cd24f
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/co/plugins/compressorTypes.h
M libs/eq/client/channel.cpp
Log Message:
-----------
#31: Minor cleanups
[ ] May break build
[ ] Breaks existing applications
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: b3fc08db5b79fa25840cbab40896ca1b630bf918
https://github.com/Eyescale/Equalizer/commit/b3fc08db5b79fa25840cbab40896ca1b630bf918
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/co/plugins/compressorTypes.h
Log Message:
-----------
#31: Don't break binary compatibility
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 668e831c5a444cbb0db0d8fed455aa014133192a
https://github.com/Eyescale/Equalizer/commit/668e831c5a444cbb0db0d8fed455aa014133192a
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/co/plugins/compressorTypes.h
M libs/eq/client/channel.cpp
Log Message:
-----------
Fix cherry-pick merge conflicts
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: a60a2d32d2216349fc0eff2bc4d8824248d036de
https://github.com/Eyescale/Equalizer/commit/a60a2d32d2216349fc0eff2bc4d8824248d036de
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/eq/client/pixelData.cpp
Log Message:
-----------
#31: Fixed unit tests
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 68a1c235dd9984b52330227ebde863a6aa7b6883
https://github.com/Eyescale/Equalizer/commit/68a1c235dd9984b52330227ebde863a6aa7b6883
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/eq/client/pixelData.cpp
Log Message:
-----------
#31: Fixed unit tests
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: c5e01720b54ccdb0e0ef103e6339d0f9d8ac981f
https://github.com/Eyescale/Equalizer/commit/c5e01720b54ccdb0e0ef103e6339d0f9d8ac981f
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/co/localNode.h
M libs/co/masterCM.cpp
M libs/co/masterCM.h
M libs/co/objectStore.cpp
Log Message:
-----------
Merge branch 'temp'
Commit: f17f86597dc01d93814eae6b5db36bcb9b8be062
https://github.com/Eyescale/Equalizer/commit/f17f86597dc01d93814eae6b5db36bcb9b8be062
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/eq/server/config.h
M libs/eq/server/node.cpp
Log Message:
-----------
Fixed node re-init fail after exit
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 24b7be7ce210093d133dcc565cd1367bd9098894
https://github.com/Eyescale/Equalizer/commit/24b7be7ce210093d133dcc565cd1367bd9098894
Author: Daniel Nachbaur <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M examples/eqPly/channel.cpp
M examples/eqPly/eqPly.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/GLEW/CMakeLists.txt
M libs/co/localNode.h
M libs/co/masterCM.cpp
M libs/co/masterCM.h
M libs/co/objectStore.cpp
M libs/eq/client/configure.cmake
M libs/eq/client/frame.h
M libs/eq/client/frameData.h
M libs/eq/client/image.h
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Conflicts:
examples/eqPly/channel.cpp
examples/eqPly/config.cpp
examples/eqPly/frameData.cpp
examples/eqPly/frameData.h
libs/eq/client/frame.h
libs/eq/client/frameData.cpp
libs/eq/client/frameData.h
libs/eq/client/image.h
Commit: 67989a727afae85c0aca489279f565387178b8de
https://github.com/Eyescale/Equalizer/commit/67989a727afae85c0aca489279f565387178b8de
Author: Carsten Rohn <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M libs/eq/server/equalizers/tileEqualizer.cpp
Log Message:
-----------
missing part of my last checkin
Commit: d1b0ca64987169cf5a92b0d4495163579ccefc05
https://github.com/Eyescale/Equalizer/commit/d1b0ca64987169cf5a92b0d4495163579ccefc05
Author: Carsten Rohn <[email protected]>
Date: 2011-08-23 (Tue, 23 Aug 2011)
Changed paths:
M .gitignore
M AUTHORS
M CMake/CPackConfig.cmake
M CMake/UploadPPA.cmake
R CMake/doxygen.cmake
M CMakeLists.txt
A doc/CMakeLists.txt
M doc/Doxyfile.co
M doc/Doxyfile.ext
M doc/Doxyfile.seq
R examples/CMakeLists.in.txt
A examples/CMakeLists.txt
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/eqPly.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/GLEW/CMakeLists.txt
M libs/co/base/refPtr.h
M libs/co/base/thread.cpp
M libs/co/dataIStream.h
M libs/co/localNode.cpp
M libs/co/localNode.h
M libs/co/masterCM.cpp
M libs/co/masterCM.h
M libs/co/object.h
M libs/co/objectStore.cpp
M libs/co/plugins/compressorTypes.h
M libs/eq/client/channel.cpp
M libs/eq/client/configure.cmake
M libs/eq/client/frame.cpp
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/image.cpp
M libs/eq/client/image.h
M libs/eq/client/wgl/window.cpp
M libs/eq/client/window.cpp
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/config.h
M libs/eq/server/node.cpp
M tests/test.h
Log Message:
-----------
Merge branch 'master' of https://github.com/tribal-tec/Equalizer
Commit: f7519e028631a46695283b89b3b13c3bedcb6b79
https://github.com/Eyescale/Equalizer/commit/f7519e028631a46695283b89b3b13c3bedcb6b79
Author: Carsten Rohn <[email protected]>
Date: 2011-08-25 (Thu, 25 Aug 2011)
Changed paths:
M examples/configs/2-node.tiles.eqc
M examples/eqPly/config.cpp
M examples/eqPly/config.h
M libs/eq/client/view.cpp
M libs/eq/client/view.h
M libs/eq/client/viewPackets.h
M libs/eq/fabric/commands.h
A libs/eq/fabric/equalizerTypes.h
M libs/eq/fabric/view.h
M libs/eq/fabric/view.ipp
M libs/eq/server/compound.cpp
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/equalizers/dfrEqualizer.h
M libs/eq/server/equalizers/equalizer.h
M libs/eq/server/equalizers/framerateEqualizer.h
M libs/eq/server/equalizers/loadEqualizer.h
M libs/eq/server/equalizers/monitorEqualizer.h
M libs/eq/server/equalizers/tileEqualizer.cpp
M libs/eq/server/equalizers/tileEqualizer.h
M libs/eq/server/equalizers/treeEqualizer.h
M libs/eq/server/equalizers/viewEqualizer.h
M libs/eq/server/view.cpp
M libs/eq/server/view.h
Log Message:
-----------
introduced equalizer switching
refactored tile size handling
cleanups
bug fixes
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[x] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 2468412bde61fe6f049ee7300026a2ce63ea8dd3
https://github.com/Eyescale/Equalizer/commit/2468412bde61fe6f049ee7300026a2ce63ea8dd3
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-26 (Fri, 26 Aug 2011)
Changed paths:
M .gitignore
M AUTHORS
M CMake/CPackConfig.cmake
M CMake/PurpleAddLibrary.cmake
M CMake/UploadPPA.cmake
R CMake/doxygen.cmake
M CMakeLists.txt
M Makefile
A doc/CMakeLists.txt
M doc/Doxyfile.co
M doc/Doxyfile.ext
M doc/Doxyfile.seq
R examples/CMakeLists.in.txt
A examples/CMakeLists.txt
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/eqPly.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/GLEW/CMakeLists.txt
M libs/co/base/refPtr.h
M libs/co/base/thread.cpp
M libs/co/command.cpp
M libs/co/commands.h
M libs/co/dataIStream.h
A libs/co/dataIStreamQueue.cpp
A libs/co/dataIStreamQueue.h
M libs/co/files.cmake
M libs/co/localNode.cpp
M libs/co/localNode.h
M libs/co/masterCM.cpp
M libs/co/masterCM.h
M libs/co/nullCM.h
M libs/co/object.h
M libs/co/objectCM.cpp
M libs/co/objectCM.h
M libs/co/objectInstanceDataOStream.cpp
M libs/co/objectInstanceDataOStream.h
M libs/co/objectPackets.h
M libs/co/objectStore.cpp
M libs/co/plugins/compressorTypes.h
M libs/co/staticMasterCM.h
M libs/co/staticSlaveCM.h
M libs/co/versionedSlaveCM.h
M libs/eq/client/config.cpp
M libs/eq/client/configure.cmake
M libs/eq/client/frame.cpp
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/image.cpp
M libs/eq/client/image.h
M libs/eq/client/version.in.h
M libs/eq/client/wgl/window.cpp
M libs/eq/client/window.cpp
M libs/eq/server/config.h
M libs/eq/server/node.cpp
M tests/CMakeLists.txt
M tests/co/commandCache.cpp
A tests/eq/server/nodeDead.eqc
A tests/eq/server/nodeFail.eqc
A tests/eq/server/ntPipeFail.eqc
A tests/eq/server/pipeDeviceFail.eqc
A tests/eq/server/pipeFail.eqc
R tests/eq/server/reliability/nodeDead.eqc
R tests/eq/server/reliability/nodeFail.eqc
R tests/eq/server/reliability/ntPipeFail.eqc
R tests/eq/server/reliability/pipeDeviceFail.eqc
R tests/eq/server/reliability/pipeFail.eqc
R tests/eq/server/reliability/sourceFail.eqc
R tests/eq/server/reliability/test.cpp
A tests/eq/server/reliability_gpu.cpp
A tests/eq/server/sourceFail.eqc
M tests/test.h
Log Message:
-----------
Fix merge conflicts
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 29ded286f9a75625e30c0dc88d9965604d02e324
https://github.com/Eyescale/Equalizer/commit/29ded286f9a75625e30c0dc88d9965604d02e324
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-26 (Fri, 26 Aug 2011)
Changed paths:
M examples/configs/2-node.tiles.eqc
M examples/eqPly/config.cpp
M examples/eqPly/config.h
M libs/eq/client/channel.cpp
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/view.cpp
M libs/eq/client/view.h
M libs/eq/client/viewPackets.h
M libs/eq/fabric/commands.h
A libs/eq/fabric/equalizerTypes.h
M libs/eq/fabric/view.h
M libs/eq/fabric/view.ipp
M libs/eq/server/compound.cpp
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/equalizers/dfrEqualizer.h
M libs/eq/server/equalizers/equalizer.h
M libs/eq/server/equalizers/framerateEqualizer.h
M libs/eq/server/equalizers/loadEqualizer.h
M libs/eq/server/equalizers/monitorEqualizer.h
M libs/eq/server/equalizers/tileEqualizer.cpp
M libs/eq/server/equalizers/tileEqualizer.h
M libs/eq/server/equalizers/treeEqualizer.h
M libs/eq/server/equalizers/viewEqualizer.h
M libs/eq/server/view.cpp
M libs/eq/server/view.h
Log Message:
-----------
Fix merge conflicts
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Compare: https://github.com/Eyescale/Equalizer/compare/5b43470...29ded28
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com
