Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Headless: Reduce some duplication.

Browse Source 
We can share the screenshot code for SDL.
This commit is contained in:
Unknown W. Brackets 2017-09-20 08:58:42 -07:00
parent 5a3d229d04
commit 7db9dfb50b
10 changed files with 138 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1769,6 +1769,7 @@ set(NativeAssets
if(HEADLESS)
add_executable(PPSSPPHeadless
headless/Headless.cpp
headless/StubHost.cpp
headless/StubHost.h
headless/Compare.cpp
headless/Compare.h

1
android/jni/Android.mk
View File

@ -444,6 +444,7 @@ ifeq ($(HEADLESS),1)
LOCAL_MODULE := ppsspp_headless
LOCAL_SRC_FILES := \
$(SRC)/headless/Headless.cpp \
$(SRC)/headless/StubHost.cpp \
$(SRC)/headless/Compare.cpp
include $(BUILD_EXECUTABLE)

8
headless/Headless.vcxproj
View File

@ -237,6 +237,13 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="SDLHeadlessHost.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="StubHost.cpp" />
<ClCompile Include="WindowsHeadlessHost.cpp" />
</ItemGroup>
<ItemGroup>
@ -268,6 +275,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="Compare.h" />
<ClInclude Include="SDLHeadlessHost.h" />
<ClInclude Include="StubHost.h" />
<ClInclude Include="WindowsHeadlessHost.h" />
</ItemGroup>

12
headless/Headless.vcxproj.filters
View File

@ -22,6 +22,10 @@
<ClCompile Include="..\Windows\GPU\D3D11Context.cpp">
<Filter>Windows</Filter>
</ClCompile>
<ClCompile Include="StubHost.cpp" />
<ClCompile Include="SDLHeadlessHost.cpp">
<Filter>Other Platforms</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="headless.txt" />
@ -33,10 +37,16 @@
<ClInclude Include="WindowsHeadlessHost.h">
<Filter>Windows</Filter>
</ClInclude>
<ClInclude Include="SDLHeadlessHost.h">
<Filter>Other Platforms</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Windows">
<UniqueIdentifier>{28215e85-3e11-4a8a-8b4d-3e355b85a542}</UniqueIdentifier>
</Filter>
<Filter Include="Other Platforms">
<UniqueIdentifier>{d34ba935-dcca-4f21-a869-5d0b3bba7478}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
</Project>

71
headless/SDLHeadlessHost.cpp
View File

@ -15,12 +15,13 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#ifdef SDL
#include <stdio.h>
#include <SDL.h>
#include "gfx/gl_lost_manager.h"
#include "SDLHeadlessHost.h"
#include "Compare.h"
#include "headless/SDLHeadlessHost.h"
#include "Common/FileUtil.h"
#include "Common/GraphicsContext.h"
@ -70,70 +71,6 @@ void SDLHeadlessHost::LoadNativeAssets() {
VFSRegister("", new DirectoryAssetReader("../"));
}
void SDLHeadlessHost::SendDebugOutput(const std::string &output) {
fwrite(output.data(), sizeof(char), output.length(), stdout);
OutputDebugStringUTF8(output.c_str());
}
void SDLHeadlessHost::SendOrCollectDebugOutput(const std::string &data) {
if (PSP_CoreParameter().printfEmuLog)
SendDebugOutput(data);
else if (PSP_CoreParameter().collectEmuLog)
*PSP_CoreParameter().collectEmuLog += data;
else
DEBUG_LOG(COMMON, "%s", data.c_str());
}
void SDLHeadlessHost::SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h) {
// Only if we're actually comparing.
if (comparisonScreenshot.empty()) {
return;
}
// We ignore the current framebuffer parameters and just grab the full screen.
const static u32 FRAME_STRIDE = 512;
const static u32 FRAME_WIDTH = 480;
const static u32 FRAME_HEIGHT = 272;
GPUDebugBuffer buffer;
gpuDebug->GetCurrentFramebuffer(buffer, GPU_DBG_FRAMEBUF_RENDER);
const std::vector<u32> pixels = TranslateDebugBufferToCompare(&buffer, 512, 272);
std::string error;
double errors = CompareScreenshot(pixels, FRAME_STRIDE, FRAME_WIDTH, FRAME_HEIGHT, comparisonScreenshot, error);
if (errors < 0)
SendOrCollectDebugOutput(error);
if (errors > 0) {
char temp[256];
snprintf(temp, 256, "Screenshot error: %f%%\n", errors * 100.0f);
SendOrCollectDebugOutput(temp);
}
if (errors > 0 && !teamCityMode) {
// Lazy, just read in the original header to output the failed screenshot.
u8 header[14 + 40] = {0};
FILE *bmp = File::OpenCFile(comparisonScreenshot, "rb");
if (bmp) {
fread(&header, sizeof(header), 1, bmp);
fclose(bmp);
}
FILE *saved = File::OpenCFile("__testfailure.bmp", "wb");
if (saved) {
fwrite(&header, sizeof(header), 1, saved);
fwrite(pixels.data(), sizeof(u32), FRAME_STRIDE * FRAME_HEIGHT, saved);
fclose(saved);
SendOrCollectDebugOutput("Actual output written to: __testfailure.bmp\n");
}
}
}
void SDLHeadlessHost::SetComparisonScreenshot(const std::string &filename) {
comparisonScreenshot = filename;
}
bool SDLHeadlessHost::InitGraphics(std::string *error_message, GraphicsContext **ctx) {
// TODO
//SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
@ -200,3 +137,5 @@ void SDLHeadlessHost::SwapBuffers() {
gfx_->SwapBuffers();
SDL_GL_SwapWindow(screen_);
}
#endif

18
headless/SDLHeadlessHost.h
View File

@ -17,7 +17,9 @@
#pragma once
#include "StubHost.h"
#ifdef SDL
#include "headless/StubHost.h"
#undef HEADLESSHOST_CLASS
#define HEADLESSHOST_CLASS SDLHeadlessHost
@ -28,21 +30,17 @@ typedef void *SDL_GLContext;
class SDLHeadlessHost : public HeadlessHost
{
public:
virtual bool InitGraphics(std::string *error_message, GraphicsContext **ctx) override;
virtual void ShutdownGraphics() override;
bool InitGraphics(std::string *error_message, GraphicsContext **ctx) override;
void ShutdownGraphics() override;
virtual void SwapBuffers() override;
virtual void SendDebugOutput(const std::string &output) override;
virtual void SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h) override;
virtual void SetComparisonScreenshot(const std::string &filename) override;
void SwapBuffers() override;
protected:
void LoadNativeAssets();
void SendOrCollectDebugOutput(const std::string &output);
SDL_Window *screen_;
SDL_GLContext glContext_;
GraphicsContext *gfx_;
std::string comparisonScreenshot;
};
#endif

88
headless/StubHost.cpp Normal file
View File

@ -0,0 +1,88 @@
// Copyright (c) 2017- PPSSPP Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0 or later versions.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/FileUtil.h"
#include "Core/CoreParameter.h"
#include "Core/System.h"
#include "GPU/Common/GPUDebugInterface.h"
#include "headless/Compare.h"
#include "headless/StubHost.h"
void HeadlessHost::SendOrCollectDebugOutput(const std::string &data)
{
if (PSP_CoreParameter().printfEmuLog)
SendDebugOutput(data);
else if (PSP_CoreParameter().collectEmuLog)
*PSP_CoreParameter().collectEmuLog += data;
else
DEBUG_LOG(COMMON, "%s", data.c_str());
}
void HeadlessHost::SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h)
{
if (!gfx_) {
return;
}
// Only if we're actually comparing.
if (comparisonScreenshot_.empty()) {
return;
}
// We ignore the current framebuffer parameters and just grab the full screen.
const static u32 FRAME_STRIDE = 512;
const static u32 FRAME_WIDTH = 480;
const static u32 FRAME_HEIGHT = 272;
GPUDebugBuffer buffer;
gpuDebug->GetCurrentFramebuffer(buffer, GPU_DBG_FRAMEBUF_RENDER);
const std::vector<u32> pixels = TranslateDebugBufferToCompare(&buffer, 512, 272);
std::string error;
double errors = CompareScreenshot(pixels, FRAME_STRIDE, FRAME_WIDTH, FRAME_HEIGHT, comparisonScreenshot_, error);
if (errors < 0)
SendOrCollectDebugOutput(error);
if (errors > 0)
{
char temp[256];
snprintf(temp, sizeof(temp), "Screenshot error: %f%%\n", errors * 100.0f);
SendOrCollectDebugOutput(temp);
}
if (errors > 0 && !teamCityMode)
{
// Lazy, just read in the original header to output the failed screenshot.
u8 header[14 + 40] = {0};
FILE *bmp = File::OpenCFile(comparisonScreenshot_, "rb");
if (bmp)
{
fread(&header, sizeof(header), 1, bmp);
fclose(bmp);
}
FILE *saved = File::OpenCFile("__testfailure.bmp", "wb");
if (saved)
{
fwrite(&header, sizeof(header), 1, saved);
fwrite(pixels.data(), sizeof(u32), FRAME_STRIDE * FRAME_HEIGHT, saved);
fclose(saved);
SendOrCollectDebugOutput("Actual output written to: __testfailure.bmp\n");
}
}
}

10
headless/StubHost.h
View File

@ -64,13 +64,21 @@ public:
debugOutputBuffer_.clear();
}
}
virtual void SetComparisonScreenshot(const std::string &filename) {}
virtual void SetComparisonScreenshot(const std::string &filename) {
comparisonScreenshot_ = filename;
}
void SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h) override;
// Unique for HeadlessHost
virtual void SwapBuffers() {}
protected:
void SendOrCollectDebugOutput(const std::string &output);
std::string comparisonScreenshot_;
std::string debugOutputBuffer_;
GPUCore gpuCore_;
GraphicsContext *gfx_ = nullptr;
};

69
headless/WindowsHeadlessHost.cpp
View File

@ -17,8 +17,7 @@
#include <stdio.h>
#include "WindowsHeadlessHost.h"
#include "Compare.h"
#include "headless/WindowsHeadlessHost.h"
#include "Common/FileUtil.h"
#include "Common/CommonWindows.h"
@ -78,72 +77,6 @@ void WindowsHeadlessHost::SendDebugOutput(const std::string &output)
OutputDebugStringUTF8(output.c_str());
}
void WindowsHeadlessHost::SendOrCollectDebugOutput(const std::string &data)
{
if (PSP_CoreParameter().printfEmuLog)
SendDebugOutput(data);
else if (PSP_CoreParameter().collectEmuLog)
*PSP_CoreParameter().collectEmuLog += data;
else
DEBUG_LOG(COMMON, "%s", data.c_str());
}
void WindowsHeadlessHost::SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h)
{
// Only if we're actually comparing.
if (comparisonScreenshot.empty()) {
return;
}
// We ignore the current framebuffer parameters and just grab the full screen.
const static u32 FRAME_STRIDE = 512;
const static u32 FRAME_WIDTH = 480;
const static u32 FRAME_HEIGHT = 272;
GPUDebugBuffer buffer;
gpuDebug->GetCurrentFramebuffer(buffer, GPU_DBG_FRAMEBUF_RENDER);
const std::vector<u32> pixels = TranslateDebugBufferToCompare(&buffer, 512, 272);
std::string error;
double errors = CompareScreenshot(pixels, FRAME_STRIDE, FRAME_WIDTH, FRAME_HEIGHT, comparisonScreenshot, error);
if (errors < 0)
SendOrCollectDebugOutput(error);
if (errors > 0)
{
char temp[256];
sprintf_s(temp, "Screenshot error: %f%%\n", errors * 100.0f);
SendOrCollectDebugOutput(temp);
}
if (errors > 0 && !teamCityMode)
{
// Lazy, just read in the original header to output the failed screenshot.
u8 header[14 + 40] = {0};
FILE *bmp = File::OpenCFile(comparisonScreenshot, "rb");
if (bmp)
{
fread(&header, sizeof(header), 1, bmp);
fclose(bmp);
}
FILE *saved = File::OpenCFile("__testfailure.bmp", "wb");
if (saved)
{
fwrite(&header, sizeof(header), 1, saved);
fwrite(pixels.data(), sizeof(u32), FRAME_STRIDE * FRAME_HEIGHT, saved);
fclose(saved);
SendOrCollectDebugOutput("Actual output written to: __testfailure.bmp\n");
}
}
}
void WindowsHeadlessHost::SetComparisonScreenshot(const std::string &filename)
{
comparisonScreenshot = filename;
}
bool WindowsHeadlessHost::InitGraphics(std::string *error_message, GraphicsContext **ctx) {
hWnd = CreateHiddenWindow();

16
headless/WindowsHeadlessHost.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "StubHost.h"
#include "headless/StubHost.h"
#undef HEADLESSHOST_CLASS
#define HEADLESSHOST_CLASS WindowsHeadlessHost
@ -28,22 +28,18 @@
class WindowsHeadlessHost : public HeadlessHost
{
public:
virtual bool InitGraphics(std::string *error_message, GraphicsContext **ctx) override;
virtual void ShutdownGraphics() override;
bool InitGraphics(std::string *error_message, GraphicsContext **ctx) override;
void ShutdownGraphics() override;
virtual void SwapBuffers() override;
void SwapBuffers() override;
virtual void SendDebugOutput(const std::string &output) override;
virtual void SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h) override;
virtual void SetComparisonScreenshot(const std::string &filename) override;
void SendDebugOutput(const std::string &output) override;
protected:
void LoadNativeAssets();
void SendOrCollectDebugOutput(const std::string &output);
HWND hWnd;
HDC hDC;
HGLRC hRC;
GraphicsContext *gfx_;
std::string comparisonScreenshot;
};
};