Merge branch 'REMIX-4751-rtx-conf-from-envvar-path' into 'main'

nv-jshopf · nv-jshopf · commit 977d5efe99ca · 2025-11-20T05:40:10.000-08:00
[REMIX-4751] Restoring previous expectation that DXVK_RTX_CONFIG_FILE is the full config file path

See merge request lightspeedrtx/dxvk-remix-nv!1800
diff --git a/src/dxvk/rtx_render/rtx_options.h b/src/dxvk/rtx_render/rtx_options.h
@@ -1299,7 +1299,7 @@ namespace dxvk {
       const Config::Desc& desc = Config::getDesc(Config::Type::Type_RtxUser);
       const std::string envVarName(desc.env);
       const std::string envVarPath = !envVarName.empty() ? env::getEnvVar(envVarName.c_str()) : "";
-      return envVarPath.empty() ? "rtx.conf" : env::getEnvVar(desc.env.c_str()) + "\\rtx.conf";
+      return envVarPath.empty() ? "rtx.conf" : env::getEnvVar(desc.env.c_str());
     }
 
     static void serialize() {

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ namespace dxvk {`
`1299`	`1299`	`const Config::Desc& desc = Config::getDesc(Config::Type::Type_RtxUser);`
`1300`	`1300`	`const std::string envVarName(desc.env);`
`1301`	`1301`	`const std::string envVarPath = !envVarName.empty() ? env::getEnvVar(envVarName.c_str()) : "";`
`1302`		`- return envVarPath.empty() ? "rtx.conf" : env::getEnvVar(desc.env.c_str()) + "\\rtx.conf";`
	`1302`	`+ return envVarPath.empty() ? "rtx.conf" : env::getEnvVar(desc.env.c_str());`
`1303`	`1303`	`}`
`1304`	`1304`
`1305`	`1305`	`static void serialize() {`