Skip to content
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

Jump to bottom

ui: show render scale and screen resolution to about window #1006

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

ui: show render scale and screen resolution to about window #1006

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9d5be59
add info on render scale in help > about
Fabxx Jun 1, 2022
1cbf27a
Add screen resolution in about window
Fabxx Jun 1, 2022
bd1a014
add temporary comments in reporting.hh
Fabxx Jun 1, 2022
7884dfa
ui: print via non static buffer, add vars in JSON report
Fabxx Jun 2, 2022
4782f38
Adjust JSON vars, put res info in dynamic buffer
Fabxx Jun 3, 2022
87d5b3b
Merge branch 'mborgerson:master' into render_scale_info
Fabxx Jun 11, 2022
22bea27
Add display mode to about window, remove JSON reporting
Fabxx Jun 12, 2022
c6615d5
remove string join in printf
Fabxx Jun 12, 2022
11aefd9
Add window resolution in about window
Fabxx Jun 15, 2022
74ac62a
remove sstruct and use parameters
Fabxx Jun 16, 2022
a612e02
Merge branch 'master' into render_scale_info
Fabxx Jun 17, 2022
8042e0a
Add array in misc.hh to avoid double translation
Fabxx Jun 20, 2022
3e0b71f
rename array to avoid ambiguation
Fabxx Jun 21, 2022
2b10f26
Merge branch 'mborgerson:master' into render_scale_info
Fabxx Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions ui/xui/main-menu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,24 +794,27 @@ void MainMenuSystemView::Draw()

void MainMenuAboutView::Draw()
{
static const char *build_info_text = NULL;
const char *build_info_text = NULL;
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
if (build_info_text == NULL) {
build_info_text = g_strdup_printf(
"Version: %s\nBranch: %s\nCommit: %s\nDate: %s",
xemu_version, xemu_branch, xemu_commit, xemu_date);
}

static const char *sys_info_text = NULL;
const char *sys_info_text = NULL;
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
if (sys_info_text == NULL) {
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
const char *gl_shader_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
const char *gl_version = (const char*)glGetString(GL_VERSION);
const char *gl_renderer = (const char*)glGetString(GL_RENDERER);
const char *gl_vendor = (const char*)glGetString(GL_VENDOR);
SDL_DisplayMode DM;
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
SDL_GetCurrentDisplayMode(0, &DM);
sys_info_text = g_strdup_printf(
"CPU: %s\nOS Platform: %s\nOS Version: %s\nManufacturer: %s\n"
"GPU Model: %s\nDriver: %s\nShader: %s",
"GPU Model: %s\nDriver: %s\nShader: %s\nScaling: %dx\n"
"Resolution: %dx%d\n",
xemu_get_cpu_info(), xemu_get_os_platform(), xemu_get_os_info(), gl_vendor,
gl_renderer, gl_version, gl_shader_version);
gl_renderer, gl_version, gl_shader_version, nv2a_get_surface_scale_factor(), DM.w, DM.h);
}

static uint32_t time_start = 0;
Expand Down
1 change: 1 addition & 0 deletions ui/xui/reporting.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const std::string &CompatibilityReport::GetSerializedReport()
{"xemu_branch", xemu_branch},
{"xemu_commit", xemu_commit},
{"xemu_date", xemu_date},
{"xemu_rendering_scale", xemu_rendering_scale},
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
{"os_platform", os_platform},
{"os_version", os_version},
{"cpu", cpu},
Expand Down
4 changes: 4 additions & 0 deletions ui/xui/reporting.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public:
std::string xemu_branch;
std::string xemu_commit;
std::string xemu_date;
//not sure if report accepts unsigned int
unsigned int xemu_rendering_scale;
//is it ok to save the data from SDL_GetCurrentDisplayMode in main_menu.cc directly into the class? same as the rendering scale so the data will be filled
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
int width, height;
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
std::string os_platform;
std::string os_version;
std::string cpu;
Expand Down