Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-09-12 02:25:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ability to convert to RGBA directly, if needed
Some checks are pending
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux32 flags:32 name:Linux GCC 32 os:ubuntu-latest]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux64 flags:64 name:Linux GCC x64 os:ubuntu-latest]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm32 flags:arm32 name:Linux GCC ARM 32 os:ubuntu-latest]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm64 flags:arm64 name:Linux GCC ARM 64 os:ubuntu-latest]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:macos name:macOS Apple Silicon os:macos-14]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win32 flags:-A Win32 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 Win32 os:windows-2022]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win64 flags:-A x64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 x64 os:windows-2022]) (push) Waiting to run
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:winarm64 flags:-A ARM64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 ARM os:windows-2022]) (push) Waiting to run
Details
CD / Create Pi Mono Setup (push) Blocked by required conditions
Details
CD / Publishing (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Lorenzooone
2025-04-30 04:14:47 +02:00
parent 2404287c7c
commit 77872ecf56
10 changed files with 155 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/WindowScreen.cpp
View File

@@ -62,7 +62,7 @@ WindowScreen::WindowScreen(ScreenType stype, CaptureStatus* capture_status, Disp
FPSArrayInit(&this->draw_fps);
FPSArrayInit(&this->poll_fps);
this->last_update_texture_data_type = VIDEO_DATA_RGB;
this->use_texture_software_based_conv = false;
this->texture_software_based_conv = NO_SOFTWARE_CONV;
this->num_frames_to_blend = NUM_FRAMES_BLENDED;
if(disable_frame_blending)
this->num_frames_to_blend = 1;
@@ -568,7 +568,7 @@ sf::String WindowScreen::title_factory() {
#endif
void WindowScreen::opengl_error_out(std::string error_base, std::string error_str) {
UpdateOutText(this->own_out_text_data, error_base + ": " + error_str, error_base, TEXT_KIND_ERROR);
UpdateOutText(this->own_out_text_data, error_base + ": " + error_str, error_base + ": " + error_str, TEXT_KIND_ERROR);
}
void WindowScreen::opengl_error_check(std::string error_base) {
@@ -591,6 +591,9 @@ bool WindowScreen::single_update_texture(unsigned int m_texture, InputVideoDataT
GLenum type = GL_UNSIGNED_BYTE;
size_t format_size = sizeof(VideoPixelRGB);
if(manually_converted && (this->texture_software_based_conv == TO_RGBA_SOFTWARE_CONV))
format = GL_RGBA;
if(!manually_converted) {
if(video_data_type == VIDEO_DATA_BGR) {
format = GL_BGR;
@@ -615,7 +618,15 @@ bool WindowScreen::single_update_texture(unsigned int m_texture, InputVideoDataT
if((format != GL_RGB) || (type != GL_UNSIGNED_BYTE)) {
UpdateOutText(this->own_out_text_data, "Switching to software-based texture updating", "", TEXT_KIND_NORMAL);
this->last_update_texture_data_type = video_data_type;
this->use_texture_software_based_conv = true;
this->texture_software_based_conv = TO_RGB_SOFTWARE_CONV;
return true;
}
}
if(glCheckInternalError == GL_INVALID_OPERATION) {
if((format != GL_RGBA) || (type != GL_UNSIGNED_BYTE)) {
UpdateOutText(this->own_out_text_data, "Switching to software-based texture updating", "", TEXT_KIND_NORMAL);
this->last_update_texture_data_type = video_data_type;
this->texture_software_based_conv = TO_RGBA_SOFTWARE_CONV;
return true;
}
}
@@ -710,12 +721,22 @@ void WindowScreen::execute_single_update_texture(bool &manually_converted, bool
unsigned int m_texture = target_texture->getNativeHandle();
bool retry = true;
while(retry) {
bool software_based_conv = manually_converted || (this->use_texture_software_based_conv && (video_data_type == this->last_update_texture_data_type));
bool software_based_conv = manually_converted || ((this->texture_software_based_conv != NO_SOFTWARE_CONV) && (video_data_type == this->last_update_texture_data_type));
if(software_based_conv) {
if(!manually_converted)
manualConvertOutputToRGB(this->saved_buf, this->saved_buf, pos_x_conv, pos_y_conv, full_width, full_height, video_data_type);
if(!manually_converted) {
if(this->texture_software_based_conv == TO_RGB_SOFTWARE_CONV)
manualConvertOutputToRGB(this->saved_buf, this->saved_buf, pos_x_conv, pos_y_conv, full_width, full_height, video_data_type);
if(this->texture_software_based_conv == TO_RGBA_SOFTWARE_CONV)
manualConvertOutputToRGBA(this->saved_buf, this->saved_buf, pos_x_conv, pos_y_conv, full_width, full_height, video_data_type);
}
manually_converted = true;
}
else {
this->texture_software_based_conv = NO_SOFTWARE_CONV;
this->last_update_texture_data_type = video_data_type;
}
retry = this->single_update_texture(m_texture, video_data_type, pos_x_data, pos_y_data, width, height, manually_converted);
}
}
@@ -1849,7 +1870,7 @@ void WindowScreen::setWinSize(bool is_main_thread) {
void WindowScreen::process_own_out_text_data(bool print_to_notification) {
if(!this->own_out_text_data.consumed) {
ConsumeOutText(this->own_out_text_data, false);
if(print_to_notification)
if(print_to_notification && this->notification->isTimerTextDone())
this->print_notification(this->own_out_text_data.small_text, this->own_out_text_data.kind);
this->own_out_text_data.consumed = true;
}