FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shadows on Mac OS

Browse Source
This commit is contained in:
Fernando García Liñán 2021-07-29 15:48:55 +02:00
parent df66decdda
commit 67bb39083c
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
simgear/scene/viewer/CompositorPass.cxx
View File

@ -199,7 +199,7 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
std::stringstream att_ss; std::stringstream att_ss;
std::string att_bit; std::string att_bit;
// No implicit attachments by default // No implicit attachments by default
att_ss << root->getStringValue("implicit-attachment-mask", "color depth"); att_ss << root->getStringValue("implicit-attachment-mask", "");
while (att_ss >> att_bit) { while (att_ss >> att_bit) {
if (att_bit == "color") implicit_attachments |= osg::DisplaySettings::IMPLICIT_COLOR_BUFFER_ATTACHMENT; if (att_bit == "color") implicit_attachments |= osg::DisplaySettings::IMPLICIT_COLOR_BUFFER_ATTACHMENT;
else if (att_bit == "depth") implicit_attachments |= osg::DisplaySettings::IMPLICIT_DEPTH_BUFFER_ATTACHMENT; else if (att_bit == "depth") implicit_attachments |= osg::DisplaySettings::IMPLICIT_DEPTH_BUFFER_ATTACHMENT;
@ -302,6 +302,7 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
} }
} }
bool color_buffer_present = false;
for (auto const &p_attachment : p_attachments) { for (auto const &p_attachment : p_attachments) {
if (!checkConditional(p_attachment)) if (!checkConditional(p_attachment))
continue; continue;
@ -319,6 +320,21 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
osg::Camera::BufferComponent component = osg::Camera::COLOR_BUFFER; osg::Camera::BufferComponent component = osg::Camera::COLOR_BUFFER;
findPropString(p_attachment, "component", component, buffer_component_map); findPropString(p_attachment, "component", component, buffer_component_map);
switch(component) {
case osg::Camera::COLOR_BUFFER:
case osg::Camera::COLOR_BUFFER0:
case osg::Camera::COLOR_BUFFER1:
case osg::Camera::COLOR_BUFFER2:
case osg::Camera::COLOR_BUFFER3:
case osg::Camera::COLOR_BUFFER4:
case osg::Camera::COLOR_BUFFER5:
case osg::Camera::COLOR_BUFFER6:
case osg::Camera::COLOR_BUFFER7:
color_buffer_present = true;
break;
default:
break;
};
unsigned int level = p_attachment->getIntValue("level", 0); unsigned int level = p_attachment->getIntValue("level", 0);
unsigned int face = p_attachment->getIntValue("face", 0); unsigned int face = p_attachment->getIntValue("face", 0);
@ -375,6 +391,12 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
<< ": " << e.what()); << ": " << e.what());
} }
} }
// Explicitly let OpenGL know that there are no color buffers attached.
// This is required on GL <4.2 contexts or the framebuffer will be
// considered incomplete.
if (!color_buffer_present)
camera->setDrawBuffer(GL_NONE);
} }
return pass.release(); return pass.release();