pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ogre ogre: Update to 1.12.11
details: https://anonhg.NetBSD.org/pkgsrc/rev/d67d7abab9d3
branches: trunk
changeset: 447955:d67d7abab9d3
user: nia <nia%pkgsrc.org@localhost>
date: Mon Mar 01 12:12:14 2021 +0000
description:
ogre: Update to 1.12.11
The main change is that it builds again.
# New and Noteworthy in OGRE 1.12
This is only a high level overview. For a detailed changes, see the git changelog.
## Core changes
### Component Media files
Previously all of our bundled Media files lived in the `Samples/Media` subdirectory - including the `RTShaderLib`.
However the latter is not a sample, but required to use the RTSS component.
Therefore, we now put media files that are required by a component into `Media/*` and install them independent of the Sample Media.
This allows you to merely reference these locations instead of having to copy them into your project.
Consequently, this allowed us to move various embedded resources to the filesystem for easier editing.
**ACTION REQUIRED** you must add the `Media/ShadowVolume` resource location to use the build-in algorithms.
### NEON intrinsics on all ARM platforms
We converted our SSE based OptimisedMath using SSE2NEON. While the gains are not as substantial as on x86, you can expect an speedup of about 30% for e.g. CPU skeletal animation.
### Automatic Plugin discovery for Windows Debug builds
Ogre now automatically append the `_d` suffix to plugin library names on windows.
Consequently it does not need a `plugins_d.cfg` any more. Therefore you can now use the same config files for release and debug with the same content.
### Separate UV skyboxes removed
Ogre no longer supports `cubic_texture .. separateUV` textures. Previously it was possible to create a "fake" cubic texture unit which would actually contain 6 individual 2d textures. These could be
used to render skyboxes. Only skyboxes that is.
For everything else you would need real hardware cubic textures.
Ogre will ignore the `separateUV` part now, and create a real cubic texture anyway.
The advantage is that ogre renders the skybox with only one draw call.
**ACTION REQUIRED** If you use custom shaders on such materials, you will have to update them to cope with real cubic textures.
### RenderSystem - unified API for fixed-function and shaders
The `RenderSystem` API was modernized and streamlined for programmable pipeline usage. Consequently most of the legacy fixed function API calls were removed (e.g. `_setProjectionMatrix`,
`_setSurfaceParams`).
Instead these parameters are now passed through the `GpuProgramParameters` structure to the fixed function unifying the API between fixed and programmable pipeline.
RenderSystems supporting `RSC_FIXED_FUNCTION`, now export the respective parameters through `getFixedFunctionParams`.
You can query and modify those and then apply them using `applyFixedFunctionParams`.
If you bypass the SceneManager and use the RenderSystem directly, e.g. `_setProjectionMatrix` becomes
```cpp
auto params = rs->getFixedFunctionParams(TVC_NONE, FOG_NONE);
params->setConstant(8, Matrix4()); // the "magic" 8 is defined in getFixedFunctionParams
rs->applyFixedFunctionParams(params, GPV_GLOBAL);
```
### Improved Profiling
The instrumentation code inside Ogre was improved to be less costy compared to the measured code. At this we also improved the labels to be more readable (camera name vs. "_renderScene") - see [the
updated Profiling tutorial](https://codedocs.xyz/OGRECave/ogre/profiler.html#profRead).
Additionally the Profiler class can now use [Remotery](https://github.com/Celtoys/Remotery) as its backend. Again see the tutorial for more details.
### Breaking non-API changes
These changes require unit testing on your side as compilation will succeed, but the rendering result may vary compared to 1.11.
* `fog_override` semantics changed: previously it would only affect fixed function fog and shader autoparams would still get the global scene fog. Now both autparams and fixed function settings are
affected.
* `SubMesh::setMaterialName` now immediately queries the `MaterialManager` instead of merely storing the name. This means that if you do not load any `.material` files and do an import/ export cycle
of a `.mesh`, the material names will be lost. This is a common use case for offline processing of mesh files. Register a `MeshSerializerListener` to create dummy materials in this case.
* `Ogre::any_cast` now throws a `std::bad_cast` exception instead of a `Ogre::InvalidParametersException` for compatibility with `std::any_cast`. Both derive from `std::exception`, in case you want
to preserve legacy compatibility.
* The `OGRE_BUILD_*` defines moved to a separate `OgreComponents.h` header. As those were typically checked with `#ifdef`, these check will silently fail. Migrate to the `Ogre.h` header instead of
including headers form OgreMain directly.
* compute shaders are no longer automatically dispatched when the according material is used during rendering. You now have to explicitly reference the respective material in a [*compute* compisitor
pass](https://ogrecave.github.io/ogre/api/latest/_compositor-_scripts.html#Compositor-Passes).
## Samples
As a side-effect of the stable media files effort, the Sample media files were refactored as well.
Now all GL rendersystems share a common GLSL shader codebase - likewise the D3D rendersystems and the Cg plugin use the same Cg shaders (which is just HLSL9 really).
Additionally we took advantage of the RTSS improvements and replaced any custom depth shadow code by the unified RTSS solution.
## Bites
The `ApplicationContext` class was split into `ApplicationContextBase` and `ApplicationContextSDL`. This allows additional implementations (like Qt) and eases consumption in projects that do not use
SDL.
## Real Time Shader System 3.0
The RTSS API was overhauled and is now more flexible and easy to use. You can now directly acquire shaders for an arbitrary Pass using `TargetRenderState` - without having to go through any Viewport
Scheme juggling. This means that `TargetRenderState` can now replace any ad-hoc shader generator that you might have in place to leverage the Ogre maintained RTSS shader snippets.
The RTSS now defaults to Per-Pixel lighting, consequently making it the default for GL3+/ GLES2 and D3D11.
### Depth Shadowmap Support
The PSSM3 shadow stage now supports hardware PCF and automatically uses it if your shadow textures are compatible (i.e. of type `PF_DEPTH`).
Furthermore you can now use it generally for depth based textures by not calling `setSplitPoints` - it will use only the first depth shadow texture then.
### Merged Lighting calculations
The Fixed Function, Per-Pixel and Normal map sub-render states now all share the same shader code.
**ACTION REQUIRED** you must update your `RTShaderLib` for the 1.12 shaders.
## Terrain
To allow usage `PF_DEPTH` shadow textures, the "linear" depth code was dropped from the `SM2Profile`.
Where previously you were expected to write an interpolated value of `(gl_Position.z - depthRange.x) * depthRange.w` in the fragment shader, it is now enough to just write `gl_FragCoord.z`.
This enables early-z optimizations by the hardware and generally eases the workflow.
Refer to the Terrain Sample for the updated depth shadow scene setup.
Furthermore it is now possible to load legacy 1.7 style Terrains (aka "terrain.cfg") using `TerrainGroup::loadLegacyTerrain`.
**ACTION REQUIRED** you have to add the `Media/Terrain` resource location to use the SM2Profile Shader Generator.
## D3D9 RenderSystem
Direct3D9 feature level 9.1 is now required.
## GL/ GLES2/ GL3+
`#include` directives in GLSL shaders are now resolved by OGRE. The lookup is performed by filename using the Resource System. (based on the existing code of the Cg plugin)
Monolithic shaders are used instead of separable shader objects (SSO) by default again due to better performance and better driver support.
diffstat:
devel/ogre/Makefile | 57 +-
devel/ogre/PLIST | 1259 +++++++++-
devel/ogre/buildlink3.mk | 14 +-
devel/ogre/distinfo | 14 +-
devel/ogre/patches/patch-OgreMain_include_OgreBitwise.h | 15 +
devel/ogre/patches/patch-OgreMain_include_OgreStringConverter.h | 46 -
devel/ogre/patches/patch-OgreMain_src_OgreStringConverter.cpp | 69 -
devel/ogre/patches/patch-aa | 83 -
8 files changed, 1266 insertions(+), 291 deletions(-)
diffs (truncated from 1774 to 300 lines):
diff -r 502ce1c6cfba -r d67d7abab9d3 devel/ogre/Makefile
--- a/devel/ogre/Makefile Mon Mar 01 11:57:20 2021 +0000
+++ b/devel/ogre/Makefile Mon Mar 01 12:12:14 2021 +0000
@@ -1,37 +1,54 @@
-# $NetBSD: Makefile,v 1.46 2020/06/05 12:48:59 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.47 2021/03/01 12:12:14 nia Exp $
-DISTNAME= ogre-v1-6-3
-PKGNAME= ogre-1.6.3
-PKGREVISION= 15
+DISTNAME= ogre-1.12.11
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ogre/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=OGRECave/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://ogre.sourceforge.net/
-COMMENT= Object-Oriented Graphics Rendering Engine
+HOMEPAGE= https://github.com/OGRECave/ogre
+COMMENT= Scene-oriented, flexible 3D engine written in C++
LICENSE= gnu-lgpl-v2.1
-WRKSRC= ${WRKDIR}/ogre
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config xmkmf
-USE_LANGUAGES= c c++03
-USE_LIBTOOL= yes
+USE_CMAKE= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES= c c++
+
+GCC_REQD+= 4.7 # C++11
+
+# Unsupported on some pkgsrc platforms (e.g. NetBSD).
+# It attempts to enable them solely based on the compiler version, which
+# doesn't work, and does not include good fallback.
+CMAKE_ARGS+= -DOGRE_ENABLE_PRECOMPILED_HEADERS=OFF
+
+CMAKE_ARGS+= -DOGRE_BUILD_DEPENDENCIES=OFF
+CMAKE_ARGS+= -DOGRE_BUILD_COMPONENT_PYTHON=OFF
+CMAKE_ARGS+= -DOGRE_BUILD_COMPONENT_JAVA=OFF
-CONFIGURE_ARGS+= --with-platform=GLX
-CONFIGURE_ARGS+= --disable-freeimage
-CONFIGURE_ARGS+= --disable-cg
+# Mostly going by which dependencies other distributors enable by default to
+# determine what is useful to include.
+# Qt5 and SDL2 are only used by example programs.
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ASSIMP=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Cg=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Softimage=ON
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON
-PKGCONFIG_OVERRIDE+= OGRE.pc.in
+PKGCONFIG_OVERRIDE+= CMake/Templates/*.pc.in
.include "../../archivers/zziplib/buildlink3.mk"
-.include "../../devel/devIL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freeimage/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 502ce1c6cfba -r d67d7abab9d3 devel/ogre/PLIST
--- a/devel/ogre/PLIST Mon Mar 01 11:57:20 2021 +0000
+++ b/devel/ogre/PLIST Mon Mar 01 12:12:14 2021 +0000
@@ -1,12 +1,56 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/01 16:53:40 hasso Exp $
-bin/OgreMaterialUpgrade
-bin/OgreMeshUpgrade
+@comment $NetBSD: PLIST,v 1.5 2021/03/01 12:12:14 nia Exp $
+bin/OgreMeshUpgrader
bin/OgreXMLConverter
-bin/rcapsdump
-include/OGRE/GLX/OgreConfigDialogImp.h
-include/OGRE/GLX/OgreErrorDialogImp.h
-include/OGRE/GLX/OgreTimerImp.h
+bin/SampleBrowser
+bin/VRMLConverter
+include/OGRE/Bites/OgreAdvancedRenderControls.h
+include/OGRE/Bites/OgreApplicationContext.h
+include/OGRE/Bites/OgreApplicationContextBase.h
+include/OGRE/Bites/OgreApplicationContextQt.h
+include/OGRE/Bites/OgreBites.i
+include/OGRE/Bites/OgreBitesConfigDialog.h
+include/OGRE/Bites/OgreBitesPrerequisites.h
+include/OGRE/Bites/OgreCameraMan.h
+include/OGRE/Bites/OgreImGuiInputListener.h
+include/OGRE/Bites/OgreInput.h
+include/OGRE/Bites/OgreSGTechniqueResolverListener.h
+include/OGRE/Bites/OgreStaticPluginLoader.h
+include/OGRE/Bites/OgreTrays.h
+include/OGRE/Bites/OgreWindowEventUtilities.h
+include/OGRE/DefaultSamplesPlugin.h
+include/OGRE/ListenerFactoryLogic.h
+include/OGRE/MeshLodGenerator/OgreLod0Stripifier.h
+include/OGRE/MeshLodGenerator/OgreLodBuffer.h
+include/OGRE/MeshLodGenerator/OgreLodCollapseCost.h
+include/OGRE/MeshLodGenerator/OgreLodCollapseCostCurvature.h
+include/OGRE/MeshLodGenerator/OgreLodCollapseCostOutside.h
+include/OGRE/MeshLodGenerator/OgreLodCollapseCostProfiler.h
+include/OGRE/MeshLodGenerator/OgreLodCollapseCostQuadric.h
+include/OGRE/MeshLodGenerator/OgreLodCollapser.h
+include/OGRE/MeshLodGenerator/OgreLodConfig.h
+include/OGRE/MeshLodGenerator/OgreLodConfigSerializer.h
+include/OGRE/MeshLodGenerator/OgreLodData.h
+include/OGRE/MeshLodGenerator/OgreLodInputProvider.h
+include/OGRE/MeshLodGenerator/OgreLodInputProviderBuffer.h
+include/OGRE/MeshLodGenerator/OgreLodInputProviderMesh.h
+include/OGRE/MeshLodGenerator/OgreLodOutputProvider.h
+include/OGRE/MeshLodGenerator/OgreLodOutputProviderBuffer.h
+include/OGRE/MeshLodGenerator/OgreLodOutputProviderCompressedBuffer.h
+include/OGRE/MeshLodGenerator/OgreLodOutputProviderCompressedMesh.h
+include/OGRE/MeshLodGenerator/OgreLodOutputProviderMesh.h
+include/OGRE/MeshLodGenerator/OgreLodOutsideMarker.h
+include/OGRE/MeshLodGenerator/OgreLodPrerequisites.h
+include/OGRE/MeshLodGenerator/OgreLodWorkQueueInjector.h
+include/OGRE/MeshLodGenerator/OgreLodWorkQueueInjectorListener.h
+include/OGRE/MeshLodGenerator/OgreLodWorkQueueRequest.h
+include/OGRE/MeshLodGenerator/OgreLodWorkQueueWorker.h
+include/OGRE/MeshLodGenerator/OgreMeshLodGenerator.h
+include/OGRE/MeshLodGenerator/OgreSmallVector.h
+include/OGRE/MeshLodGenerator/OgreVectorSet.h
+include/OGRE/MeshLodGenerator/OgreVectorSetImpl.h
include/OGRE/Ogre.h
+include/OGRE/Ogre.i
+include/OGRE/OgreASTCCodec.h
include/OGRE/OgreAlignedAllocator.h
include/OGRE/OgreAnimable.h
include/OGRE/OgreAnimation.h
@@ -16,7 +60,7 @@
include/OGRE/OgreArchive.h
include/OGRE/OgreArchiveFactory.h
include/OGRE/OgreArchiveManager.h
-include/OGRE/OgreAtomicWrappers.h
+include/OGRE/OgreAtomicScalar.h
include/OGRE/OgreAutoParamDataSource.h
include/OGRE/OgreAxisAlignedBox.h
include/OGRE/OgreBillboard.h
@@ -26,21 +70,20 @@
include/OGRE/OgreBitwise.h
include/OGRE/OgreBlendMode.h
include/OGRE/OgreBone.h
-include/OGRE/OgreBorderPanelOverlayElement.h
+include/OGRE/OgreBuildSettings.h
include/OGRE/OgreCamera.h
include/OGRE/OgreCodec.h
include/OGRE/OgreColourValue.h
include/OGRE/OgreCommon.h
-include/OGRE/OgreCompiler2Pass.h
+include/OGRE/OgreComponents.h
include/OGRE/OgreCompositionPass.h
include/OGRE/OgreCompositionTargetPass.h
include/OGRE/OgreCompositionTechnique.h
include/OGRE/OgreCompositor.h
include/OGRE/OgreCompositorChain.h
include/OGRE/OgreCompositorInstance.h
+include/OGRE/OgreCompositorLogic.h
include/OGRE/OgreCompositorManager.h
-include/OGRE/OgreCompositorScriptCompiler.h
-include/OGRE/OgreCompositorSerializer.h
include/OGRE/OgreConfig.h
include/OGRE/OgreConfigDialog.h
include/OGRE/OgreConfigFile.h
@@ -48,44 +91,64 @@
include/OGRE/OgreController.h
include/OGRE/OgreControllerManager.h
include/OGRE/OgreConvexBody.h
+include/OGRE/OgreCustomCompositionPass.h
include/OGRE/OgreDDSCodec.h
include/OGRE/OgreDataStream.h
+include/OGRE/OgreDefaultDebugDrawer.h
include/OGRE/OgreDefaultHardwareBufferManager.h
+include/OGRE/OgreDefaultWorkQueue.h
+include/OGRE/OgreDefaultWorkQueueStandard.h
+include/OGRE/OgreDefaultWorkQueueTBB.h
+include/OGRE/OgreDeflate.h
+include/OGRE/OgreDepthBuffer.h
+include/OGRE/OgreDistanceLodStrategy.h
+include/OGRE/OgreDualQuaternion.h
include/OGRE/OgreDynLib.h
include/OGRE/OgreDynLibManager.h
+include/OGRE/OgreETCCodec.h
include/OGRE/OgreEdgeListBuilder.h
include/OGRE/OgreEntity.h
-include/OGRE/OgreErrorDialog.h
include/OGRE/OgreException.h
+include/OGRE/OgreExports.h
include/OGRE/OgreExternalTextureSource.h
include/OGRE/OgreExternalTextureSourceManager.h
include/OGRE/OgreFactoryObj.h
include/OGRE/OgreFileSystem.h
-include/OGRE/OgreFont.h
-include/OGRE/OgreFontManager.h
+include/OGRE/OgreFileSystemLayer.h
include/OGRE/OgreFrameListener.h
-include/OGRE/OgreFreeImageCodec.h
include/OGRE/OgreFrustum.h
include/OGRE/OgreGpuProgram.h
include/OGRE/OgreGpuProgramManager.h
+include/OGRE/OgreGpuProgramParams.h
include/OGRE/OgreGpuProgramUsage.h
include/OGRE/OgreHardwareBuffer.h
include/OGRE/OgreHardwareBufferManager.h
+include/OGRE/OgreHardwareCounterBuffer.h
include/OGRE/OgreHardwareIndexBuffer.h
include/OGRE/OgreHardwareOcclusionQuery.h
include/OGRE/OgreHardwarePixelBuffer.h
+include/OGRE/OgreHardwareUniformBuffer.h
include/OGRE/OgreHardwareVertexBuffer.h
+include/OGRE/OgreHeaderPrefix.h
+include/OGRE/OgreHeaderSuffix.h
include/OGRE/OgreHighLevelGpuProgram.h
include/OGRE/OgreHighLevelGpuProgramManager.h
-include/OGRE/OgreILCodecs.h
-include/OGRE/OgreILImageCodec.h
-include/OGRE/OgreILUtil.h
include/OGRE/OgreImage.h
include/OGRE/OgreImageCodec.h
-include/OGRE/OgreInstancedGeometry.h
+include/OGRE/OgreInstanceBatch.h
+include/OGRE/OgreInstanceBatchHW.h
+include/OGRE/OgreInstanceBatchHW_VTF.h
+include/OGRE/OgreInstanceBatchShader.h
+include/OGRE/OgreInstanceBatchVTF.h
+include/OGRE/OgreInstanceManager.h
+include/OGRE/OgreInstancedEntity.h
+include/OGRE/OgreIteratorWrapper.h
include/OGRE/OgreIteratorWrappers.h
include/OGRE/OgreKeyFrame.h
include/OGRE/OgreLight.h
+include/OGRE/OgreLodListener.h
+include/OGRE/OgreLodStrategy.h
+include/OGRE/OgreLodStrategyManager.h
include/OGRE/OgreLog.h
include/OGRE/OgreLogManager.h
include/OGRE/OgreManualObject.h
@@ -95,34 +158,22 @@
include/OGRE/OgreMath.h
include/OGRE/OgreMatrix3.h
include/OGRE/OgreMatrix4.h
-include/OGRE/OgreMemoryAllocatedObject.h
include/OGRE/OgreMemoryAllocatorConfig.h
-include/OGRE/OgreMemoryNedAlloc.h
-include/OGRE/OgreMemorySTLAllocator.h
-include/OGRE/OgreMemoryStdAlloc.h
-include/OGRE/OgreMemoryTracker.h
include/OGRE/OgreMesh.h
include/OGRE/OgreMeshFileFormat.h
include/OGRE/OgreMeshManager.h
include/OGRE/OgreMeshSerializer.h
-include/OGRE/OgreMeshSerializerImpl.h
include/OGRE/OgreMovableObject.h
include/OGRE/OgreMovablePlane.h
+include/OGRE/OgreMurmurHash3.h
+include/OGRE/OgreNameGenerator.h
include/OGRE/OgreNode.h
include/OGRE/OgreNumerics.h
include/OGRE/OgreOptimisedUtil.h
-include/OGRE/OgreOverlay.h
-include/OGRE/OgreOverlayContainer.h
-include/OGRE/OgreOverlayElement.h
-include/OGRE/OgreOverlayElementCommands.h
-include/OGRE/OgreOverlayElementFactory.h
-include/OGRE/OgreOverlayManager.h
-include/OGRE/OgrePanelOverlayElement.h
include/OGRE/OgreParticle.h
include/OGRE/OgreParticleAffector.h
include/OGRE/OgreParticleAffectorFactory.h
include/OGRE/OgreParticleEmitter.h
-include/OGRE/OgreParticleEmitterCommands.h
include/OGRE/OgreParticleEmitterFactory.h
include/OGRE/OgreParticleIterator.h
include/OGRE/OgreParticleSystem.h
@@ -131,6 +182,7 @@
include/OGRE/OgrePass.h
include/OGRE/OgrePatchMesh.h
include/OGRE/OgrePatchSurface.h
+include/OGRE/OgrePixelCountLodStrategy.h
include/OGRE/OgrePixelFormat.h
include/OGRE/OgrePlane.h
include/OGRE/OgrePlaneBoundedVolume.h
@@ -140,15 +192,13 @@
include/OGRE/OgrePolygon.h
include/OGRE/OgrePose.h
Home |
Main Index |
Thread Index |
Old Index