Skip to content

A
angle
Commit 80aa5592 by Olli Etuaho Committed by Commit Bot
Options

Clean up TextureD3D_2DMultisample

This removes some duplicate unreachable calls from TextureD3D_External and TextureD3D_2DMultisample. There will be further use for this once TextureD3D_2DMultisampleArray is implemented. This also cleans up some no-ops from TextureD3D_2DMultisample and sets it correctly as immutable. BUG=angleproject:2775 TEST=angle_end2end_tests Change-Id: Ia253a1ed6f418a24bb0c4a4e61654b1c061dba97 Reviewed-on: https://chromium-review.googlesource.com/1193950Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent f0d0408a
Showing with 16 additions and 60 deletions
src/libANGLE/renderer/d3d/TextureD3D.h
...@@ -663,15 +663,14 @@ class TextureD3D_2DArray : public TextureD3D ...@@ -663,15 +663,14 @@ class TextureD3D_2DArray : public TextureD3D
ImageD3D **mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS]; ImageD3D **mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
}; };
class TextureD3D_External : public TextureD3D // Base class for immutable textures. These don't support manipulation of individual texture images.
class TextureD3DImmutableBase : public TextureD3D
{ {
public: public:
TextureD3D_External(const gl::TextureState &data, RendererD3D *renderer); TextureD3DImmutableBase(const gl::TextureState &data, RendererD3D *renderer);
~TextureD3D_External() override; ~TextureD3DImmutableBase() override;
ImageD3D *getImage(const gl::ImageIndex &index) const override; ImageD3D *getImage(const gl::ImageIndex &index) const override;
GLsizei getLayerCount(int level) const override;
gl::Error setImage(const gl::Context *context, gl::Error setImage(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
...@@ -714,20 +713,23 @@ class TextureD3D_External : public TextureD3D ...@@ -714,20 +713,23 @@ class TextureD3D_External : public TextureD3D
const gl::Rectangle &sourceArea, const gl::Rectangle &sourceArea,
gl::Framebuffer *source) override; gl::Framebuffer *source) override;
gl::Error setStorage(const gl::Context *context, gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
gl::TextureType type, gl::Error releaseTexImage(const gl::Context *context) override;
size_t levels, };
GLenum internalFormat,
const gl::Extents &size) override; class TextureD3D_External : public TextureD3DImmutableBase
{
public:
TextureD3D_External(const gl::TextureState &data, RendererD3D *renderer);
~TextureD3D_External() override;
GLsizei getLayerCount(int level) const override;
gl::Error setImageExternal(const gl::Context *context, gl::Error setImageExternal(const gl::Context *context,
gl::TextureType type, gl::TextureType type,
egl::Stream *stream, egl::Stream *stream,
const egl::Stream::GLTextureDescription &desc) override; const egl::Stream::GLTextureDescription &desc) override;
gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
gl::Error releaseTexImage(const gl::Context *context) override;
gl::Error setEGLImageTarget(const gl::Context *context, gl::Error setEGLImageTarget(const gl::Context *context,
gl::TextureType type, gl::TextureType type,
egl::Image *image) override; egl::Image *image) override;
...@@ -756,55 +758,12 @@ class TextureD3D_External : public TextureD3D ...@@ -756,55 +758,12 @@ class TextureD3D_External : public TextureD3D
bool isImageComplete(const gl::ImageIndex &index) const override; bool isImageComplete(const gl::ImageIndex &index) const override;
}; };
class TextureD3D_2DMultisample : public TextureD3D class TextureD3D_2DMultisample : public TextureD3DImmutableBase
{ {
public: public:
TextureD3D_2DMultisample(const gl::TextureState &data, RendererD3D *renderer); TextureD3D_2DMultisample(const gl::TextureState &data, RendererD3D *renderer);
~TextureD3D_2DMultisample() override; ~TextureD3D_2DMultisample() override;
ImageD3D *getImage(const gl::ImageIndex &index) const override;
gl::Error setImage(const gl::Context *context,
const gl::ImageIndex &index,
GLenum internalFormat,
const gl::Extents &size,
GLenum format,
GLenum type,
const gl::PixelUnpackState &unpack,
const uint8_t *pixels) override;
gl::Error setSubImage(const gl::Context *context,
const gl::ImageIndex &index,
const gl::Box &area,
GLenum format,
GLenum type,
const gl::PixelUnpackState &unpack,
const uint8_t *pixels) override;
gl::Error setCompressedImage(const gl::Context *context,
const gl::ImageIndex &index,
GLenum internalFormat,
const gl::Extents &size,
const gl::PixelUnpackState &unpack,
size_t imageSize,
const uint8_t *pixels) override;
gl::Error setCompressedSubImage(const gl::Context *context,
const gl::ImageIndex &index,
const gl::Box &area,
GLenum format,
const gl::PixelUnpackState &unpack,
size_t imageSize,
const uint8_t *pixels) override;
gl::Error copyImage(const gl::Context *context,
const gl::ImageIndex &index,
const gl::Rectangle &sourceArea,
GLenum internalFormat,
gl::Framebuffer *source) override;
gl::Error copySubImage(const gl::Context *context,
const gl::ImageIndex &index,
const gl::Offset &destOffset,
const gl::Rectangle &sourceArea,
gl::Framebuffer *source) override;
gl::Error setStorageMultisample(const gl::Context *context, gl::Error setStorageMultisample(const gl::Context *context,
gl::TextureType type, gl::TextureType type,
GLsizei samples, GLsizei samples,
...@@ -812,9 +771,6 @@ class TextureD3D_2DMultisample : public TextureD3D ...@@ -812,9 +771,6 @@ class TextureD3D_2DMultisample : public TextureD3D
const gl::Extents &size, const gl::Extents &size,
bool fixedSampleLocations) override; bool fixedSampleLocations) override;
gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
gl::Error releaseTexImage(const gl::Context *context) override;
gl::Error setEGLImageTarget(const gl::Context *context, gl::Error setEGLImageTarget(const gl::Context *context,
gl::TextureType type, gl::TextureType type,
egl::Image *image) override; egl::Image *image) override;
......
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