Hash :
6fe13477
Author :
Date :
2021-11-11T00:47:14
Vulkan: Add external's pNext to ANGLE_external_objects_flags ANGLE was chaining VkImageFormatListCreateInfoKHR to VkImageCreateInfo::pNext to support sRGB extensions. For external images, it was unknown whether that was valid because there was no way to know if external used an identical chain of pNexts. This was causing a discrepancy between images created by Chrome and those created by ANGLE as part of an import. This change updates ANGLE_external_objects_flags to take in the pNext chain external has used to create the image so ANGLE could create the image identically. Bug: chromium:1266094 Change-Id: I479b9e7ff39d437425dc91c79834880749766f99 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3274177 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Peng Huang <penghuang@chromium.org> Commit-Queue: 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
//
// Copyright 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.
//
// TextureImpl_mock.h: Defines a mock of the TextureImpl class.
#ifndef LIBANGLE_RENDERER_TEXTUREIMPLMOCK_H_
#define LIBANGLE_RENDERER_TEXTUREIMPLMOCK_H_
#include "gmock/gmock.h"
#include "libANGLE/renderer/TextureImpl.h"
namespace rx
{
class MockTextureImpl : public TextureImpl
{
public:
MockTextureImpl() : TextureImpl(mMockState), mMockState(gl::TextureType::_2D) {}
virtual ~MockTextureImpl() { destructor(); }
MOCK_METHOD9(setImage,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
GLenum,
const gl::Extents &,
GLenum,
GLenum,
const gl::PixelUnpackState &,
gl::Buffer *,
const uint8_t *));
MOCK_METHOD8(setSubImage,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
const gl::Box &,
GLenum,
GLenum,
const gl::PixelUnpackState &,
gl::Buffer *,
const uint8_t *));
MOCK_METHOD7(setCompressedImage,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
GLenum,
const gl::Extents &,
const gl::PixelUnpackState &,
size_t,
const uint8_t *));
MOCK_METHOD7(setCompressedSubImage,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
const gl::Box &,
GLenum,
const gl::PixelUnpackState &,
size_t,
const uint8_t *));
MOCK_METHOD5(copyImage,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
const gl::Rectangle &,
GLenum,
gl::Framebuffer *));
MOCK_METHOD5(copySubImage,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
const gl::Offset &,
const gl::Rectangle &,
gl::Framebuffer *));
MOCK_METHOD9(copyTexture,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
GLenum,
GLenum,
GLint,
bool,
bool,
bool,
const gl::Texture *));
MOCK_METHOD9(copySubTexture,
angle::Result(const gl::Context *,
const gl::ImageIndex &,
const gl::Offset &,
GLint,
const gl::Box &,
bool,
bool,
bool,
const gl::Texture *));
MOCK_METHOD2(copyCompressedTexture,
angle::Result(const gl::Context *, const gl::Texture *source));
MOCK_METHOD5(
setStorage,
angle::Result(const gl::Context *, gl::TextureType, size_t, GLenum, const gl::Extents &));
MOCK_METHOD10(setStorageExternalMemory,
angle::Result(const gl::Context *,
gl::TextureType,
size_t,
GLenum,
const gl::Extents &,
gl::MemoryObject *,
GLuint64,
GLbitfield,
GLbitfield,
const void *));
MOCK_METHOD4(setImageExternal,
angle::Result(const gl::Context *,
gl::TextureType,
egl::Stream *,
const egl::Stream::GLTextureDescription &));
MOCK_METHOD3(setEGLImageTarget,
angle::Result(const gl::Context *, gl::TextureType, egl::Image *));
MOCK_METHOD1(generateMipmap, angle::Result(const gl::Context *));
MOCK_METHOD2(bindTexImage, angle::Result(const gl::Context *, egl::Surface *));
MOCK_METHOD1(releaseTexImage, angle::Result(const gl::Context *));
MOCK_METHOD5(getAttachmentRenderTarget,
angle::Result(const gl::Context *,
GLenum,
const gl::ImageIndex &,
GLsizei,
FramebufferAttachmentRenderTarget **));
MOCK_METHOD6(setStorageMultisample,
angle::Result(const gl::Context *,
gl::TextureType,
GLsizei,
GLint,
const gl::Extents &,
bool));
MOCK_METHOD2(setBaseLevel, angle::Result(const gl::Context *, GLuint));
MOCK_METHOD3(syncState,
angle::Result(const gl::Context *,
const gl::Texture::DirtyBits &,
gl::Command source));
MOCK_METHOD0(destructor, void());
protected:
gl::TextureState mMockState;
};
} // namespace rx
#endif // LIBANGLE_RENDERER_TEXTUREIMPLMOCK_H_