diff --git a/filament/backend/src/opengl/PlatformCocoaGL.mm b/filament/backend/src/opengl/PlatformCocoaGL.mm index 0369268b6c..285b7a0ce4 100644 --- a/filament/backend/src/opengl/PlatformCocoaGL.mm +++ b/filament/backend/src/opengl/PlatformCocoaGL.mm @@ -51,6 +51,7 @@ Driver* PlatformCocoaGL::createDriver(void* sharedContext) noexcept { // NSOpenGLPFAColorSize: when unspecified, a format that matches the screen is preferred NSOpenGLPixelFormatAttribute pixelFormatAttributes[] = { NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, + NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute) 24, NSOpenGLPFADoubleBuffer, (NSOpenGLPixelFormatAttribute) true, NSOpenGLPFAAccelerated, (NSOpenGLPixelFormatAttribute) true, NSOpenGLPFANoRecovery, (NSOpenGLPixelFormatAttribute) true, diff --git a/filament/backend/src/opengl/PlatformEGL.cpp b/filament/backend/src/opengl/PlatformEGL.cpp index 377e0c8ff8..c5ae0d4719 100644 --- a/filament/backend/src/opengl/PlatformEGL.cpp +++ b/filament/backend/src/opengl/PlatformEGL.cpp @@ -194,6 +194,7 @@ Driver* PlatformEGL::createDriver(void* sharedContext) noexcept { EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, EGL_ALPHA_SIZE, 0, // reserved to set ALPHA_SIZE below + EGL_DEPTH_SIZE, 24, EGL_RECORDABLE_ANDROID, 1, EGL_NONE }; diff --git a/filament/backend/src/opengl/PlatformGLX.cpp b/filament/backend/src/opengl/PlatformGLX.cpp index aea8661591..a687238b2c 100644 --- a/filament/backend/src/opengl/PlatformGLX.cpp +++ b/filament/backend/src/opengl/PlatformGLX.cpp @@ -33,12 +33,12 @@ #define LIBRARY_X11 "libX11.so.6" // Function pointer types for X11 functions -typedef Display* (*X11_OPEN_DISPLAY)(const char*); -typedef Display* (*X11_CLOSE_DISPLAY)(Display*); +typedef Display* (* X11_OPEN_DISPLAY)(const char*); +typedef Display* (* X11_CLOSE_DISPLAY)(Display*); // Function pointer types for GLX functions -typedef void (*GLX_DESTROY_CONTEXT)(Display*, GLXContext); -typedef void (*GLX_SWAP_BUFFERS)(Display *dpy, GLXDrawable drawable); +typedef void (* GLX_DESTROY_CONTEXT)(Display*, GLXContext); +typedef void (* GLX_SWAP_BUFFERS)(Display* dpy, GLXDrawable drawable); // Stores GLX function pointers and a handle to the system's GLX library struct GLXFunctions { PFNGLXCHOOSEFBCONFIGPROC chooseFbConfig; @@ -93,29 +93,29 @@ static bool loadLibraries() { } getProcAddress = - (PFNGLXGETPROCADDRESSPROC) dlsym(g_glx.library, "glXGetProcAddressARB"); + (PFNGLXGETPROCADDRESSPROC)dlsym(g_glx.library, "glXGetProcAddressARB"); g_glx.chooseFbConfig = (PFNGLXCHOOSEFBCONFIGPROC) - getProcAddress((const GLubyte*) "glXChooseFBConfig"); + getProcAddress((const GLubyte*)"glXChooseFBConfig"); g_glx.createContext = (PFNGLXCREATECONTEXTATTRIBSARBPROC) - getProcAddress((const GLubyte*) "glXCreateContextAttribsARB"); + getProcAddress((const GLubyte*)"glXCreateContextAttribsARB"); g_glx.createPbuffer = (PFNGLXCREATEPBUFFERPROC) - getProcAddress((const GLubyte*) "glXCreatePbuffer"); + getProcAddress((const GLubyte*)"glXCreatePbuffer"); g_glx.destroyPbuffer = (PFNGLXDESTROYPBUFFERPROC) - getProcAddress((const GLubyte*) "glXDestroyPbuffer"); + getProcAddress((const GLubyte*)"glXDestroyPbuffer"); g_glx.setCurrentContext = (PFNGLXMAKECONTEXTCURRENTPROC) - getProcAddress((const GLubyte*) "glXMakeContextCurrent"); + getProcAddress((const GLubyte*)"glXMakeContextCurrent"); g_glx.destroyContext = (GLX_DESTROY_CONTEXT) - getProcAddress((const GLubyte*) "glXDestroyContext"); + getProcAddress((const GLubyte*)"glXDestroyContext"); g_glx.swapBuffers = (GLX_SWAP_BUFFERS) - getProcAddress((const GLubyte*) "glXSwapBuffers"); + getProcAddress((const GLubyte*)"glXSwapBuffers"); g_glx.queryContext = (PFNGLXQUERYCONTEXTPROC) - getProcAddress((const GLubyte*) "glXQueryContext"); + getProcAddress((const GLubyte*)"glXQueryContext"); g_glx.getFbConfigs = (PFNGLXGETFBCONFIGSPROC) - getProcAddress((const GLubyte*) "glXGetFBConfigs"); + getProcAddress((const GLubyte*)"glXGetFBConfigs"); g_glx.getFbConfigAttrib = (PFNGLXGETFBCONFIGATTRIBPROC) - getProcAddress((const GLubyte*) "glXGetFBConfigAttrib"); + getProcAddress((const GLubyte*)"glXGetFBConfigAttrib"); g_x11.library = dlopen(LIBRARY_X11, RTLD_LOCAL | RTLD_NOW); if (!g_x11.library) { @@ -123,8 +123,8 @@ static bool loadLibraries() { return false; } - g_x11.openDisplay = (X11_OPEN_DISPLAY) dlsym(g_x11.library, "XOpenDisplay"); - g_x11.closeDisplay = (X11_CLOSE_DISPLAY) dlsym(g_x11.library, "XCloseDisplay"); + g_x11.openDisplay = (X11_OPEN_DISPLAY)dlsym(g_x11.library, "XOpenDisplay"); + g_x11.closeDisplay = (X11_CLOSE_DISPLAY)dlsym(g_x11.library, "XCloseDisplay"); return true; } @@ -142,20 +142,20 @@ Driver* PlatformGLX::createDriver(void* const sharedGLContext) noexcept { } if (sharedGLContext != nullptr) { - int r = -1; int usedFbId = -1; GLXContext sharedCtx = (GLXContext)((void*)sharedGLContext); - + r = g_glx.queryContext(mGLXDisplay, sharedCtx, GLX_FBCONFIG_ID, &usedFbId); if (r != 0) { - utils::slog.e << "Failed to get GLX_FBCONFIG_ID from shared GL context." << utils::io::endl; + utils::slog.e << "Failed to get GLX_FBCONFIG_ID from shared GL context." + << utils::io::endl; return nullptr; } - + int numConfigs = 0; GLXFBConfig* fbConfigs = g_glx.getFbConfigs(mGLXDisplay, 0, &numConfigs); - + if (fbConfigs == nullptr) { utils::slog.e << "Failed to get the available GLXFBConfigs." << utils::io::endl; return nullptr; @@ -163,15 +163,15 @@ Driver* PlatformGLX::createDriver(void* const sharedGLContext) noexcept { int fbId = 0; int fbIndex = -1; - + for (int i = 0; i < numConfigs; ++i) { - r = g_glx.getFbConfigAttrib(mGLXDisplay, fbConfigs[i], GLX_FBCONFIG_ID, &fbId); if (r != 0) { - utils::slog.e << "Failed to get GLX_FBCONFIG_ID for entry " << i << "." << utils::io::endl; + utils::slog.e << "Failed to get GLX_FBCONFIG_ID for entry " << i << "." + << utils::io::endl; continue; } - + if (fbId == usedFbId) { fbIndex = i; break; @@ -179,30 +179,34 @@ Driver* PlatformGLX::createDriver(void* const sharedGLContext) noexcept { } if (fbIndex < 0) { - utils::slog.e << "Failed to find an `GLXFBConfig` with the requested ID." << utils::io::endl; + utils::slog.e << "Failed to find an `GLXFBConfig` with the requested ID." + << utils::io::endl; return nullptr; } - - mGLXConfig = fbConfigs + fbIndex; - } - else { + mGLXConfig = fbConfigs + fbIndex; + } else { // Create a context - static int attribs[] = { GLX_DOUBLEBUFFER, True, None }; + static int attribs[] = { + GLX_DOUBLEBUFFER, True, + GLX_DEPTH_SIZE, 24, + None + }; int configCount = 0; mGLXConfig = g_glx.chooseFbConfig(mGLXDisplay, DefaultScreen(mGLXDisplay), - attribs, &configCount); + attribs, &configCount); if (mGLXConfig == nullptr || configCount == 0) { return nullptr; } } PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = (PFNGLXCREATECONTEXTATTRIBSARBPROC) - getProcAddress((GLubyte*) "glXCreateContextAttribsARB"); + getProcAddress((GLubyte*)"glXCreateContextAttribsARB"); if (glXCreateContextAttribs == nullptr) { - utils::slog.i << "Unable to retrieve function pointer for `glXCreateContextAttribs()`." << utils::io::endl; + utils::slog.i << "Unable to retrieve function pointer for `glXCreateContextAttribs()`." + << utils::io::endl; return nullptr; } @@ -211,12 +215,12 @@ Driver* PlatformGLX::createDriver(void* const sharedGLContext) noexcept { GLX_CONTEXT_MINOR_VERSION_ARB, 1, GL_NONE }; - + mGLXContext = g_glx.createContext(mGLXDisplay, mGLXConfig[0], - (GLXContext) sharedGLContext, True, contextAttribs); + (GLXContext)sharedGLContext, True, contextAttribs); int pbufferAttribs[] = { - GLX_PBUFFER_WIDTH, 1, + GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, GL_NONE }; @@ -241,7 +245,7 @@ void PlatformGLX::terminate() noexcept { Platform::SwapChain* PlatformGLX::createSwapChain(void* nativeWindow, uint64_t& flags) noexcept { // Transparent swap chain is not supported flags &= ~backend::SWAP_CHAIN_CONFIG_TRANSPARENT; - return (SwapChain*) nativeWindow; + return (SwapChain*)nativeWindow; } Platform::SwapChain* PlatformGLX::createSwapChain( @@ -249,7 +253,7 @@ Platform::SwapChain* PlatformGLX::createSwapChain( // Transparent swap chain is not supported flags &= ~backend::SWAP_CHAIN_CONFIG_TRANSPARENT; int pbufferAttribs[] = { - GLX_PBUFFER_WIDTH, int(width), + GLX_PBUFFER_WIDTH, int(width), GLX_PBUFFER_HEIGHT, int(height), GL_NONE }; @@ -257,7 +261,7 @@ Platform::SwapChain* PlatformGLX::createSwapChain( if (sur) { mPBuffers.push_back(sur); } - return (SwapChain*) sur; + return (SwapChain*)sur; } void PlatformGLX::destroySwapChain(Platform::SwapChain* swapChain) noexcept { @@ -271,7 +275,7 @@ void PlatformGLX::destroySwapChain(Platform::SwapChain* swapChain) noexcept { void PlatformGLX::makeCurrent( Platform::SwapChain* drawSwapChain, Platform::SwapChain* readSwapChain) noexcept { g_glx.setCurrentContext(mGLXDisplay, - (GLXDrawable) drawSwapChain, (GLXDrawable) readSwapChain, mGLXContext); + (GLXDrawable)drawSwapChain, (GLXDrawable)readSwapChain, mGLXContext); } void PlatformGLX::commit(Platform::SwapChain* swapChain) noexcept { diff --git a/filament/backend/src/opengl/PlatformWebGL.cpp b/filament/backend/src/opengl/PlatformWebGL.cpp index bf2b73c38e..8c0bc36ed0 100644 --- a/filament/backend/src/opengl/PlatformWebGL.cpp +++ b/filament/backend/src/opengl/PlatformWebGL.cpp @@ -30,7 +30,7 @@ void PlatformWebGL::terminate() noexcept { Platform::SwapChain* PlatformWebGL::createSwapChain( void* nativeWindow, uint64_t& flags) noexcept { - return (SwapChain*) nativeWindow; + return (SwapChain*)nativeWindow; } Platform::SwapChain* PlatformWebGL::createSwapChain( @@ -43,7 +43,7 @@ void PlatformWebGL::destroySwapChain(Platform::SwapChain* swapChain) noexcept { } void PlatformWebGL::makeCurrent(Platform::SwapChain* drawSwapChain, - Platform::SwapChain* readSwapChain) noexcept { + Platform::SwapChain* readSwapChain) noexcept { } void PlatformWebGL::commit(Platform::SwapChain* swapChain) noexcept { diff --git a/filament/src/Renderer.cpp b/filament/src/Renderer.cpp index d86f6a7521..cb207cbaa3 100644 --- a/filament/src/Renderer.cpp +++ b/filament/src/Renderer.cpp @@ -269,15 +269,8 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) { // FIXME: this doesn't work when the target is a user provided rendertarget const bool translucent = mSwapChain->isTransparent() || blending; - const TextureFormat hdrFormat = getHdrFormat(view, translucent); - // FIXME: we use "hasPostProcess" as a proxy for deciding if we need a depth-buffer or not - // historically this has been true, but it's definitely wrong. - // This hack is needed because viewRenderTarget(output) doesn't have a depth-buffer, - // so when skipping post-process (which draws directly into it), we can't rely on it. - const bool colorPassNeedsDepthBuffer = hasPostProcess; - const Handle viewRenderTarget = getRenderTarget(view); FrameGraphRenderTargetHandle fgViewRenderTarget = fg.importRenderTarget("viewRenderTarget", { .viewport = vp }, viewRenderTarget, vp.width, vp.height, @@ -419,12 +412,10 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) { if (viewRenderTarget == mRenderTarget) { // The default render target is not multi-sampled, so we need an intermediate // buffer. - // The default render target also doesn't have a depth buffer, so if one is needed, we - // use an intermediate buffer also. // The intermediate buffer is accomplished with a "fake" dynamicScaling (i.e. blit) // operation. - if (msaa > 1 || colorPassNeedsDepthBuffer) { + if (msaa > 1) { input = ppm.dynamicScaling(fg, msaa, scaled, blending, input, ldrFormat); } }