Skip to content

Commit

Permalink
Merge branch 'markh/configurableClearColors2' into 'main'
Browse files Browse the repository at this point in the history
[REMIX-2477] improving hdremix api

See merge request lightspeedrtx/dxvk-remix-nv!628
  • Loading branch information
MarkEHenderson committed Dec 28, 2023
2 parents f41d736 + 582016b commit 5ee9192
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions public/include/remix/remix.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ namespace remix {
Result< void > dxvk_CopyRenderingOutput(IDirect3DSurface9* destination,
remixapi_dxvk_CopyRenderingOutputType type);
Result< void > dxvk_SetDefaultOutput(remixapi_dxvk_CopyRenderingOutputType type,
remixapi_Float4D color);
const remixapi_Float4D& color);
};

namespace lib {
Expand Down Expand Up @@ -735,7 +735,7 @@ namespace remix {
}

inline Result< void > Interface::dxvk_SetDefaultOutput(
remixapi_dxvk_CopyRenderingOutputType type, remixapi_Float4D color) {
remixapi_dxvk_CopyRenderingOutputType type, const remixapi_Float4D& color) {
return m_CInterface.dxvk_SetDefaultOutput(type, color);
}
}
2 changes: 1 addition & 1 deletion public/include/remix/remix_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ extern "C" {

typedef remixapi_ErrorCode(REMIXAPI_PTR* PFN_remixapi_dxvk_SetDefaultOutput)(
remixapi_dxvk_CopyRenderingOutputType type,
remixapi_Float4D color);
const remixapi_Float4D& color);


typedef struct remixapi_InitializeLibraryInfo {
Expand Down
2 changes: 1 addition & 1 deletion src/dxvk/rtx_render/rtx_remix_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ namespace {


remixapi_ErrorCode REMIXAPI_CALL remixapi_dxvk_SetDefaultOutput(
remixapi_dxvk_CopyRenderingOutputType type, remixapi_Float4D color) {
remixapi_dxvk_CopyRenderingOutputType type, const remixapi_Float4D& color) {
dxvk::D3D9DeviceEx* remixDevice = tryAsDxvk();
if (!remixDevice) {
return REMIXAPI_ERROR_CODE_REMIX_DEVICE_WAS_NOT_REGISTERED;
Expand Down

0 comments on commit 5ee9192

Please sign in to comment.