Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

GLES: Restore stencil/depth readback for debugger.

Browse source 
Only works on desktop GL.
This commit is contained in:
Unknown W. Brackets 2018-06-16 16:04:25 -07:00
parent f0694ba115
commit 35ccd16746
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/native/thin3d/GLQueueRunner.cpp
View file

@ -1085,13 +1085,27 @@ void GLQueueRunner::PerformReadback(const GLRStep &pass) {
CHECK_GL_ERROR_IF_DEBUG(); CHECK_GL_ERROR_IF_DEBUG();
// Always read back in 8888 format. // Always read back in 8888 format for the color aspect.
const GLuint internalFormat = GL_RGBA; GLuint internalFormat = GL_RGBA;
const GLuint format = GL_RGBA; GLuint format = GL_RGBA;
const GLuint type = GL_UNSIGNED_BYTE; GLuint type = GL_UNSIGNED_BYTE;
const int srcAlignment = 4; int srcAlignment = 4;
int dstAlignment = (int)DataFormatSizeInBytes(pass.readback.dstFormat); int dstAlignment = (int)DataFormatSizeInBytes(pass.readback.dstFormat);
#ifndef USING_GLES2
if (pass.readback.aspectMask & GL_DEPTH_BUFFER_BIT) {
internalFormat = GL_DEPTH_COMPONENT;
format = GL_DEPTH_COMPONENT;
type = GL_FLOAT;
srcAlignment = 4;
} else if (pass.readback.aspectMask & GL_STENCIL_BUFFER_BIT) {
internalFormat = GL_STENCIL_INDEX;
format = GL_STENCIL_INDEX;
type = GL_UNSIGNED_BYTE;
srcAlignment = 1;
}
#endif
int pixelStride = pass.readback.srcRect.w; int pixelStride = pass.readback.srcRect.w;
// Apply the correct alignment. // Apply the correct alignment.
glPixelStorei(GL_PACK_ALIGNMENT, srcAlignment); glPixelStorei(GL_PACK_ALIGNMENT, srcAlignment);
@ -1102,7 +1116,7 @@ void GLQueueRunner::PerformReadback(const GLRStep &pass) {
GLRect2D rect = pass.readback.srcRect; GLRect2D rect = pass.readback.srcRect;
bool convert = pass.readback.dstFormat != DataFormat::R8G8B8A8_UNORM; bool convert = internalFormat == GL_RGBA && pass.readback.dstFormat != DataFormat::R8G8B8A8_UNORM;
int tempSize = srcAlignment * rect.w * rect.h; int tempSize = srcAlignment * rect.w * rect.h;
int readbackSize = dstAlignment * rect.w * rect.h; int readbackSize = dstAlignment * rect.w * rect.h;

4
ext/native/thin3d/thin3d_gl.cpp
View file

@ -720,6 +720,10 @@ static void LogReadPixelsError(GLenum error) {
#endif #endif
bool OpenGLContext::CopyFramebufferToMemorySync(Framebuffer *src, int channelBits, int x, int y, int w, int h, Draw::DataFormat dataFormat, void *pixels, int pixelStride) { bool OpenGLContext::CopyFramebufferToMemorySync(Framebuffer *src, int channelBits, int x, int y, int w, int h, Draw::DataFormat dataFormat, void *pixels, int pixelStride) {
if (gl_extensions.IsGLES && (channelBits & FB_COLOR_BIT) == 0) {
// Can't readback depth or stencil on GLES.
return false;
}
OpenGLFramebuffer *fb = (OpenGLFramebuffer *)src; OpenGLFramebuffer *fb = (OpenGLFramebuffer *)src;
GLuint aspect = 0; GLuint aspect = 0;
if (channelBits & FB_COLOR_BIT) if (channelBits & FB_COLOR_BIT)