Skip to content

Commit

Permalink
Merge branch 'v193'
Browse files Browse the repository at this point in the history
  • Loading branch information
@duckey77
duckey77 committed Oct 7, 2019
2 parents 1966a1d + c04e562 commit e80fd7f
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 1,214 deletions.
1,180 changes: 0 additions & 1,180 deletions Compatibility/Core/HLE/sceDisplay.cpp
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.8.0</string>
<string>1.9.3</string>
<key>NSPrincipalClass</key>
<string>OEGameCoreController</string>
<key>OEGameCoreClass</key>
Expand Down
41 changes: 15 additions & 26 deletions PPSSPP.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,8 @@
EE0812DA218CBADA007FD1AB /* VulkanMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE0812D3218CBADA007FD1AB /* VulkanMemory.cpp */; };
EE19A4C420B9E470005343B9 /* DataFormatGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE19A4BB20B9E46F005343B9 /* DataFormatGL.cpp */; };
EE19A4C520B9E470005343B9 /* GLQueueRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE19A4BC20B9E46F005343B9 /* GLQueueRunner.cpp */; };
EE2B0064234BDB1E000DB0B8 /* sceUsbMic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2B0062234BDB1E000DB0B8 /* sceUsbMic.cpp */; };
EE2B0068234BDC29000DB0B8 /* Playback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2B0066234BDC29000DB0B8 /* Playback.cpp */; };
EE7679CA20C82E89006470A2 /* Replay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE7679C920C82E88006470A2 /* Replay.cpp */; };
EE76801920C82F9B006470A2 /* spirv_glsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE7677DA20C82D0D006470A2 /* spirv_glsl.cpp */; };
EE76802120C833B9006470A2 /* spirv_cross.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE7677E920C82D0D006470A2 /* spirv_cross.cpp */; };
Expand Down Expand Up @@ -704,7 +706,6 @@
3EDB61FC2012B13E00CF55BE /* dataconv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dataconv.cpp; sourceTree = "<group>"; };
3EDB61FE2012B18700CF55BE /* BlobFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobFileSystem.cpp; sourceTree = "<group>"; };
3EDB61FF2012B18700CF55BE /* BlobFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobFileSystem.h; sourceTree = "<group>"; };
3EDB620A20156D2500CF55BE /* sceDisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sceDisplay.cpp; sourceTree = "<group>"; };
8706346A1C2516A1007FAA2F /* knownfuncs.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = knownfuncs.ini; sourceTree = "<group>"; };
8706346B1C2516A1007FAA2F /* langregion.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = langregion.ini; sourceTree = "<group>"; };
872FC2FF22B814F800AF67DE /* SpvPostProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpvPostProcess.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1595,6 +1596,11 @@
EE19A4BD20B9E46F005343B9 /* thin3d_create.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thin3d_create.h; sourceTree = "<group>"; };
EE19A4BF20B9E46F005343B9 /* GLQueueRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLQueueRunner.h; sourceTree = "<group>"; };
EE19A4C120B9E46F005343B9 /* DataFormatGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataFormatGL.h; sourceTree = "<group>"; };
EE2B0062234BDB1E000DB0B8 /* sceUsbMic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sceUsbMic.cpp; sourceTree = "<group>"; };
EE2B0063234BDB1E000DB0B8 /* sceUsbMic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sceUsbMic.h; sourceTree = "<group>"; };
EE2B0065234BDC29000DB0B8 /* RecordFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordFormat.h; sourceTree = "<group>"; };
EE2B0066234BDC29000DB0B8 /* Playback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Playback.cpp; sourceTree = "<group>"; };
EE2B0067234BDC29000DB0B8 /* Playback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Playback.h; sourceTree = "<group>"; };
EE7677DA20C82D0D006470A2 /* spirv_glsl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_glsl.cpp; sourceTree = "<group>"; };
EE7677DE20C82D0D006470A2 /* barrier.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = barrier.hpp; sourceTree = "<group>"; };
EE7677DF20C82D0D006470A2 /* thread_group.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = thread_group.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3298,30 +3304,6 @@
name = IR;
sourceTree = "<group>";
};
3EDB620720156CA900CF55BE /* Compatibility */ = {
isa = PBXGroup;
children = (
3EDB620820156CCD00CF55BE /* Core */,
);
path = Compatibility;
sourceTree = "<group>";
};
3EDB620820156CCD00CF55BE /* Core */ = {
isa = PBXGroup;
children = (
3EDB620920156CDA00CF55BE /* HLE */,
);
path = Core;
sourceTree = "<group>";
};
3EDB620920156CDA00CF55BE /* HLE */ = {
isa = PBXGroup;
children = (
3EDB620A20156D2500CF55BE /* sceDisplay.cpp */,
);
path = HLE;
sourceTree = "<group>";
};
87E051341B102C0A00E870E1 /* sfmt19937 */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3956,6 +3938,9 @@
8C2D4EE41824011100E65166 /* Debugger */ = {
isa = PBXGroup;
children = (
EE2B0066234BDC29000DB0B8 /* Playback.cpp */,
EE2B0067234BDC29000DB0B8 /* Playback.h */,
EE2B0065234BDC29000DB0B8 /* RecordFormat.h */,
EE081277218CA90B007FD1AB /* Debugger.cpp */,
EE081276218CA90A007FD1AB /* Debugger.h */,
3EDB61F620129C5A00CF55BE /* Record.cpp */,
Expand Down Expand Up @@ -4044,7 +4029,6 @@
isa = PBXGroup;
children = (
8C8447A9186B8DD500BE03D5 /* gfx */,
3EDB620720156CA900CF55BE /* Compatibility */,
8CAFC10A1785B60F00647A96 /* Classes */,
8CAFC1181785B63900647A96 /* Supporting Files */,
8CAFA79C1785AE2A00647A96 /* Frameworks and Libraries */,
Expand Down Expand Up @@ -4350,6 +4334,8 @@
8CAFA8791785B3C200647A96 /* HLE */ = {
isa = PBXGroup;
children = (
EE2B0062234BDB1E000DB0B8 /* sceUsbMic.cpp */,
EE2B0063234BDB1E000DB0B8 /* sceUsbMic.h */,
EE08127B218CAC20007FD1AB /* KernelThreadDebugInterface.h */,
EE08127A218CAC20007FD1AB /* sceUsbAcc.cpp */,
EE081279218CAC20007FD1AB /* sceUsbAcc.h */,
Expand Down Expand Up @@ -7030,6 +7016,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 8CAFA78E1785AA9900647A96;
Expand Down Expand Up @@ -7312,6 +7299,7 @@
3EDB61F320129C2E00CF55BE /* SamplerX86.cpp in Sources */,
EE0812B9218CB23B007FD1AB /* ShaderManagerVulkan.cpp in Sources */,
EE0812B1218CB23B007FD1AB /* GPU_Vulkan.cpp in Sources */,
EE2B0068234BDC29000DB0B8 /* Playback.cpp in Sources */,
EE0812B2218CB23B007FD1AB /* StateMappingVulkan.cpp in Sources */,
3E3044871F21648A00B06252 /* TextureScalerGLES.cpp in Sources */,
EE7680B420CB840E006470A2 /* ShaderTranslation.cpp in Sources */,
Expand Down Expand Up @@ -7483,6 +7471,7 @@
8CAFC3041785DAA000647A96 /* sceKernelMbx.cpp in Sources */,
8CAFC3061785DAA000647A96 /* sceKernelMemory.cpp in Sources */,
8CAFC3081785DAA000647A96 /* sceKernelModule.cpp in Sources */,
EE2B0064234BDB1E000DB0B8 /* sceUsbMic.cpp in Sources */,
8CAFC30A1785DAA000647A96 /* sceKernelMsgPipe.cpp in Sources */,
8CAFC30C1785DAA000647A96 /* sceKernelMutex.cpp in Sources */,
EE7679CA20C82E89006470A2 /* Replay.cpp in Sources */,
Expand Down
1 change: 0 additions & 1 deletion PPSSPPGameCore.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ - (void)executeFrame
OEgraphicsContext->InitFromRenderThread(nullptr);

_coreParam.graphicsContext = OEgraphicsContext;
_coreParam.thin3d = OEgraphicsContext ? OEgraphicsContext->GetDrawContext() : nullptr;

NativeInitGraphics(OEgraphicsContext);
}
Expand Down
1 change: 0 additions & 1 deletion gfx/OpenEmuGLContext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ void OpenEmuGLContext::CreateDrawContext() {
draw_ = Draw::T3DCreateGLContext();
renderManager_ = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);

PSP_CoreParameter().thin3d = draw_;
bool success = draw_->CreatePresets();
assert(success);

Expand Down
2 changes: 0 additions & 2 deletions gfx/OpenEmuGLContext.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#pragma once
//#include <atomic>

#include "Common/GraphicsContext.h"
#include "thin3d/thin3d_create.h"
Expand Down Expand Up @@ -28,7 +27,6 @@ class OpenEmuGLContext : public GraphicsContext {

void Shutdown() override {
DestroyDrawContext();
PSP_CoreParameter().thin3d = nullptr;
}
void SwapInterval(int interval) override {}
void Resize() override {}
Expand Down
3 changes: 1 addition & 2 deletions gfx/gl_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,4 @@ static void (*glInvalidateFramebuffer)(GLenum target, GLsizei numAttachments, co
static void (*glCopyImageSubData)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth) = 0;
static void (*glCopyImageSubDataNV)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth) = 0;
static void (*glBufferStorage) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags) = 0;


static void (*glGetTextureSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels) = 0;
2 changes: 1 addition & 1 deletion ppsspp
Submodule ppsspp updated 400 files

0 comments on commit e80fd7f

Please sign in to comment.