mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 03:14:34 +01:00
Merge branch 'master' into feature_openxr_6dof
This commit is contained in:
commit
f81779b0de
11 files changed
+48
-20
No files matched your search
@@ -120,12 +120,12 @@ jobs:
|
||||
cc: clang
|
||||
cxx: clang++
|
||||
args: ./b.sh --headless --unittest
|
||||
id: clang
|
||||
id: clang-normal
|
||||
- os: ubuntu-latest
|
||||
cc: gcc
|
||||
cxx: g++
|
||||
args: ./b.sh --headless --unittest
|
||||
id: gcc
|
||||
id: gcc-normal
|
||||
|
||||
- os: ubuntu-latest
|
||||
extra: android
|
||||
|
||||
@@ -154,7 +154,7 @@ void RequestHeader::ParseHeaders(net::InputSink *sink) {
|
||||
}
|
||||
|
||||
VERBOSE_LOG(IO, "finished parsing request.");
|
||||
ok = line_count > 1;
|
||||
ok = line_count > 1 && resource != nullptr;
|
||||
}
|
||||
|
||||
} // namespace http
|
||||
+14
-2
@@ -1608,8 +1608,20 @@ void XEmitter::MOVDQU(OpArg arg, X64Reg regOp) {WriteSSEOp(0xF3, sseMOVDQtoRM,
|
||||
|
||||
void XEmitter::MOVSS(X64Reg regOp, OpArg arg) {WriteSSEOp(0xF3, sseMOVUPfromRM, regOp, arg);}
|
||||
void XEmitter::MOVSD(X64Reg regOp, OpArg arg) {WriteSSEOp(0xF2, sseMOVUPfromRM, regOp, arg);}
|
||||
void XEmitter::MOVSS(OpArg arg, X64Reg regOp) {WriteSSEOp(0xF3, sseMOVUPtoRM, regOp, arg);}
|
||||
void XEmitter::MOVSD(OpArg arg, X64Reg regOp) {WriteSSEOp(0xF2, sseMOVUPtoRM, regOp, arg);}
|
||||
void XEmitter::MOVSS(OpArg arg, X64Reg regOp) {
|
||||
// Make Valgrind happy.
|
||||
if (arg.IsSimpleReg())
|
||||
MOVSS(arg.GetSimpleReg(), R(regOp));
|
||||
else
|
||||
WriteSSEOp(0xF3, sseMOVUPtoRM, regOp, arg);
|
||||
}
|
||||
void XEmitter::MOVSD(OpArg arg, X64Reg regOp) {
|
||||
// Make Valgrind happy.
|
||||
if (arg.IsSimpleReg())
|
||||
MOVSD(arg.GetSimpleReg(), R(regOp));
|
||||
else
|
||||
WriteSSEOp(0xF2, sseMOVUPtoRM, regOp, arg);
|
||||
}
|
||||
|
||||
void XEmitter::MOVLPS(X64Reg regOp, OpArg arg) { WriteSSEOp(0x00, sseMOVLPfromRM, regOp, arg); }
|
||||
void XEmitter::MOVLPD(X64Reg regOp, OpArg arg) { WriteSSEOp(0x66, sseMOVLPfromRM, regOp, arg); }
|
||||
|
||||
@@ -401,7 +401,7 @@ struct Atrac {
|
||||
// Used by low-level decoding and to track streaming.
|
||||
u32 bufferPos_;
|
||||
u32 bufferValidBytes_;
|
||||
u32 bufferHeaderSize_;
|
||||
u32 bufferHeaderSize_ = 0;
|
||||
|
||||
u16 channels_;
|
||||
u16 outputChannels_;
|
||||
|
||||
+3
-1
@@ -447,7 +447,9 @@ bool PSP_InitStart(const CoreParameter &coreParam, std::string *error_string) {
|
||||
bool success = !g_CoreParameter.fileToStart.empty();
|
||||
if (!success) {
|
||||
Core_NotifyLifecycle(CoreLifecycle::START_COMPLETE);
|
||||
pspIsIniting = false;
|
||||
// In this case, we must call shutdown since the caller won't know to.
|
||||
// It must've partially started since CPU_Init returned true.
|
||||
PSP_Shutdown();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -607,7 +607,7 @@ bool GenerateFragmentShader(const FShaderID &id, char *buffer, const ShaderLangu
|
||||
} else {
|
||||
WRITE(p, " vec2 uv = %s.xy;\n vec2 uv_round;\n", texcoord);
|
||||
}
|
||||
WRITE(p, " vec2 tsize = textureSize(tex, 0).xy;\n");
|
||||
WRITE(p, " vec2 tsize = vec2(textureSize(tex, 0).xy);\n");
|
||||
WRITE(p, " vec2 fraction;\n");
|
||||
WRITE(p, " bool bilinear = (u_depal_mask_shift_off_fmt >> 31) != 0U;\n");
|
||||
WRITE(p, " if (bilinear) {\n");
|
||||
|
||||
@@ -282,8 +282,8 @@ int BufMapping::slabGeneration_ = 0;
|
||||
|
||||
class DumpExecute {
|
||||
public:
|
||||
DumpExecute(const std::vector<u8> &pushbuf, const std::vector<Command> &commands)
|
||||
: pushbuf_(pushbuf), commands_(commands), mapping_(pushbuf) {
|
||||
DumpExecute(const std::vector<u8> &pushbuf, const std::vector<Command> &commands, uint32_t version)
|
||||
: pushbuf_(pushbuf), commands_(commands), mapping_(pushbuf), version_(version) {
|
||||
}
|
||||
~DumpExecute();
|
||||
|
||||
@@ -320,6 +320,7 @@ private:
|
||||
const std::vector<u8> &pushbuf_;
|
||||
const std::vector<Command> &commands_;
|
||||
BufMapping mapping_;
|
||||
uint32_t version_ = 0;
|
||||
};
|
||||
|
||||
void DumpExecute::SyncStall() {
|
||||
@@ -564,7 +565,7 @@ void DumpExecute::Framebuf(int level, u32 ptr, u32 sz) {
|
||||
u32 headerSize = (u32)sizeof(FramebufData);
|
||||
u32 pspSize = sz - headerSize;
|
||||
const bool isTarget = (framebuf->flags & 1) != 0;
|
||||
const bool unchangedVRAM = (framebuf->flags & 2) != 0;
|
||||
const bool unchangedVRAM = version_ >= 6 && (framebuf->flags & 2) != 0;
|
||||
// TODO: Could use drawnVRAM flag, but it can be wrong.
|
||||
// Could potentially always skip if !isTarget, but playing it safe for offset texture behavior.
|
||||
if (Memory::IsValidRange(framebuf->addr, pspSize) && !unchangedVRAM && (!isTarget || !g_Config.bSoftwareRendering)) {
|
||||
@@ -708,11 +709,14 @@ bool RunMountedReplay(const std::string &filename) {
|
||||
|
||||
std::lock_guard<std::mutex> guard(executeLock);
|
||||
Core_ListenStopRequest(&ReplayStop);
|
||||
|
||||
uint32_t version = 0;
|
||||
if (lastExecFilename != filename) {
|
||||
PROFILE_THIS_SCOPE("ReplayLoad");
|
||||
u32 fp = pspFileSystem.OpenFile(filename, FILEACCESS_READ);
|
||||
Header header;
|
||||
pspFileSystem.ReadFile(fp, (u8 *)&header, sizeof(header));
|
||||
version = header.version;
|
||||
|
||||
if (memcmp(header.magic, HEADER_MAGIC, sizeof(header.magic)) != 0 || header.version > VERSION || header.version < MIN_VERSION) {
|
||||
ERROR_LOG(SYSTEM, "Invalid GE dump or unsupported version");
|
||||
@@ -751,7 +755,7 @@ bool RunMountedReplay(const std::string &filename) {
|
||||
lastExecFilename = filename;
|
||||
}
|
||||
|
||||
DumpExecute executor(lastExecPushbuf, lastExecCommands);
|
||||
DumpExecute executor(lastExecPushbuf, lastExecCommands, version);
|
||||
return executor.Run();
|
||||
}
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ static void DirtyAllVRAM(DirtyVRAMFlag flag) {
|
||||
|
||||
static void DirtyVRAM(u32 start, u32 sz, DirtyVRAMFlag flag) {
|
||||
u32 count = (sz + DIRTY_VRAM_ROUND) >> DIRTY_VRAM_SHIFT;
|
||||
u32 first = (start >> 10) & DIRTY_VRAM_MASK;
|
||||
u32 first = (start >> DIRTY_VRAM_SHIFT) & DIRTY_VRAM_MASK;
|
||||
if (first + count > DIRTY_VRAM_SIZE) {
|
||||
DirtyAllVRAM(flag);
|
||||
return;
|
||||
@@ -329,10 +329,15 @@ static void EmitTextureData(int level, u32 texaddr) {
|
||||
|
||||
bool isDirtyVRAM = false;
|
||||
bool isDrawnVRAM = false;
|
||||
uint32_t start = (texaddr >> DIRTY_VRAM_SHIFT) & DIRTY_VRAM_MASK;
|
||||
for (uint32_t i = 0; i < (sizeInRAM + DIRTY_VRAM_ROUND) >> DIRTY_VRAM_SHIFT; ++i) {
|
||||
DirtyVRAMFlag flag = dirtyVRAM[(texaddr >> DIRTY_VRAM_SHIFT) + i];
|
||||
DirtyVRAMFlag flag = dirtyVRAM[start + i];
|
||||
isDirtyVRAM = isDirtyVRAM || flag != DirtyVRAMFlag::CLEAN;
|
||||
isDrawnVRAM = isDrawnVRAM || flag == DirtyVRAMFlag::DRAWN;
|
||||
|
||||
// Mark the VRAM clean now that it's been copied to VRAM.
|
||||
if (flag == DirtyVRAMFlag::DIRTY)
|
||||
dirtyVRAM[start + i] = DirtyVRAMFlag::CLEAN;
|
||||
}
|
||||
|
||||
// The isTarget flag is mostly used for replay of dumps on a PSP.
|
||||
|
||||
@@ -34,7 +34,8 @@ static const char *HEADER_MAGIC = "PPSSPPGE";
|
||||
// Version 3: Adds FRAMEBUF0-FRAMEBUF9
|
||||
// Version 4: Expanded header with game ID
|
||||
// Version 5: Uses zstd
|
||||
static const int VERSION = 5;
|
||||
// Version 6: Corrects dirty VRAM flag
|
||||
static const int VERSION = 6;
|
||||
static const int MIN_VERSION = 2;
|
||||
|
||||
enum class CommandType : u8 {
|
||||
|
||||
@@ -46,7 +46,7 @@ TransformUnit::TransformUnit() {
|
||||
}
|
||||
|
||||
TransformUnit::~TransformUnit() {
|
||||
FreeMemoryPages(decoded_, DECODED_VERTEX_BUFFER_SIZE);
|
||||
FreeMemoryPages(decoded_, TRANSFORM_BUF_SIZE);
|
||||
delete binner_;
|
||||
}
|
||||
|
||||
@@ -281,6 +281,8 @@ VertexData TransformUnit::ReadVertex(VertexReader &vreader, const TransformState
|
||||
|
||||
if (state.readUV) {
|
||||
vreader.ReadUV(vertex.texturecoords.AsArray());
|
||||
} else {
|
||||
vertex.texturecoords.SetZero();
|
||||
}
|
||||
|
||||
Vec3<float> normal;
|
||||
|
||||
@@ -80,8 +80,10 @@ public:
|
||||
}
|
||||
|
||||
void StopThread() override {
|
||||
renderManager_->WaitUntilQueueIdle();
|
||||
renderManager_->StopThread();
|
||||
if (renderManager_) {
|
||||
renderManager_->WaitUntilQueueIdle();
|
||||
renderManager_->StopThread();
|
||||
}
|
||||
}
|
||||
|
||||
void Shutdown() override {}
|
||||
@@ -90,7 +92,7 @@ public:
|
||||
void SwapBuffers() override {}
|
||||
|
||||
private:
|
||||
Draw::DrawContext *draw_;
|
||||
Draw::DrawContext *draw_ = nullptr;
|
||||
GLRenderManager *renderManager_ = nullptr;
|
||||
SDL_Window *screen_;
|
||||
SDL_GLContext glContext_;
|
||||
@@ -201,7 +203,7 @@ bool SDLHeadlessHost::InitGraphics(std::string *error_message, GraphicsContext *
|
||||
|
||||
void SDLHeadlessHost::ShutdownGraphics() {
|
||||
gfx_->StopThread();
|
||||
while (threadState_ != RenderThreadState::STOPPED)
|
||||
while (threadState_ != RenderThreadState::STOPPED && threadState_ != RenderThreadState::START_FAILED)
|
||||
sleep_ms(1);
|
||||
|
||||
gfx_->Shutdown();
|
||||
|
||||
Reference in new issue
Block a user