Hash :
44168468
Author :
Date :
2019-06-20T09:50:23
Vulkan: Sync image in TextureVk::syncState. We can use the DIRTY_BIT_IMPLEMENTATION internal dirty bit in the gl::Texture class to force calls to ContextVk::syncState. In syncState we can ensure we call ensureImageInitialized before we get to the ContextVk. This in turn means we can remove some of the command graph breaks from TextureVk. We need to make sure the dirty bits are propagated to EGL Image siblings with this method. This fixes a potential implementation issue with EGL images with the GL back-end. Also makes a state change test a little better by removing some of the VAO and program init calls before the draw. Improves perf on the texture change microbenchmark by 12.5%. Bug: angleproject:3539 Bug: angleproject:3117 Change-Id: I2b5481690801fa98f859a6c02e3f4b974590cd3d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1663839 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@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 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189
//
// Copyright (c) 2015 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.
//
// Image.h: Defines the egl::Image class representing the EGLimage object.
#ifndef LIBANGLE_IMAGE_H_
#define LIBANGLE_IMAGE_H_
#include "common/angleutils.h"
#include "libANGLE/AttributeMap.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h"
#include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/RefCountObject.h"
#include "libANGLE/formatutils.h"
#include <set>
namespace rx
{
class EGLImplFactory;
class ImageImpl;
class ExternalImageSiblingImpl;
// Used for distinguishing dirty bit messages from gl::Texture/rx::TexureImpl/gl::Image.
constexpr size_t kTextureImageImplObserverMessageIndex = 0;
constexpr size_t kTextureImageSiblingMessageIndex = 1;
} // namespace rx
namespace egl
{
class Image;
class Display;
// Only currently Renderbuffers and Textures can be bound with images. This makes the relationship
// explicit, and also ensures that an image sibling can determine if it's been initialized or not,
// which is important for the robust resource init extension with Textures and EGLImages.
class ImageSibling : public gl::FramebufferAttachmentObject, public angle::ObserverInterface
{
public:
ImageSibling();
~ImageSibling() override;
bool isEGLImageTarget() const;
gl::InitState sourceEGLImageInitState() const;
void setSourceEGLImageInitState(gl::InitState initState) const;
bool isRenderable(const gl::Context *context,
GLenum binding,
const gl::ImageIndex &imageIndex) const override;
// ObserverInterface implementation
void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override
{
// default to no-op.
}
protected:
// Set the image target of this sibling
void setTargetImage(const gl::Context *context, egl::Image *imageTarget);
// Orphan all EGL image sources and targets
angle::Result orphanImages(const gl::Context *context);
void notifySiblings(angle::SubjectMessage message);
private:
friend class Image;
// Called from Image only to add a new source image
void addImageSource(egl::Image *imageSource);
// Called from Image only to remove a source image when the Image is being deleted
void removeImageSource(egl::Image *imageSource);
std::set<Image *> mSourcesOf;
BindingPointer<Image> mTargetOf;
};
// Wrapper for EGLImage sources that are not owned by ANGLE, these often have to do
// platform-specific queries for format and size information.
class ExternalImageSibling : public ImageSibling
{
public:
ExternalImageSibling(rx::EGLImplFactory *factory,
const gl::Context *context,
EGLenum target,
EGLClientBuffer buffer,
const AttributeMap &attribs);
~ExternalImageSibling() override;
void onDestroy(const egl::Display *display);
Error initialize(const Display *display);
gl::Extents getAttachmentSize(const gl::ImageIndex &imageIndex) const override;
gl::Format getAttachmentFormat(GLenum binding, const gl::ImageIndex &imageIndex) const override;
GLsizei getAttachmentSamples(const gl::ImageIndex &imageIndex) const override;
bool isRenderable(const gl::Context *context,
GLenum binding,
const gl::ImageIndex &imageIndex) const override;
bool isTextureable(const gl::Context *context) const;
void onAttach(const gl::Context *context) override;
void onDetach(const gl::Context *context) override;
GLuint getId() const override;
gl::InitState initState(const gl::ImageIndex &imageIndex) const override;
void setInitState(const gl::ImageIndex &imageIndex, gl::InitState initState) override;
rx::ExternalImageSiblingImpl *getImplementation() const;
protected:
rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
private:
std::unique_ptr<rx::ExternalImageSiblingImpl> mImplementation;
};
struct ImageState : private angle::NonCopyable
{
ImageState(EGLenum target, ImageSibling *buffer, const AttributeMap &attribs);
~ImageState();
EGLLabelKHR label;
EGLenum target;
gl::ImageIndex imageIndex;
ImageSibling *source;
std::set<ImageSibling *> targets;
gl::Format format;
gl::Extents size;
size_t samples;
EGLenum sourceType;
};
class Image final : public RefCountObject, public LabeledObject
{
public:
Image(rx::EGLImplFactory *factory,
const gl::Context *context,
EGLenum target,
ImageSibling *buffer,
const AttributeMap &attribs);
void onDestroy(const Display *display) override;
~Image() override;
void setLabel(EGLLabelKHR label) override;
EGLLabelKHR getLabel() const override;
const gl::Format &getFormat() const;
bool isRenderable(const gl::Context *context) const;
bool isTexturable(const gl::Context *context) const;
size_t getWidth() const;
size_t getHeight() const;
size_t getSamples() const;
Error initialize(const Display *display);
rx::ImageImpl *getImplementation() const;
bool orphaned() const;
gl::InitState sourceInitState() const;
void setInitState(gl::InitState initState);
private:
friend class ImageSibling;
// Called from ImageSibling only notify the image that a new target sibling exists for state
// tracking.
void addTargetSibling(ImageSibling *sibling);
// Called from ImageSibling only to notify the image that a sibling (source or target) has
// been respecified and state tracking should be updated.
angle::Result orphanSibling(const gl::Context *context, ImageSibling *sibling);
void notifySiblings(const ImageSibling *notifier, angle::SubjectMessage message);
ImageState mState;
rx::ImageImpl *mImplementation;
bool mOrphanedAndNeedsInit;
};
} // namespace egl
#endif // LIBANGLE_IMAGE_H_