Merge branch 'core4' into feature/vcpkg-pipeline

# Conflicts:
#	.github/workflows/cross-compile-client.yml

Author: zerotacg

CMakeModules/ConfigureChecks.cmake

@@ -6,6 +6,10 @@ MACRO(NL_CONFIGURE_CHECKS)
     SET(NL_OPENGL_AVAILABLE 1)
   ENDIF()
 
+  IF(WITH_DRIVER_OPENGL3)
+    SET(NL_OPENGL3_AVAILABLE 1)
+  ENDIF()
+
   IF(WITH_DRIVER_OPENGLES)
     SET(NL_OPENGLES_AVAILABLE 1)
   ENDIF()

CMakeModules/nel.cmake

@@ -133,6 +133,9 @@ IF(HUNTER_ENABLED)
   IF(WITH_DRIVER_OPENGL)
     TARGET_LINK_LIBRARIES(${name} nel_drv_opengl${drv_suffix})
   ENDIF()
+  IF(WITH_DRIVER_OPENGL3)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengl3${drv_suffix})
+  ENDIF()
   IF(WITH_DRIVER_OPENGLES)
     TARGET_LINK_LIBRARIES(${name} nel_drv_opengles${drv_suffix})
   ENDIF()
@@ -151,6 +154,14 @@ ELSE()
         TARGET_LINK_LIBRARIES(${name} nel_drv_opengl)
       ENDIF()
     ENDIF()
+	
+    IF(WITH_DRIVER_OPENGL3)
+      IF(WIN32)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_opengl3_win)
+      ELSE(WIN32)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_opengl3)
+      ENDIF()
+    ENDIF()
 
     IF(WITH_DRIVER_OPENGLES)
       IF(WIN32)
@@ -338,6 +349,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
   # Drivers Support
   ###
   OPTION(WITH_DRIVER_OPENGL       "Build OpenGL Driver (3D)"                      ON )
+  OPTION(WITH_DRIVER_OPENGL3      "Build OpenGL3 Driver (3D)"                     OFF)
   OPTION(WITH_DRIVER_OPENGLES     "Build OpenGL ES Driver (3D)"                   OFF)
   OPTION(WITH_DRIVER_DIRECT3D     "Build Direct3D Driver (3D)"                    OFF)
   OPTION(WITH_DRIVER_OPENAL       "Build OpenAL Driver (Sound)"                   ON )

azure-pipelines.yml

@@ -186,6 +186,7 @@ jobs:
           -DHUNTER_ROOT=$(Pipeline.Workspace)/.hunter
           -DWITH_DRIVER_OPENAL=ON
           -DWITH_DRIVER_OPENGL=ON
+          -DWITH_DRIVER_OPENGL3=ON
           -DWITH_INSTALL_LIBRARIES=OFF
           -DWITH_NEL_SAMPLES=OFF
           -DWITH_NEL_TESTS=OFF

cmake/CMakePresets.os.json

@@ -14,6 +14,7 @@
     {
       "name": "windows",
       "hidden": true,
+      "toolset": "host=x64",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",

config.h.cmake

@@ -2,6 +2,7 @@
 #define CONFIG_H
 
 #cmakedefine NL_OPENGL_AVAILABLE ${NL_OPENGL_AVAILABLE}
+#cmakedefine NL_OPENGL3_AVAILABLE ${NL_OPENGL3_AVAILABLE}
 #cmakedefine NL_OPENGLES_AVAILABLE ${NL_OPENGLES_AVAILABLE}
 #cmakedefine NL_DIRECT3D_AVAILABLE ${NL_DIRECT3D_AVAILABLE}
 

nel/CMakePresets.json

@@ -17,6 +17,7 @@
         "WITH_NEL_TOOLS": true,
         "WITH_DRIVER_OPENAL": true,
         "WITH_DRIVER_OPENGL": true,
+        "WITH_DRIVER_OPENGL3": true,
         "WITH_NELNS": false,
         "WITH_LUA51": false,
         "WITH_LUA52": true,

nel/include/nel/3d/deform_2d.h

@@ -73,7 +73,7 @@ class CDeform2d
 	static uint _YGranularity;
 	static uint _XQuad;
 	static uint _YQuad;
-	static NLMISC::CSmartPtr<ITexture> _Tex ; // the texture used to get back datas from the framebuffer
+	static NLMISC::CSmartPtr<ITexture> _Tex ; // the texture used to get back datas from the framebuffer. STATIC GPU RESOURCE: Blocks multiple driver instances
 
 };
 

nel/include/nel/3d/driver.h

@@ -39,6 +39,7 @@
 #include "nel/3d/material.h"
 #include "nel/misc/mutex.h"
 #include "nel/3d/primitive_profile.h"
+#include "nel/3d/uniform_buffer.h"
 
 #include <vector>
 #include <list>
@@ -163,9 +164,21 @@ class IDriver : public NLMISC::CRefCount
 
 	enum TProgram
 	{
-		VertexProgram = 0,
-		PixelProgram = 1,
-		GeometryProgram = 2
+		ShaderProgram = 0, // Monolithic shader program, must contain a matching VP/PP pair at minimum.
+		// Monolithic shaders only support UBOs, not individual uniforms. The driver light
+		// list is split between per-vertex lights (VP) and per-pixel lights (PP). With
+		// individual uniforms on separate shader objects, each stage has its own namespace,
+		// so the VP and PP declare their light slots independently with separate numbering
+		// (light0..N in VP, ppLight0..N in PP). UBOs make this unnecessary — both stages
+		// just share the full light table and a split index. This is simpler in general
+		// and essential for monolithic programs sharing one namespace, as well as for
+		// modern APIs (Vulkan, Metal, D3D12) which don't have individual uniforms.
+
+		VertexProgram = 1,
+		PixelProgram = 2,
+		// GeometryProgram = 3,
+
+		ProgramNb
 	};
 
 protected:
@@ -175,6 +188,7 @@ class IDriver : public NLMISC::CRefCount
 	TVBDrvInfoPtrList					_VBDrvInfos;
 	TIBDrvInfoPtrList					_IBDrvInfos;
 	TGPUPrgDrvInfoPtrList				_GPUPrgDrvInfos;
+	TUBDrvInfoPtrList					_UBDrvInfos;
 
 	TPolygonMode			_PolygonMode;
 
@@ -253,6 +267,9 @@ class IDriver : public NLMISC::CRefCount
 	// Must be a HWND for Windows (WIN32).
 	virtual nlWindow		getDisplay() = 0;
 
+	/// Return true if the driver supports monitor color properties (gamma, contrast, luminosity)
+	virtual bool			supportMonitorColorProperties() const = 0;
+
 	/// Setup monitor color properties. Return false if setup failed
 	virtual bool			setMonitorColorProperties(const CMonitorColorProperties &properties) = 0;
 
@@ -299,7 +316,7 @@ class IDriver : public NLMISC::CRefCount
 	virtual bool			clearZBuffer(float zval=1) = 0;
 
 	/// Clear the current target surface stencil buffer. The function ignores the viewport settings but uses the scissor.
-	virtual bool			clearStencilBuffer(float stencilval=0) = 0;
+	virtual bool			clearStencilBuffer(sint stencilval=0) = 0;
 
 	/// Set the color mask filter through where the operation done will pass
 	virtual void			setColorMask(bool bRed, bool bGreen, bool bBlue, bool bAlpha) = 0;
@@ -488,8 +505,17 @@ class IDriver : public NLMISC::CRefCount
 	virtual void			endMaterialMultiPass() = 0;
 	// @}
 
-	// Does the driver support the per-pixel lighting shader ?
+	// Does the driver support the per-pixel lighting shader ? (legacy fixed-function technique)
 	virtual bool supportPerPixelLighting(bool specular) const = 0;
+
+	/// Does the driver's builtin VP/PP support per-pixel lighting features?
+	/// When true, user shader programs may use the following CProgramFeatures:
+	///   - InputsWorldSpaceNormal:    Request world-space normal at varying location 2.
+	///   - InputsWorldSpacePosition:  Request PZB-relative world-space position at varying location 0.
+	///   - OutputsWorldSpacePosition: Indicate that a user VP outputs world-space position at location 0.
+	/// These enable GLSL per-pixel lighting in user PPs (light direction, attenuation, etc.).
+	/// The builtin PP adapts fog to use world-space distance when position is in world space.
+	virtual bool supportWorldSpacePPL() const = 0;
 	// @}
 
 
@@ -581,7 +607,7 @@ class IDriver : public NLMISC::CRefCount
 	bool					getStaticMemoryToVRAM() const { return _StaticMemoryToVRAM; }
 
 	/* Set to true if static vertex and index buffers must by allocated in VRAM, false in AGP.
-	 * Default is false.
+	 * Default is true.
 	 */
 	void					setStaticMemoryToVRAM(bool staticMemoryToVRAM);
 
@@ -817,14 +843,20 @@ class IDriver : public NLMISC::CRefCount
 
 	/// \name Fog support.
 	// @{
+	enum TFogMode { FogLinear = 0, FogExp, FogExp2 };
+
 	virtual	bool			fogEnabled() = 0;
 	virtual	void			enableFog(bool enable = true) = 0;
 	/// setup fog parameters. fog must enabled to see result. start and end are distance values.
 	virtual	void			setupFog(float start, float end, NLMISC::CRGBA color) = 0;
+	/// setup fog mode and density. mode/density are orthogonal to start/end/color.
+	virtual	void			setupFogMode(TFogMode mode = FogLinear, float density = 1.f) = 0;
 	/// Get.
 	virtual	float			getFogStart() const = 0;
 	virtual	float			getFogEnd() const = 0;
 	virtual	NLMISC::CRGBA	getFogColor() const = 0;
+	virtual	TFogMode		getFogMode() const = 0;
+	virtual	float			getFogDensity() const = 0;
 	// @}
 
 
@@ -1080,6 +1112,58 @@ class IDriver : public NLMISC::CRefCount
 	// @}
 
 
+	/** \name Light Table
+	  *
+	  * The light table is a resizable array of CLight entries in the driver,
+	  * populated once per frame. Each unique scene light (sun, point lights)
+	  * is uploaded once via setLightTableEntry(). Per-object rendering then
+	  * references lights by table index + influence factor through setLights(),
+	  * rather than uploading fully modulated CLight data per draw call.
+	  *
+	  * Two modes:
+	  * - **Table mode** (scene rendering): enableLightTableMode(true). Lights
+	  *   are set up via setLightTableEntry() and selected per object via
+	  *   setLights(). The legacy setLight()/enableLight() calls are not used.
+	  * - **Legacy mode** (samples, UI, debug): enableLightTableMode(false).
+	  *   setLight()/enableLight() work as before.
+	  *
+	  * setLights() applies per-object factor modulation internally: each
+	  * factor (0-255) scales the table entry's diffuse and specular colors.
+	  * The ambient parameter replaces the ambient of slot 0 (sun); point
+	  * light slots receive black ambient.
+	  */
+	// @{
+
+	/// Return the maximum number of entries the light table can hold.
+	/// Drivers without a fixed limit (legacy, no UBO) return UINT_MAX.
+	virtual uint getMaxLightTableSize() const { return (uint)~0; }
+
+	/// Enable or disable light table mode. When disabled, legacy setLight()/enableLight() resumes.
+	virtual void enableLightTableMode(bool enable) = 0;
+
+	/// Resize the light table. Existing entries beyond the new size are discarded.
+	virtual void setLightTableSize(uint count) = 0;
+
+	/// Set a light table entry. The light is stored as-is (no factor modulation).
+	virtual void setLightTableEntry(uint index, const CLight &light) = 0;
+
+	/** Set the active lights for the current object from the light table.
+	  * \param tableIndices       Array of indices into the light table. Slot 0 is the sun.
+	  * \param factors            Parallel array of influence factors (0-255) per light.
+	  * \param numLights          Number of entries in tableIndices/factors.
+	  * \param numPerPixelLights  First N lights evaluated per-pixel in PP (0 = all VP).
+	  * \param ambient            Per-object ambient color, written to slot 0's ambient.
+	  */
+	virtual void setLights(
+		const sint16 *tableIndices,
+		const uint8 *factors,
+		uint numLights,
+		uint numPerPixelLights,
+		NLMISC::CRGBA ambient) = 0;
+
+	// @}
+
+
 
 	/// \name Vertex Program
 	// @{
@@ -1094,6 +1178,12 @@ class IDriver : public NLMISC::CRefCount
 	  */
 	virtual bool			isVertexProgramEmulated() const = 0;
 
+	/** Return true if the driver supports builtin UBOs for vertex programs
+	  * (NlCamera, NlLightTable, NlModel). When true, user VPs can use
+	  * UsesObjectUBO/UsesLightTableUBO/UsesCameraUBO feature flags.
+	  */
+	virtual bool			supportBuiltinUBO() const { return false; }
+
 	/** Return true if the driver supports the specified vertex program profile.
 	  */
 	virtual bool			supportVertexProgram(CVertexProgram::TProfile profile) const = 0;
@@ -1217,6 +1307,10 @@ class IDriver : public NLMISC::CRefCount
 	virtual void			setUniformFog(TProgram program, uint index) = 0;
     // Set feature parameters
 	virtual bool			isUniformProgramState() = 0;
+
+	/// Bind a user uniform buffer to a binding point. Creates GPU buffer on first use,
+	/// uploads if dirty. Pass NULL to unbind.
+	virtual bool			bindUniformBuffer(TUBBinding binding, CUniformBuffer *ub) { return false; }
 	// @}
 
 
@@ -1253,6 +1347,9 @@ class IDriver : public NLMISC::CRefCount
 	virtual bool			supportTextureShaders() const = 0;
 	// Is the shader water supported ? If not, the driver caller should implement its own version
 	virtual bool			supportWaterShader() const = 0;
+	/// Does the cubemap face convention use +Z as forward? (D3D: true, GL: false)
+	/// GL cubemaps map forward (-Z) to NEGATIVE_Z face, D3D maps forward (+Z) to POSITIVE_Z face.
+	virtual bool			cubemapZPositiveForward() const = 0;
 	//
 	/// test whether a texture addressing mode is supported
 	virtual bool			supportTextureAddrMode(CMaterial::TTexAddressingMode mode) const = 0;
@@ -1439,6 +1536,7 @@ class IDriver : public NLMISC::CRefCount
 	friend	class			IMaterialDrvInfos;
 	friend	class			IProgramDrvInfos;
 	friend	class			IProgramParamsDrvInfos;
+	friend	class			IUBDrvInfos;
 
 	/// remove ptr from the lists in the driver.
 	void					removeVBDrvInfoPtr(ItVBDrvInfoPtrList vbDrvInfoIt);
@@ -1447,6 +1545,7 @@ class IDriver : public NLMISC::CRefCount
 	void					removeTextureDrvSharePtr(ItTexDrvSharePtrList texDrvShareIt);
 	void					removeMatDrvInfoPtr(ItMatDrvInfoPtrList shaderIt);
 	void					removeGPUPrgDrvInfoPtr(ItGPUPrgDrvInfoPtrList gpuPrgDrvInfoIt);
+	void					removeUBDrvInfoPtr(ItUBDrvInfoPtrList ubDrvInfoIt);
 
 private:
 	bool					_StaticMemoryToVRAM;

nel/include/nel/3d/driver_user.h

@@ -208,6 +208,8 @@ class CDriverUser : public UDriver
 	virtual	void			enableFog(bool enable);
 	/// setup fog parameters. fog must enabled to see result. start and end are in [0,1] range.
 	virtual	void			setupFog(float start, float end, CRGBA color);
+	/// setup fog mode and density. mode/density are orthogonal to start/end/color.
+	virtual	void			setupFogMode(uint mode = 0, float density = 1.f);
 	// @}
 
 	/// \name Light support.
@@ -489,6 +491,7 @@ class CDriverUser : public UDriver
 	virtual uint			getAnisotropicFilter() const;
 	virtual uint			getAnisotropicFilterMaximum() const;
 	virtual void			forceTextureResize(uint divisor);
+	virtual bool			supportMonitorColorProperties () const;
 	virtual bool			setMonitorColorProperties (const CMonitorColorProperties &properties);
 	// @}
 

nel/include/nel/3d/dru.h

@@ -29,14 +29,17 @@
 
 #if defined (NL_COMP_MINGW)
 # define NL3D_GL_DLL_NAME "libnel_drv_opengl_win"
+# define NL3D_GL3_DLL_NAME "libnel_drv_opengl3_win"
 # define NL3D_GLES_DLL_NAME "libnel_drv_opengles_win"
 # define NL3D_D3D_DLL_NAME "libnel_drv_direct3d_win"
 #elif defined (NL_OS_WINDOWS)
 # define NL3D_GL_DLL_NAME "nel_drv_opengl_win"
+# define NL3D_GL3_DLL_NAME "nel_drv_opengl3_win"
 # define NL3D_GLES_DLL_NAME "nel_drv_opengles_win"
 # define NL3D_D3D_DLL_NAME "nel_drv_direct3d_win"
 #elif defined (NL_OS_UNIX)
 # define NL3D_GL_DLL_NAME "nel_drv_opengl"
+# define NL3D_GL3_DLL_NAME "nel_drv_opengl3"
 # define NL3D_GLES_DLL_NAME "nel_drv_opengles"
 #else
 # error "Unknown system"
@@ -77,6 +80,32 @@ struct EDruOpenglDriverCantCreateDriver : public EDru
 	EDruOpenglDriverCantCreateDriver() : EDru( NL3D_GL_DLL_NAME " can't create driver" ) {}
 };
 
+// OpenGL 3
+struct EDruOpengl3DriverNotFound : public EDru
+{
+	EDruOpengl3DriverNotFound() : EDru( NL3D_GL3_DLL_NAME " not found" ) {}
+};
+
+struct EDruOpengl3DriverCorrupted : public EDru
+{
+	EDruOpengl3DriverCorrupted() : EDru( "Can't get NL3D_createIDriverInstance from " NL3D_GL3_DLL_NAME " (Bad dll?)" ) {}
+};
+
+struct EDruOpengl3DriverOldVersion : public EDru
+{
+	EDruOpengl3DriverOldVersion() : EDru( NL3D_GL3_DLL_NAME " is a too old version. Ask for a more recent file" ) {}
+};
+
+struct EDruOpengl3DriverUnknownVersion : public EDru
+{
+	EDruOpengl3DriverUnknownVersion() : EDru( NL3D_GL3_DLL_NAME " is more recent than the application" ) {}
+};
+
+struct EDruOpengl3DriverCantCreateDriver : public EDru
+{
+	EDruOpengl3DriverCantCreateDriver() : EDru( NL3D_GL3_DLL_NAME " can't create driver" ) {}
+};
+
 // OpenGL ES
 struct EDruOpenglEsDriverNotFound : public EDru
 {
@@ -139,6 +168,9 @@ class	CDRU
 	/// Portable Function which create a GL Driver (using gl dll...).
 	static IDriver		*createGlDriver();
 
+	/// Portable Function which create a GL3 Driver (using gl dll...).
+	static IDriver		*createGl3Driver();
+
 	/// Portable Function which create a GL ES Driver (using gl dll...).
 	static IDriver		*createGlEsDriver();