Split out the GPU vendor and the full detail.

This way we can sort things more easily.
This commit is contained in:
Unknown W. Brackets 2013-04-29 00:30:54 -07:00
parent 8d4299a4d2
commit b0ce9e934e
5 changed files with 17 additions and 8 deletions

View file

@ -242,15 +242,16 @@ namespace Reporting
{
Payload &payload = payloadBuffer[pos];
std::string gpuInfo;
gpu->GetReportingInfo(gpuInfo);
std::string gpuPrimary, gpuFull;
gpu->GetReportingInfo(gpuPrimary, gpuFull);
UrlEncoder postdata;
postdata.Add("version", PPSSPP_GIT_VERSION);
// TODO: Maybe ParamSFOData shouldn't include nulls in std::strings? Don't work to break savedata, though...
postdata.Add("game", StripTrailingNull(g_paramSFO.GetValueString("DISC_ID")) + "_" + StripTrailingNull(g_paramSFO.GetValueString("DISC_VERSION")));
postdata.Add("game_title", StripTrailingNull(g_paramSFO.GetValueString("TITLE")));
postdata.Add("gpu", gpuInfo);
postdata.Add("gpu", gpuPrimary);
postdata.Add("gpu_full", gpuFull);
postdata.Add("cpu", cpu_info.Summarize());
postdata.Add("platform", GetPlatformIdentifer());

View file

@ -223,7 +223,8 @@ void GLES_GPU::BuildReportingInfo() {
char temp[2048];
snprintf(temp, sizeof(temp), "%s (%s %s), %s (extensions: %s)", glVersion, glVendor, glRenderer, glSlVersion, glExtensions);
reportingInfo_ = temp;
reportingPrimaryInfo_ = glVendor;
reportingFullInfo_ = temp;
}
void GLES_GPU::DeviceLost() {

View file

@ -60,7 +60,10 @@ public:
}
virtual bool FramebufferDirty();
virtual void GetReportingInfo(std::string &info) { info = reportingInfo_; }
virtual void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) {
primaryInfo = reportingPrimaryInfo_;
fullInfo = reportingFullInfo_;
}
std::vector<FramebufferInfo> GetFramebufferList();
protected:
@ -84,5 +87,6 @@ private:
u8 *flushBeforeCommand_;
bool resized_;
std::string reportingInfo_;
std::string reportingPrimaryInfo_;
std::string reportingFullInfo_;
};

View file

@ -187,7 +187,7 @@ public:
// Debugging
virtual void DumpNextFrame() = 0;
virtual void GetReportingInfo(std::string &info) = 0;
virtual void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) = 0;
virtual const std::list<int>& GetDisplayLists() = 0;
virtual DisplayList* GetCurrentDisplayList() = 0;
virtual bool DecodeTexture(u8* dest, GPUgstate state) = 0;

View file

@ -42,7 +42,10 @@ public:
virtual void DumpNextFrame() {}
virtual void Resized() {}
virtual void GetReportingInfo(std::string &info) { info = "NULL"; }
virtual void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) {
primaryInfo = "NULL";
fullInfo = "NULL";
}
protected:
virtual void FastRunLoop(DisplayList &list);