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

360 texture pushing thread waits for image loading #361

Merged
merged 13 commits into from
Sep 1, 2022
Merged

360 texture pushing thread waits for image loading #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c8a187c
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
5e98e52
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
b9d2bbd
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
0907990
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
bd2214b
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
ec2aa3e
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
ad25e64
Stop Texture Pusher Thread Getting Blocked
datacrystals Sep 1, 2022
baed076
Stop Texture Loader Skipping Levels
datacrystals Sep 1, 2022
3092882
Stop Texture Loader Skipping Levels
datacrystals Sep 1, 2022
0558ce2
Stop Texture Loader Skipping Levels
datacrystals Sep 1, 2022
1a6dd8b
Stop Texture Loader Skipping Levels
datacrystals Sep 1, 2022
a29570d
Stop Texture Loader Skipping Levels
datacrystals Sep 1, 2022
d81f7cf
Stop Texture Loader Skipping Levels
datacrystals Sep 1, 2022
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
1 change: 1 addition & 0 deletions Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_AssetStreamingManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ void ERS_CLASS_AssetStreamingManager::SortSceneModels(std::map<unsigned int, int
} else if (MaxTextureResolution_ < 0) {
MaxTextureResolution_ = 0;
}
TargetTextureLevelVRAM = std::min(TargetTextureLevelVRAM, Model->TargetTextureLevelRAM);



Expand Down
48 changes: 35 additions & 13 deletions Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_AsyncTextureUpdater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,9 @@ void ERS_CLASS_AsyncTextureUpdater::SetLevelRAM(ERS_STRUCT_Model* Model, bool Lo
}
void ERS_CLASS_AsyncTextureUpdater::SetLevelVRAM(ERS_STRUCT_Model* Model, bool LogEnable) {


// Abort If Level Not Loaded Yet
if (Model->TextureLevelInVRAM_ < Model->TargetTextureLevelVRAM) {

// We Need All Texture Levels In RAM To Push To VRAM, Check This Is True!
// If It's Not, We're Going To Load Them
if (Model->TextureLevelInRAM_ <= Model->TargetTextureLevelVRAM) {
if (Model->TargetTextureLevelRAM < Model->TargetTextureLevelVRAM) {
Model->TargetTextureLevelRAM = Model->TargetTextureLevelVRAM;
}
SetLevelRAM(Model, LogEnable);
}


// Load This VRAM Level For All Textures
int LevelToLoad = Model->TargetTextureLevelVRAM;
for (unsigned int TextureIndex = 0; TextureIndex < Model->Textures_.size(); TextureIndex++) {
Expand All @@ -432,6 +422,14 @@ void ERS_CLASS_AsyncTextureUpdater::SetLevelVRAM(ERS_STRUCT_Model* Model, bool L
for (unsigned int LevelToUnload = (unsigned int)Model->TextureLevelInVRAM_; LevelToUnload > (unsigned int)Model->TargetTextureLevelVRAM; LevelToUnload--) {
for (unsigned int TextureIndex = 0; TextureIndex < Model->Textures_.size(); TextureIndex++) {

// Ensure That The Level Prior Is Loaded
int PriorLevel = LevelToUnload - 1;
if (PriorLevel > 0) {
if (!Model->Textures_[TextureIndex].TextureLevels[PriorLevel].LevelLoadedInVRAM) {
LoadImageDataVRAM(&Model->Textures_[TextureIndex], PriorLevel, LogEnable);
}
}

// Check If Level Already Loaded, Otherwise, Don't Try To Unload It
if (Model->Textures_[TextureIndex].TextureLevels[LevelToUnload].LevelLoadedInVRAM) {
UnloadImageDataVRAM(&Model->Textures_[TextureIndex], LevelToUnload, LogEnable);
Expand All @@ -445,7 +443,16 @@ void ERS_CLASS_AsyncTextureUpdater::SetLevelVRAM(ERS_STRUCT_Model* Model, bool L
}

}
Model->TextureLevelInVRAM_ = LevelToUnload - 1;

}

// Detect New Level Loaded In Memory
if (Model->Textures_.size() > 0) {
for (int i = 0; i < Model->Textures_[0].TextureLevels.size(); i++) {
if (Model->Textures_[0].TextureLevels[i].LevelLoadedInVRAM) {
Model->TextureLevelInVRAM_ = i;
}
}
}
}

Expand Down Expand Up @@ -642,7 +649,22 @@ void ERS_CLASS_AsyncTextureUpdater::TexturePusherThread(int Index) {
// Process Item, If Item Doens't Exist, Sleep Thread
if (HasWorkItem) {
WorkItem->TexturesBeingPushed = true;
ProcessPushWorkItem(WorkItem.get());

// We Need All Texture Levels In RAM To Push To VRAM, Check This Is True!
// If It's Not, We're Going To Wait Until They Are By Moving This Item To The End Of The Queue
if (WorkItem->TextureLevelInRAM_ < WorkItem->TargetTextureLevelVRAM) {
// if (WorkItem->TargetTextureLevelRAM < WorkItem->TargetTextureLevelVRAM) {
// WorkItem->TargetTextureLevelRAM = WorkItem->TargetTextureLevelVRAM;
// }
// SetLevelRAM(Model, LogEnable);
// BlockPusherThreads_.lock();
// PushWorkItems_.push_back(WorkItem);
// BlockPusherThreads_.unlock();

}
else {
ProcessPushWorkItem(WorkItem.get());
}
WorkItem->TexturesBeingPushed = false;
} else {
std::this_thread::sleep_for(std::chrono::milliseconds(1));
Expand Down