TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to unbreak OpenGL ES build

Browse Source
This commit is contained in:
rdb 2012-02-11 09:21:54 +00:00
parent fffc982206
commit 1c8f6f378a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/glstuff/glGraphicsBuffer_src.cxx
View File

@ -350,6 +350,7 @@ rebuild_bitplanes() {
bind_slot(face, rb_resize, attach, (RenderTexturePlane)(RTP_aux_float_0+i), next); bind_slot(face, rb_resize, attach, (RenderTexturePlane)(RTP_aux_float_0+i), next);
next += 1; next += 1;
} }
#endif // OPENGLES
// Clear if the fbo was just created, regardless of the clear settings per frame. // Clear if the fbo was just created, regardless of the clear settings per frame.
if (_initial_clear) { if (_initial_clear) {
@ -366,6 +367,7 @@ rebuild_bitplanes() {
glgsg->bind_fbo(_fbo_multisample); glgsg->bind_fbo(_fbo_multisample);
bind_slot_multisample(rb_resize, attach, RTP_depth, GL_DEPTH_ATTACHMENT_EXT); bind_slot_multisample(rb_resize, attach, RTP_depth, GL_DEPTH_ATTACHMENT_EXT);
bind_slot_multisample(rb_resize, attach, RTP_color, GL_COLOR_ATTACHMENT0_EXT); bind_slot_multisample(rb_resize, attach, RTP_color, GL_COLOR_ATTACHMENT0_EXT);
#ifndef OPENGLES
int next = GL_COLOR_ATTACHMENT1_EXT; int next = GL_COLOR_ATTACHMENT1_EXT;
for (int i=0; i<_fb_properties.get_aux_rgba(); i++) { for (int i=0; i<_fb_properties.get_aux_rgba(); i++) {
bind_slot_multisample(rb_resize, attach, (RenderTexturePlane)(RTP_aux_rgba_0+i), next); bind_slot_multisample(rb_resize, attach, (RenderTexturePlane)(RTP_aux_rgba_0+i), next);
@ -379,6 +381,7 @@ rebuild_bitplanes() {
bind_slot_multisample(rb_resize, attach, (RenderTexturePlane)(RTP_aux_float_0+i), next); bind_slot_multisample(rb_resize, attach, (RenderTexturePlane)(RTP_aux_float_0+i), next);
next += 1; next += 1;
} }
#endif // OPENGLES
glEnable(GL_MULTISAMPLE); glEnable(GL_MULTISAMPLE);
if (_initial_clear) { if (_initial_clear) {
@ -388,7 +391,6 @@ rebuild_bitplanes() {
} else { } else {
glDisable(GL_MULTISAMPLE); glDisable(GL_MULTISAMPLE);
} }
#endif // OPENGLES
_initial_clear = false; _initial_clear = false;