summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h')
-rw-r--r--src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h864
1 files changed, 688 insertions, 176 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h
index 1d5faee703..eb206a6ccc 100644
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureD3D.h
@@ -9,9 +9,12 @@
#ifndef LIBANGLE_RENDERER_D3D_TEXTURED3D_H_
#define LIBANGLE_RENDERER_D3D_TEXTURED3D_H_
-#include "libANGLE/renderer/TextureImpl.h"
-#include "libANGLE/angletypes.h"
+#include "common/Color.h"
#include "libANGLE/Constants.h"
+#include "libANGLE/Stream.h"
+#include "libANGLE/angletypes.h"
+#include "libANGLE/renderer/TextureImpl.h"
+#include "libANGLE/renderer/d3d/TextureStorage.h"
namespace gl
{
@@ -26,29 +29,51 @@ class RendererD3D;
class RenderTargetD3D;
class TextureStorage;
+template <typename T>
+using TexLevelsArray = std::array<T, gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS>;
+
class TextureD3D : public TextureImpl
{
public:
- TextureD3D(RendererD3D *renderer);
- virtual ~TextureD3D();
+ TextureD3D(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D() override;
+
+ gl::Error onDestroy(const gl::Context *context) override;
- gl::Error getNativeTexture(TextureStorage **outStorage);
+ gl::Error getNativeTexture(const gl::Context *context, TextureStorage **outStorage);
- virtual void setUsage(GLenum usage) { mUsage = usage; }
bool hasDirtyImages() const { return mDirtyImages; }
void resetDirty() { mDirtyImages = false; }
virtual ImageD3D *getImage(const gl::ImageIndex &index) const = 0;
virtual GLsizei getLayerCount(int level) const = 0;
+ gl::Error getImageAndSyncFromStorage(const gl::Context *context,
+ const gl::ImageIndex &index,
+ ImageD3D **outImage);
+
GLint getBaseLevelWidth() const;
GLint getBaseLevelHeight() const;
- GLint getBaseLevelDepth() const;
GLenum getBaseLevelInternalFormat() const;
+ gl::Error setStorage(const gl::Context *context,
+ GLenum target,
+ size_t levels,
+ GLenum internalFormat,
+ const gl::Extents &size) override;
+
+ gl::Error setStorageMultisample(const gl::Context *context,
+ GLenum target,
+ GLsizei samples,
+ GLint internalFormat,
+ const gl::Extents &size,
+ bool fixedSampleLocations) override;
+
bool isImmutable() const { return mImmutable; }
- virtual gl::Error getRenderTarget(const gl::ImageIndex &index, RenderTargetD3D **outRT) = 0;
+ virtual gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) = 0;
// Returns an iterator over all "Images" for this particular Texture.
virtual gl::ImageIndexIterator imageIterator() const = 0;
@@ -58,47 +83,91 @@ class TextureD3D : public TextureImpl
virtual gl::ImageIndex getImageIndex(GLint mip, GLint layer) const = 0;
virtual bool isValidIndex(const gl::ImageIndex &index) const = 0;
- gl::Error generateMipmaps(const gl::TextureState &textureState) override;
+ gl::Error setImageExternal(const gl::Context *context,
+ GLenum target,
+ egl::Stream *stream,
+ const egl::Stream::GLTextureDescription &desc) override;
+ gl::Error generateMipmap(const gl::Context *context) override;
TextureStorage *getStorage();
ImageD3D *getBaseLevelImage() const;
- gl::Error getAttachmentRenderTarget(const gl::FramebufferAttachment::Target &target,
+ gl::Error getAttachmentRenderTarget(const gl::Context *context,
+ GLenum binding,
+ const gl::ImageIndex &imageIndex,
FramebufferAttachmentRenderTarget **rtOut) override;
+ gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
+
+ void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
+
+ gl::Error initializeContents(const gl::Context *context,
+ const gl::ImageIndex &imageIndex) override;
+
protected:
- gl::Error setImageImpl(const gl::ImageIndex &index,
+ gl::Error setImageImpl(const gl::Context *context,
+ const gl::ImageIndex &index,
GLenum type,
const gl::PixelUnpackState &unpack,
const uint8_t *pixels,
ptrdiff_t layerOffset);
- gl::Error subImage(const gl::ImageIndex &index, const gl::Box &area, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels, ptrdiff_t layerOffset);
- gl::Error setCompressedImageImpl(const gl::ImageIndex &index,
+ gl::Error subImage(const gl::Context *context,
+ const gl::ImageIndex &index,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels,
+ ptrdiff_t layerOffset);
+ gl::Error setCompressedImageImpl(const gl::Context *context,
+ const gl::ImageIndex &index,
const gl::PixelUnpackState &unpack,
const uint8_t *pixels,
ptrdiff_t layerOffset);
- gl::Error subImageCompressed(const gl::ImageIndex &index, const gl::Box &area, GLenum format,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels, ptrdiff_t layerOffset);
- bool isFastUnpackable(const gl::PixelUnpackState &unpack, GLenum sizedInternalFormat);
- gl::Error fastUnpackPixels(const gl::PixelUnpackState &unpack, const uint8_t *pixels, const gl::Box &destArea,
- GLenum sizedInternalFormat, GLenum type, RenderTargetD3D *destRenderTarget);
+ gl::Error subImageCompressed(const gl::Context *context,
+ const gl::ImageIndex &index,
+ const gl::Box &area,
+ GLenum format,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels,
+ ptrdiff_t layerOffset);
+ bool isFastUnpackable(const gl::Buffer *unpackBuffer, GLenum sizedInternalFormat);
+ gl::Error fastUnpackPixels(const gl::Context *context,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels,
+ const gl::Box &destArea,
+ GLenum sizedInternalFormat,
+ GLenum type,
+ RenderTargetD3D *destRenderTarget);
+
+ GLint getLevelZeroWidth() const;
+ GLint getLevelZeroHeight() const;
+ virtual GLint getLevelZeroDepth() const;
GLint creationLevels(GLsizei width, GLsizei height, GLsizei depth) const;
- int mipLevels() const;
- virtual void initMipmapsImages() = 0;
+ virtual gl::Error initMipmapImages(const gl::Context *context) = 0;
bool isBaseImageZeroSize() const;
virtual bool isImageComplete(const gl::ImageIndex &index) const = 0;
bool canCreateRenderTargetForImage(const gl::ImageIndex &index) const;
- virtual gl::Error ensureRenderTarget();
+ gl::Error ensureRenderTarget(const gl::Context *context);
- virtual gl::Error createCompleteStorage(bool renderTarget, TextureStorage **outTexStorage) const = 0;
- virtual gl::Error setCompleteTexStorage(TextureStorage *newCompleteTexStorage) = 0;
- gl::Error commitRegion(const gl::ImageIndex &index, const gl::Box &region);
+ virtual gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outTexStorage) const = 0;
+ virtual gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) = 0;
+ gl::Error commitRegion(const gl::Context *context,
+ const gl::ImageIndex &index,
+ const gl::Box &region);
- RendererD3D *mRenderer;
+ gl::Error releaseTexStorage(const gl::Context *context);
+
+ GLuint getBaseLevel() const { return mBaseLevel; };
- GLenum mUsage;
+ virtual void markAllImagesDirty() = 0;
+
+ GLint getBaseLevelDepth() const;
+
+ RendererD3D *mRenderer;
bool mDirtyImages;
@@ -106,154 +175,301 @@ class TextureD3D : public TextureImpl
TextureStorage *mTexStorage;
private:
- virtual gl::Error initializeStorage(bool renderTarget) = 0;
+ virtual gl::Error initializeStorage(const gl::Context *context, bool renderTarget) = 0;
- virtual gl::Error updateStorage() = 0;
+ virtual gl::Error updateStorage(const gl::Context *context) = 0;
bool shouldUseSetData(const ImageD3D *image) const;
- gl::Error generateMipmapsUsingImages();
+ gl::Error generateMipmapUsingImages(const gl::Context *context, const GLuint maxLevel);
+
+ GLuint mBaseLevel;
};
class TextureD3D_2D : public TextureD3D
{
public:
- TextureD3D_2D(RendererD3D *renderer);
- virtual ~TextureD3D_2D();
+ TextureD3D_2D(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D_2D() override;
- virtual ImageD3D *getImage(int level, int layer) const;
- virtual ImageD3D *getImage(const gl::ImageIndex &index) const;
- virtual GLsizei getLayerCount(int level) const;
+ gl::Error onDestroy(const gl::Context *context) override;
+
+ ImageD3D *getImage(int level, int layer) const;
+ ImageD3D *getImage(const gl::ImageIndex &index) const override;
+ GLsizei getLayerCount(int level) const override;
GLsizei getWidth(GLint level) const;
GLsizei getHeight(GLint level) const;
GLenum getInternalFormat(GLint level) const;
bool isDepth(GLint level) const;
+ bool isSRGB(GLint level) const;
- gl::Error setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
- gl::Error setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
-
- gl::Error setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
- gl::Error setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
-
- gl::Error copyImage(GLenum target, size_t level, const gl::Rectangle &sourceArea, GLenum internalFormat,
+ gl::Error setImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels) override;
+
+ gl::Error setCompressedImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Rectangle &sourceArea,
+ GLenum internalFormat,
const gl::Framebuffer *source) override;
- gl::Error copySubImage(GLenum target, size_t level, const gl::Offset &destOffset, const gl::Rectangle &sourceArea,
+ gl::Error copySubImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ const gl::Rectangle &sourceArea,
const gl::Framebuffer *source) override;
- gl::Error setStorage(GLenum target, size_t levels, GLenum internalFormat, const gl::Extents &size) override;
-
- virtual void bindTexImage(egl::Surface *surface);
- virtual void releaseTexImage();
+ gl::Error copyTexture(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ GLenum internalFormat,
+ GLenum type,
+ size_t sourceLevel,
+ bool unpackFlipY,
+ bool unpackPremultiplyAlpha,
+ bool unpackUnmultiplyAlpha,
+ const gl::Texture *source) override;
+ gl::Error copySubTexture(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ size_t sourceLevel,
+ const gl::Rectangle &sourceArea,
+ bool unpackFlipY,
+ bool unpackPremultiplyAlpha,
+ bool unpackUnmultiplyAlpha,
+ const gl::Texture *source) override;
+ gl::Error copyCompressedTexture(const gl::Context *context, const gl::Texture *source) override;
+
+ gl::Error setStorage(const gl::Context *context,
+ GLenum target,
+ size_t levels,
+ GLenum internalFormat,
+ const gl::Extents &size) 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,
+ GLenum target,
+ egl::Image *image) override;
+
+ gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) override;
+
+ gl::ImageIndexIterator imageIterator() const override;
+ gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
+ bool isValidIndex(const gl::ImageIndex &index) const override;
- gl::Error setEGLImageTarget(GLenum target, egl::Image *image) override;
-
- virtual gl::Error getRenderTarget(const gl::ImageIndex &index, RenderTargetD3D **outRT);
-
- virtual gl::ImageIndexIterator imageIterator() const;
- virtual gl::ImageIndex getImageIndex(GLint mip, GLint layer) const;
- virtual bool isValidIndex(const gl::ImageIndex &index) const;
+ protected:
+ void markAllImagesDirty() override;
private:
- virtual gl::Error initializeStorage(bool renderTarget);
- virtual gl::Error createCompleteStorage(bool renderTarget, TextureStorage **outTexStorage) const;
- virtual gl::Error setCompleteTexStorage(TextureStorage *newCompleteTexStorage);
+ gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
+ gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outTexStorage) const override;
+ gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) override;
- virtual gl::Error updateStorage();
- virtual void initMipmapsImages();
+ gl::Error updateStorage(const gl::Context *context) override;
+ gl::Error initMipmapImages(const gl::Context *context) override;
bool isValidLevel(int level) const;
bool isLevelComplete(int level) const;
- virtual bool isImageComplete(const gl::ImageIndex &index) const;
+ bool isImageComplete(const gl::ImageIndex &index) const override;
- gl::Error updateStorageLevel(int level);
+ gl::Error updateStorageLevel(const gl::Context *context, int level);
- void redefineImage(size_t level,
- GLenum internalformat,
- const gl::Extents &size,
- bool forceRelease);
+ gl::Error redefineImage(const gl::Context *context,
+ size_t level,
+ GLenum internalformat,
+ const gl::Extents &size,
+ bool forceRelease);
bool mEGLImageTarget;
- ImageD3D *mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
+ TexLevelsArray<std::unique_ptr<ImageD3D>> mImageArray;
};
class TextureD3D_Cube : public TextureD3D
{
public:
- TextureD3D_Cube(RendererD3D *renderer);
- virtual ~TextureD3D_Cube();
+ TextureD3D_Cube(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D_Cube() override;
- virtual ImageD3D *getImage(int level, int layer) const;
- virtual ImageD3D *getImage(const gl::ImageIndex &index) const;
- virtual GLsizei getLayerCount(int level) const;
+ gl::Error onDestroy(const gl::Context *context) override;
- virtual bool hasDirtyImages() const { return mDirtyImages; }
- virtual void resetDirty() { mDirtyImages = false; }
- virtual void setUsage(GLenum usage) { mUsage = usage; }
+ ImageD3D *getImage(int level, int layer) const;
+ ImageD3D *getImage(const gl::ImageIndex &index) const override;
+ GLsizei getLayerCount(int level) const override;
GLenum getInternalFormat(GLint level, GLint layer) const;
bool isDepth(GLint level, GLint layer) const;
+ bool isSRGB(GLint level, GLint layer) const;
- gl::Error setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
- gl::Error setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
-
- gl::Error setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
- gl::Error setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
-
- gl::Error copyImage(GLenum target, size_t level, const gl::Rectangle &sourceArea, GLenum internalFormat,
+ gl::Error setImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels) override;
+
+ gl::Error setCompressedImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Rectangle &sourceArea,
+ GLenum internalFormat,
const gl::Framebuffer *source) override;
- gl::Error copySubImage(GLenum target, size_t level, const gl::Offset &destOffset, const gl::Rectangle &sourceArea,
+ gl::Error copySubImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ const gl::Rectangle &sourceArea,
const gl::Framebuffer *source) override;
- gl::Error setStorage(GLenum target, size_t levels, GLenum internalFormat, const gl::Extents &size) override;
+ gl::Error copyTexture(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ GLenum internalFormat,
+ GLenum type,
+ size_t sourceLevel,
+ bool unpackFlipY,
+ bool unpackPremultiplyAlpha,
+ bool unpackUnmultiplyAlpha,
+ const gl::Texture *source) override;
+ gl::Error copySubTexture(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ size_t sourceLevel,
+ const gl::Rectangle &sourceArea,
+ bool unpackFlipY,
+ bool unpackPremultiplyAlpha,
+ bool unpackUnmultiplyAlpha,
+ const gl::Texture *source) override;
+
+ gl::Error setStorage(const gl::Context *context,
+ GLenum target,
+ size_t levels,
+ GLenum internalFormat,
+ const gl::Extents &size) 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,
+ GLenum target,
+ egl::Image *image) override;
+
+ gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) override;
+
+ gl::ImageIndexIterator imageIterator() const override;
+ gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
+ bool isValidIndex(const gl::ImageIndex &index) const override;
- virtual void bindTexImage(egl::Surface *surface);
- virtual void releaseTexImage();
-
- gl::Error setEGLImageTarget(GLenum target, egl::Image *image) override;
-
- virtual gl::Error getRenderTarget(const gl::ImageIndex &index, RenderTargetD3D **outRT);
-
- virtual gl::ImageIndexIterator imageIterator() const;
- virtual gl::ImageIndex getImageIndex(GLint mip, GLint layer) const;
- virtual bool isValidIndex(const gl::ImageIndex &index) const;
+ protected:
+ void markAllImagesDirty() override;
private:
- virtual gl::Error initializeStorage(bool renderTarget);
- virtual gl::Error createCompleteStorage(bool renderTarget, TextureStorage **outTexStorage) const;
- virtual gl::Error setCompleteTexStorage(TextureStorage *newCompleteTexStorage);
+ gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
+ gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outTexStorage) const override;
+ gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) override;
- virtual gl::Error updateStorage();
- virtual void initMipmapsImages();
+ gl::Error updateStorage(const gl::Context *context) override;
+ gl::Error initMipmapImages(const gl::Context *context) override;
bool isValidFaceLevel(int faceIndex, int level) const;
bool isFaceLevelComplete(int faceIndex, int level) const;
bool isCubeComplete() const;
- virtual bool isImageComplete(const gl::ImageIndex &index) const;
- gl::Error updateStorageFaceLevel(int faceIndex, int level);
+ bool isImageComplete(const gl::ImageIndex &index) const override;
+ gl::Error updateStorageFaceLevel(const gl::Context *context, int faceIndex, int level);
- void redefineImage(int faceIndex, GLint level, GLenum internalformat, const gl::Extents &size);
+ gl::Error redefineImage(const gl::Context *context,
+ int faceIndex,
+ GLint level,
+ GLenum internalformat,
+ const gl::Extents &size,
+ bool forceRelease);
- ImageD3D *mImageArray[6][gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
+ std::array<TexLevelsArray<std::unique_ptr<ImageD3D>>, 6> mImageArray;
};
class TextureD3D_3D : public TextureD3D
{
public:
- TextureD3D_3D(RendererD3D *renderer);
- virtual ~TextureD3D_3D();
+ TextureD3D_3D(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D_3D() override;
- virtual ImageD3D *getImage(int level, int layer) const;
- virtual ImageD3D *getImage(const gl::ImageIndex &index) const;
- virtual GLsizei getLayerCount(int level) const;
+ gl::Error onDestroy(const gl::Context *context) override;
+
+ ImageD3D *getImage(int level, int layer) const;
+ ImageD3D *getImage(const gl::ImageIndex &index) const override;
+ GLsizei getLayerCount(int level) const override;
GLsizei getWidth(GLint level) const;
GLsizei getHeight(GLint level) const;
@@ -261,110 +477,213 @@ class TextureD3D_3D : public TextureD3D
GLenum getInternalFormat(GLint level) const;
bool isDepth(GLint level) const;
- gl::Error setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
- gl::Error setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
-
- gl::Error setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
- gl::Error setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
-
- gl::Error copyImage(GLenum target, size_t level, const gl::Rectangle &sourceArea, GLenum internalFormat,
+ gl::Error setImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels) override;
+
+ gl::Error setCompressedImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Rectangle &sourceArea,
+ GLenum internalFormat,
const gl::Framebuffer *source) override;
- gl::Error copySubImage(GLenum target, size_t level, const gl::Offset &destOffset, const gl::Rectangle &sourceArea,
+ gl::Error copySubImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ const gl::Rectangle &sourceArea,
const gl::Framebuffer *source) override;
- gl::Error setStorage(GLenum target, size_t levels, GLenum internalFormat, const gl::Extents &size) override;
+ gl::Error setStorage(const gl::Context *context,
+ GLenum target,
+ size_t levels,
+ GLenum internalFormat,
+ const gl::Extents &size) override;
- virtual void bindTexImage(egl::Surface *surface);
- virtual void releaseTexImage();
+ gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
+ gl::Error releaseTexImage(const gl::Context *context) override;
- gl::Error setEGLImageTarget(GLenum target, egl::Image *image) override;
+ gl::Error setEGLImageTarget(const gl::Context *context,
+ GLenum target,
+ egl::Image *image) override;
- virtual gl::Error getRenderTarget(const gl::ImageIndex &index, RenderTargetD3D **outRT);
+ gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) override;
- virtual gl::ImageIndexIterator imageIterator() const;
- virtual gl::ImageIndex getImageIndex(GLint mip, GLint layer) const;
- virtual bool isValidIndex(const gl::ImageIndex &index) const;
+ gl::ImageIndexIterator imageIterator() const override;
+ gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
+ bool isValidIndex(const gl::ImageIndex &index) const override;
+
+ protected:
+ void markAllImagesDirty() override;
+ GLint getLevelZeroDepth() const override;
private:
- virtual gl::Error initializeStorage(bool renderTarget);
- virtual gl::Error createCompleteStorage(bool renderTarget, TextureStorage **outStorage) const;
- virtual gl::Error setCompleteTexStorage(TextureStorage *newCompleteTexStorage);
+ gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
+ gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outStorage) const override;
+ gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) override;
- virtual gl::Error updateStorage();
- virtual void initMipmapsImages();
+ gl::Error updateStorage(const gl::Context *context) override;
+ gl::Error initMipmapImages(const gl::Context *context) override;
bool isValidLevel(int level) const;
bool isLevelComplete(int level) const;
- virtual bool isImageComplete(const gl::ImageIndex &index) const;
- gl::Error updateStorageLevel(int level);
+ bool isImageComplete(const gl::ImageIndex &index) const override;
+ gl::Error updateStorageLevel(const gl::Context *context, int level);
- void redefineImage(GLint level, GLenum internalformat, const gl::Extents &size);
+ gl::Error redefineImage(const gl::Context *context,
+ GLint level,
+ GLenum internalformat,
+ const gl::Extents &size,
+ bool forceRelease);
- ImageD3D *mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
+ TexLevelsArray<std::unique_ptr<ImageD3D>> mImageArray;
};
class TextureD3D_2DArray : public TextureD3D
{
public:
- TextureD3D_2DArray(RendererD3D *renderer);
- virtual ~TextureD3D_2DArray();
+ TextureD3D_2DArray(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D_2DArray() override;
+
+ gl::Error onDestroy(const gl::Context *context) override;
virtual ImageD3D *getImage(int level, int layer) const;
- virtual ImageD3D *getImage(const gl::ImageIndex &index) const;
- virtual GLsizei getLayerCount(int level) const;
+ ImageD3D *getImage(const gl::ImageIndex &index) const override;
+ GLsizei getLayerCount(int level) const override;
GLsizei getWidth(GLint level) const;
GLsizei getHeight(GLint level) const;
GLenum getInternalFormat(GLint level) const;
bool isDepth(GLint level) const;
- gl::Error setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
- gl::Error setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type,
- const gl::PixelUnpackState &unpack, const uint8_t *pixels) override;
-
- gl::Error setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
- gl::Error setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
- const gl::PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels) override;
-
- gl::Error copyImage(GLenum target, size_t level, const gl::Rectangle &sourceArea, GLenum internalFormat,
+ gl::Error setImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels) override;
+
+ gl::Error setCompressedImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Rectangle &sourceArea,
+ GLenum internalFormat,
const gl::Framebuffer *source) override;
- gl::Error copySubImage(GLenum target, size_t level, const gl::Offset &destOffset, const gl::Rectangle &sourceArea,
+ gl::Error copySubImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ const gl::Rectangle &sourceArea,
const gl::Framebuffer *source) override;
- gl::Error setStorage(GLenum target, size_t levels, GLenum internalFormat, const gl::Extents &size) override;
+ gl::Error setStorage(const gl::Context *context,
+ GLenum target,
+ size_t levels,
+ GLenum internalFormat,
+ const gl::Extents &size) override;
+
+ gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
+ gl::Error releaseTexImage(const gl::Context *context) override;
- virtual void bindTexImage(egl::Surface *surface);
- virtual void releaseTexImage();
+ gl::Error setEGLImageTarget(const gl::Context *context,
+ GLenum target,
+ egl::Image *image) override;
- gl::Error setEGLImageTarget(GLenum target, egl::Image *image) override;
+ gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) override;
- virtual gl::Error getRenderTarget(const gl::ImageIndex &index, RenderTargetD3D **outRT);
+ gl::ImageIndexIterator imageIterator() const override;
+ gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
+ bool isValidIndex(const gl::ImageIndex &index) const override;
- virtual gl::ImageIndexIterator imageIterator() const;
- virtual gl::ImageIndex getImageIndex(GLint mip, GLint layer) const;
- virtual bool isValidIndex(const gl::ImageIndex &index) const;
+ protected:
+ void markAllImagesDirty() override;
private:
- virtual gl::Error initializeStorage(bool renderTarget);
- virtual gl::Error createCompleteStorage(bool renderTarget, TextureStorage **outStorage) const;
- virtual gl::Error setCompleteTexStorage(TextureStorage *newCompleteTexStorage);
+ gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
+ gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outStorage) const override;
+ gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) override;
- virtual gl::Error updateStorage();
- virtual void initMipmapsImages();
+ gl::Error updateStorage(const gl::Context *context) override;
+ gl::Error initMipmapImages(const gl::Context *context) override;
bool isValidLevel(int level) const;
bool isLevelComplete(int level) const;
- virtual bool isImageComplete(const gl::ImageIndex &index) const;
- gl::Error updateStorageLevel(int level);
+ bool isImageComplete(const gl::ImageIndex &index) const override;
+ gl::Error updateStorageLevel(const gl::Context *context, int level);
void deleteImages();
- void redefineImage(GLint level, GLenum internalformat, const gl::Extents &size);
+ gl::Error redefineImage(const gl::Context *context,
+ GLint level,
+ GLenum internalformat,
+ const gl::Extents &size,
+ bool forceRelease);
// Storing images as an array of single depth textures since D3D11 treats each array level of a
// Texture2D object as a separate subresource. Each layer would have to be looped over
@@ -374,6 +693,199 @@ class TextureD3D_2DArray : public TextureD3D
ImageD3D **mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
};
+class TextureD3D_External : public TextureD3D
+{
+ public:
+ TextureD3D_External(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D_External() override;
+
+ ImageD3D *getImage(const gl::ImageIndex &index) const override;
+ GLsizei getLayerCount(int level) const override;
+
+ gl::Error setImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels) override;
+
+ gl::Error setCompressedImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Rectangle &sourceArea,
+ GLenum internalFormat,
+ const gl::Framebuffer *source) override;
+ gl::Error copySubImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ const gl::Rectangle &sourceArea,
+ const gl::Framebuffer *source) override;
+
+ gl::Error setStorage(const gl::Context *context,
+ GLenum target,
+ size_t levels,
+ GLenum internalFormat,
+ const gl::Extents &size) override;
+
+ gl::Error setImageExternal(const gl::Context *context,
+ GLenum target,
+ egl::Stream *stream,
+ 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,
+ GLenum target,
+ egl::Image *image) override;
+
+ gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) override;
+
+ gl::ImageIndexIterator imageIterator() const override;
+ gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
+ bool isValidIndex(const gl::ImageIndex &index) const override;
+
+ protected:
+ void markAllImagesDirty() override;
+
+ private:
+ gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
+ gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outTexStorage) const override;
+ gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) override;
+
+ gl::Error updateStorage(const gl::Context *context) override;
+ gl::Error initMipmapImages(const gl::Context *context) override;
+
+ bool isImageComplete(const gl::ImageIndex &index) const override;
+};
+
+class TextureD3D_2DMultisample : public TextureD3D
+{
+ public:
+ TextureD3D_2DMultisample(const gl::TextureState &data, RendererD3D *renderer);
+ ~TextureD3D_2DMultisample() override;
+
+ ImageD3D *getImage(const gl::ImageIndex &index) const override;
+ gl::Error setImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Box &area,
+ GLenum format,
+ GLenum type,
+ const gl::PixelUnpackState &unpack,
+ const uint8_t *pixels) override;
+
+ gl::Error setCompressedImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ 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,
+ GLenum target,
+ size_t level,
+ const gl::Rectangle &sourceArea,
+ GLenum internalFormat,
+ const gl::Framebuffer *source) override;
+ gl::Error copySubImage(const gl::Context *context,
+ GLenum target,
+ size_t level,
+ const gl::Offset &destOffset,
+ const gl::Rectangle &sourceArea,
+ const gl::Framebuffer *source) override;
+
+ gl::Error setStorageMultisample(const gl::Context *context,
+ GLenum target,
+ GLsizei samples,
+ GLint internalFormat,
+ const gl::Extents &size,
+ 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,
+ GLenum target,
+ egl::Image *image) override;
+
+ gl::Error getRenderTarget(const gl::Context *context,
+ const gl::ImageIndex &index,
+ RenderTargetD3D **outRT) override;
+
+ gl::ImageIndexIterator imageIterator() const override;
+ gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
+ bool isValidIndex(const gl::ImageIndex &index) const override;
+
+ GLsizei getLayerCount(int level) const override;
+
+ protected:
+ void markAllImagesDirty() override;
+
+ private:
+ gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
+ gl::Error createCompleteStorage(bool renderTarget,
+ TexStoragePointer *outTexStorage) const override;
+ gl::Error setCompleteTexStorage(const gl::Context *context,
+ TextureStorage *newCompleteTexStorage) override;
+
+ gl::Error updateStorage(const gl::Context *context) override;
+ gl::Error initMipmapImages(const gl::Context *context) override;
+
+ bool isImageComplete(const gl::ImageIndex &index) const override;
+};
}
#endif // LIBANGLE_RENDERER_D3D_TEXTURED3D_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 21:09:55 +0000