Merge branch 'fix-vtxcol-is-baked' into 'release/v1.2'

[REMIX-4580] Fix default values for isVertexColorBakedLighting

See merge request lightspeedrtx/dxvk-remix-nv!1691

Author: pkristof

public/include/remix/remix.h

@@ -722,7 +722,7 @@ namespace remix {
       textureAlphaOperation = 1 /* DxvkRtTextureOperation::SelectArg1 */;
       tFactor = 0XFFFFFFFF;
       isTextureFactorBlend = false;
-      isVertexColorBakedLighting = false;
+      isVertexColorBakedLighting = true;
       static_assert(sizeof remixapi_InstanceInfoBlendEXT == 96);
     }
   };

src/dxvk/rtx_render/rtx_materials.h

@@ -291,7 +291,7 @@ struct RtSurface {
   bool isAnimatedWater = false;
   bool isClipPlaneEnabled = false;
   bool isTextureFactorBlend = false;
-  bool isVertexColorBakedLighting = false;
+  bool isVertexColorBakedLighting = true;
   bool isMotionBlurMaskOut = false;
   bool skipSurfaceInteractionSpritesheetAdjustment = false;
   bool isInsideFrustum = false;
@@ -1600,7 +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;
+  bool isVertexColorBakedLighting = true;
 
   void setHashOverride(XXH64_hash_t hash) {
     m_cachedHash = hash;

src/dxvk/rtx_render/rtx_remix_api.cpp

@@ -726,7 +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.isVertexColorBakedLighting = (s_apiVersion >= REMIXAPI_VERSION_MAKE(0, 5, 2)) ? extBlend->isVertexColorBakedLighting : RtxOptions::vertexColorIsBakedLighting();
     prototype.materialData.blendMode.colorSrcFactor = (VkBlendFactor) extBlend->srcColorBlendFactor;
     prototype.materialData.blendMode.colorDstFactor = (VkBlendFactor) extBlend->dstColorBlendFactor;
     prototype.materialData.blendMode.colorBlendOp = (VkBlendOp) extBlend->colorBlendOp;