Merge branch 'dev/adunn/vertex_lighting_as_surface_prop' into 'main'

AlexDunn · AlexDunn · commit 9de72042b2af · 2025-08-27T13:04:03.000-07:00
[REMIX-4529] Implement the vertex color as baked lighting as a per surface property

See merge request lightspeedrtx/dxvk-remix-nv!1681
diff --git a/bridge/src/util/util_remixapi.cpp b/bridge/src/util/util_remixapi.cpp
@@ -502,7 +502,8 @@ void InstanceInfoObjectPicking::_dtor() {
                               srcAlphaBlendFactor, \
                               dstAlphaBlendFactor, \
                               alphaBlendOp, \
-                              writeMask
+                              writeMask, \
+                              isVertexColorBakedLighting
 uint32_t InstanceInfoBlend::_calcSize() const {
   return fold_helper::calcSize(InstanceInfoBlendVars);
 }
diff --git a/bridge/test/rtx/unit/test_remix_api_common.h b/bridge/test/rtx/unit/test_remix_api_common.h
@@ -428,7 +428,8 @@ bool InstanceInfoObjectPicking::compare(const RemixApiT& me, const RemixApiT& ot
                               srcAlphaBlendFactor, \
                               dstAlphaBlendFactor, \
                               alphaBlendOp, \
-                              writeMask
+                              writeMask, \
+                              isVertexColorBakedLighting
 using InstanceInfoBlend = Expected<remixapi_InstanceInfoBlendEXT>;
 void InstanceInfoBlend::init() {
   sType = REMIXAPI_STRUCT_TYPE_INSTANCE_INFO_BLEND_EXT;
diff --git a/public/include/remix/remix.h b/public/include/remix/remix.h
@@ -722,6 +722,7 @@ namespace remix {
       textureAlphaOperation = 1 /* DxvkRtTextureOperation::SelectArg1 */;
       tFactor = 0XFFFFFFFF;
       isTextureFactorBlend = false;
+      isVertexColorBakedLighting = false;
       static_assert(sizeof remixapi_InstanceInfoBlendEXT == 96);
     }
   };
diff --git a/public/include/remix/remix_c.h b/public/include/remix/remix_c.h
@@ -54,7 +54,7 @@
 
 #define REMIXAPI_VERSION_MAJOR 0
 #define REMIXAPI_VERSION_MINOR 5
-#define REMIXAPI_VERSION_PATCH 1
+#define REMIXAPI_VERSION_PATCH 2
 
 
 // External
@@ -389,6 +389,7 @@ extern "C" {
     uint32_t            dstAlphaBlendFactor;
     uint32_t            alphaBlendOp;
     uint32_t            writeMask;
+    remixapi_Bool       isVertexColorBakedLighting;
   } remixapi_InstanceInfoBlendEXT;
 
   typedef struct remixapi_InstanceInfoObjectPickingEXT {
diff --git a/src/d3d9/d3d9_rtx_utils.cpp b/src/d3d9/d3d9_rtx_utils.cpp
@@ -153,7 +153,7 @@ namespace dxvk {
     const bool hasPositionT = d3d9State.vertexDecl != nullptr && d3d9State.vertexDecl->TestFlag(D3D9VertexDeclFlag::HasPositionT);
     const bool hasColor0 = d3d9State.vertexDecl != nullptr && d3d9State.vertexDecl->TestFlag(D3D9VertexDeclFlag::HasColor0);
     const bool hasColor1 = d3d9State.vertexDecl != nullptr && d3d9State.vertexDecl->TestFlag(D3D9VertexDeclFlag::HasColor1);
-    const bool lighting = d3d9State.renderStates[D3DRS_LIGHTING] != 0 && !hasPositionT;
+    const bool lighting = d3d9State.renderStates[D3DRS_LIGHTING] != 0 && !hasPositionT; // FFP lighting on only if not positionT
 
     uint32_t diffuseSource = hasColor0 ? D3DMCS_COLOR1 : D3DMCS_MATERIAL;
     uint32_t specularSource = hasColor1 ? D3DMCS_COLOR2 : D3DMCS_MATERIAL;
@@ -218,8 +218,12 @@ namespace dxvk {
     m.alphaDstFactor = NormalizeFactor(m.alphaDstFactor);
 
     materialData.d3dMaterial = d3d9State.material;
+
+    // Allow the users to configure vertex color as baked lighting for legacy draw calls.
+    materialData.isVertexColorBakedLighting = RtxOptions::vertexColorIsBakedLighting();
   }
 
+
   void setFogState(D3D9DeviceEx* pDevice, FogState& fogState) {
     const Direct3DState9& d3d9State = *pDevice->GetRawState();
 
diff --git a/src/d3d9/d3d9_vertex_declaration.h b/src/d3d9/d3d9_vertex_declaration.h
@@ -14,7 +14,7 @@ namespace dxvk {
     HasPointSize,
     HasFog,
     HasBlendWeight,
-    HasBlendIndices
+    HasBlendIndices,
   };
   using D3D9VertexDeclFlags = Flags<D3D9VertexDeclFlag>;
 
diff --git a/src/dxvk/rtx_render/rtx_context.cpp b/src/dxvk/rtx_render/rtx_context.cpp
@@ -1190,7 +1190,6 @@ namespace dxvk {
 
     constants.uniformRandomNumber = jenkinsHash(constants.frameIdx);
     constants.vertexColorStrength = RtxOptions::vertexColorStrength();
-    constants.vertexColorIsBakedLighting = RtxOptions::vertexColorIsBakedLighting();
     constants.viewModelRayTMax = RtxOptions::ViewModel::rangeMeters() * RtxOptions::getMeterToWorldUnitScale();
     constants.roughnessDemodulationOffset = m_common->metaDemodulate().demodulateRoughnessOffset();
     
diff --git a/src/dxvk/rtx_render/rtx_game_capturer.cpp b/src/dxvk/rtx_render/rtx_game_capturer.cpp
@@ -98,6 +98,7 @@ namespace dxvk {
       meta.textureAlphaOperation = (uint32_t) rtInstance.surface.textureAlphaOperation;
       meta.tFactor = rtInstance.surface.tFactor;
       meta.isTextureFactorBlend = rtInstance.surface.isTextureFactorBlend;
+      meta.isVertexColorBakedLighting = rtInstance.surface.isVertexColorBakedLighting;
       return meta;
     }
 
diff --git a/src/dxvk/rtx_render/rtx_instance_manager.cpp b/src/dxvk/rtx_render/rtx_instance_manager.cpp
@@ -1049,6 +1049,7 @@ namespace dxvk {
         currentInstance.surface.isAnimatedWater = currentInstance.testCategoryFlags(InstanceCategories::AnimatedWater);
         currentInstance.surface.associatedGeometryHash = drawCall.getHash(RtxOptions::geometryAssetHashRule());
         currentInstance.surface.isTextureFactorBlend = drawCall.getMaterialData().isTextureFactorBlend;
+        currentInstance.surface.isVertexColorBakedLighting = drawCall.getMaterialData().isVertexColorBakedLighting;
         currentInstance.surface.isMotionBlurMaskOut = currentInstance.testCategoryFlags(InstanceCategories::IgnoreMotionBlur);
         currentInstance.surface.ignoreTransparencyLayer = currentInstance.testCategoryFlags(InstanceCategories::IgnoreTransparencyLayer);
 
diff --git a/src/dxvk/rtx_render/rtx_materials.h b/src/dxvk/rtx_render/rtx_materials.h
@@ -99,10 +99,12 @@ struct RtSurface {
     writeGPUHelperExplicit<2>(data, offset, indexBufferIndex);
     writeGPUHelperExplicit<2>(data, offset, color0BufferIndex);
 
-    writeGPUHelperExplicit<1>(data, offset, normalFormat == VK_FORMAT_R32_UINT ? 1 : 0);
+    uint16_t flags0 = 0;
+    flags0 |= normalFormat == VK_FORMAT_R32_UINT ? 1 : 0;
+    flags0 |= isVertexColorBakedLighting ? (1 << 1) : 0;
+    // NOTE: Spare flags bits here
 
-    // 1 unused bytes here.
-    writeGPUPadding<1>(data, offset);
+    writeGPUHelper(data, offset, flags0);
 
     const uint16_t packedHash =
       (uint16_t) (associatedGeometryHash >> 48) ^
@@ -131,32 +133,32 @@ struct RtSurface {
     assert(static_cast<uint32_t>(alphaState.alphaTestReferenceValue) < (1 << 8));
     assert(static_cast<uint32_t>(alphaState.blendType) < (1 << 4));
 
-    uint32_t flags = 0;
+    uint32_t flags1 = 0;
 
-    flags |= isEmissive ? (1 << 0) : 0;
-    flags |= alphaState.isFullyOpaque ? (1 << 1) : 0;
-    flags |= isStatic ? (1 << 2) : 0;
-    flags |= static_cast<uint32_t>(alphaState.alphaTestType) << 3;
+    flags1 |= isEmissive ? (1 << 0) : 0;
+    flags1 |= alphaState.isFullyOpaque ? (1 << 1) : 0;
+    flags1 |= isStatic ? (1 << 2) : 0;
+    flags1 |= static_cast<uint32_t>(alphaState.alphaTestType) << 3;
     // Note: No mask needed as masking of this value to be 8 bit is done elsewhere.
-    flags |= static_cast<uint32_t>(alphaState.alphaTestReferenceValue) << 6;
-    flags |= static_cast<uint32_t>(alphaState.blendType) << 14;
-    flags |= alphaState.invertedBlend ?      (1 << 18) : 0;
-    flags |= alphaState.isBlendingDisabled ? (1 << 19) : 0;
-    flags |= alphaState.emissiveBlend ?      (1 << 20) : 0;
-    flags |= alphaState.isParticle ?         (1 << 21) : 0;
-    flags |= alphaState.isDecal ?            (1 << 22) : 0;
-    flags |= hasMaterialChanged ?            (1 << 23) : 0;
-    flags |= isAnimatedWater ?               (1 << 24) : 0;
-    flags |= isClipPlaneEnabled ?            (1 << 25) : 0;
-    flags |= isMatte ?                       (1 << 26) : 0;
-    flags |= isTextureFactorBlend ?          (1 << 27) : 0;
-    flags |= isMotionBlurMaskOut ?           (1 << 28) : 0;
-    flags |= skipSurfaceInteractionSpritesheetAdjustment ? (1 << 29) : 0;
-    flags |= ignoreTransparencyLayer ?       (1 << 30) : 0;
+    flags1 |= static_cast<uint32_t>(alphaState.alphaTestReferenceValue) << 6;
+    flags1 |= static_cast<uint32_t>(alphaState.blendType) << 14;
+    flags1 |= alphaState.invertedBlend ?      (1 << 18) : 0;
+    flags1 |= alphaState.isBlendingDisabled ? (1 << 19) : 0;
+    flags1 |= alphaState.emissiveBlend ?      (1 << 20) : 0;
+    flags1 |= alphaState.isParticle ?         (1 << 21) : 0;
+    flags1 |= alphaState.isDecal ?            (1 << 22) : 0;
+    flags1 |= hasMaterialChanged ?            (1 << 23) : 0;
+    flags1 |= isAnimatedWater ?               (1 << 24) : 0;
+    flags1 |= isClipPlaneEnabled ?            (1 << 25) : 0;
+    flags1 |= isMatte ?                       (1 << 26) : 0;
+    flags1 |= isTextureFactorBlend ?          (1 << 27) : 0;
+    flags1 |= isMotionBlurMaskOut ?           (1 << 28) : 0;
+    flags1 |= skipSurfaceInteractionSpritesheetAdjustment ? (1 << 29) : 0;
+    flags1 |= ignoreTransparencyLayer ?       (1 << 30) : 0;
     // Note: This flag is purely for debug view purpose. If we need to add more functional flags and running out of bits, we should move this flag to other place.
-    flags |= isInsideFrustum ?               (1 << 31) : 0;
+    flags1 |= isInsideFrustum ?               (1 << 31) : 0;
 
-    writeGPUHelper(data, offset, flags);
+    writeGPUHelper(data, offset, flags1);
 
     // Note: Matricies are stored on the cpu side in column-major order, the same as the GPU.
 
@@ -289,6 +291,7 @@ struct RtSurface {
   bool isAnimatedWater = false;
   bool isClipPlaneEnabled = false;
   bool isTextureFactorBlend = false;
+  bool isVertexColorBakedLighting = false;
   bool isMotionBlurMaskOut = false;
   bool skipSurfaceInteractionSpritesheetAdjustment = false;
   bool isInsideFrustum = false;
@@ -1597,6 +1600,7 @@ struct LegacyMaterialData {
   uint32_t tFactor = 0xffffffff;  // Value for D3DRS_TEXTUREFACTOR, default value of is opaque white
   D3DMATERIAL9 d3dMaterial = {};
   bool isTextureFactorBlend = false;
+  bool isVertexColorBakedLighting = false;
 
   void setHashOverride(XXH64_hash_t hash) {
     m_cachedHash = hash;
diff --git a/src/dxvk/rtx_render/rtx_particle_system.cpp b/src/dxvk/rtx_render/rtx_particle_system.cpp
@@ -655,6 +655,7 @@ namespace dxvk {
       newDrawCallState.materialData.textureAlphaArg1Source = RtTextureArgSource::Texture;
       newDrawCallState.materialData.textureAlphaArg2Source = RtTextureArgSource::VertexColor0;
       newDrawCallState.materialData.textureAlphaOperation = DxvkRtTextureOperation::Modulate;
+      newDrawCallState.materialData.isVertexColorBakedLighting = false;
 
       ctx->getSceneManager().submitDrawState(ctx, newDrawCallState, &particleSystem.materialData);
     }
diff --git a/src/dxvk/rtx_render/rtx_remix_api.cpp b/src/dxvk/rtx_render/rtx_remix_api.cpp
@@ -726,6 +726,7 @@ dxvk::ExternalDrawState dxvk::RemixAPIPrivateAccessor::toRtDrawState(const remix
     prototype.materialData.textureAlphaArg2Source = (RtTextureArgSource) extBlend->textureAlphaArg2Source;
     prototype.materialData.tFactor = extBlend->tFactor;
     prototype.materialData.isTextureFactorBlend = extBlend->isTextureFactorBlend;
+    prototype.materialData.isVertexColorBakedLighting = (s_apiVersion >= REMIXAPI_VERSION_MAKE(0, 5, 2)) ? extBlend->isVertexColorBakedLighting : false;
     prototype.materialData.blendMode.colorSrcFactor = (VkBlendFactor) extBlend->srcColorBlendFactor;
     prototype.materialData.blendMode.colorDstFactor = (VkBlendFactor) extBlend->dstColorBlendFactor;
     prototype.materialData.blendMode.colorBlendOp = (VkBlendOp) extBlend->colorBlendOp;
diff --git a/src/dxvk/shaders/rtx/concept/surface/surface.h b/src/dxvk/shaders/rtx/concept/surface/surface.h
@@ -290,9 +290,14 @@ struct Surface
 
   property bool normalsEncoded
   {
-    get { return (data0b.z & 1) != 0; }
-    // Todo
-    set { data0b.z = 0; }
+    get { return packedFlagGet(data0b.z, 1 << 0); }
+    set { data0b.z = newValue ? packedFlagSet(data0b.z, 1 << 0) : packedFlagUnset(data0b.z, 1 << 0); }
+  }
+
+  property bool isVertexColorBakedLighting
+  {
+    get { return packedFlagGet(data0b.z, 1 << 1); }
+    set { data0b.z = newValue ? packedFlagSet(data0b.z, 1 << 1) : packedFlagUnset(data0b.z, 1 << 1); }
   }
 
   property uint16_t hashPacked
diff --git a/src/dxvk/shaders/rtx/concept/surface_material/opaque_surface_material_interaction.slangh b/src/dxvk/shaders/rtx/concept/surface_material/opaque_surface_material_interaction.slangh
@@ -623,7 +623,7 @@ OpaqueSurfaceMaterialInteraction opaqueSurfaceMaterialInteractionCreate(
   if (applyTextureOperations) 
 #endif
   {
-    if (cb.vertexColorIsBakedLighting) {
+    if (surface.isVertexColorBakedLighting) {
       // "Normalize" vertex color to remove lighting contribution in different vertices.
       // We assume the diffuse term contributes most lighting. Therefore, vertex color = diffuseColor * (N*L).
       // By dividing the vertex color by its largest component, the result is irrelavant to N*L, but proportional to the 
diff --git a/src/dxvk/shaders/rtx/pass/raytrace_args.h b/src/dxvk/shaders/rtx/pass/raytrace_args.h
@@ -381,7 +381,7 @@ struct RaytraceArgs {
   uint allowNrcTraining;
 
   float vertexColorStrength;
-  uint vertexColorIsBakedLighting;
+  uint pad0;
 
   float wboitEnergyLossCompensation;
   float wboitDepthWeightTuning;
diff --git a/src/lssusd/game_exporter.cpp b/src/lssusd/game_exporter.cpp
@@ -921,6 +921,7 @@ void GameExporter::exportInstances(const Export& exportData, ExportContext& ctx)
       _SetDrawMetadata(textureAlphaOperation, UInt);
       _SetDrawMetadata(tFactor, UInt);
       _SetDrawMetadata(isTextureFactorBlend, Bool);
+      _SetDrawMetadata(isVertexColorBakedLighting, Bool);
 #undef _SetDrawMetadata
     }
 
diff --git a/src/lssusd/game_exporter_types.h b/src/lssusd/game_exporter_types.h
@@ -166,6 +166,7 @@ struct RenderingMetaData {
   uint32_t textureAlphaOperation;
   uint32_t tFactor;
   bool isTextureFactorBlend;
+  bool isVertexColorBakedLighting;
 };
 
 struct Mesh {

Original file line number	Diff line number	Diff line change
`@@ -722,6 +722,7 @@ namespace remix {`
`722`	`722`	`textureAlphaOperation = 1 /* DxvkRtTextureOperation::SelectArg1 */;`
`723`	`723`	`tFactor = 0XFFFFFFFF;`
`724`	`724`	`isTextureFactorBlend = false;`
	`725`	`+ isVertexColorBakedLighting = false;`
`725`	`726`	`static_assert(sizeof remixapi_InstanceInfoBlendEXT == 96);`
`726`	`727`	`}`
`727`	`728`	`};`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ namespace dxvk {`
`98`	`98`	`meta.textureAlphaOperation = (uint32_t) rtInstance.surface.textureAlphaOperation;`
`99`	`99`	`meta.tFactor = rtInstance.surface.tFactor;`
`100`	`100`	`meta.isTextureFactorBlend = rtInstance.surface.isTextureFactorBlend;`
	`101`	`+ meta.isVertexColorBakedLighting = rtInstance.surface.isVertexColorBakedLighting;`
`101`	`102`	`return meta;`
`102`	`103`	`}`
`103`	`104`