livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend inspect floater and show the actual texture memory per texture and total as well

Ansariel 2017-11-26 17:16:47 +01:00
parent 4a976ff1be
commit cdaa487abe
4 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/llfloaterinspect.cpp
View File

@ -299,6 +299,7 @@ void LLFloaterInspect::refresh()
S32 primcount = 0;
mTextureList.clear();
mTextureMemory = 0;
mTextureVRAMMemory = 0;
std::string format_res_string;
// PoundLife - End
getChildView("button owner")->setEnabled(false);
@ -451,11 +452,19 @@ void LLFloaterInspect::refresh()
row["columns"][8]["value"] = format_res_string;
// Poundlife - Get VRAM
res_mgr.getIntegerString(format_res_string, getObjectVRAM(obj->getObject()) / 1024);
row["columns"][9]["column"] = "vramcount";
U32 texture_memory = 0;
U32 vram_memory = 0;
getObjectTextureMemory(obj->getObject(), texture_memory, vram_memory);
res_mgr.getIntegerString(format_res_string, texture_memory / 1024);
row["columns"][9]["column"] = "tramcount";
row["columns"][9]["type"] = "text";
row["columns"][9]["value"] = format_res_string;
res_mgr.getIntegerString(format_res_string, vram_memory / 1024);
row["columns"][10]["column"] = "vramcount";
row["columns"][10]["type"] = "text";
row["columns"][10]["value"] = format_res_string;
primcount = sel_mgr.getSelection()->getObjectCount();
objcount = sel_mgr.getSelection()->getRootObjectCount();
fcount += obj->getObject()->getNumFaces();
@ -489,20 +498,21 @@ void LLFloaterInspect::refresh()
res_mgr.getIntegerString(format_res_string, mTextureList.size());
args["NUM_TEXTURES"] = format_res_string;
res_mgr.getIntegerString(format_res_string, mTextureMemory / 1024);
args["TEXTURE_MEMORY"] = format_res_string;
res_mgr.getIntegerString(format_res_string, mTextureVRAMMemory / 1024);
args["VRAM_USAGE"] = format_res_string;
getChild<LLTextBase>("linksetstats_text")->setText(getString("stats_list", args));
// PoundLife - End
}
// PoundLife - Improved Object Inspect
U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
void LLFloaterInspect::getObjectTextureMemory(LLViewerObject* object, U32& object_texture_memory, U32& object_vram_memory)
{
U32 memory = 0;
uuid_vec_t object_texture_list;
if (!object)
{
return memory;
return;
}
LLUUID uuid;
@ -513,7 +523,7 @@ U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
LLViewerTexture* img = object->getTEImage(j);
if (img)
{
memory += addToVRAMTexList(img, object_texture_list);
calculateTextureMemory(img, object_texture_list, object_texture_memory, object_vram_memory);
}
// materials per face
@ -525,7 +535,7 @@ U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
LLViewerTexture* img = gTextureList.getImage(uuid);
if (img)
{
memory += addToVRAMTexList(img, object_texture_list);
calculateTextureMemory(img, object_texture_list, object_texture_memory, object_vram_memory);
}
}
@ -535,7 +545,7 @@ U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
LLViewerTexture* img = gTextureList.getImage(uuid);
if (img)
{
memory += addToVRAMTexList(img, object_texture_list);
calculateTextureMemory(img, object_texture_list, object_texture_memory, object_vram_memory);
}
}
}
@ -549,32 +559,29 @@ U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
LLViewerTexture* img = gTextureList.getImage(uuid);
if (img)
{
memory += addToVRAMTexList(img, object_texture_list);
calculateTextureMemory(img, object_texture_list, object_texture_memory, object_vram_memory);
}
}
return memory;
}
U32 LLFloaterInspect::addToVRAMTexList(LLViewerTexture* texture, uuid_vec_t& object_texture_list)
void LLFloaterInspect::calculateTextureMemory(LLViewerTexture* texture, uuid_vec_t& object_texture_list, U32& object_texture_memory, U32& object_vram_memory)
{
const LLUUID uuid = texture->getID();
U32 memory = (texture->getFullHeight() * texture->getFullWidth() * 32 / 8);
U32 vram_memory = (texture->getFullHeight() * texture->getFullWidth() * 32 / 8);
U32 texture_memory = (texture->getFullHeight() * texture->getFullWidth() * texture->getComponents());
if (std::find(mTextureList.begin(), mTextureList.end(), uuid) == mTextureList.end())
{
mTextureList.push_back(uuid);
mTextureMemory += memory;
mTextureMemory += texture_memory;
mTextureVRAMMemory += vram_memory;
}
if (std::find(object_texture_list.begin(), object_texture_list.end(), uuid) == object_texture_list.end())
{
object_texture_list.push_back(uuid);
return memory;
}
else
{
return 0;
object_texture_memory += texture_memory;
object_vram_memory += vram_memory;
}
}
// PoundLife - End

5
indra/newview/llfloaterinspect.h
View File

@ -73,10 +73,11 @@ protected:
private:
// PoundLife - Improved Object Inspect
U32 getObjectVRAM(LLViewerObject* object);
U32 addToVRAMTexList(LLViewerTexture* texture, uuid_vec_t& object_texture_list);
void getObjectTextureMemory(LLViewerObject* object, U32& object_texture_memory, U32& object_vram_memory);
void calculateTextureMemory(LLViewerTexture* texture, uuid_vec_t& object_texture_list, U32& object_texture_memory, U32& object_vram_memory);
uuid_vec_t mTextureList;
U32 mTextureMemory;
U32 mTextureVRAMMemory;
// PoundLife - End
void onGetOwnerNameCallback();
void onGetCreatorNameCallback();

2
indra/newview/skins/default/xui/de/floater_inspect.xml
View File

@ -16,6 +16,7 @@ Vertices: [NUM_VERTICES]
Dreiecke: [NUM_TRIANGLES]
Texturen: [NUM_TEXTURES]
TMem: [TEXTURE_MEMORY] KB
VRAM: [VRAM_USAGE] KB
</floater.string>
<text_editor name="linksetstats_text" value="(wird geladen...)"/>
@ -27,6 +28,7 @@ VRAM: [VRAM_USAGE] KB
<scroll_list.columns label="Flächen" name="facecount"/>
<scroll_list.columns label="Vertices" name="vertexcount"/>
<scroll_list.columns label="Dreiecke" name="trianglecount"/>
<scroll_list.columns label="TMem" name="tramcount"/>
<scroll_list.columns label="VRAM" name="vramcount"/>
<scroll_list.columns label="Erstellungsdatum" name="creation_date"/>
</scroll_list>

5
indra/newview/skins/default/xui/en/floater_inspect.xml
View File

@ -29,6 +29,7 @@ Vertices: [NUM_VERTICES]
Triangles: [NUM_TRIANGLES]
Textures: [NUM_TEXTURES]
TMem: [TEXTURE_MEMORY] KB
VRAM: [VRAM_USAGE] KB
</floater.string>
@ -88,6 +89,10 @@ VRAM: [VRAM_USAGE] KB
label="Triangles"
name="trianglecount"
width="55" />
<scroll_list.columns
label="TMem"
name="tramcount"
width="55" />
<scroll_list.columns
label="VRAM"
name="vramcount"