Skip to content

dxmt(fix) show DXMT version in HUD on macOS27 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aquadran wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

dxmt(fix) show DXMT version in HUD on macOS27 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/dxmt/dxmt_hud_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@ HUDState::initialize(const std::string &heading) {
using namespace WMT;
auto pool = MakeAutoreleasePool();
auto str_dxmt_version = MakeString("com.github.3shain.dxmt-version", WMTUTF8StringEncoding);
hud_.addLabel(str_dxmt_version, String::string("com.apple.hud-graph.default", WMTUTF8StringEncoding));
hud_.updateLabel(str_dxmt_version, String::string(heading.c_str(), WMTUTF8StringEncoding));
uint64_t macos_major_version = 0, macos_minor_version = 0;
WMTGetOSVersion(&macos_major_version, &macos_minor_version, nullptr);
if (macos_major_version >= 27) {
hud_.addMetric(
str_dxmt_version,
String::string(heading.c_str(), WMTUTF8StringEncoding),
String::string("", WMTUTF8StringEncoding),
0xFFFFFFFF, 0x00000000, 0x800, 0);
hud_.updateIntegerMetric(str_dxmt_version, 1);
} else {
hud_.addLabel(str_dxmt_version, String::string("com.apple.hud-graph.default", WMTUTF8StringEncoding));
hud_.updateLabel(str_dxmt_version, String::string(heading.c_str(), WMTUTF8StringEncoding));
}
line_labels_.push_back(std::move(str_dxmt_version));
}

Expand Down
10 changes: 10 additions & 0 deletions src/winemetal/Metal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,16 @@ class DeveloperHUDProperties : public Object {
DeveloperHUDProperties_updateLabel(handle, label, value);
}

void
addMetric(String metric, String name, String unit, uint32_t nameColor, uint32_t valueColor, uint32_t visualType, uint32_t options) {
DeveloperHUDProperties_addMetric(handle, metric, name, unit, nameColor, valueColor, visualType, options);
}

void
updateIntegerMetric(String metric, int64_t value) {
DeveloperHUDProperties_updateMetric(handle, metric, value);
}

void
remove(String label) {
DeveloperHUDProperties_remove(handle, label);
Expand Down
23 changes: 23 additions & 0 deletions src/winemetal/unix/winemetal_unix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,6 +1516,25 @@ _DeveloperHUDProperties_updateLabel(void *obj) {
return STATUS_SUCCESS;
}

static NTSTATUS
_DeveloperHUDProperties_addMetric(void *obj) {
struct unixcall_generic_obj_obj_obj_obj_uint_uint_uint_uint_noret *params = obj;
((void (*)(id, SEL, id, id, id, NSUInteger, NSUInteger, NSUInteger, NSUInteger)
)objc_msgSend)(
(id)params->handle, @selector(addMetric:name:unit:nameColor:valueColor:visualType:options:),
(id)params->arg0, (id)params->arg1, (id)params->arg2, (NSUInteger)params->arg3,
(NSUInteger)params->arg4, (NSUInteger)params->arg5, (NSUInteger)params->arg6);
return STATUS_SUCCESS;
}

static NTSTATUS
_DeveloperHUDProperties_updateIntegerMetric(void *obj) {
struct unixcall_generic_obj_obj_int64_noret *params = obj;
((void (*)(id, SEL, id, NSInteger)
)objc_msgSend)((id)params->handle, @selector(updateIntegerMetric:value:), (id)params->arg0, (NSInteger)params->arg1);
return STATUS_SUCCESS;
}

static NTSTATUS
_DeveloperHUDProperties_remove(void *obj) {
struct unixcall_generic_obj_obj_noret *params = obj;
Expand Down Expand Up @@ -2999,6 +3018,8 @@ const void *__wine_unix_call_funcs[] = {
&_MTLCommandBuffer_blitCommandEncoderWithSampleBuffers,
&_MTLCommandBuffer_property,
&_MTLDevice_newTileRenderPipelineState,
&_DeveloperHUDProperties_addMetric,
&_DeveloperHUDProperties_updateIntegerMetric,
};

#ifndef DXMT_NATIVE
Expand Down Expand Up @@ -3135,5 +3156,7 @@ const void *__wine_unix_call_wow64_funcs[] = {
&_MTLCommandBuffer_blitCommandEncoderWithSampleBuffers,
&_MTLCommandBuffer_property,
&_MTLDevice_newTileRenderPipelineState,
&_DeveloperHUDProperties_addMetric,
&_DeveloperHUDProperties_updateIntegerMetric,
};
#endif
7 changes: 7 additions & 0 deletions src/winemetal/winemetal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,6 +1654,13 @@ WINEMETAL_API bool DeveloperHUDProperties_addLabel(obj_handle_t obj, obj_handle_

WINEMETAL_API void DeveloperHUDProperties_updateLabel(obj_handle_t obj, obj_handle_t label, obj_handle_t value);

WINEMETAL_API void
DeveloperHUDProperties_addMetric(
obj_handle_t obj, obj_handle_t metric, obj_handle_t name, obj_handle_t unit,
uint32_t nameColor, uint32_t valueColor, uint32_t visualType, uint32_t options);

WINEMETAL_API void DeveloperHUDProperties_updateMetric(obj_handle_t obj, obj_handle_t metric, int64_t value);

WINEMETAL_API void DeveloperHUDProperties_remove(obj_handle_t obj, obj_handle_t label);

WINEMETAL_API obj_handle_t MetalDrawable_texture(obj_handle_t drawable);
Expand Down
25 changes: 25 additions & 0 deletions src/winemetal/winemetal_thunks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,31 @@ DeveloperHUDProperties_updateLabel(obj_handle_t obj, obj_handle_t label, obj_han
UNIX_CALL(64, &params);
}

WINEMETAL_API void
DeveloperHUDProperties_addMetric(
obj_handle_t obj, obj_handle_t metric, obj_handle_t name, obj_handle_t unit,
uint32_t nameColor, uint32_t valueColor, uint32_t visualType, uint32_t options) {
struct unixcall_generic_obj_obj_obj_obj_uint_uint_uint_uint_noret params;
params.handle = obj;
params.arg0 = metric;
params.arg1 = name;
params.arg2 = unit;
params.arg3 = nameColor;
params.arg4 = valueColor;
params.arg5 = visualType;
params.arg6 = options;
UNIX_CALL(132, &params);
}

WINEMETAL_API void
DeveloperHUDProperties_updateMetric(obj_handle_t obj, obj_handle_t metric, int64_t value) {
struct unixcall_generic_obj_obj_int64_noret params;
params.handle = obj;
params.arg0 = metric;
params.arg1 = value;
UNIX_CALL(133, &params);
}

WINEMETAL_API void
DeveloperHUDProperties_remove(obj_handle_t obj, obj_handle_t label) {
struct unixcall_generic_obj_obj_noret params;
Expand Down
17 changes: 17 additions & 0 deletions src/winemetal/winemetal_thunks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,23 @@ struct unixcall_generic_obj_obj_obj_noret {
obj_handle_t arg1;
};

struct unixcall_generic_obj_obj_obj_obj_uint_uint_uint_uint_noret {
obj_handle_t handle;
obj_handle_t arg0;
obj_handle_t arg1;
obj_handle_t arg2;
uint32_t arg3;
uint32_t arg4;
uint32_t arg5;
uint32_t arg6;
};

struct unixcall_generic_obj_obj_int64_noret {
obj_handle_t handle;
obj_handle_t arg0;
int64_t arg1;
};

struct unixcall_generic_obj_obj_obj_uint64_ret {
obj_handle_t handle;
obj_handle_t arg0;
Expand Down
Loading