diff options
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp | 54 |
1 files changed, 41 insertions, 13 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp index c91fedff06..991801a091 100644 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp +++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp @@ -9,25 +9,22 @@ #include "libANGLE/renderer/d3d/RenderbufferD3D.h" +#include "libANGLE/Image.h" +#include "libANGLE/renderer/d3d/EGLImageD3D.h" #include "libANGLE/renderer/d3d/RendererD3D.h" #include "libANGLE/renderer/d3d/RenderTargetD3D.h" namespace rx { -RenderbufferD3D::RenderbufferD3D(RendererD3D *renderer) : mRenderer(renderer) +RenderbufferD3D::RenderbufferD3D(RendererD3D *renderer) + : mRenderer(renderer), mRenderTarget(nullptr), mImage(nullptr) { - mRenderTarget = NULL; } RenderbufferD3D::~RenderbufferD3D() { SafeDelete(mRenderTarget); -} - -RenderbufferD3D *RenderbufferD3D::makeRenderbufferD3D(RenderbufferImpl *renderbuffer) -{ - ASSERT(HAS_DYNAMIC_TYPE(RenderbufferD3D*, renderbuffer)); - return static_cast<RenderbufferD3D*>(renderbuffer); + mImage = nullptr; } gl::Error RenderbufferD3D::setStorage(GLenum internalformat, size_t width, size_t height) @@ -47,27 +44,58 @@ gl::Error RenderbufferD3D::setStorageMultisample(size_t samples, GLenum internal creationFormat = GL_DEPTH24_STENCIL8_OES; } + // ANGLE_framebuffer_multisample states GL_OUT_OF_MEMORY is generated on a failure to create + // the specified storage. + // Because ES 3.0 already knows the exact number of supported samples, it would already have been + // validated and generated GL_INVALID_VALUE. + const gl::TextureCaps &formatCaps = mRenderer->getRendererTextureCaps().get(creationFormat); + if (samples > formatCaps.getMaxSamples()) + { + return gl::Error(GL_OUT_OF_MEMORY, "Renderbuffer format does not support %u samples, %u is the maximum.", + samples, formatCaps.getMaxSamples()); + } + RenderTargetD3D *newRT = NULL; - gl::Error error = mRenderer->createRenderTarget(width, height, creationFormat, samples, &newRT); + gl::Error error = + mRenderer->createRenderTarget(static_cast<int>(width), static_cast<int>(height), + creationFormat, static_cast<GLsizei>(samples), &newRT); if (error.isError()) { return error; } SafeDelete(mRenderTarget); + mImage = nullptr; mRenderTarget = newRT; return gl::Error(GL_NO_ERROR); } -RenderTargetD3D *RenderbufferD3D::getRenderTarget() +gl::Error RenderbufferD3D::setStorageEGLImageTarget(egl::Image *image) +{ + mImage = GetImplAs<EGLImageD3D>(image); + SafeDelete(mRenderTarget); + + return gl::Error(GL_NO_ERROR); +} + +gl::Error RenderbufferD3D::getRenderTarget(RenderTargetD3D **outRenderTarget) { - return mRenderTarget; + if (mImage) + { + return mImage->getRenderTarget(outRenderTarget); + } + else + { + *outRenderTarget = mRenderTarget; + return gl::Error(GL_NO_ERROR); + } } -unsigned int RenderbufferD3D::getRenderTargetSerial() const +gl::Error RenderbufferD3D::getAttachmentRenderTarget(const gl::FramebufferAttachment::Target &target, + FramebufferAttachmentRenderTarget **rtOut) { - return (mRenderTarget ? mRenderTarget->getSerial() : 0); + return getRenderTarget(reinterpret_cast<RenderTargetD3D **>(rtOut)); } } |