Hash :
623d0443
Author :
Date :
2020-04-21T15:15:03
Revert "Vulkan: Forward RenderBuffer/Surface dirty messages." This reverts commit 3fb33ade6ec8f286797bff5645304df580b1a963. Reason for revert: Causing WebGL test failures on GLES/ANGLE/Android. Bug: chromium:1072739 Original change's description: > Vulkan: Forward RenderBuffer/Surface dirty messages. > > Previously we were only forwarding Texture staging changes to the > Framebuffer for re-sync. We could miss out on clears that were staged > in Surfaces and Renderbuffer attachments. Complete the chain by making > the SurfaceVk and RenderbufferVk forward notifications from the > VkImage. > > Bug: angleproject:4517 > Change-Id: I15f36c225517e915f656d0c2464a99631ef9f945 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2150699 > Reviewed-by: Cody Northrop <cnorthrop@google.com> > Commit-Queue: Jamie Madill <jmadill@chromium.org> TBR=cnorthrop@google.com,timvp@google.com,jmadill@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: angleproject:4517 Change-Id: I4fd4d79dc11da0ba86065d3a80975de4c791a2a0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2159288 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140
//
// Copyright 2002 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// Renderbuffer.h: Defines the renderer-agnostic container class gl::Renderbuffer.
// Implements GL renderbuffer objects and related functionality.
// [OpenGL ES 2.0.24] section 4.4.3 page 108.
#ifndef LIBANGLE_RENDERBUFFER_H_
#define LIBANGLE_RENDERBUFFER_H_
#include "angle_gl.h"
#include "common/angleutils.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h"
#include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/Image.h"
#include "libANGLE/formatutils.h"
#include "libANGLE/renderer/RenderbufferImpl.h"
namespace rx
{
class GLImplFactory;
} // namespace rx
namespace gl
{
// A GL renderbuffer object is usually used as a depth or stencil buffer attachment
// for a framebuffer object. The renderbuffer itself is a distinct GL object, see
// FramebufferAttachment and Framebuffer for how they are applied to an FBO via an
// attachment point.
class RenderbufferState final : angle::NonCopyable
{
public:
RenderbufferState();
~RenderbufferState();
GLsizei getWidth() const;
GLsizei getHeight() const;
const Format &getFormat() const;
GLsizei getSamples() const;
private:
friend class Renderbuffer;
void update(GLsizei width,
GLsizei height,
const Format &format,
GLsizei samples,
InitState initState);
GLsizei mWidth;
GLsizei mHeight;
Format mFormat;
GLsizei mSamples;
// For robust resource init.
InitState mInitState;
};
class Renderbuffer final : public RefCountObject<RenderbufferID>,
public egl::ImageSibling,
public LabeledObject
{
public:
Renderbuffer(rx::GLImplFactory *implFactory, RenderbufferID id);
~Renderbuffer() override;
void onDestroy(const Context *context) override;
void setLabel(const Context *context, const std::string &label) override;
const std::string &getLabel() const override;
angle::Result setStorage(const Context *context,
GLenum internalformat,
size_t width,
size_t height);
angle::Result setStorageMultisample(const Context *context,
size_t samples,
GLenum internalformat,
size_t width,
size_t height);
angle::Result setStorageEGLImageTarget(const Context *context, egl::Image *imageTarget);
rx::RenderbufferImpl *getImplementation() const;
GLsizei getWidth() const;
GLsizei getHeight() const;
const Format &getFormat() const;
GLsizei getSamples() const;
GLuint getRedSize() const;
GLuint getGreenSize() const;
GLuint getBlueSize() const;
GLuint getAlphaSize() const;
GLuint getDepthSize() const;
GLuint getStencilSize() const;
GLint getMemorySize() const;
// FramebufferAttachmentObject Impl
Extents getAttachmentSize(const ImageIndex &imageIndex) const override;
Format getAttachmentFormat(GLenum binding, const ImageIndex &imageIndex) const override;
GLsizei getAttachmentSamples(const ImageIndex &imageIndex) const override;
bool isRenderable(const Context *context,
GLenum binding,
const ImageIndex &imageIndex) const override;
void onAttach(const Context *context) override;
void onDetach(const Context *context) override;
GLuint getId() const override;
InitState initState(const ImageIndex &imageIndex) const override;
void setInitState(const ImageIndex &imageIndex, InitState initState) override;
GLenum getImplementationColorReadFormat(const Context *context) const;
GLenum getImplementationColorReadType(const Context *context) const;
// We pass the pack buffer and state explicitly so they can be overridden during capture.
angle::Result getRenderbufferImage(const Context *context,
const PixelPackState &packState,
Buffer *packBuffer,
GLenum format,
GLenum type,
void *pixels) const;
private:
rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
RenderbufferState mState;
std::unique_ptr<rx::RenderbufferImpl> mImplementation;
std::string mLabel;
};
} // namespace gl
#endif // LIBANGLE_RENDERBUFFER_H_