TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix texture extraction of MRTs in OpenGL ES

Browse Source 
Fixes #815
This commit is contained in:
rdb 2019-12-29 17:47:36 +01:00
parent 2d11f36c9e
commit fccffb4932
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -2523,6 +2523,20 @@ reset() {
} }
#endif #endif
#if defined(OPENGLES) && !defined(OPENGLES_1)
if (is_at_least_gles_version(3, 0)) {
_glReadBuffer = (PFNGLREADBUFFERPROC)
get_extension_func("glReadBuffer");
} else if (has_extension("GL_NV_read_buffer")) {
_glReadBuffer = (PFNGLREADBUFFERPROC)
get_extension_func("glReadBufferNV");
} else {
_glReadBuffer = nullptr;
}
#endif
#ifndef OPENGLES_1 #ifndef OPENGLES_1
_max_color_targets = 1; _max_color_targets = 1;
if (_glDrawBuffers != nullptr) { if (_glDrawBuffers != nullptr) {
@ -8868,7 +8882,7 @@ set_draw_buffer(int rbtype) {
*/ */
void CLP(GraphicsStateGuardian):: void CLP(GraphicsStateGuardian)::
set_read_buffer(int rbtype) { set_read_buffer(int rbtype) {
#ifndef OPENGLES // Draw buffers not supported by OpenGL ES. (TODO!) #ifndef OPENGLES_1 // Draw buffers not supported by OpenGL ES 1.
if (rbtype & (RenderBuffer::T_depth | RenderBuffer::T_stencil)) { if (rbtype & (RenderBuffer::T_depth | RenderBuffer::T_stencil)) {
// Special case: don't have to call ReadBuffer for these. // Special case: don't have to call ReadBuffer for these.
return; return;
@ -8901,10 +8915,14 @@ set_read_buffer(int rbtype) {
} }
++index; ++index;
} }
#ifdef OPENGLES
_glReadBuffer(buffer);
#else
glReadBuffer(buffer); glReadBuffer(buffer);
#endif
} else { } else {
#ifndef OPENGLES
switch (rbtype & RenderBuffer::T_color) { switch (rbtype & RenderBuffer::T_color) {
case RenderBuffer::T_front: case RenderBuffer::T_front:
glReadBuffer(GL_FRONT); glReadBuffer(GL_FRONT);
@ -8941,10 +8959,11 @@ set_read_buffer(int rbtype) {
default: default:
break; break;
} }
#endif // OPENGLES
} }
report_my_gl_errors(); report_my_gl_errors();
#endif // OPENGLES #endif // OPENGLES_1
} }
/** /**

5
panda/src/glstuff/glGraphicsStateGuardian_src.h
View File

@ -92,6 +92,7 @@ typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum src);
typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value); typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
@ -935,6 +936,10 @@ public:
PFNGLBLITFRAMEBUFFEREXTPROC _glBlitFramebuffer; PFNGLBLITFRAMEBUFFEREXTPROC _glBlitFramebuffer;
PFNGLDRAWBUFFERSPROC _glDrawBuffers; PFNGLDRAWBUFFERSPROC _glDrawBuffers;
#if defined(OPENGLES) && !defined(OPENGLES_1)
PFNGLREADBUFFERPROC _glReadBuffer;
#endif
#ifndef OPENGLES_1 #ifndef OPENGLES_1
PFNGLCLEARBUFFERFVPROC _glClearBufferfv; PFNGLCLEARBUFFERFVPROC _glClearBufferfv;
PFNGLCLEARBUFFERIVPROC _glClearBufferiv; PFNGLCLEARBUFFERIVPROC _glClearBufferiv;