Skip to content

A
angle
Commit d8b037d6 by Shahbaz Youssefi Committed by Commit Bot
Options

Change renderbuffer width/height/sample types to GLsizei

This matches the types used by GL and stored in the state. setStorage and setStorageMultisampled calls were using size_t instead with a number of unnecessary casts in places which are now removed. Bug: angleproject:4836 Change-Id: Ibb570f0c088a6f29abe10f513de27c30ba4dd098 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2411697Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 30fc7ff2
Showing with 103 additions and 108 deletions
src/libANGLE/Renderbuffer.cpp
...@@ -65,8 +65,8 @@ void RenderbufferState::update(GLsizei width, ...@@ -65,8 +65,8 @@ void RenderbufferState::update(GLsizei width,
GLsizei samples, GLsizei samples,
InitState initState) InitState initState)
{ {
mWidth = static_cast<GLsizei>(width); mWidth = width;
mHeight = static_cast<GLsizei>(height); mHeight = height;
mFormat = format; mFormat = format;
mSamples = samples; mSamples = samples;
mInitState = InitState::MayNeedInit; mInitState = InitState::MayNeedInit;
...@@ -107,37 +107,35 @@ const std::string &Renderbuffer::getLabel() const ...@@ -107,37 +107,35 @@ const std::string &Renderbuffer::getLabel() const
angle::Result Renderbuffer::setStorage(const Context *context, angle::Result Renderbuffer::setStorage(const Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
ANGLE_TRY(orphanImages(context)); ANGLE_TRY(orphanImages(context));
ANGLE_TRY(mImplementation->setStorage(context, internalformat, width, height)); ANGLE_TRY(mImplementation->setStorage(context, internalformat, width, height));
mState.update(static_cast<GLsizei>(width), static_cast<GLsizei>(height), Format(internalformat), mState.update(width, height, Format(internalformat), 0, InitState::MayNeedInit);
0, InitState::MayNeedInit);
onStateChange(angle::SubjectMessage::SubjectChanged); onStateChange(angle::SubjectMessage::SubjectChanged);
return angle::Result::Continue; return angle::Result::Continue;
} }
angle::Result Renderbuffer::setStorageMultisample(const Context *context, angle::Result Renderbuffer::setStorageMultisample(const Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
MultisamplingMode mode) MultisamplingMode mode)
{ {
ANGLE_TRY(orphanImages(context)); ANGLE_TRY(orphanImages(context));
// Potentially adjust "samples" to a supported value // Potentially adjust "samples" to a supported value
const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat); const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat);
samples = formatCaps.getNearestSamples(static_cast<GLuint>(samples)); samples = formatCaps.getNearestSamples(samples);
ANGLE_TRY(mImplementation->setStorageMultisample(context, samples, internalformat, width, ANGLE_TRY(mImplementation->setStorageMultisample(context, samples, internalformat, width,
height, mode)); height, mode));
mState.update(static_cast<GLsizei>(width), static_cast<GLsizei>(height), Format(internalformat), mState.update(width, height, Format(internalformat), samples, InitState::MayNeedInit);
static_cast<GLsizei>(samples), InitState::MayNeedInit);
onStateChange(angle::SubjectMessage::SubjectChanged); onStateChange(angle::SubjectMessage::SubjectChanged);
return angle::Result::Continue; return angle::Result::Continue;
......
src/libANGLE/Renderbuffer.h
...@@ -77,13 +77,13 @@ class Renderbuffer final : public RefCountObject<RenderbufferID>, ...@@ -77,13 +77,13 @@ class Renderbuffer final : public RefCountObject<RenderbufferID>,
angle::Result setStorage(const Context *context, angle::Result setStorage(const Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height); GLsizei height);
angle::Result setStorageMultisample(const Context *context, angle::Result setStorageMultisample(const Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
MultisamplingMode mode); MultisamplingMode mode);
angle::Result setStorageEGLImageTarget(const Context *context, egl::Image *imageTarget); angle::Result setStorageEGLImageTarget(const Context *context, egl::Image *imageTarget);
......
src/libANGLE/renderer/RenderbufferImpl.h
...@@ -38,13 +38,13 @@ class RenderbufferImpl : public FramebufferAttachmentObjectImpl ...@@ -38,13 +38,13 @@ class RenderbufferImpl : public FramebufferAttachmentObjectImpl
virtual angle::Result setStorage(const gl::Context *context, virtual angle::Result setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) = 0; GLsizei height) = 0;
virtual angle::Result setStorageMultisample(const gl::Context *context, virtual angle::Result setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) = 0; gl::MultisamplingMode mode) = 0;
virtual angle::Result setStorageEGLImageTarget(const gl::Context *context, virtual angle::Result setStorageEGLImageTarget(const gl::Context *context,
egl::Image *image) = 0; egl::Image *image) = 0;
......
src/libANGLE/renderer/RenderbufferImpl_mock.h
...@@ -23,10 +23,14 @@ class MockRenderbufferImpl : public RenderbufferImpl ...@@ -23,10 +23,14 @@ class MockRenderbufferImpl : public RenderbufferImpl
public: public:
MockRenderbufferImpl() : RenderbufferImpl(mMockState) {} MockRenderbufferImpl() : RenderbufferImpl(mMockState) {}
virtual ~MockRenderbufferImpl() { destructor(); } virtual ~MockRenderbufferImpl() { destructor(); }
MOCK_METHOD4(setStorage, angle::Result(const gl::Context *, GLenum, size_t, size_t)); MOCK_METHOD4(setStorage, angle::Result(const gl::Context *, GLenum, GLsizei, GLsizei));
MOCK_METHOD6( MOCK_METHOD6(setStorageMultisample,
setStorageMultisample, angle::Result(const gl::Context *,
angle::Result(const gl::Context *, size_t, GLenum, size_t, size_t, gl::MultisamplingMode)); GLsizei,
GLenum,
GLsizei,
GLsizei,
gl::MultisamplingMode));
MOCK_METHOD2(setStorageEGLImageTarget, angle::Result(const gl::Context *, egl::Image *)); MOCK_METHOD2(setStorageEGLImageTarget, angle::Result(const gl::Context *, egl::Image *));
MOCK_METHOD5(getAttachmentRenderTarget, MOCK_METHOD5(getAttachmentRenderTarget,
......
src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
...@@ -34,18 +34,18 @@ void RenderbufferD3D::onDestroy(const gl::Context *context) ...@@ -34,18 +34,18 @@ void RenderbufferD3D::onDestroy(const gl::Context *context)
angle::Result RenderbufferD3D::setStorage(const gl::Context *context, angle::Result RenderbufferD3D::setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
return setStorageMultisample(context, 0, internalformat, width, height, return setStorageMultisample(context, 0, internalformat, width, height,
gl::MultisamplingMode::Regular); gl::MultisamplingMode::Regular);
} }
angle::Result RenderbufferD3D::setStorageMultisample(const gl::Context *context, angle::Result RenderbufferD3D::setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) gl::MultisamplingMode mode)
{ {
// TODO: Correctly differentiate between normal multisampling and render to texture. In the // TODO: Correctly differentiate between normal multisampling and render to texture. In the
...@@ -68,12 +68,12 @@ angle::Result RenderbufferD3D::setStorageMultisample(const gl::Context *context, ...@@ -68,12 +68,12 @@ angle::Result RenderbufferD3D::setStorageMultisample(const gl::Context *context,
// Because ES 3.0 already knows the exact number of supported samples, it would already have // Because ES 3.0 already knows the exact number of supported samples, it would already have
// been validated and generated GL_INVALID_VALUE. // been validated and generated GL_INVALID_VALUE.
const gl::TextureCaps &formatCaps = mRenderer->getNativeTextureCaps().get(creationFormat); const gl::TextureCaps &formatCaps = mRenderer->getNativeTextureCaps().get(creationFormat);
ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextD3D>(context), samples <= formatCaps.getMaxSamples()); ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextD3D>(context),
static_cast<uint32_t>(samples) <= formatCaps.getMaxSamples());
RenderTargetD3D *newRT = nullptr; RenderTargetD3D *newRT = nullptr;
ANGLE_TRY(mRenderer->createRenderTarget(context, static_cast<int>(width), ANGLE_TRY(
static_cast<int>(height), creationFormat, mRenderer->createRenderTarget(context, width, height, creationFormat, samples, &newRT));
static_cast<GLsizei>(samples), &newRT));
SafeDelete(mRenderTarget); SafeDelete(mRenderTarget);
mImage = nullptr; mImage = nullptr;
......
src/libANGLE/renderer/d3d/RenderbufferD3D.h
...@@ -31,13 +31,13 @@ class RenderbufferD3D : public RenderbufferImpl ...@@ -31,13 +31,13 @@ class RenderbufferD3D : public RenderbufferImpl
angle::Result setStorage(const gl::Context *context, angle::Result setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) override; GLsizei height) override;
angle::Result setStorageMultisample(const gl::Context *context, angle::Result setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) override; gl::MultisamplingMode mode) override;
angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override; angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
......
src/libANGLE/renderer/gl/RenderbufferGL.cpp
...@@ -41,8 +41,8 @@ void RenderbufferGL::onDestroy(const gl::Context *context) ...@@ -41,8 +41,8 @@ void RenderbufferGL::onDestroy(const gl::Context *context)
angle::Result RenderbufferGL::setStorage(const gl::Context *context, angle::Result RenderbufferGL::setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
const FunctionsGL *functions = GetFunctionsGL(context); const FunctionsGL *functions = GetFunctionsGL(context);
StateManagerGL *stateManager = GetStateManagerGL(context); StateManagerGL *stateManager = GetStateManagerGL(context);
...@@ -53,9 +53,8 @@ angle::Result RenderbufferGL::setStorage(const gl::Context *context, ...@@ -53,9 +53,8 @@ angle::Result RenderbufferGL::setStorage(const gl::Context *context,
nativegl::RenderbufferFormat renderbufferFormat = nativegl::RenderbufferFormat renderbufferFormat =
nativegl::GetRenderbufferFormat(functions, features, internalformat); nativegl::GetRenderbufferFormat(functions, features, internalformat);
ANGLE_GL_TRY_ALWAYS_CHECK( ANGLE_GL_TRY_ALWAYS_CHECK(
context, context, functions->renderbufferStorage(GL_RENDERBUFFER, renderbufferFormat.internalFormat,
functions->renderbufferStorage(GL_RENDERBUFFER, renderbufferFormat.internalFormat, width, height));
static_cast<GLsizei>(width), static_cast<GLsizei>(height)));
mNativeInternalFormat = renderbufferFormat.internalFormat; mNativeInternalFormat = renderbufferFormat.internalFormat;
...@@ -63,10 +62,10 @@ angle::Result RenderbufferGL::setStorage(const gl::Context *context, ...@@ -63,10 +62,10 @@ angle::Result RenderbufferGL::setStorage(const gl::Context *context,
} }
angle::Result RenderbufferGL::setStorageMultisample(const gl::Context *context, angle::Result RenderbufferGL::setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) gl::MultisamplingMode mode)
{ {
// Note: GL_EXT_multisampled_render_to_texture is not supported in the GL backend. // Note: GL_EXT_multisampled_render_to_texture is not supported in the GL backend.
...@@ -82,10 +81,8 @@ angle::Result RenderbufferGL::setStorageMultisample(const gl::Context *context, ...@@ -82,10 +81,8 @@ angle::Result RenderbufferGL::setStorageMultisample(const gl::Context *context,
nativegl::RenderbufferFormat renderbufferFormat = nativegl::RenderbufferFormat renderbufferFormat =
nativegl::GetRenderbufferFormat(functions, features, internalformat); nativegl::GetRenderbufferFormat(functions, features, internalformat);
ANGLE_GL_TRY_ALWAYS_CHECK( ANGLE_GL_TRY_ALWAYS_CHECK(
context, context, functions->renderbufferStorageMultisample(
functions->renderbufferStorageMultisample( GL_RENDERBUFFER, samples, renderbufferFormat.internalFormat, width, height));
GL_RENDERBUFFER, static_cast<GLsizei>(samples), renderbufferFormat.internalFormat,
static_cast<GLsizei>(width), static_cast<GLsizei>(height)));
mNativeInternalFormat = renderbufferFormat.internalFormat; mNativeInternalFormat = renderbufferFormat.internalFormat;
......
src/libANGLE/renderer/gl/RenderbufferGL.h
...@@ -38,13 +38,13 @@ class RenderbufferGL : public RenderbufferImpl ...@@ -38,13 +38,13 @@ class RenderbufferGL : public RenderbufferImpl
angle::Result setStorage(const gl::Context *context, angle::Result setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) override; GLsizei height) override;
angle::Result setStorageMultisample(const gl::Context *context, angle::Result setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) override; gl::MultisamplingMode mode) override;
angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override; angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
......
src/libANGLE/renderer/metal/RenderBufferMtl.h
...@@ -27,13 +27,13 @@ class RenderbufferMtl : public RenderbufferImpl ...@@ -27,13 +27,13 @@ class RenderbufferMtl : public RenderbufferImpl
angle::Result setStorage(const gl::Context *context, angle::Result setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) override; GLsizei height) override;
angle::Result setStorageMultisample(const gl::Context *context, angle::Result setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) override; gl::MultisamplingMode mode) override;
angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override; angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
...@@ -48,10 +48,10 @@ class RenderbufferMtl : public RenderbufferImpl ...@@ -48,10 +48,10 @@ class RenderbufferMtl : public RenderbufferImpl
private: private:
angle::Result setStorageImpl(const gl::Context *context, angle::Result setStorageImpl(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height); GLsizei height);
void releaseTexture(); void releaseTexture();
......
src/libANGLE/renderer/metal/RenderBufferMtl.mm
...@@ -31,10 +31,10 @@ void RenderbufferMtl::releaseTexture() ...@@ -31,10 +31,10 @@ void RenderbufferMtl::releaseTexture()
} }
angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context, angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
ContextMtl *contextMtl = mtl::GetImpl(context); ContextMtl *contextMtl = mtl::GetImpl(context);
...@@ -45,8 +45,7 @@ angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context, ...@@ -45,8 +45,7 @@ angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context,
{ {
// Check against the state if we need to recreate the storage. // Check against the state if we need to recreate the storage.
if (internalformat != mState.getFormat().info->internalFormat || if (internalformat != mState.getFormat().info->internalFormat ||
static_cast<GLsizei>(width) != mState.getWidth() || width != mState.getWidth() || height != mState.getHeight())
static_cast<GLsizei>(height) != mState.getHeight())
{ {
releaseTexture(); releaseTexture();
} }
...@@ -59,8 +58,7 @@ angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context, ...@@ -59,8 +58,7 @@ angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context,
if ((mTexture == nullptr || !mTexture->valid()) && (width != 0 && height != 0)) if ((mTexture == nullptr || !mTexture->valid()) && (width != 0 && height != 0))
{ {
ANGLE_TRY(mtl::Texture::Make2DTexture(contextMtl, mFormat, static_cast<uint32_t>(width), ANGLE_TRY(mtl::Texture::Make2DTexture(contextMtl, mFormat, width, height, 1, false,
static_cast<uint32_t>(height), 1, false,
mFormat.hasDepthAndStencilBits(), &mTexture)); mFormat.hasDepthAndStencilBits(), &mTexture));
mRenderTarget.set(mTexture, 0, 0, mFormat); mRenderTarget.set(mTexture, 0, 0, mFormat);
...@@ -83,17 +81,17 @@ angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context, ...@@ -83,17 +81,17 @@ angle::Result RenderbufferMtl::setStorageImpl(const gl::Context *context,
angle::Result RenderbufferMtl::setStorage(const gl::Context *context, angle::Result RenderbufferMtl::setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
return setStorageImpl(context, 1, internalformat, width, height); return setStorageImpl(context, 1, internalformat, width, height);
} }
angle::Result RenderbufferMtl::setStorageMultisample(const gl::Context *context, angle::Result RenderbufferMtl::setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) gl::MultisamplingMode mode)
{ {
// NOTE(hqle): Support MSAA // NOTE(hqle): Support MSAA
......
src/libANGLE/renderer/null/RenderbufferNULL.cpp
...@@ -20,17 +20,17 @@ RenderbufferNULL::~RenderbufferNULL() {} ...@@ -20,17 +20,17 @@ RenderbufferNULL::~RenderbufferNULL() {}
angle::Result RenderbufferNULL::setStorage(const gl::Context *context, angle::Result RenderbufferNULL::setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
return angle::Result::Continue; return angle::Result::Continue;
} }
angle::Result RenderbufferNULL::setStorageMultisample(const gl::Context *context, angle::Result RenderbufferNULL::setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) gl::MultisamplingMode mode)
{ {
return angle::Result::Continue; return angle::Result::Continue;
......
src/libANGLE/renderer/null/RenderbufferNULL.h
...@@ -23,13 +23,13 @@ class RenderbufferNULL : public RenderbufferImpl ...@@ -23,13 +23,13 @@ class RenderbufferNULL : public RenderbufferImpl
angle::Result setStorage(const gl::Context *context, angle::Result setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) override; GLsizei height) override;
angle::Result setStorageMultisample(const gl::Context *context, angle::Result setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) override; gl::MultisamplingMode mode) override;
angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override; angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
......
src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
...@@ -38,10 +38,10 @@ void RenderbufferVk::onDestroy(const gl::Context *context) ...@@ -38,10 +38,10 @@ void RenderbufferVk::onDestroy(const gl::Context *context)
} }
angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context, angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) gl::MultisamplingMode mode)
{ {
ContextVk *contextVk = vk::GetImpl(context); ContextVk *contextVk = vk::GetImpl(context);
...@@ -57,8 +57,7 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context, ...@@ -57,8 +57,7 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context,
{ {
// Check against the state if we need to recreate the storage. // Check against the state if we need to recreate the storage.
if (internalformat != mState.getFormat().info->internalFormat || if (internalformat != mState.getFormat().info->internalFormat ||
static_cast<GLsizei>(width) != mState.getWidth() || width != mState.getWidth() || height != mState.getHeight())
static_cast<GLsizei>(height) != mState.getHeight())
{ {
releaseImage(contextVk); releaseImage(contextVk);
} }
...@@ -88,9 +87,8 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context, ...@@ -88,9 +87,8 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context,
(isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0); (isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0);
VkExtent3D extents = {static_cast<uint32_t>(width), static_cast<uint32_t>(height), 1u}; VkExtent3D extents = {static_cast<uint32_t>(width), static_cast<uint32_t>(height), 1u};
ANGLE_TRY(mImage->init(contextVk, gl::TextureType::_2D, extents, vkFormat, ANGLE_TRY(mImage->init(contextVk, gl::TextureType::_2D, extents, vkFormat, samples, usage,
static_cast<uint32_t>(samples), usage, gl::LevelIndex(0), gl::LevelIndex(0), gl::LevelIndex(0), 1, 1));
gl::LevelIndex(0), 1, 1));
VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
ANGLE_TRY(mImage->initMemory(contextVk, renderer->getMemoryProperties(), flags)); ANGLE_TRY(mImage->initMemory(contextVk, renderer->getMemoryProperties(), flags));
...@@ -103,18 +101,18 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context, ...@@ -103,18 +101,18 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context,
angle::Result RenderbufferVk::setStorage(const gl::Context *context, angle::Result RenderbufferVk::setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) GLsizei height)
{ {
return setStorageImpl(context, 1, internalformat, width, height, return setStorageImpl(context, 1, internalformat, width, height,
gl::MultisamplingMode::Regular); gl::MultisamplingMode::Regular);
} }
angle::Result RenderbufferVk::setStorageMultisample(const gl::Context *context, angle::Result RenderbufferVk::setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) gl::MultisamplingMode mode)
{ {
return setStorageImpl(context, samples, internalformat, width, height, mode); return setStorageImpl(context, samples, internalformat, width, height, mode);
......
src/libANGLE/renderer/vulkan/RenderbufferVk.h
...@@ -27,13 +27,13 @@ class RenderbufferVk : public RenderbufferImpl, public angle::ObserverInterface ...@@ -27,13 +27,13 @@ class RenderbufferVk : public RenderbufferImpl, public angle::ObserverInterface
angle::Result setStorage(const gl::Context *context, angle::Result setStorage(const gl::Context *context,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height) override; GLsizei height) override;
angle::Result setStorageMultisample(const gl::Context *context, angle::Result setStorageMultisample(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode) override; gl::MultisamplingMode mode) override;
angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override; angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
...@@ -64,10 +64,10 @@ class RenderbufferVk : public RenderbufferImpl, public angle::ObserverInterface ...@@ -64,10 +64,10 @@ class RenderbufferVk : public RenderbufferImpl, public angle::ObserverInterface
void releaseImage(ContextVk *contextVk); void releaseImage(ContextVk *contextVk);
angle::Result setStorageImpl(const gl::Context *context, angle::Result setStorageImpl(const gl::Context *context,
size_t samples, GLsizei samples,
GLenum internalformat, GLenum internalformat,
size_t width, GLsizei width,
size_t height, GLsizei height,
gl::MultisamplingMode mode); gl::MultisamplingMode mode);
const gl::InternalFormat &getImplementationSizedFormat() const; const gl::InternalFormat &getImplementationSizedFormat() const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment