gl_rasterizer: Implement primitive restart.

src/video_core/engines/maxwell_3d.h

@@ -751,7 +751,14 @@ public:
                     };
                 } draw;
 
-                INSERT_PADDING_WORDS(0x6B);
+                INSERT_PADDING_WORDS(0xA);
+
+                struct {
+                    u32 enabled;
+                    u32 index;
+                } primitive_restart;
+
+                INSERT_PADDING_WORDS(0x5F);
 
                 struct {
                     u32 start_addr_high;
@@ -1082,6 +1089,7 @@ ASSERT_REG_POSITION(stencil_back_func_func, 0x569);
 ASSERT_REG_POSITION(point_coord_replace, 0x581);
 ASSERT_REG_POSITION(code_address, 0x582);
 ASSERT_REG_POSITION(draw, 0x585);
+ASSERT_REG_POSITION(primitive_restart, 0x591);
 ASSERT_REG_POSITION(index_array, 0x5F2);
 ASSERT_REG_POSITION(instanced_arrays, 0x620);
 ASSERT_REG_POSITION(cull, 0x646);

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -570,6 +570,7 @@ void RasterizerOpenGL::DrawArrays() {
     SyncBlendState();
     SyncLogicOpState();
     SyncCullMode();
+    SyncPrimitiveRestart();
     SyncDepthRange();
     SyncScissorTest();
     // Alpha Testing is synced on shaders.
@@ -924,6 +925,13 @@ void RasterizerOpenGL::SyncCullMode() {
     }
 }
 
+void RasterizerOpenGL::SyncPrimitiveRestart() {
+    const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;
+
+    state.primitive_restart.enabled = regs.primitive_restart.enabled;
+    state.primitive_restart.index = regs.primitive_restart.index;
+}
+
 void RasterizerOpenGL::SyncDepthRange() {
     const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;
 

src/video_core/renderer_opengl/gl_rasterizer.h

@@ -144,6 +144,9 @@ private:
     /// Syncs the cull mode to match the guest state
     void SyncCullMode();
 
+    /// Syncs the primitve restart to match the guest state
+    void SyncPrimitiveRestart();
+
     /// Syncs the depth range to match the guest state
     void SyncDepthRange();
 

src/video_core/renderer_opengl/gl_state.cpp

@@ -24,6 +24,9 @@ OpenGLState::OpenGLState() {
     depth.depth_range_near = 0.0f;
     depth.depth_range_far = 1.0f;
 
+    primitive_restart.enabled = false;
+    primitive_restart.index = 0;
+
     color_mask.red_enabled = GL_TRUE;
     color_mask.green_enabled = GL_TRUE;
     color_mask.blue_enabled = GL_TRUE;
@@ -127,6 +130,18 @@ void OpenGLState::Apply() const {
         glDepthRange(depth.depth_range_near, depth.depth_range_far);
     }
 
+    // Primitive restart
+    if (primitive_restart.enabled != cur_state.primitive_restart.enabled) {
+        if (primitive_restart.enabled) {
+            glEnable(GL_PRIMITIVE_RESTART);
+        } else {
+            glDisable(GL_PRIMITIVE_RESTART);
+        }
+    }
+    if (primitive_restart.index != cur_state.primitive_restart.index) {
+        glPrimitiveRestartIndex(primitive_restart.index);
+    }
+
     // Color mask
     if (color_mask.red_enabled != cur_state.color_mask.red_enabled ||
         color_mask.green_enabled != cur_state.color_mask.green_enabled ||

src/video_core/renderer_opengl/gl_state.h

@@ -49,6 +49,11 @@ public:
         GLfloat depth_range_far;  // GL_DEPTH_RANGE
     } depth;
 
+    struct {
+        bool enabled;
+        GLuint index;
+    } primitive_restart; // GL_PRIMITIVE_RESTART
+
     struct {
         GLboolean red_enabled;
         GLboolean green_enabled;

src/yuzu/configuration/configure_system.cpp

@@ -48,40 +48,20 @@ constexpr std::array<u8, 107> backup_jpeg{
     0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9,
 };
 
-QString GetImagePath(Service::Account::UUID uuid) {
-    const auto path = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
-                      "/system/save/8000000000000010/su/avators/" + uuid.FormatSwitch() + ".jpg";
-    return QString::fromStdString(path);
+std::string GetImagePath(Service::Account::UUID uuid) {
+    return FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
+           "/system/save/8000000000000010/su/avators/" + uuid.FormatSwitch() + ".jpg";
 }
 
-QString GetAccountUsername(const Service::Account::ProfileManager& manager,
-                           Service::Account::UUID uuid) {
+std::string GetAccountUsername(const Service::Account::ProfileManager& manager,
+                               Service::Account::UUID uuid) {
     Service::Account::ProfileBase profile;
     if (!manager.GetProfileBase(uuid, profile)) {
-        return {};
+        return "";
     }
 
-    const auto text = Common::StringFromFixedZeroTerminatedBuffer(
+    return Common::StringFromFixedZeroTerminatedBuffer(
         reinterpret_cast<const char*>(profile.username.data()), profile.username.size());
-    return QString::fromStdString(text);
-}
-
-QString FormatUserEntryText(const QString& username, Service::Account::UUID uuid) {
-    return ConfigureSystem::tr("%1\n%2",
-                               "%1 is the profile username, %2 is the formatted UUID (e.g. "
-                               "00112233-4455-6677-8899-AABBCCDDEEFF))")
-        .arg(username, QString::fromStdString(uuid.FormatSwitch()));
-}
-
-QPixmap GetIcon(Service::Account::UUID uuid) {
-    QPixmap icon{GetImagePath(uuid)};
-
-    if (!icon) {
-        icon.fill(Qt::black);
-        icon.loadFromData(backup_jpeg.data(), backup_jpeg.size());
-    }
-
-    return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 } // Anonymous namespace
 
@@ -151,6 +131,18 @@ void ConfigureSystem::setConfiguration() {
     UpdateCurrentUser();
 }
 
+static QPixmap GetIcon(Service::Account::UUID uuid) {
+    const auto icon_url = QString::fromStdString(GetImagePath(uuid));
+    QPixmap icon{icon_url};
+
+    if (!icon) {
+        icon.fill(Qt::black);
+        icon.loadFromData(backup_jpeg.data(), backup_jpeg.size());
+    }
+
+    return icon;
+}
+
 void ConfigureSystem::PopulateUserList() {
     const auto& profiles = profile_manager->GetAllUsers();
     for (const auto& user : profiles) {
@@ -162,7 +154,8 @@ void ConfigureSystem::PopulateUserList() {
             reinterpret_cast<const char*>(profile.username.data()), profile.username.size());
 
         list_items.push_back(QList<QStandardItem*>{new QStandardItem{
-            GetIcon(user), FormatUserEntryText(QString::fromStdString(username), user)}});
+            GetIcon(user).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
+            QString::fromStdString(username + '\n' + user.FormatSwitch())}});
     }
 
     for (const auto& item : list_items)
@@ -179,7 +172,7 @@ void ConfigureSystem::UpdateCurrentUser() {
     scene->clear();
     scene->addPixmap(
         GetIcon(*current_user).scaled(48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-    ui->current_user_username->setText(username);
+    ui->current_user_username->setText(QString::fromStdString(username));
 }
 
 void ConfigureSystem::ReadSystemSettings() {}
@@ -255,23 +248,25 @@ void ConfigureSystem::AddUser() {
 
     profile_manager->CreateNewUser(uuid, username.toStdString());
 
-    item_model->appendRow(new QStandardItem{GetIcon(uuid), FormatUserEntryText(username, uuid)});
+    item_model->appendRow(new QStandardItem{
+        GetIcon(uuid).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
+        QString::fromStdString(username.toStdString() + '\n' + uuid.FormatSwitch())});
 }
 
 void ConfigureSystem::RenameUser() {
     const auto user = tree_view->currentIndex().row();
     const auto uuid = profile_manager->GetUser(user);
     ASSERT(uuid != std::nullopt);
+    const auto username = GetAccountUsername(*profile_manager, *uuid);
 
     Service::Account::ProfileBase profile;
     if (!profile_manager->GetProfileBase(*uuid, profile))
         return;
 
     bool ok = false;
-    const auto old_username = GetAccountUsername(*profile_manager, *uuid);
     const auto new_username =
         QInputDialog::getText(this, tr("Enter Username"), tr("Enter a new username:"),
-                              QLineEdit::Normal, old_username, &ok);
+                              QLineEdit::Normal, QString::fromStdString(username), &ok);
 
     if (!ok)
         return;
@@ -289,8 +284,12 @@ void ConfigureSystem::RenameUser() {
 
     item_model->setItem(
         user, 0,
-        new QStandardItem{GetIcon(*uuid),
-                          FormatUserEntryText(QString::fromStdString(username_std), *uuid)});
+        new QStandardItem{
+            GetIcon(*uuid).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
+            tr("%1\n%2", "%1 is the profile username, %2 is the formatted UUID (e.g. "
+                         "00112233-4455-6677-8899-AABBCCDDEEFF))")
+                .arg(QString::fromStdString(username_std),
+                     QString::fromStdString(uuid->FormatSwitch()))});
     UpdateCurrentUser();
 }
 
@@ -300,9 +299,10 @@ void ConfigureSystem::DeleteUser() {
     ASSERT(uuid != std::nullopt);
     const auto username = GetAccountUsername(*profile_manager, *uuid);
 
-    const auto confirm = QMessageBox::question(
-        this, tr("Confirm Delete"),
-        tr("You are about to delete user with name \"%1\". Are you sure?").arg(username));
+    const auto confirm =
+        QMessageBox::question(this, tr("Confirm Delete"),
+                              tr("You are about to delete user with name %1. Are you sure?")
+                                  .arg(QString::fromStdString(username)));
 
     if (confirm == QMessageBox::No)
         return;
@@ -325,47 +325,28 @@ void ConfigureSystem::SetUserImage() {
     const auto index = tree_view->currentIndex().row();
     const auto uuid = profile_manager->GetUser(index);
     ASSERT(uuid != std::nullopt);
+    const auto username = GetAccountUsername(*profile_manager, *uuid);
 
     const auto file = QFileDialog::getOpenFileName(this, tr("Select User Image"), QString(),
                                                    tr("JPEG Images (*.jpg *.jpeg)"));
 
-    if (file.isEmpty()) {
+    if (file.isEmpty())
         return;
-    }
 
-    const auto image_path = GetImagePath(*uuid);
-    if (QFile::exists(image_path) && !QFile::remove(image_path)) {
-        QMessageBox::warning(
-            this, tr("Error deleting image"),
-            tr("Error occurred attempting to overwrite previous image at: %1.").arg(image_path));
-        return;
-    }
+    FileUtil::Delete(GetImagePath(*uuid));
 
-    const auto raw_path = QString::fromStdString(
-        FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) + "/system/save/8000000000000010");
-    const QFileInfo raw_info{raw_path};
-    if (raw_info.exists() && !raw_info.isDir() && !QFile::remove(raw_path)) {
-        QMessageBox::warning(this, tr("Error deleting file"),
-                             tr("Unable to delete existing file: %1.").arg(raw_path));
-        return;
-    }
+    const auto raw_path =
+        FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) + "/system/save/8000000000000010";
+    if (FileUtil::Exists(raw_path) && !FileUtil::IsDirectory(raw_path))
+        FileUtil::Delete(raw_path);
 
-    const QString absolute_dst_path = QFileInfo{image_path}.absolutePath();
-    if (!QDir{raw_path}.mkpath(absolute_dst_path)) {
-        QMessageBox::warning(
-            this, tr("Error creating user image directory"),
-            tr("Unable to create directory %1 for storing user images.").arg(absolute_dst_path));
-        return;
-    }
+    FileUtil::CreateFullPath(GetImagePath(*uuid));
+    FileUtil::Copy(file.toStdString(), GetImagePath(*uuid));
 
-    if (!QFile::copy(file, image_path)) {
-        QMessageBox::warning(this, tr("Error copying user image"),
-                             tr("Unable to copy image from %1 to %2").arg(file, image_path));
-        return;
-    }
-
-    const auto username = GetAccountUsername(*profile_manager, *uuid);
-    item_model->setItem(index, 0,
-                        new QStandardItem{GetIcon(*uuid), FormatUserEntryText(username, *uuid)});
+    item_model->setItem(
+        index, 0,
+        new QStandardItem{
+            GetIcon(*uuid).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
+            QString::fromStdString(username + '\n' + uuid->FormatSwitch())});
     UpdateCurrentUser();
 }