[globjects] 01/06: Merge tag 'upstream/1.0.0' into debian/master

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Mon Nov 21 17:02:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository globjects.

commit 850d74f149ce9c43ed4298502480fb3a5b82e787
Merge: 8c6b36a 274885d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Nov 20 22:29:43 2016 +0000

    Merge tag 'upstream/1.0.0' into debian/master
    
    Upstream version 1.0.0

 CMakeLists.txt                                     |  23 +-
 LICENSE                                            |   2 +-
 README.md                                          | 568 ++++++++++++++++++++-
 cmake/CompileOptions.cmake                         |  16 +-
 cmake/Custom.cmake                                 |   2 +-
 deploy/CMakeLists.txt                              |  12 +
 deploy/images/logo.bmp                             | Bin 0 -> 9140 bytes
 deploy/images/logo.ico                             | Bin 0 -> 32038 bytes
 deploy/packages/pack-globjects.cmake               |  23 +-
 docs/manual/globjects.tex                          | 373 +++++++++++---
 docs/what-is-globjects.png                         | Bin 0 -> 293486 bytes
 globjects-config.cmake                             |  11 +-
 source/CMakeLists.txt                              |   1 -
 source/examples/CMakeLists.txt                     |   7 +-
 source/examples/commandlineoutput/CMakeLists.txt   |   5 +-
 source/examples/commandlineoutput/main.cpp         |  38 +-
 source/examples/computeshader/CMakeLists.txt       |   6 +-
 source/examples/computeshader/datapath.inl         |  38 ++
 source/examples/computeshader/main.cpp             | 217 ++++----
 source/examples/programpipelines/CMakeLists.txt    |   5 +-
 source/examples/programpipelines/main.cpp          | 172 +++----
 .../{qt-example => qtexample}/CMakeLists.txt       |   8 +-
 .../{qt-example => qtexample}/WindowQt.cpp         |  14 +-
 .../examples/{qt-example => qtexample}/WindowQt.h  |  13 +-
 source/examples/qtexample/datapath.inl             |  38 ++
 source/examples/{qt-example => qtexample}/main.cpp | 329 ++++++------
 source/examples/shaderincludes/CMakeLists.txt      |   7 +-
 source/examples/shaderincludes/datapath.inl        |  38 ++
 source/examples/shaderincludes/main.cpp            | 149 ++----
 .../CMakeLists.txt                                 |  10 +-
 .../ScreenAlignedQuad.cpp                          |   0
 .../ScreenAlignedQuad.h                            |   0
 source/examples/sparsetexture/datapath.inl         |  38 ++
 .../{sparse-texture => sparsetexture}/main.cpp     | 191 +++----
 source/examples/ssbo/CMakeLists.txt                |   7 +-
 source/examples/ssbo/datapath.inl                  |  38 ++
 source/examples/ssbo/main.cpp                      | 188 +++----
 source/examples/states/CMakeLists.txt              |   6 +-
 source/examples/states/datapath.inl                |  38 ++
 source/examples/states/main.cpp                    | 240 ++++-----
 source/examples/tessellation/CMakeLists.txt        |   7 +-
 source/examples/tessellation/datapath.inl          |  38 ++
 source/examples/tessellation/main.cpp              | 216 +++-----
 source/examples/texture/CMakeLists.txt             |   5 +-
 source/examples/texture/main.cpp                   | 141 +++--
 source/examples/transformfeedback/CMakeLists.txt   |   6 +-
 source/examples/transformfeedback/datapath.inl     |  38 ++
 source/examples/transformfeedback/main.cpp         | 266 ++++------
 source/examples/wikiexample/CMakeLists.txt         | 124 -----
 source/examples/wikiexample/main.cpp               | 198 -------
 source/globjects/CMakeLists.txt                    |  54 +-
 source/globjects/include/globjects/AbstractState.h |  10 +-
 .../{AbstractState.hpp => AbstractState.inl}       |   8 +-
 .../globjects/include/globjects/AbstractUniform.h  |   7 +-
 .../{AbstractUniform.hpp => AbstractUniform.inl}   |   4 +-
 .../include/globjects/AttachedRenderbuffer.h       |   4 +
 .../globjects/include/globjects/AttachedTexture.h  |   4 +
 source/globjects/include/globjects/Buffer.h        |   7 +-
 .../include/globjects/{Buffer.hpp => Buffer.inl}   |   7 +-
 source/globjects/include/globjects/Capability.h    |   4 +
 source/globjects/include/globjects/DebugMessage.h  |   3 +
 source/globjects/include/globjects/Error.h         |   4 +
 source/globjects/include/globjects/Framebuffer.h   |   3 +
 .../include/globjects/FramebufferAttachment.h      |   4 +
 .../globjects/include/globjects/LocationIdentity.h |   5 +-
 source/globjects/include/globjects/NamedString.h   |   5 +
 source/globjects/include/globjects/Object.h        |   4 +
 source/globjects/include/globjects/ObjectVisitor.h |   6 +-
 source/globjects/include/globjects/Program.h       |  10 +-
 .../include/globjects/{Program.hpp => Program.inl} |   5 +-
 source/globjects/include/globjects/ProgramBinary.h |   4 +-
 source/globjects/include/globjects/Query.h         |   4 +
 source/globjects/include/globjects/Renderbuffer.h  |   4 +
 source/globjects/include/globjects/Sampler.h       |   4 +
 source/globjects/include/globjects/Shader.h        |   5 +
 source/globjects/include/globjects/State.h         |   5 +-
 source/globjects/include/globjects/StateSetting.h  |   7 +-
 .../{StateSetting.hpp => StateSetting.inl}         |   7 +-
 source/globjects/include/globjects/Sync.h          |   4 +
 source/globjects/include/globjects/Texture.h       |   5 +-
 source/globjects/include/globjects/TextureHandle.h |   4 +
 .../include/globjects/TransformFeedback.h          |  16 +-
 ...TransformFeedback.hpp => TransformFeedback.inl} |   9 +-
 source/globjects/include/globjects/Uniform.h       |   7 +-
 .../include/globjects/{Uniform.hpp => Uniform.inl} |   4 +-
 source/globjects/include/globjects/UniformBlock.h  |   4 +
 source/globjects/include/globjects/VertexArray.h   |   5 +-
 .../include/globjects/VertexAttributeBinding.h     |  36 +-
 .../include/globjects/base/AbstractFunctionCall.h  |  44 +-
 .../include/globjects/base/AbstractLogHandler.h    |   4 +
 .../include/globjects/base/AbstractStringSource.h  |   4 +
 .../include/globjects/base/ChangeListener.h        |   4 +
 .../globjects/include/globjects/base/Changeable.h  |   4 +
 .../include/globjects/base/CompositeStringSource.h |   4 +
 .../include/globjects/base/ConsoleLogger.h         |   4 +
 source/globjects/include/globjects/base/File.h     |   4 +
 .../include/globjects/base/FunctionCall.h          |   7 +-
 .../base/{FunctionCall.hpp => FunctionCall.inl}    |   7 +-
 source/globjects/include/globjects/base/HeapOnly.h |   3 +
 .../globjects/include/globjects/base/LogMessage.h  |   4 +
 .../include/globjects/base/LogMessageBuilder.h     |   6 +-
 ...LogMessageBuilder.hpp => LogMessageBuilder.inl} |   4 +-
 .../include/globjects/base/LogMessageLevel.h       |   4 +
 .../globjects/include/globjects/base/Referenced.h  |   3 +
 .../globjects/include/globjects/base/Singleton.h   |   7 +-
 .../base/{Singleton.hpp => Singleton.inl}          |   5 +-
 .../include/globjects/base/StaticStringSource.h    |   4 +
 .../include/globjects/base/StringSourceDecorator.h |   4 +
 .../include/globjects/base/StringTemplate.h        |   4 +
 .../globjects/include/globjects/base/baselogging.h |   7 +-
 .../base/{baselogging.hpp => baselogging.inl}      |   5 +-
 .../include/globjects/base/formatString.h          |   7 +-
 .../base/{formatString.hpp => formatString.inl}    |   5 +-
 source/globjects/include/globjects/base/ref_ptr.h  |   7 +-
 .../globjects/base/{ref_ptr.hpp => ref_ptr.inl}    |   6 +-
 .../globjects/include/globjects/glbindinglogging.h |   6 +
 source/globjects/include/globjects/glmlogging.h    |   4 +
 source/globjects/include/globjects/globjects.h     |   9 +-
 .../globjects/{globjects.hpp => globjects.inl}     |   5 +-
 source/globjects/include/globjects/logging.h       |   1 +
 source/globjects/include/globjects/objectlogging.h |   9 +-
 .../{objectlogging.hpp => objectlogging.inl}       |   8 +-
 source/globjects/source/AbstractState.cpp          |  19 +-
 source/globjects/source/AbstractUniform.cpp        |   4 +-
 source/globjects/source/AttachedRenderbuffer.cpp   |   5 +-
 source/globjects/source/AttachedTexture.cpp        |   5 +-
 source/globjects/source/Buffer.cpp                 |  10 +-
 source/globjects/source/Capability.cpp             |   4 +-
 source/globjects/source/DebugMessage.cpp           |   9 +-
 source/globjects/source/Error.cpp                  |   5 +-
 source/globjects/source/Framebuffer.cpp            |   9 +-
 source/globjects/source/FramebufferAttachment.cpp  |   5 +-
 source/globjects/source/IncludeProcessor.cpp       | 105 ++--
 source/globjects/source/IncludeProcessor.h         |   4 +-
 source/globjects/source/LocationIdentity.cpp       |   5 +-
 source/globjects/source/NamedString.cpp            |   4 +-
 source/globjects/source/Object.cpp                 |   7 +-
 source/globjects/source/ObjectVisitor.cpp          |   4 +
 source/globjects/source/Program.cpp                |  14 +-
 source/globjects/source/ProgramBinary.cpp          |   5 +-
 source/globjects/source/Query.cpp                  |   5 +-
 source/globjects/source/Renderbuffer.cpp           |   5 +-
 source/globjects/source/Resource.cpp               |   5 +-
 source/globjects/source/Resource.h                 |   4 +
 source/globjects/source/Sampler.cpp                |   5 +-
 source/globjects/source/Shader.cpp                 |  10 +-
 source/globjects/source/State.cpp                  |   8 +-
 source/globjects/source/StateSetting.cpp           |   9 +-
 source/globjects/source/Sync.cpp                   |   4 +
 source/globjects/source/Texture.cpp                |   9 +-
 source/globjects/source/TextureHandle.cpp          |   4 +
 source/globjects/source/TransformFeedback.cpp      |   5 +-
 source/globjects/source/UniformBlock.cpp           |   5 +-
 source/globjects/source/VertexArray.cpp            |  20 +-
 source/globjects/source/VertexAttributeBinding.cpp |  88 +++-
 .../globjects/source/base/AbstractFunctionCall.cpp |   4 +
 .../globjects/source/base/AbstractStringSource.cpp |   4 +
 source/globjects/source/base/ChangeListener.cpp    |   4 +
 source/globjects/source/base/Changeable.cpp        |   4 +
 .../source/base/CompositeStringSource.cpp          |   4 +
 source/globjects/source/base/ConsoleLogger.cpp     |   4 +
 source/globjects/source/base/File.cpp              |   4 +
 source/globjects/source/base/FileRegistry.cpp      |   4 +
 source/globjects/source/base/FileRegistry.h        |   5 +
 source/globjects/source/base/HeapOnly.cpp          |   7 +-
 source/globjects/source/base/LogMessage.cpp        |   4 +
 source/globjects/source/base/LogMessageBuilder.cpp |   4 +
 source/globjects/source/base/Referenced.cpp        |   2 +
 .../globjects/source/base/StaticStringSource.cpp   |   4 +
 .../source/base/StringSourceDecorator.cpp          |   4 +
 source/globjects/source/base/StringTemplate.cpp    |   8 +-
 source/globjects/source/base/baselogging.cpp       |  15 +-
 source/globjects/source/base/formatString.cpp      | 102 ++--
 source/globjects/source/container_helpers.h        |  22 +
 ...container_helpers.hpp => container_helpers.inl} |   3 +-
 source/globjects/source/glbindinglogging.cpp       |   2 +
 source/globjects/source/glmlogging.cpp             |   2 +
 source/globjects/source/globjects.cpp              | 116 +++--
 .../AbstractBufferImplementation.cpp               |   4 +-
 .../implementations/AbstractBufferImplementation.h |   3 +
 .../AbstractDebugImplementation.cpp                |   3 +
 .../implementations/AbstractDebugImplementation.h  |   4 +
 .../AbstractFramebufferImplementation.cpp          |   6 +-
 .../AbstractFramebufferImplementation.h            |   3 +
 .../AbstractObjectNameImplementation.cpp           |   8 +-
 .../AbstractObjectNameImplementation.h             |   3 +
 .../AbstractProgramBinaryImplementation.cpp        |   4 +-
 .../AbstractProgramBinaryImplementation.h          |   3 +
 ...bstractShadingLanguageIncludeImplementation.cpp |   6 +-
 .../AbstractShadingLanguageIncludeImplementation.h |   3 +
 .../AbstractTextureImplementation.cpp              |   4 +-
 .../AbstractTextureImplementation.h                |   4 +
 .../AbstractTextureStorageImplementation.cpp       |   4 +-
 .../AbstractTextureStorageImplementation.h         |   4 +
 .../AbstractUniformImplementation.cpp              |   4 +-
 .../AbstractUniformImplementation.h                |   3 +
 ...bstractVertexAttributeBindingImplementation.cpp |   4 +
 .../AbstractVertexAttributeBindingImplementation.h |   7 +-
 .../BufferImplementation_DirectStateAccessARB.cpp  |   4 +-
 .../BufferImplementation_DirectStateAccessARB.h    |   3 +
 .../BufferImplementation_DirectStateAccessEXT.cpp  |   4 +-
 .../BufferImplementation_DirectStateAccessEXT.h    |   3 +
 .../BufferImplementation_Legacy.cpp                |   4 +-
 .../implementations/BufferImplementation_Legacy.h  |   3 +
 .../DebugImplementation_DebugKHR.cpp               |   9 +-
 .../implementations/DebugImplementation_DebugKHR.h |   3 +
 .../implementations/DebugImplementation_Legacy.cpp |   4 +-
 .../implementations/DebugImplementation_Legacy.h   |   3 +
 ...mebufferImplementation_DirectStateAccessARB.cpp |   4 +-
 ...ramebufferImplementation_DirectStateAccessARB.h |   3 +
 ...mebufferImplementation_DirectStateAccessEXT.cpp |   4 +-
 ...ramebufferImplementation_DirectStateAccessEXT.h |   3 +
 .../FramebufferImplementation_Legacy.cpp           |   3 +
 .../FramebufferImplementation_Legacy.h             |   3 +
 ...g.cpp => ObjectNameImplementation_DebugKHR.cpp} |   8 +-
 ...debug.h => ObjectNameImplementation_DebugKHR.h} |   4 +
 .../ObjectNameImplementation_Legacy.cpp            |   6 +-
 .../ObjectNameImplementation_Legacy.h              |   4 +
 ...ramBinaryImplementation_GetProgramBinaryARB.cpp |   4 +-
 ...ogramBinaryImplementation_GetProgramBinaryARB.h |   3 +
 .../ProgramBinaryImplementation_None.cpp           |   2 +
 .../ProgramBinaryImplementation_None.h             |   3 +
 ...adingLanguageIncludeImplementation_Fallback.cpp |   4 +-
 ...ShadingLanguageIncludeImplementation_Fallback.h |   3 +
 ...deImplementation_ShadingLanguageIncludeARB.cpp} |   5 +-
 ...ludeImplementation_ShadingLanguageIncludeARB.h} |   3 +
 .../TextureImplementation_DirectStateAccessARB.cpp |   6 +-
 .../TextureImplementation_DirectStateAccessARB.h   |   4 +
 .../TextureImplementation_DirectStateAccessEXT.cpp |   6 +-
 .../TextureImplementation_DirectStateAccessEXT.h   |   4 +
 .../TextureImplementation_Legacy.cpp               |   6 +-
 .../implementations/TextureImplementation_Legacy.h |   4 +
 ...eStorageImplementation_DirectStateAccessARB.cpp |   6 +-
 ...ureStorageImplementation_DirectStateAccessARB.h |   4 +
 ...eStorageImplementation_DirectStateAccessEXT.cpp |   6 +-
 ...ureStorageImplementation_DirectStateAccessEXT.h |   4 +
 .../TextureStorageImplementation_Fallback.cpp      |   9 +-
 .../TextureStorageImplementation_Fallback.h        |   4 +
 .../TextureStorageImplementation_Legacy.cpp        |   6 +-
 .../TextureStorageImplementation_Legacy.h          |   4 +
 .../UniformImplementation_Legacy.cpp               |   4 +-
 .../implementations/UniformImplementation_Legacy.h |   3 +
 ...formImplementation_SeparateShaderObjectsARB.cpp |   3 +
 ...niformImplementation_SeparateShaderObjectsARB.h |   3 +
 ...eBindingImplementation_DirectStateAccessARB.cpp |   4 +-
 ...uteBindingImplementation_DirectStateAccessARB.h |   4 +
 ...VertexAttributeBindingImplementation_Legacy.cpp |   5 +-
 .../VertexAttributeBindingImplementation_Legacy.h  |   3 +
 ...indingImplementation_VertexAttribBindingARB.cpp |   5 +-
 ...eBindingImplementation_VertexAttribBindingARB.h |   7 +-
 source/globjects/source/objectlogging.cpp          |   7 +-
 source/globjects/source/pixelformat.cpp            |  13 +-
 source/globjects/source/pixelformat.h              |   7 +-
 .../source/registry/ExtensionRegistry.cpp          |   9 +-
 .../globjects/source/registry/ExtensionRegistry.h  |   9 +-
 .../source/registry/ImplementationRegistry.cpp     |   4 +
 .../source/registry/ImplementationRegistry.h       |   3 +
 .../source/registry/NamedStringRegistry.cpp        |   4 +
 .../source/registry/NamedStringRegistry.h          |   4 +
 .../globjects/source/registry/ObjectRegistry.cpp   |   7 +-
 source/globjects/source/registry/ObjectRegistry.h  |   4 +
 source/globjects/source/registry/Registry.cpp      |  49 +-
 source/globjects/source/registry/Registry.h        |   5 +-
 source/version.h.in                                |  22 +-
 264 files changed, 3456 insertions(+), 2154 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/globjects.git



More information about the debian-science-commits mailing list