Vulkan: Rename Vulkan "Texture" format to "Image"
Also adds some comments to vk_format_utils.h.
Bug: angleproject:3372
Change-Id: I529b9b189e4cdfd400c3c981a47139727d9954ab
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1565062
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/scripts/run_code_generation_hashes.json b/scripts/run_code_generation_hashes.json
index f2c7d0a..3cb8f88 100644
--- a/scripts/run_code_generation_hashes.json
+++ b/scripts/run_code_generation_hashes.json
@@ -186,11 +186,11 @@
"Vulkan format:src/libANGLE/renderer/angle_format_map.json":
"be9f9bdbdf785dda05920146e8c55dbb",
"Vulkan format:src/libANGLE/renderer/vulkan/gen_vk_format_table.py":
- "9937d3c942f0a5fe08f1ca080d40d47e",
+ "c1f153d67fa50e5f6683170c83b610d4",
"Vulkan format:src/libANGLE/renderer/vulkan/vk_format_map.json":
- "9b5a784d36ea31610e143d23860425d7",
+ "a6522dc0af17eebfee8b3d6d4723594f",
"Vulkan format:src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp":
- "ef0ea80cf33e60f76391bcfed10b3c0a",
+ "34dcf4f106f94b03f74c9fd08b22f6ed",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
"1262e5e903c7dad214ded83625f9d3c4",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc":
diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 8d3ca85..566629e 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -45,7 +45,7 @@
RenderTargetVk *renderTarget)
{
GLenum implFormat =
- renderTarget->getImageFormat().textureFormat().fboImplementationInternalFormat;
+ renderTarget->getImageFormat().imageFormat().fboImplementationInternalFormat;
return gl::GetSizedInternalFormatInfo(implFormat);
}
@@ -62,12 +62,12 @@
RenderTargetVk *srcRenderTarget,
RenderTargetVk *dstRenderTarget)
{
- const VkFormat srcFormat = srcRenderTarget->getImageFormat().vkTextureFormat;
- const VkFormat dstFormat = dstRenderTarget->getImageFormat().vkTextureFormat;
+ const VkFormat srcFormat = srcRenderTarget->getImageFormat().vkImageFormat;
+ const VkFormat dstFormat = dstRenderTarget->getImageFormat().vkImageFormat;
// Verifies if the draw and read images have the necessary prerequisites for blitting.
- return renderer->hasTextureFormatFeatureBits(srcFormat, VK_FORMAT_FEATURE_BLIT_SRC_BIT) &&
- renderer->hasTextureFormatFeatureBits(dstFormat, VK_FORMAT_FEATURE_BLIT_DST_BIT);
+ return renderer->hasImageFormatFeatureBits(srcFormat, VK_FORMAT_FEATURE_BLIT_SRC_BIT) &&
+ renderer->hasImageFormatFeatureBits(dstFormat, VK_FORMAT_FEATURE_BLIT_DST_BIT);
}
// Special rules apply to VkBufferImageCopy with depth/stencil. The components are tightly packed
@@ -539,7 +539,7 @@
RenderTargetVk *drawRenderTarget)
{
RendererVk *renderer = contextVk->getRenderer();
- const angle::Format &readFormat = readRenderTarget->getImageFormat().textureFormat();
+ const angle::Format &readFormat = readRenderTarget->getImageFormat().imageFormat();
ASSERT(aspect == VK_IMAGE_ASPECT_DEPTH_BIT || aspect == VK_IMAGE_ASPECT_STENCIL_BIT);
@@ -752,7 +752,7 @@
const vk::Format &readImageFormat = readRenderTarget->getImageFormat();
VkImageAspectFlags aspectMask =
colorBlit ? VK_IMAGE_ASPECT_COLOR_BIT
- : vk::GetDepthStencilAspectFlags(readImageFormat.textureFormat());
+ : vk::GetDepthStencilAspectFlags(readImageFormat.imageFormat());
vk::ImageHelper *srcImage = readRenderTarget->getImageForRead(
&mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
@@ -845,7 +845,7 @@
if (renderTarget)
{
const angle::Format &emulatedFormat =
- renderTarget->getImageFormat().textureFormat();
+ renderTarget->getImageFormat().imageFormat();
updateActiveColorMasks(
colorIndex, emulatedFormat.redBits > 0, emulatedFormat.greenBits > 0,
emulatedFormat.blueBits > 0, emulatedFormat.alphaBits > 0);
@@ -1064,7 +1064,7 @@
const RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
ASSERT(colorRenderTarget);
- params.colorFormat = &colorRenderTarget->getImage().getFormat().textureFormat();
+ params.colorFormat = &colorRenderTarget->getImage().getFormat().imageFormat();
params.colorAttachmentIndex = colorIndex;
params.colorMaskFlags = colorMaskFlags;
if (mEmulatedAlphaAttachmentMask[colorIndex])
@@ -1177,7 +1177,7 @@
vk::ImageHelper *srcImage =
renderTarget->getImageForRead(&mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
- const angle::Format *readFormat = &srcImage->getFormat().textureFormat();
+ const angle::Format *readFormat = &srcImage->getFormat().imageFormat();
if (copyAspectFlags != VK_IMAGE_ASPECT_COLOR_BIT)
{
diff --git a/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp b/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
index 38912c6..854130d 100644
--- a/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
@@ -58,7 +58,7 @@
vk::RenderPassDesc *renderPassDesc)
{
ASSERT(commandBuffer->valid());
- ASSERT(!mImage->getFormat().textureFormat().hasDepthOrStencilBits());
+ ASSERT(!mImage->getFormat().imageFormat().hasDepthOrStencilBits());
// Store the attachment info in the renderPassDesc.
renderPassDesc->packAttachment(mImage->getFormat());
@@ -81,13 +81,13 @@
vk::RenderPassDesc *renderPassDesc)
{
ASSERT(commandBuffer->valid());
- ASSERT(mImage->getFormat().textureFormat().hasDepthOrStencilBits());
+ ASSERT(mImage->getFormat().imageFormat().hasDepthOrStencilBits());
// Store the attachment info in the renderPassDesc.
renderPassDesc->packAttachment(mImage->getFormat());
// TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
- const angle::Format &format = mImage->getFormat().textureFormat();
+ const angle::Format &format = mImage->getFormat().imageFormat();
VkImageAspectFlags aspectFlags = vk::GetDepthStencilAspectFlags(format);
ANGLE_TRY(ensureImageInitialized(contextVk));
diff --git a/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp b/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
index f3bcf8f..3e911b8 100644
--- a/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
@@ -63,7 +63,7 @@
mOwnsImage = true;
}
- const angle::Format &textureFormat = vkFormat.textureFormat();
+ const angle::Format &textureFormat = vkFormat.imageFormat();
bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
const VkImageUsageFlags usage =
VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
@@ -117,7 +117,7 @@
mOwnsImage = false;
const vk::Format &vkFormat = renderer->getFormat(image->getFormat().info->sizedInternalFormat);
- const angle::Format &textureFormat = vkFormat.textureFormat();
+ const angle::Format &textureFormat = vkFormat.imageFormat();
VkImageAspectFlags aspect = vk::GetFormatAspectFlags(textureFormat);
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index f3629c3..49bebbc 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -1818,14 +1818,13 @@
// These functions look at the mandatory format for support, and fallback to querying the device (if
// necessary) to test the availability of the bits.
-bool RendererVk::hasLinearTextureFormatFeatureBits(VkFormat format,
- const VkFormatFeatureFlags featureBits)
+bool RendererVk::hasLinearImageFormatFeatureBits(VkFormat format,
+ const VkFormatFeatureFlags featureBits)
{
return hasFormatFeatureBits<&VkFormatProperties::linearTilingFeatures>(format, featureBits);
}
-bool RendererVk::hasTextureFormatFeatureBits(VkFormat format,
- const VkFormatFeatureFlags featureBits)
+bool RendererVk::hasImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits)
{
return hasFormatFeatureBits<&VkFormatProperties::optimalTilingFeatures>(format, featureBits);
}
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.h b/src/libANGLE/renderer/vulkan/RendererVk.h
index 3805423..e4bb095 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.h
+++ b/src/libANGLE/renderer/vulkan/RendererVk.h
@@ -202,8 +202,8 @@
// Query the format properties for select bits (linearTilingFeatures, optimalTilingFeatures and
// bufferFeatures). Looks through mandatory features first, and falls back to querying the
// device (first time only).
- bool hasLinearTextureFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
- bool hasTextureFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
+ bool hasLinearImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
+ bool hasImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
bool hasBufferFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
void insertDebugMarker(GLenum source, GLuint id, std::string &&marker);
diff --git a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
index 3db64b6..81249a3 100644
--- a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
@@ -92,7 +92,7 @@
{
RendererVk *renderer = displayVk->getRenderer();
- const angle::Format &textureFormat = vkFormat.textureFormat();
+ const angle::Format &textureFormat = vkFormat.imageFormat();
bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVKDepthStencilImageUsageFlags
: kSurfaceVKColorImageUsageFlags;
@@ -464,7 +464,7 @@
surfaceFormats.data()));
const vk::Format &format = renderer->getFormat(mState.config->renderTargetFormat);
- VkFormat nativeFormat = format.vkTextureFormat;
+ VkFormat nativeFormat = format.vkImageFormat;
if (surfaceFormatCount == 1u && surfaceFormats[0].format == VK_FORMAT_UNDEFINED)
{
@@ -522,7 +522,7 @@
releaseSwapchainImages(renderer);
const vk::Format &format = renderer->getFormat(mState.config->renderTargetFormat);
- VkFormat nativeFormat = format.vkTextureFormat;
+ VkFormat nativeFormat = format.vkImageFormat;
// We need transfer src for reading back from the backbuffer.
constexpr VkImageUsageFlags kImageUsageFlags = kSurfaceVKColorImageUsageFlags;
@@ -588,7 +588,7 @@
ANGLE_TRY(mDepthStencilImage.initMemory(displayVk, renderer->getMemoryProperties(),
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
- const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(dsFormat.textureFormat());
+ const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(dsFormat.imageFormat());
ANGLE_TRY(mDepthStencilImage.initImageView(displayVk, gl::TextureType::_2D, aspect,
gl::SwizzleState(), &mDepthStencilImageView, 0,
1));
@@ -742,10 +742,10 @@
presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
presentInfo.waitSemaphoreCount = 1;
presentInfo.pWaitSemaphores = mFlushSemaphoreChain.back().ptr();
- presentInfo.swapchainCount = 1;
- presentInfo.pSwapchains = &mSwapchain;
- presentInfo.pImageIndices = &mCurrentSwapchainImageIndex;
- presentInfo.pResults = nullptr;
+ presentInfo.swapchainCount = 1;
+ presentInfo.pSwapchains = &mSwapchain;
+ presentInfo.pImageIndices = &mCurrentSwapchainImageIndex;
+ presentInfo.pResults = nullptr;
VkPresentRegionKHR presentRegion = {};
VkPresentRegionsKHR presentRegions = {};
@@ -825,7 +825,7 @@
angle::Result WindowSurfaceVk::nextSwapchainImage(DisplayVk *displayVk)
{
- VkDevice device = displayVk->getDevice();
+ VkDevice device = displayVk->getDevice();
vk::Semaphore aquireImageSemaphore;
ANGLE_VK_TRY(displayVk, aquireImageSemaphore.init(device));
diff --git a/src/libANGLE/renderer/vulkan/TextureVk.cpp b/src/libANGLE/renderer/vulkan/TextureVk.cpp
index 8d8a2a7..7e31a06 100644
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -45,20 +45,20 @@
// NOTE(syoussefi): technically, you can transfer between formats as long as they have the same
// size and are compatible, but for now, let's just support same-format copies with transfer.
return srcFormat.internalFormat == destFormat.internalFormat &&
- renderer->hasTextureFormatFeatureBits(srcFormat.vkTextureFormat,
- VK_FORMAT_FEATURE_TRANSFER_SRC_BIT) &&
- renderer->hasTextureFormatFeatureBits(destFormat.vkTextureFormat,
- VK_FORMAT_FEATURE_TRANSFER_DST_BIT);
+ renderer->hasImageFormatFeatureBits(srcFormat.vkImageFormat,
+ VK_FORMAT_FEATURE_TRANSFER_SRC_BIT) &&
+ renderer->hasImageFormatFeatureBits(destFormat.vkImageFormat,
+ VK_FORMAT_FEATURE_TRANSFER_DST_BIT);
}
bool CanCopyWithDraw(RendererVk *renderer,
const vk::Format &srcFormat,
const vk::Format &destFormat)
{
- return renderer->hasTextureFormatFeatureBits(srcFormat.vkTextureFormat,
- VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) &&
- renderer->hasTextureFormatFeatureBits(destFormat.vkTextureFormat,
- VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT);
+ return renderer->hasImageFormatFeatureBits(srcFormat.vkImageFormat,
+ VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) &&
+ renderer->hasImageFormatFeatureBits(destFormat.vkImageFormat,
+ VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT);
}
bool ForceCpuPathForCopy(RendererVk *renderer, vk::ImageHelper *image)
@@ -492,8 +492,8 @@
uint8_t *sourceData = nullptr;
ANGLE_TRY(source->copyImageDataToBuffer(contextVk, sourceLevel, 1, sourceArea, &sourceData));
- const angle::Format &sourceTextureFormat = sourceVkFormat.textureFormat();
- const angle::Format &destTextureFormat = destVkFormat.textureFormat();
+ const angle::Format &sourceTextureFormat = sourceVkFormat.imageFormat();
+ const angle::Format &destTextureFormat = destVkFormat.imageFormat();
size_t destinationAllocationSize =
sourceArea.width * sourceArea.height * destTextureFormat.pixelBytes;
@@ -670,7 +670,7 @@
// TODO(syoussefi): If the cube map is LUMA, we need swizzle. http://anglebug.com/2911
// This can't happen when copying from framebuffers, so only source of concern would be
// copy[Sub]Texture copying from a LUMA cube map.
- ASSERT(!srcImage->getFormat().textureFormat().isLUMA());
+ ASSERT(!srcImage->getFormat().imageFormat().isLUMA());
gl::TextureType arrayTextureType =
Get2DTextureType(srcImage->getLayerCount(), srcImage->getSamples());
@@ -991,7 +991,7 @@
// Make sure the source is initialized and it's images are flushed.
ANGLE_TRY(ensureImageInitialized(contextVk));
- const angle::Format &imageFormat = getImage().getFormat().textureFormat();
+ const angle::Format &imageFormat = getImage().getFormat().imageFormat();
size_t sourceCopyAllocationSize =
sourceArea.width * sourceArea.height * imageFormat.pixelBytes * layerCount;
@@ -1044,7 +1044,7 @@
ANGLE_TRY(copyImageDataToBuffer(contextVk, mState.getEffectiveBaseLevel(), imageLayerCount,
imageArea, &imageData));
- const angle::Format &angleFormat = mImage->getFormat().textureFormat();
+ const angle::Format &angleFormat = mImage->getFormat().imageFormat();
GLuint sourceRowPitch = baseLevelExtents.width * angleFormat.pixelBytes;
size_t baseLevelAllocationSize = sourceRowPitch * baseLevelExtents.height;
@@ -1092,8 +1092,7 @@
// Check if the image supports blit. If it does, we can do the mipmap generation on the gpu
// only.
- if (renderer->hasTextureFormatFeatureBits(mImage->getFormat().vkTextureFormat,
- kBlitFeatureFlags))
+ if (renderer->hasImageFormatFeatureBits(mImage->getFormat().vkImageFormat, kBlitFeatureFlags))
{
ANGLE_TRY(ensureImageInitialized(contextVk));
ANGLE_TRY(mImage->generateMipmapsWithBlit(contextVk, mState.getMipmapMaxLevel()));
@@ -1317,7 +1316,7 @@
vk::ImageView **imageViewOut)
{
ASSERT(mImage->valid());
- ASSERT(!mImage->getFormat().textureFormat().isBlock);
+ ASSERT(!mImage->getFormat().imageFormat().isBlock);
// Lazily allocate the storage for image views
if (mLayerLevelDrawImageViews.empty())
@@ -1359,7 +1358,7 @@
vk::CommandBuffer *commandBuffer)
{
const RendererVk *renderer = contextVk->getRenderer();
- const angle::Format &textureFormat = format.textureFormat();
+ const angle::Format &textureFormat = format.imageFormat();
VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_TRANSFER_DST_BIT |
VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
@@ -1382,7 +1381,7 @@
// If the image has an emulated channel, always clear it. These channels will be masked out in
// future writes, and shouldn't contain uninitialized values.
- if (format.hasEmulatedChannels())
+ if (format.hasEmulatedImageChannels())
{
uint32_t levelCount = mImage->getLevelCount();
uint32_t layerCount = mImage->getLayerCount();
@@ -1418,7 +1417,7 @@
ANGLE_TRY(mImage->initLayerImageView(contextVk, mState.getType(), VK_IMAGE_ASPECT_COLOR_BIT,
mappedSwizzle, &mReadBaseLevelImageView, baseLevel, 1,
baseLayer, layerCount));
- if (!format.textureFormat().isBlock)
+ if (!format.imageFormat().isBlock)
{
ANGLE_TRY(mImage->initLayerImageView(contextVk, mState.getType(), VK_IMAGE_ASPECT_COLOR_BIT,
gl::SwizzleState(), &mDrawBaseLevelImageView,
diff --git a/src/libANGLE/renderer/vulkan/UtilsVk.cpp b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
index cf8af7c..18e1754 100644
--- a/src/libANGLE/renderer/vulkan/UtilsVk.cpp
+++ b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
@@ -159,7 +159,7 @@
uint32_t mask = 0;
const angle::Format &angleFormat = format.angleFormat();
- const angle::Format &textureFormat = format.textureFormat();
+ const angle::Format &textureFormat = format.imageFormat();
// Red can never be introduced due to format emulation (except for luma which is handled
// especially)
diff --git a/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp b/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
index a60f12c..94bb4b1 100644
--- a/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
+++ b/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
@@ -98,13 +98,13 @@
ANGLE_VK_TRY(displayVk, vkGetAndroidHardwareBufferPropertiesANDROID(device, hardwareBuffer,
&bufferProperties));
- const vk::Format &vkFormat = renderer->getFormat(internalFormat);
- const angle::Format &textureFormat = vkFormat.textureFormat();
- bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
+ const vk::Format &vkFormat = renderer->getFormat(internalFormat);
+ const angle::Format &imageFormat = vkFormat.imageFormat();
+ bool isDepthOrStencilFormat = imageFormat.depthBits > 0 || imageFormat.stencilBits > 0;
const VkImageUsageFlags usage =
VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
VK_IMAGE_USAGE_SAMPLED_BIT |
- (textureFormat.redBits > 0 ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : 0) |
+ (imageFormat.redBits > 0 ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : 0) |
(isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0);
VkExternalFormatANDROID externalFormat = {};
@@ -149,15 +149,15 @@
constexpr uint32_t kColorRenderableRequiredBits = VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
constexpr uint32_t kDepthStencilRenderableRequiredBits = VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
- mRenderable = renderer->hasTextureFormatFeatureBits(vkFormat.vkTextureFormat,
- kColorRenderableRequiredBits) ||
- renderer->hasTextureFormatFeatureBits(vkFormat.vkTextureFormat,
- kDepthStencilRenderableRequiredBits);
+ mRenderable =
+ renderer->hasImageFormatFeatureBits(vkFormat.vkImageFormat, kColorRenderableRequiredBits) ||
+ renderer->hasImageFormatFeatureBits(vkFormat.vkImageFormat,
+ kDepthStencilRenderableRequiredBits);
constexpr uint32_t kTextureableRequiredBits =
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
mTextureable =
- renderer->hasTextureFormatFeatureBits(vkFormat.vkTextureFormat, kTextureableRequiredBits);
+ renderer->hasImageFormatFeatureBits(vkFormat.vkImageFormat, kTextureableRequiredBits);
return angle::Result::Continue;
}
diff --git a/src/libANGLE/renderer/vulkan/gen_vk_format_table.py b/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
index 6499a9f..7ddef0e 100644
--- a/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
+++ b/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
@@ -66,20 +66,20 @@
format_entry_template = """case angle::FormatID::{format_id}:
internalFormat = {internal_format};
-{texture_template}
+{image_template}
{buffer_template}
break;
"""
-texture_basic_template = """textureFormatID = {texture};
-vkTextureFormat = {vk_texture_format};
-textureInitializerFunction = {texture_initializer};"""
+image_basic_template = """imageFormatID = {image};
+vkImageFormat = {vk_image_format};
+imageInitializerFunction = {image_initializer};"""
-texture_struct_template="{{{texture}, {vk_texture_format}, {texture_initializer}}}"
+image_struct_template="{{{image}, {vk_image_format}, {image_initializer}}}"
-texture_fallback_template = """{{
-static constexpr TextureFormatInitInfo kInfo[] = {{{texture_list}}};
-initTextureFallback(renderer, kInfo, ArraySize(kInfo));
+image_fallback_template = """{{
+static constexpr ImageFormatInitInfo kInfo[] = {{{image_list}}};
+initImageFallback(renderer, kInfo, ArraySize(kInfo));
}}"""
buffer_basic_template = """bufferFormatID = {buffer};
@@ -108,7 +108,7 @@
args = dict(
format_id=angle,
internal_format=internal_format,
- texture_template="",
+ image_template="",
buffer_template="")
if ((angle not in vk_map) and (angle not in vk_overrides) and
@@ -124,11 +124,11 @@
fallbacks = [fallbacks]
return [format] + fallbacks
- def texture_args(format):
+ def image_args(format):
return dict(
- texture="angle::FormatID::" + format,
- vk_texture_format=vk_map[format],
- texture_initializer=angle_format.get_internal_format_initializer(
+ image="angle::FormatID::" + format,
+ vk_image_format=vk_map[format],
+ image_initializer=angle_format.get_internal_format_initializer(
internal_format, format))
def buffer_args(format):
@@ -141,16 +141,16 @@
vertex_load_converts='false' if angle == format else 'true',
)
- textures = get_formats(angle, "texture")
- if len(textures) == 1:
- args.update(texture_template=texture_basic_template)
- args.update(texture_args(textures[0]))
- elif len(textures) > 1:
+ images = get_formats(angle, "image")
+ if len(images) == 1:
+ args.update(image_template=image_basic_template)
+ args.update(image_args(images[0]))
+ elif len(images) > 1:
args.update(
- texture_template=texture_fallback_template,
- texture_list=", ".join(
- texture_struct_template.format(**texture_args(i))
- for i in textures))
+ image_template=image_fallback_template,
+ image_list=", ".join(
+ image_struct_template.format(**image_args(i))
+ for i in images))
buffers = get_formats(angle, "buffer")
if len(buffers) == 1:
diff --git a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
index 4db2c0b..92bc6ec 100644
--- a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
@@ -144,7 +144,7 @@
{
// We would only need this flag for duplicated attachments. Apply it conservatively.
desc->flags = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT;
- desc->format = format.vkTextureFormat;
+ desc->format = format.vkImageFormat;
desc->samples = gl_vk::GetSamples(samples);
desc->loadOp = static_cast<VkAttachmentLoadOp>(ops.loadOp);
desc->storeOp = static_cast<VkAttachmentStoreOp>(ops.storeOp);
diff --git a/src/libANGLE/renderer/vulkan/vk_format_map.json b/src/libANGLE/renderer/vulkan/vk_format_map.json
index 96841d7..f6d0b26 100644
--- a/src/libANGLE/renderer/vulkan/vk_format_map.json
+++ b/src/libANGLE/renderer/vulkan/vk_format_map.json
@@ -4,7 +4,7 @@
"Use of this source code is governed by a BSD-style license that can be",
"found in the LICENSE file.",
"",
- "vk_format_map.json: Texture format mapping between OpenGL and Vulkan.",
+ "vk_format_map.json: Format mapping between OpenGL and Vulkan.",
"",
"The format of the map is a dictionary where the key of each entry is the",
"ANGLE format ID, and the value is the Vulkan format enum. Note some formats",
@@ -14,7 +14,7 @@
"",
"We implement formats that aren't natively supported in Vulkan using",
"fallback and override formats. These are specified as dictionaries (also keyed on",
- "the angle format ID), with two optional entries for Buffer and Texture/Image",
+ "the angle format ID), with two optional entries for Buffer and Image",
"formats. Each entry specifies a fallback or override format.",
"",
"Override formats are used for emulated support for formats we assume are never",
@@ -190,43 +190,43 @@
},
"overrides": {
"A16_FLOAT": {
- "texture": "R16_FLOAT"
+ "image": "R16_FLOAT"
},
"A32_FLOAT": {
- "texture": "R32_FLOAT"
+ "image": "R32_FLOAT"
},
"A8_UNORM": {
- "texture": "R8_UNORM"
+ "image": "R8_UNORM"
},
"L8_UNORM": {
- "texture": "R8_UNORM"
+ "image": "R8_UNORM"
},
"L8A8_UNORM": {
- "texture": "R8G8_UNORM"
+ "image": "R8G8_UNORM"
},
"R4G4B4A4_UNORM": {
- "texture": "R8G8B8A8_UNORM"
+ "image": "R8G8B8A8_UNORM"
},
"R5G5B5A1_UNORM": {
- "texture": "A1R5G5B5_UNORM"
+ "image": "A1R5G5B5_UNORM"
},
"R8G8B8_UNORM": {
- "texture": "R8G8B8A8_UNORM"
+ "image": "R8G8B8A8_UNORM"
},
"R8G8B8_UNORM_SRGB": {
- "texture": "R8G8B8A8_UNORM_SRGB"
+ "image": "R8G8B8A8_UNORM_SRGB"
},
"B8G8R8X8_UNORM": {
"buffer": "NONE",
- "texture": "B8G8R8A8_UNORM"
+ "image": "B8G8R8A8_UNORM"
},
"D24_UNORM_X8_UINT": {
"buffer": "NONE",
- "texture": "D24_UNORM_S8_UINT"
+ "image": "D24_UNORM_S8_UINT"
},
"ETC1_R8G8B8_UNORM_BLOCK": {
"buffer": "NONE",
- "texture": "ETC2_R8G8B8_UNORM_BLOCK"
+ "image": "ETC2_R8G8B8_UNORM_BLOCK"
},
"R32_FIXED": {
"buffer": "R32_FLOAT"
@@ -243,16 +243,16 @@
},
"fallbacks": {
"D32_FLOAT_S8X24_UINT": {
- "texture": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"]
+ "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"]
},
"D24_UNORM_S8_UINT": {
- "texture": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
+ "image": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
},
"D24_UNORM_X8_UINT": {
- "texture": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
+ "image": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
},
"S8_UINT": {
- "texture": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT", "S8_UINT"]
+ "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT", "S8_UINT"]
},
"R8_UNORM": {
diff --git a/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp b/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
index ff0f66c..a49c852 100644
--- a/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
@@ -27,18 +27,18 @@
switch (angleFormat.id)
{
case angle::FormatID::A16_FLOAT:
- internalFormat = GL_ALPHA16F_EXT;
- textureFormatID = angle::FormatID::R16_FLOAT;
- vkTextureFormat = VK_FORMAT_R16_SFLOAT;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_ALPHA16F_EXT;
+ imageFormatID = angle::FormatID::R16_FLOAT;
+ vkImageFormat = VK_FORMAT_R16_SFLOAT;
+ imageInitializerFunction = nullptr;
break;
case angle::FormatID::A1R5G5B5_UNORM:
internalFormat = GL_A1RGB5_ANGLEX;
- textureFormatID = angle::FormatID::A1R5G5B5_UNORM;
- vkTextureFormat = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::A1R5G5B5_UNORM;
+ vkImageFormat = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::A1R5G5B5_UNORM;
vkBufferFormat = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -47,26 +47,26 @@
break;
case angle::FormatID::A32_FLOAT:
- internalFormat = GL_ALPHA32F_EXT;
- textureFormatID = angle::FormatID::R32_FLOAT;
- vkTextureFormat = VK_FORMAT_R32_SFLOAT;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_ALPHA32F_EXT;
+ imageFormatID = angle::FormatID::R32_FLOAT;
+ vkImageFormat = VK_FORMAT_R32_SFLOAT;
+ imageInitializerFunction = nullptr;
break;
case angle::FormatID::A8_UNORM:
- internalFormat = GL_ALPHA8_EXT;
- textureFormatID = angle::FormatID::R8_UNORM;
- vkTextureFormat = VK_FORMAT_R8_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_ALPHA8_EXT;
+ imageFormatID = angle::FormatID::R8_UNORM;
+ vkImageFormat = VK_FORMAT_R8_UNORM;
+ imageInitializerFunction = nullptr;
break;
case angle::FormatID::ASTC_10x10_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR;
- textureFormatID = angle::FormatID::ASTC_10x10_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x10_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x10_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -76,9 +76,9 @@
case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_10x10_KHR;
- textureFormatID = angle::FormatID::ASTC_10x10_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x10_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x10_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -88,9 +88,9 @@
case angle::FormatID::ASTC_10x5_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR;
- textureFormatID = angle::FormatID::ASTC_10x5_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x5_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x5_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -100,9 +100,9 @@
case angle::FormatID::ASTC_10x5_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_10x5_KHR;
- textureFormatID = angle::FormatID::ASTC_10x5_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x5_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x5_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -112,9 +112,9 @@
case angle::FormatID::ASTC_10x6_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR;
- textureFormatID = angle::FormatID::ASTC_10x6_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x6_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x6_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -124,9 +124,9 @@
case angle::FormatID::ASTC_10x6_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_10x6_KHR;
- textureFormatID = angle::FormatID::ASTC_10x6_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x6_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x6_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -136,9 +136,9 @@
case angle::FormatID::ASTC_10x8_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR;
- textureFormatID = angle::FormatID::ASTC_10x8_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x8_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x8_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -148,9 +148,9 @@
case angle::FormatID::ASTC_10x8_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_10x8_KHR;
- textureFormatID = angle::FormatID::ASTC_10x8_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_10x8_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_10x8_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -160,9 +160,9 @@
case angle::FormatID::ASTC_12x10_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR;
- textureFormatID = angle::FormatID::ASTC_12x10_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_12x10_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_12x10_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -172,9 +172,9 @@
case angle::FormatID::ASTC_12x10_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_12x10_KHR;
- textureFormatID = angle::FormatID::ASTC_12x10_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_12x10_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_12x10_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -184,9 +184,9 @@
case angle::FormatID::ASTC_12x12_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
- textureFormatID = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -196,9 +196,9 @@
case angle::FormatID::ASTC_12x12_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
- textureFormatID = angle::FormatID::ASTC_12x12_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_12x12_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_12x12_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -208,9 +208,9 @@
case angle::FormatID::ASTC_4x4_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR;
- textureFormatID = angle::FormatID::ASTC_4x4_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_4x4_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_4x4_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -220,9 +220,9 @@
case angle::FormatID::ASTC_4x4_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
- textureFormatID = angle::FormatID::ASTC_4x4_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_4x4_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_4x4_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -232,9 +232,9 @@
case angle::FormatID::ASTC_5x4_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR;
- textureFormatID = angle::FormatID::ASTC_5x4_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_5x4_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_5x4_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -244,9 +244,9 @@
case angle::FormatID::ASTC_5x4_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_5x4_KHR;
- textureFormatID = angle::FormatID::ASTC_5x4_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_5x4_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_5x4_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -256,9 +256,9 @@
case angle::FormatID::ASTC_5x5_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR;
- textureFormatID = angle::FormatID::ASTC_5x5_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_5x5_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_5x5_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -268,9 +268,9 @@
case angle::FormatID::ASTC_5x5_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_5x5_KHR;
- textureFormatID = angle::FormatID::ASTC_5x5_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_5x5_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_5x5_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -280,9 +280,9 @@
case angle::FormatID::ASTC_6x5_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR;
- textureFormatID = angle::FormatID::ASTC_6x5_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_6x5_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_6x5_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -292,9 +292,9 @@
case angle::FormatID::ASTC_6x5_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_6x5_KHR;
- textureFormatID = angle::FormatID::ASTC_6x5_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_6x5_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_6x5_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -304,9 +304,9 @@
case angle::FormatID::ASTC_6x6_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR;
- textureFormatID = angle::FormatID::ASTC_6x6_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_6x6_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_6x6_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -316,9 +316,9 @@
case angle::FormatID::ASTC_6x6_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_6x6_KHR;
- textureFormatID = angle::FormatID::ASTC_6x6_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_6x6_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_6x6_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -328,9 +328,9 @@
case angle::FormatID::ASTC_8x5_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR;
- textureFormatID = angle::FormatID::ASTC_8x5_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_8x5_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_8x5_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -340,9 +340,9 @@
case angle::FormatID::ASTC_8x5_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_8x5_KHR;
- textureFormatID = angle::FormatID::ASTC_8x5_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_8x5_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_8x5_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -352,9 +352,9 @@
case angle::FormatID::ASTC_8x6_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR;
- textureFormatID = angle::FormatID::ASTC_8x6_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_8x6_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_8x6_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -364,9 +364,9 @@
case angle::FormatID::ASTC_8x6_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_8x6_KHR;
- textureFormatID = angle::FormatID::ASTC_8x6_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_8x6_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_8x6_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -376,9 +376,9 @@
case angle::FormatID::ASTC_8x8_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR;
- textureFormatID = angle::FormatID::ASTC_8x8_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_8x8_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_8x8_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -388,9 +388,9 @@
case angle::FormatID::ASTC_8x8_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_8x8_KHR;
- textureFormatID = angle::FormatID::ASTC_8x8_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ASTC_8x8_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ASTC_8x8_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -400,9 +400,9 @@
case angle::FormatID::B4G4R4A4_UNORM:
internalFormat = GL_BGRA4_ANGLEX;
- textureFormatID = angle::FormatID::B4G4R4A4_UNORM;
- vkTextureFormat = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::B4G4R4A4_UNORM;
+ vkImageFormat = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::B4G4R4A4_UNORM;
vkBufferFormat = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -412,9 +412,9 @@
case angle::FormatID::B5G5R5A1_UNORM:
internalFormat = GL_BGR5_A1_ANGLEX;
- textureFormatID = angle::FormatID::B5G5R5A1_UNORM;
- vkTextureFormat = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::B5G5R5A1_UNORM;
+ vkImageFormat = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::B5G5R5A1_UNORM;
vkBufferFormat = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -424,9 +424,9 @@
case angle::FormatID::B5G6R5_UNORM:
internalFormat = GL_BGR565_ANGLEX;
- textureFormatID = angle::FormatID::B5G6R5_UNORM;
- vkTextureFormat = VK_FORMAT_B5G6R5_UNORM_PACK16;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::B5G6R5_UNORM;
+ vkImageFormat = VK_FORMAT_B5G6R5_UNORM_PACK16;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::B5G6R5_UNORM;
vkBufferFormat = VK_FORMAT_B5G6R5_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -444,9 +444,9 @@
case angle::FormatID::B8G8R8A8_UNORM:
internalFormat = GL_BGRA8_EXT;
- textureFormatID = angle::FormatID::B8G8R8A8_UNORM;
- vkTextureFormat = VK_FORMAT_B8G8R8A8_UNORM;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::B8G8R8A8_UNORM;
+ vkImageFormat = VK_FORMAT_B8G8R8A8_UNORM;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::B8G8R8A8_UNORM;
vkBufferFormat = VK_FORMAT_B8G8R8A8_UNORM;
vkBufferFormatIsPacked = false;
@@ -456,9 +456,9 @@
case angle::FormatID::B8G8R8A8_UNORM_SRGB:
internalFormat = GL_BGRA8_SRGB_ANGLEX;
- textureFormatID = angle::FormatID::B8G8R8A8_UNORM_SRGB;
- vkTextureFormat = VK_FORMAT_B8G8R8A8_SRGB;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::B8G8R8A8_UNORM_SRGB;
+ vkImageFormat = VK_FORMAT_B8G8R8A8_SRGB;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::B8G8R8A8_UNORM_SRGB;
vkBufferFormat = VK_FORMAT_B8G8R8A8_SRGB;
vkBufferFormatIsPacked = false;
@@ -468,9 +468,9 @@
case angle::FormatID::B8G8R8X8_UNORM:
internalFormat = GL_BGRX8_ANGLEX;
- textureFormatID = angle::FormatID::B8G8R8A8_UNORM;
- vkTextureFormat = VK_FORMAT_B8G8R8A8_UNORM;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::B8G8R8A8_UNORM;
+ vkImageFormat = VK_FORMAT_B8G8R8A8_UNORM;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::NONE;
vkBufferFormat = VK_FORMAT_UNDEFINED;
vkBufferFormatIsPacked = false;
@@ -480,9 +480,9 @@
case angle::FormatID::BC1_RGBA_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
- textureFormatID = angle::FormatID::BC1_RGBA_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC1_RGBA_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC1_RGBA_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -492,9 +492,9 @@
case angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
- textureFormatID = angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -504,9 +504,9 @@
case angle::FormatID::BC1_RGB_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
- textureFormatID = angle::FormatID::BC1_RGB_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC1_RGB_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC1_RGB_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -516,9 +516,9 @@
case angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
- textureFormatID = angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_BC1_RGB_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_BC1_RGB_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_BC1_RGB_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -528,9 +528,9 @@
case angle::FormatID::BC2_RGBA_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE;
- textureFormatID = angle::FormatID::BC2_RGBA_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_BC2_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC2_RGBA_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_BC2_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC2_RGBA_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_BC2_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -540,9 +540,9 @@
case angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
- textureFormatID = angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_BC2_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_BC2_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_BC2_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -552,9 +552,9 @@
case angle::FormatID::BC3_RGBA_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE;
- textureFormatID = angle::FormatID::BC3_RGBA_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_BC3_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC3_RGBA_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_BC3_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC3_RGBA_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_BC3_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -564,9 +564,9 @@
case angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
- textureFormatID = angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_BC3_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_BC3_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_BC3_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -576,9 +576,9 @@
case angle::FormatID::BPTC_RGBA_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_BPTC_UNORM_EXT;
- textureFormatID = angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_BC7_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_BC7_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_BC7_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -588,9 +588,9 @@
case angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK:
internalFormat = GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT;
- textureFormatID = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK;
- vkTextureFormat = VK_FORMAT_BC6H_SFLOAT_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK;
+ vkImageFormat = VK_FORMAT_BC6H_SFLOAT_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK;
vkBufferFormat = VK_FORMAT_BC6H_SFLOAT_BLOCK;
vkBufferFormatIsPacked = false;
@@ -600,9 +600,9 @@
case angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK:
internalFormat = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT;
- textureFormatID = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK;
- vkTextureFormat = VK_FORMAT_BC6H_UFLOAT_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK;
+ vkImageFormat = VK_FORMAT_BC6H_UFLOAT_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK;
vkBufferFormat = VK_FORMAT_BC6H_UFLOAT_BLOCK;
vkBufferFormatIsPacked = false;
@@ -612,9 +612,9 @@
case angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT;
- textureFormatID = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_BC7_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_BC7_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_BC7_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -624,9 +624,9 @@
case angle::FormatID::D16_UNORM:
internalFormat = GL_DEPTH_COMPONENT16;
- textureFormatID = angle::FormatID::D16_UNORM;
- vkTextureFormat = VK_FORMAT_D16_UNORM;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::D16_UNORM;
+ vkImageFormat = VK_FORMAT_D16_UNORM;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::D16_UNORM;
vkBufferFormat = VK_FORMAT_D16_UNORM;
vkBufferFormatIsPacked = false;
@@ -637,11 +637,11 @@
case angle::FormatID::D24_UNORM_S8_UINT:
internalFormat = GL_DEPTH24_STENCIL8;
{
- static constexpr TextureFormatInitInfo kInfo[] = {
+ static constexpr ImageFormatInitInfo kInfo[] = {
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
{angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
- initTextureFallback(renderer, kInfo, ArraySize(kInfo));
+ initImageFallback(renderer, kInfo, ArraySize(kInfo));
}
bufferFormatID = angle::FormatID::D24_UNORM_S8_UINT;
vkBufferFormat = VK_FORMAT_D24_UNORM_S8_UINT;
@@ -653,11 +653,11 @@
case angle::FormatID::D24_UNORM_X8_UINT:
internalFormat = GL_DEPTH_COMPONENT24;
{
- static constexpr TextureFormatInitInfo kInfo[] = {
+ static constexpr ImageFormatInitInfo kInfo[] = {
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
{angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
- initTextureFallback(renderer, kInfo, ArraySize(kInfo));
+ initImageFallback(renderer, kInfo, ArraySize(kInfo));
}
bufferFormatID = angle::FormatID::NONE;
vkBufferFormat = VK_FORMAT_UNDEFINED;
@@ -668,9 +668,9 @@
case angle::FormatID::D32_FLOAT:
internalFormat = GL_DEPTH_COMPONENT32F;
- textureFormatID = angle::FormatID::D32_FLOAT;
- vkTextureFormat = VK_FORMAT_D32_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::D32_FLOAT;
+ vkImageFormat = VK_FORMAT_D32_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::D32_FLOAT;
vkBufferFormat = VK_FORMAT_D32_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -681,11 +681,11 @@
case angle::FormatID::D32_FLOAT_S8X24_UINT:
internalFormat = GL_DEPTH32F_STENCIL8;
{
- static constexpr TextureFormatInitInfo kInfo[] = {
+ static constexpr ImageFormatInitInfo kInfo[] = {
{angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
{angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr}};
- initTextureFallback(renderer, kInfo, ArraySize(kInfo));
+ initImageFallback(renderer, kInfo, ArraySize(kInfo));
}
bufferFormatID = angle::FormatID::D32_FLOAT_S8X24_UINT;
vkBufferFormat = VK_FORMAT_D32_SFLOAT_S8_UINT;
@@ -700,9 +700,9 @@
case angle::FormatID::EAC_R11G11_SNORM_BLOCK:
internalFormat = GL_COMPRESSED_SIGNED_RG11_EAC;
- textureFormatID = angle::FormatID::EAC_R11G11_SNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::EAC_R11G11_SNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::EAC_R11G11_SNORM_BLOCK;
vkBufferFormat = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -712,9 +712,9 @@
case angle::FormatID::EAC_R11G11_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RG11_EAC;
- textureFormatID = angle::FormatID::EAC_R11G11_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::EAC_R11G11_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::EAC_R11G11_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -724,9 +724,9 @@
case angle::FormatID::EAC_R11_SNORM_BLOCK:
internalFormat = GL_COMPRESSED_SIGNED_R11_EAC;
- textureFormatID = angle::FormatID::EAC_R11_SNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_EAC_R11_SNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::EAC_R11_SNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_EAC_R11_SNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::EAC_R11_SNORM_BLOCK;
vkBufferFormat = VK_FORMAT_EAC_R11_SNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -736,9 +736,9 @@
case angle::FormatID::EAC_R11_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_R11_EAC;
- textureFormatID = angle::FormatID::EAC_R11_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_EAC_R11_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::EAC_R11_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_EAC_R11_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::EAC_R11_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_EAC_R11_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -752,9 +752,9 @@
case angle::FormatID::ETC1_R8G8B8_UNORM_BLOCK:
internalFormat = GL_ETC1_RGB8_OES;
- textureFormatID = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::NONE;
vkBufferFormat = VK_FORMAT_UNDEFINED;
vkBufferFormatIsPacked = false;
@@ -764,9 +764,9 @@
case angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
- textureFormatID = angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -775,22 +775,22 @@
break;
case angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK:
- internalFormat = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
- textureFormatID = angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
- textureInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
- bufferFormatID = angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
- vkBufferFormat = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
- vkBufferFormatIsPacked = false;
- vertexLoadFunction = CopyNativeVertexData<GLubyte, 4, 4, 0>;
+ internalFormat = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
+ imageInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
+ bufferFormatID = angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
+ vkBufferFormat = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
+ vkBufferFormatIsPacked = false;
+ vertexLoadFunction = CopyNativeVertexData<GLubyte, 4, 4, 0>;
vertexLoadRequiresConversion = false;
break;
case angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC;
- textureFormatID = angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -800,9 +800,9 @@
case angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA8_ETC2_EAC;
- textureFormatID = angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -812,9 +812,9 @@
case angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK:
internalFormat = GL_COMPRESSED_SRGB8_ETC2;
- textureFormatID = angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK;
vkBufferFormat = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
vkBufferFormatIsPacked = false;
@@ -824,9 +824,9 @@
case angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGB8_ETC2;
- textureFormatID = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
- vkTextureFormat = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
+ vkImageFormat = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
vkBufferFormat = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
vkBufferFormatIsPacked = false;
@@ -851,18 +851,18 @@
break;
case angle::FormatID::L8A8_UNORM:
- internalFormat = GL_LUMINANCE8_ALPHA8_EXT;
- textureFormatID = angle::FormatID::R8G8_UNORM;
- vkTextureFormat = VK_FORMAT_R8G8_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_LUMINANCE8_ALPHA8_EXT;
+ imageFormatID = angle::FormatID::R8G8_UNORM;
+ vkImageFormat = VK_FORMAT_R8G8_UNORM;
+ imageInitializerFunction = nullptr;
break;
case angle::FormatID::L8_UNORM:
- internalFormat = GL_LUMINANCE8_EXT;
- textureFormatID = angle::FormatID::R8_UNORM;
- vkTextureFormat = VK_FORMAT_R8_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_LUMINANCE8_EXT;
+ imageFormatID = angle::FormatID::R8_UNORM;
+ vkImageFormat = VK_FORMAT_R8_UNORM;
+ imageInitializerFunction = nullptr;
break;
@@ -872,9 +872,9 @@
case angle::FormatID::R10G10B10A2_SINT:
internalFormat = GL_RGB10_A2_SINT_ANGLEX;
- textureFormatID = angle::FormatID::R10G10B10A2_SINT;
- vkTextureFormat = VK_FORMAT_A2B10G10R10_SINT_PACK32;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R10G10B10A2_SINT;
+ vkImageFormat = VK_FORMAT_A2B10G10R10_SINT_PACK32;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R10G10B10A2_SINT;
vkBufferFormat = VK_FORMAT_A2B10G10R10_SINT_PACK32;
vkBufferFormatIsPacked = true;
@@ -884,9 +884,9 @@
case angle::FormatID::R10G10B10A2_SNORM:
internalFormat = GL_RGB10_A2_SNORM_ANGLEX;
- textureFormatID = angle::FormatID::R10G10B10A2_SNORM;
- vkTextureFormat = VK_FORMAT_A2B10G10R10_SNORM_PACK32;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R10G10B10A2_SNORM;
+ vkImageFormat = VK_FORMAT_A2B10G10R10_SNORM_PACK32;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R10G10B10A2_SNORM;
vkBufferFormat = VK_FORMAT_A2B10G10R10_SNORM_PACK32;
vkBufferFormatIsPacked = true;
@@ -896,9 +896,9 @@
case angle::FormatID::R10G10B10A2_SSCALED:
internalFormat = GL_RGB10_A2_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R10G10B10A2_SSCALED;
- vkTextureFormat = VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R10G10B10A2_SSCALED;
+ vkImageFormat = VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R10G10B10A2_SSCALED;
vkBufferFormat = VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
vkBufferFormatIsPacked = true;
@@ -908,9 +908,9 @@
case angle::FormatID::R10G10B10A2_UINT:
internalFormat = GL_RGB10_A2UI;
- textureFormatID = angle::FormatID::R10G10B10A2_UINT;
- vkTextureFormat = VK_FORMAT_A2B10G10R10_UINT_PACK32;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R10G10B10A2_UINT;
+ vkImageFormat = VK_FORMAT_A2B10G10R10_UINT_PACK32;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R10G10B10A2_UINT;
vkBufferFormat = VK_FORMAT_A2B10G10R10_UINT_PACK32;
vkBufferFormatIsPacked = true;
@@ -920,9 +920,9 @@
case angle::FormatID::R10G10B10A2_UNORM:
internalFormat = GL_RGB10_A2;
- textureFormatID = angle::FormatID::R10G10B10A2_UNORM;
- vkTextureFormat = VK_FORMAT_A2B10G10R10_UNORM_PACK32;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R10G10B10A2_UNORM;
+ vkImageFormat = VK_FORMAT_A2B10G10R10_UNORM_PACK32;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R10G10B10A2_UNORM;
vkBufferFormat = VK_FORMAT_A2B10G10R10_UNORM_PACK32;
vkBufferFormatIsPacked = true;
@@ -932,9 +932,9 @@
case angle::FormatID::R10G10B10A2_USCALED:
internalFormat = GL_RGB10_A2_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R10G10B10A2_USCALED;
- vkTextureFormat = VK_FORMAT_A2B10G10R10_USCALED_PACK32;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R10G10B10A2_USCALED;
+ vkImageFormat = VK_FORMAT_A2B10G10R10_USCALED_PACK32;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R10G10B10A2_USCALED;
vkBufferFormat = VK_FORMAT_A2B10G10R10_USCALED_PACK32;
vkBufferFormatIsPacked = true;
@@ -948,9 +948,9 @@
case angle::FormatID::R16G16B16A16_FLOAT:
internalFormat = GL_RGBA16F;
- textureFormatID = angle::FormatID::R16G16B16A16_FLOAT;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16B16A16_FLOAT;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16B16A16_FLOAT;
vkBufferFormat = VK_FORMAT_R16G16B16A16_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -960,9 +960,9 @@
case angle::FormatID::R16G16B16A16_SINT:
internalFormat = GL_RGBA16I;
- textureFormatID = angle::FormatID::R16G16B16A16_SINT;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16B16A16_SINT;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16B16A16_SINT;
vkBufferFormat = VK_FORMAT_R16G16B16A16_SINT;
vkBufferFormatIsPacked = false;
@@ -971,10 +971,10 @@
break;
case angle::FormatID::R16G16B16A16_SNORM:
- internalFormat = GL_RGBA16_SNORM_EXT;
- textureFormatID = angle::FormatID::R16G16B16A16_SNORM;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA16_SNORM_EXT;
+ imageFormatID = angle::FormatID::R16G16B16A16_SNORM;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, false,
@@ -986,10 +986,10 @@
break;
case angle::FormatID::R16G16B16A16_SSCALED:
- internalFormat = GL_RGBA16_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16G16B16A16_SSCALED;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA16_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16G16B16A16_SSCALED;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16A16_SSCALED, VK_FORMAT_R16G16B16A16_SSCALED, false,
@@ -1002,9 +1002,9 @@
case angle::FormatID::R16G16B16A16_UINT:
internalFormat = GL_RGBA16UI;
- textureFormatID = angle::FormatID::R16G16B16A16_UINT;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16B16A16_UINT;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16B16A16_UINT;
vkBufferFormat = VK_FORMAT_R16G16B16A16_UINT;
vkBufferFormatIsPacked = false;
@@ -1013,10 +1013,10 @@
break;
case angle::FormatID::R16G16B16A16_UNORM:
- internalFormat = GL_RGBA16_EXT;
- textureFormatID = angle::FormatID::R16G16B16A16_UNORM;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA16_EXT;
+ imageFormatID = angle::FormatID::R16G16B16A16_UNORM;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, false,
@@ -1028,10 +1028,10 @@
break;
case angle::FormatID::R16G16B16A16_USCALED:
- internalFormat = GL_RGBA16_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16G16B16A16_USCALED;
- vkTextureFormat = VK_FORMAT_R16G16B16A16_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA16_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16G16B16A16_USCALED;
+ vkImageFormat = VK_FORMAT_R16G16B16A16_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16A16_USCALED, VK_FORMAT_R16G16B16A16_USCALED, false,
@@ -1044,9 +1044,9 @@
case angle::FormatID::R16G16B16_FLOAT:
internalFormat = GL_RGB16F;
- textureFormatID = angle::FormatID::R16G16B16_FLOAT;
- vkTextureFormat = VK_FORMAT_R16G16B16_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16B16_FLOAT;
+ vkImageFormat = VK_FORMAT_R16G16B16_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16B16_FLOAT;
vkBufferFormat = VK_FORMAT_R16G16B16_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1056,9 +1056,9 @@
case angle::FormatID::R16G16B16_SINT:
internalFormat = GL_RGB16I;
- textureFormatID = angle::FormatID::R16G16B16_SINT;
- vkTextureFormat = VK_FORMAT_R16G16B16_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16B16_SINT;
+ vkImageFormat = VK_FORMAT_R16G16B16_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16B16_SINT;
vkBufferFormat = VK_FORMAT_R16G16B16_SINT;
vkBufferFormatIsPacked = false;
@@ -1067,10 +1067,10 @@
break;
case angle::FormatID::R16G16B16_SNORM:
- internalFormat = GL_RGB16_SNORM_EXT;
- textureFormatID = angle::FormatID::R16G16B16_SNORM;
- vkTextureFormat = VK_FORMAT_R16G16B16_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB16_SNORM_EXT;
+ imageFormatID = angle::FormatID::R16G16B16_SNORM;
+ vkImageFormat = VK_FORMAT_R16G16B16_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16_SNORM, VK_FORMAT_R16G16B16_SNORM, false,
@@ -1082,10 +1082,10 @@
break;
case angle::FormatID::R16G16B16_SSCALED:
- internalFormat = GL_RGB16_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16G16B16_SSCALED;
- vkTextureFormat = VK_FORMAT_R16G16B16_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB16_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16G16B16_SSCALED;
+ vkImageFormat = VK_FORMAT_R16G16B16_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16_SSCALED, VK_FORMAT_R16G16B16_SSCALED, false,
@@ -1098,9 +1098,9 @@
case angle::FormatID::R16G16B16_UINT:
internalFormat = GL_RGB16UI;
- textureFormatID = angle::FormatID::R16G16B16_UINT;
- vkTextureFormat = VK_FORMAT_R16G16B16_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16B16_UINT;
+ vkImageFormat = VK_FORMAT_R16G16B16_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16B16_UINT;
vkBufferFormat = VK_FORMAT_R16G16B16_UINT;
vkBufferFormatIsPacked = false;
@@ -1109,10 +1109,10 @@
break;
case angle::FormatID::R16G16B16_UNORM:
- internalFormat = GL_RGB16_EXT;
- textureFormatID = angle::FormatID::R16G16B16_UNORM;
- vkTextureFormat = VK_FORMAT_R16G16B16_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB16_EXT;
+ imageFormatID = angle::FormatID::R16G16B16_UNORM;
+ vkImageFormat = VK_FORMAT_R16G16B16_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16_UNORM, VK_FORMAT_R16G16B16_UNORM, false,
@@ -1124,10 +1124,10 @@
break;
case angle::FormatID::R16G16B16_USCALED:
- internalFormat = GL_RGB16_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16G16B16_USCALED;
- vkTextureFormat = VK_FORMAT_R16G16B16_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB16_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16G16B16_USCALED;
+ vkImageFormat = VK_FORMAT_R16G16B16_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16B16_USCALED, VK_FORMAT_R16G16B16_USCALED, false,
@@ -1140,9 +1140,9 @@
case angle::FormatID::R16G16_FLOAT:
internalFormat = GL_RG16F;
- textureFormatID = angle::FormatID::R16G16_FLOAT;
- vkTextureFormat = VK_FORMAT_R16G16_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16_FLOAT;
+ vkImageFormat = VK_FORMAT_R16G16_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16_FLOAT;
vkBufferFormat = VK_FORMAT_R16G16_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1152,9 +1152,9 @@
case angle::FormatID::R16G16_SINT:
internalFormat = GL_RG16I;
- textureFormatID = angle::FormatID::R16G16_SINT;
- vkTextureFormat = VK_FORMAT_R16G16_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16_SINT;
+ vkImageFormat = VK_FORMAT_R16G16_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16_SINT;
vkBufferFormat = VK_FORMAT_R16G16_SINT;
vkBufferFormatIsPacked = false;
@@ -1163,10 +1163,10 @@
break;
case angle::FormatID::R16G16_SNORM:
- internalFormat = GL_RG16_SNORM_EXT;
- textureFormatID = angle::FormatID::R16G16_SNORM;
- vkTextureFormat = VK_FORMAT_R16G16_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG16_SNORM_EXT;
+ imageFormatID = angle::FormatID::R16G16_SNORM;
+ vkImageFormat = VK_FORMAT_R16G16_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16_SNORM, VK_FORMAT_R16G16_SNORM, false,
@@ -1178,10 +1178,10 @@
break;
case angle::FormatID::R16G16_SSCALED:
- internalFormat = GL_RG16_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16G16_SSCALED;
- vkTextureFormat = VK_FORMAT_R16G16_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG16_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16G16_SSCALED;
+ vkImageFormat = VK_FORMAT_R16G16_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16_SSCALED, VK_FORMAT_R16G16_SSCALED, false,
@@ -1194,9 +1194,9 @@
case angle::FormatID::R16G16_UINT:
internalFormat = GL_RG16UI;
- textureFormatID = angle::FormatID::R16G16_UINT;
- vkTextureFormat = VK_FORMAT_R16G16_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16G16_UINT;
+ vkImageFormat = VK_FORMAT_R16G16_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16G16_UINT;
vkBufferFormat = VK_FORMAT_R16G16_UINT;
vkBufferFormatIsPacked = false;
@@ -1205,10 +1205,10 @@
break;
case angle::FormatID::R16G16_UNORM:
- internalFormat = GL_RG16_EXT;
- textureFormatID = angle::FormatID::R16G16_UNORM;
- vkTextureFormat = VK_FORMAT_R16G16_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG16_EXT;
+ imageFormatID = angle::FormatID::R16G16_UNORM;
+ vkImageFormat = VK_FORMAT_R16G16_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16_UNORM, VK_FORMAT_R16G16_UNORM, false,
@@ -1220,10 +1220,10 @@
break;
case angle::FormatID::R16G16_USCALED:
- internalFormat = GL_RG16_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16G16_USCALED;
- vkTextureFormat = VK_FORMAT_R16G16_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG16_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16G16_USCALED;
+ vkImageFormat = VK_FORMAT_R16G16_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16G16_USCALED, VK_FORMAT_R16G16_USCALED, false,
@@ -1236,9 +1236,9 @@
case angle::FormatID::R16_FLOAT:
internalFormat = GL_R16F;
- textureFormatID = angle::FormatID::R16_FLOAT;
- vkTextureFormat = VK_FORMAT_R16_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16_FLOAT;
+ vkImageFormat = VK_FORMAT_R16_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16_FLOAT;
vkBufferFormat = VK_FORMAT_R16_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1248,9 +1248,9 @@
case angle::FormatID::R16_SINT:
internalFormat = GL_R16I;
- textureFormatID = angle::FormatID::R16_SINT;
- vkTextureFormat = VK_FORMAT_R16_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16_SINT;
+ vkImageFormat = VK_FORMAT_R16_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16_SINT;
vkBufferFormat = VK_FORMAT_R16_SINT;
vkBufferFormatIsPacked = false;
@@ -1259,10 +1259,10 @@
break;
case angle::FormatID::R16_SNORM:
- internalFormat = GL_R16_SNORM_EXT;
- textureFormatID = angle::FormatID::R16_SNORM;
- vkTextureFormat = VK_FORMAT_R16_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R16_SNORM_EXT;
+ imageFormatID = angle::FormatID::R16_SNORM;
+ vkImageFormat = VK_FORMAT_R16_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16_SNORM, VK_FORMAT_R16_SNORM, false,
@@ -1274,10 +1274,10 @@
break;
case angle::FormatID::R16_SSCALED:
- internalFormat = GL_R16_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16_SSCALED;
- vkTextureFormat = VK_FORMAT_R16_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R16_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16_SSCALED;
+ vkImageFormat = VK_FORMAT_R16_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16_SSCALED, VK_FORMAT_R16_SSCALED, false,
@@ -1290,9 +1290,9 @@
case angle::FormatID::R16_UINT:
internalFormat = GL_R16UI;
- textureFormatID = angle::FormatID::R16_UINT;
- vkTextureFormat = VK_FORMAT_R16_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R16_UINT;
+ vkImageFormat = VK_FORMAT_R16_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R16_UINT;
vkBufferFormat = VK_FORMAT_R16_UINT;
vkBufferFormatIsPacked = false;
@@ -1301,10 +1301,10 @@
break;
case angle::FormatID::R16_UNORM:
- internalFormat = GL_R16_EXT;
- textureFormatID = angle::FormatID::R16_UNORM;
- vkTextureFormat = VK_FORMAT_R16_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R16_EXT;
+ imageFormatID = angle::FormatID::R16_UNORM;
+ vkImageFormat = VK_FORMAT_R16_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16_UNORM, VK_FORMAT_R16_UNORM, false,
@@ -1316,10 +1316,10 @@
break;
case angle::FormatID::R16_USCALED:
- internalFormat = GL_R16_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R16_USCALED;
- vkTextureFormat = VK_FORMAT_R16_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R16_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R16_USCALED;
+ vkImageFormat = VK_FORMAT_R16_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R16_USCALED, VK_FORMAT_R16_USCALED, false,
@@ -1342,9 +1342,9 @@
case angle::FormatID::R32G32B32A32_FLOAT:
internalFormat = GL_RGBA32F;
- textureFormatID = angle::FormatID::R32G32B32A32_FLOAT;
- vkTextureFormat = VK_FORMAT_R32G32B32A32_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32B32A32_FLOAT;
+ vkImageFormat = VK_FORMAT_R32G32B32A32_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32B32A32_FLOAT;
vkBufferFormat = VK_FORMAT_R32G32B32A32_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1354,9 +1354,9 @@
case angle::FormatID::R32G32B32A32_SINT:
internalFormat = GL_RGBA32I;
- textureFormatID = angle::FormatID::R32G32B32A32_SINT;
- vkTextureFormat = VK_FORMAT_R32G32B32A32_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32B32A32_SINT;
+ vkImageFormat = VK_FORMAT_R32G32B32A32_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32B32A32_SINT;
vkBufferFormat = VK_FORMAT_R32G32B32A32_SINT;
vkBufferFormatIsPacked = false;
@@ -1374,9 +1374,9 @@
case angle::FormatID::R32G32B32A32_UINT:
internalFormat = GL_RGBA32UI;
- textureFormatID = angle::FormatID::R32G32B32A32_UINT;
- vkTextureFormat = VK_FORMAT_R32G32B32A32_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32B32A32_UINT;
+ vkImageFormat = VK_FORMAT_R32G32B32A32_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32B32A32_UINT;
vkBufferFormat = VK_FORMAT_R32G32B32A32_UINT;
vkBufferFormatIsPacked = false;
@@ -1404,9 +1404,9 @@
case angle::FormatID::R32G32B32_FLOAT:
internalFormat = GL_RGB32F;
- textureFormatID = angle::FormatID::R32G32B32_FLOAT;
- vkTextureFormat = VK_FORMAT_R32G32B32_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32B32_FLOAT;
+ vkImageFormat = VK_FORMAT_R32G32B32_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32B32_FLOAT;
vkBufferFormat = VK_FORMAT_R32G32B32_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1416,9 +1416,9 @@
case angle::FormatID::R32G32B32_SINT:
internalFormat = GL_RGB32I;
- textureFormatID = angle::FormatID::R32G32B32_SINT;
- vkTextureFormat = VK_FORMAT_R32G32B32_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32B32_SINT;
+ vkImageFormat = VK_FORMAT_R32G32B32_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32B32_SINT;
vkBufferFormat = VK_FORMAT_R32G32B32_SINT;
vkBufferFormatIsPacked = false;
@@ -1436,9 +1436,9 @@
case angle::FormatID::R32G32B32_UINT:
internalFormat = GL_RGB32UI;
- textureFormatID = angle::FormatID::R32G32B32_UINT;
- vkTextureFormat = VK_FORMAT_R32G32B32_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32B32_UINT;
+ vkImageFormat = VK_FORMAT_R32G32B32_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32B32_UINT;
vkBufferFormat = VK_FORMAT_R32G32B32_UINT;
vkBufferFormatIsPacked = false;
@@ -1466,9 +1466,9 @@
case angle::FormatID::R32G32_FLOAT:
internalFormat = GL_RG32F;
- textureFormatID = angle::FormatID::R32G32_FLOAT;
- vkTextureFormat = VK_FORMAT_R32G32_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32_FLOAT;
+ vkImageFormat = VK_FORMAT_R32G32_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32_FLOAT;
vkBufferFormat = VK_FORMAT_R32G32_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1478,9 +1478,9 @@
case angle::FormatID::R32G32_SINT:
internalFormat = GL_RG32I;
- textureFormatID = angle::FormatID::R32G32_SINT;
- vkTextureFormat = VK_FORMAT_R32G32_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32_SINT;
+ vkImageFormat = VK_FORMAT_R32G32_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32_SINT;
vkBufferFormat = VK_FORMAT_R32G32_SINT;
vkBufferFormatIsPacked = false;
@@ -1498,9 +1498,9 @@
case angle::FormatID::R32G32_UINT:
internalFormat = GL_RG32UI;
- textureFormatID = angle::FormatID::R32G32_UINT;
- vkTextureFormat = VK_FORMAT_R32G32_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32G32_UINT;
+ vkImageFormat = VK_FORMAT_R32G32_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32G32_UINT;
vkBufferFormat = VK_FORMAT_R32G32_UINT;
vkBufferFormatIsPacked = false;
@@ -1528,9 +1528,9 @@
case angle::FormatID::R32_FLOAT:
internalFormat = GL_R32F;
- textureFormatID = angle::FormatID::R32_FLOAT;
- vkTextureFormat = VK_FORMAT_R32_SFLOAT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32_FLOAT;
+ vkImageFormat = VK_FORMAT_R32_SFLOAT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32_FLOAT;
vkBufferFormat = VK_FORMAT_R32_SFLOAT;
vkBufferFormatIsPacked = false;
@@ -1540,9 +1540,9 @@
case angle::FormatID::R32_SINT:
internalFormat = GL_R32I;
- textureFormatID = angle::FormatID::R32_SINT;
- vkTextureFormat = VK_FORMAT_R32_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32_SINT;
+ vkImageFormat = VK_FORMAT_R32_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32_SINT;
vkBufferFormat = VK_FORMAT_R32_SINT;
vkBufferFormatIsPacked = false;
@@ -1560,9 +1560,9 @@
case angle::FormatID::R32_UINT:
internalFormat = GL_R32UI;
- textureFormatID = angle::FormatID::R32_UINT;
- vkTextureFormat = VK_FORMAT_R32_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R32_UINT;
+ vkImageFormat = VK_FORMAT_R32_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R32_UINT;
vkBufferFormat = VK_FORMAT_R32_UINT;
vkBufferFormatIsPacked = false;
@@ -1580,9 +1580,9 @@
case angle::FormatID::R4G4B4A4_UNORM:
internalFormat = GL_RGBA4;
- textureFormatID = angle::FormatID::R8G8B8A8_UNORM;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_UNORM;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8B8A8_UNORM;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_UNORM;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R4G4B4A4_UNORM;
vkBufferFormat = VK_FORMAT_R4G4B4A4_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -1592,9 +1592,9 @@
case angle::FormatID::R5G5B5A1_UNORM:
internalFormat = GL_RGB5_A1;
- textureFormatID = angle::FormatID::A1R5G5B5_UNORM;
- vkTextureFormat = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::A1R5G5B5_UNORM;
+ vkImageFormat = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R5G5B5A1_UNORM;
vkBufferFormat = VK_FORMAT_R5G5B5A1_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -1604,9 +1604,9 @@
case angle::FormatID::R5G6B5_UNORM:
internalFormat = GL_RGB565;
- textureFormatID = angle::FormatID::R5G6B5_UNORM;
- vkTextureFormat = VK_FORMAT_R5G6B5_UNORM_PACK16;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R5G6B5_UNORM;
+ vkImageFormat = VK_FORMAT_R5G6B5_UNORM_PACK16;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R5G6B5_UNORM;
vkBufferFormat = VK_FORMAT_R5G6B5_UNORM_PACK16;
vkBufferFormatIsPacked = true;
@@ -1616,9 +1616,9 @@
case angle::FormatID::R8G8B8A8_SINT:
internalFormat = GL_RGBA8I;
- textureFormatID = angle::FormatID::R8G8B8A8_SINT;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8B8A8_SINT;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8B8A8_SINT;
vkBufferFormat = VK_FORMAT_R8G8B8A8_SINT;
vkBufferFormatIsPacked = false;
@@ -1627,10 +1627,10 @@
break;
case angle::FormatID::R8G8B8A8_SNORM:
- internalFormat = GL_RGBA8_SNORM;
- textureFormatID = angle::FormatID::R8G8B8A8_SNORM;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA8_SNORM;
+ imageFormatID = angle::FormatID::R8G8B8A8_SNORM;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, false,
@@ -1642,10 +1642,10 @@
break;
case angle::FormatID::R8G8B8A8_SSCALED:
- internalFormat = GL_RGBA8_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8G8B8A8_SSCALED;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA8_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8G8B8A8_SSCALED;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8A8_SSCALED, VK_FORMAT_R8G8B8A8_SSCALED, false,
@@ -1666,9 +1666,9 @@
case angle::FormatID::R8G8B8A8_UINT:
internalFormat = GL_RGBA8UI;
- textureFormatID = angle::FormatID::R8G8B8A8_UINT;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8B8A8_UINT;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8B8A8_UINT;
vkBufferFormat = VK_FORMAT_R8G8B8A8_UINT;
vkBufferFormatIsPacked = false;
@@ -1677,10 +1677,10 @@
break;
case angle::FormatID::R8G8B8A8_UNORM:
- internalFormat = GL_RGBA8;
- textureFormatID = angle::FormatID::R8G8B8A8_UNORM;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA8;
+ imageFormatID = angle::FormatID::R8G8B8A8_UNORM;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, false,
@@ -1693,9 +1693,9 @@
case angle::FormatID::R8G8B8A8_UNORM_SRGB:
internalFormat = GL_SRGB8_ALPHA8;
- textureFormatID = angle::FormatID::R8G8B8A8_UNORM_SRGB;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_SRGB;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8B8A8_UNORM_SRGB;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_SRGB;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8B8A8_UNORM_SRGB;
vkBufferFormat = VK_FORMAT_R8G8B8A8_SRGB;
vkBufferFormatIsPacked = false;
@@ -1704,10 +1704,10 @@
break;
case angle::FormatID::R8G8B8A8_USCALED:
- internalFormat = GL_RGBA8_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8G8B8A8_USCALED;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGBA8_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8G8B8A8_USCALED;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8A8_USCALED, VK_FORMAT_R8G8B8A8_USCALED, false,
@@ -1720,9 +1720,9 @@
case angle::FormatID::R8G8B8_SINT:
internalFormat = GL_RGB8I;
- textureFormatID = angle::FormatID::R8G8B8_SINT;
- vkTextureFormat = VK_FORMAT_R8G8B8_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8B8_SINT;
+ vkImageFormat = VK_FORMAT_R8G8B8_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8B8_SINT;
vkBufferFormat = VK_FORMAT_R8G8B8_SINT;
vkBufferFormatIsPacked = false;
@@ -1731,10 +1731,10 @@
break;
case angle::FormatID::R8G8B8_SNORM:
- internalFormat = GL_RGB8_SNORM;
- textureFormatID = angle::FormatID::R8G8B8_SNORM;
- vkTextureFormat = VK_FORMAT_R8G8B8_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB8_SNORM;
+ imageFormatID = angle::FormatID::R8G8B8_SNORM;
+ vkImageFormat = VK_FORMAT_R8G8B8_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8_SNORM, VK_FORMAT_R8G8B8_SNORM, false,
@@ -1746,10 +1746,10 @@
break;
case angle::FormatID::R8G8B8_SSCALED:
- internalFormat = GL_RGB8_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8G8B8_SSCALED;
- vkTextureFormat = VK_FORMAT_R8G8B8_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB8_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8G8B8_SSCALED;
+ vkImageFormat = VK_FORMAT_R8G8B8_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8_SSCALED, VK_FORMAT_R8G8B8_SSCALED, false,
@@ -1762,9 +1762,9 @@
case angle::FormatID::R8G8B8_UINT:
internalFormat = GL_RGB8UI;
- textureFormatID = angle::FormatID::R8G8B8_UINT;
- vkTextureFormat = VK_FORMAT_R8G8B8_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8B8_UINT;
+ vkImageFormat = VK_FORMAT_R8G8B8_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8B8_UINT;
vkBufferFormat = VK_FORMAT_R8G8B8_UINT;
vkBufferFormatIsPacked = false;
@@ -1773,10 +1773,10 @@
break;
case angle::FormatID::R8G8B8_UNORM:
- internalFormat = GL_RGB8;
- textureFormatID = angle::FormatID::R8G8B8A8_UNORM;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_UNORM;
- textureInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
+ internalFormat = GL_RGB8;
+ imageFormatID = angle::FormatID::R8G8B8A8_UNORM;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_UNORM;
+ imageInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8_UNORM, VK_FORMAT_R8G8B8_UNORM, false,
@@ -1788,22 +1788,22 @@
break;
case angle::FormatID::R8G8B8_UNORM_SRGB:
- internalFormat = GL_SRGB8;
- textureFormatID = angle::FormatID::R8G8B8A8_UNORM_SRGB;
- vkTextureFormat = VK_FORMAT_R8G8B8A8_SRGB;
- textureInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
- bufferFormatID = angle::FormatID::R8G8B8_UNORM_SRGB;
- vkBufferFormat = VK_FORMAT_R8G8B8_SRGB;
- vkBufferFormatIsPacked = false;
- vertexLoadFunction = CopyNativeVertexData<GLubyte, 3, 3, 0>;
+ internalFormat = GL_SRGB8;
+ imageFormatID = angle::FormatID::R8G8B8A8_UNORM_SRGB;
+ vkImageFormat = VK_FORMAT_R8G8B8A8_SRGB;
+ imageInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
+ bufferFormatID = angle::FormatID::R8G8B8_UNORM_SRGB;
+ vkBufferFormat = VK_FORMAT_R8G8B8_SRGB;
+ vkBufferFormatIsPacked = false;
+ vertexLoadFunction = CopyNativeVertexData<GLubyte, 3, 3, 0>;
vertexLoadRequiresConversion = false;
break;
case angle::FormatID::R8G8B8_USCALED:
- internalFormat = GL_RGB8_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8G8B8_USCALED;
- vkTextureFormat = VK_FORMAT_R8G8B8_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RGB8_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8G8B8_USCALED;
+ vkImageFormat = VK_FORMAT_R8G8B8_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8B8_USCALED, VK_FORMAT_R8G8B8_USCALED, false,
@@ -1816,9 +1816,9 @@
case angle::FormatID::R8G8_SINT:
internalFormat = GL_RG8I;
- textureFormatID = angle::FormatID::R8G8_SINT;
- vkTextureFormat = VK_FORMAT_R8G8_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8_SINT;
+ vkImageFormat = VK_FORMAT_R8G8_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8_SINT;
vkBufferFormat = VK_FORMAT_R8G8_SINT;
vkBufferFormatIsPacked = false;
@@ -1827,10 +1827,10 @@
break;
case angle::FormatID::R8G8_SNORM:
- internalFormat = GL_RG8_SNORM;
- textureFormatID = angle::FormatID::R8G8_SNORM;
- vkTextureFormat = VK_FORMAT_R8G8_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG8_SNORM;
+ imageFormatID = angle::FormatID::R8G8_SNORM;
+ vkImageFormat = VK_FORMAT_R8G8_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8_SNORM, VK_FORMAT_R8G8_SNORM, false,
@@ -1842,10 +1842,10 @@
break;
case angle::FormatID::R8G8_SSCALED:
- internalFormat = GL_RG8_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8G8_SSCALED;
- vkTextureFormat = VK_FORMAT_R8G8_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG8_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8G8_SSCALED;
+ vkImageFormat = VK_FORMAT_R8G8_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8_SSCALED, VK_FORMAT_R8G8_SSCALED, false,
@@ -1858,9 +1858,9 @@
case angle::FormatID::R8G8_UINT:
internalFormat = GL_RG8UI;
- textureFormatID = angle::FormatID::R8G8_UINT;
- vkTextureFormat = VK_FORMAT_R8G8_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8G8_UINT;
+ vkImageFormat = VK_FORMAT_R8G8_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8G8_UINT;
vkBufferFormat = VK_FORMAT_R8G8_UINT;
vkBufferFormatIsPacked = false;
@@ -1869,10 +1869,10 @@
break;
case angle::FormatID::R8G8_UNORM:
- internalFormat = GL_RG8;
- textureFormatID = angle::FormatID::R8G8_UNORM;
- vkTextureFormat = VK_FORMAT_R8G8_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG8;
+ imageFormatID = angle::FormatID::R8G8_UNORM;
+ vkImageFormat = VK_FORMAT_R8G8_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8_UNORM, VK_FORMAT_R8G8_UNORM, false,
@@ -1884,10 +1884,10 @@
break;
case angle::FormatID::R8G8_USCALED:
- internalFormat = GL_RG8_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8G8_USCALED;
- vkTextureFormat = VK_FORMAT_R8G8_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_RG8_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8G8_USCALED;
+ vkImageFormat = VK_FORMAT_R8G8_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8G8_USCALED, VK_FORMAT_R8G8_USCALED, false,
@@ -1900,9 +1900,9 @@
case angle::FormatID::R8_SINT:
internalFormat = GL_R8I;
- textureFormatID = angle::FormatID::R8_SINT;
- vkTextureFormat = VK_FORMAT_R8_SINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8_SINT;
+ vkImageFormat = VK_FORMAT_R8_SINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8_SINT;
vkBufferFormat = VK_FORMAT_R8_SINT;
vkBufferFormatIsPacked = false;
@@ -1911,10 +1911,10 @@
break;
case angle::FormatID::R8_SNORM:
- internalFormat = GL_R8_SNORM;
- textureFormatID = angle::FormatID::R8_SNORM;
- vkTextureFormat = VK_FORMAT_R8_SNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R8_SNORM;
+ imageFormatID = angle::FormatID::R8_SNORM;
+ vkImageFormat = VK_FORMAT_R8_SNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8_SNORM, VK_FORMAT_R8_SNORM, false,
@@ -1926,10 +1926,10 @@
break;
case angle::FormatID::R8_SSCALED:
- internalFormat = GL_R8_SSCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8_SSCALED;
- vkTextureFormat = VK_FORMAT_R8_SSCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R8_SSCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8_SSCALED;
+ vkImageFormat = VK_FORMAT_R8_SSCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8_SSCALED, VK_FORMAT_R8_SSCALED, false,
@@ -1942,9 +1942,9 @@
case angle::FormatID::R8_UINT:
internalFormat = GL_R8UI;
- textureFormatID = angle::FormatID::R8_UINT;
- vkTextureFormat = VK_FORMAT_R8_UINT;
- textureInitializerFunction = nullptr;
+ imageFormatID = angle::FormatID::R8_UINT;
+ vkImageFormat = VK_FORMAT_R8_UINT;
+ imageInitializerFunction = nullptr;
bufferFormatID = angle::FormatID::R8_UINT;
vkBufferFormat = VK_FORMAT_R8_UINT;
vkBufferFormatIsPacked = false;
@@ -1953,10 +1953,10 @@
break;
case angle::FormatID::R8_UNORM:
- internalFormat = GL_R8;
- textureFormatID = angle::FormatID::R8_UNORM;
- vkTextureFormat = VK_FORMAT_R8_UNORM;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R8;
+ imageFormatID = angle::FormatID::R8_UNORM;
+ vkImageFormat = VK_FORMAT_R8_UNORM;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8_UNORM, VK_FORMAT_R8_UNORM, false,
@@ -1968,10 +1968,10 @@
break;
case angle::FormatID::R8_USCALED:
- internalFormat = GL_R8_USCALED_ANGLEX;
- textureFormatID = angle::FormatID::R8_USCALED;
- vkTextureFormat = VK_FORMAT_R8_USCALED;
- textureInitializerFunction = nullptr;
+ internalFormat = GL_R8_USCALED_ANGLEX;
+ imageFormatID = angle::FormatID::R8_USCALED;
+ vkImageFormat = VK_FORMAT_R8_USCALED;
+ imageInitializerFunction = nullptr;
{
static constexpr BufferFormatInitInfo kInfo[] = {
{angle::FormatID::R8_USCALED, VK_FORMAT_R8_USCALED, false,
@@ -1989,12 +1989,12 @@
case angle::FormatID::S8_UINT:
internalFormat = GL_STENCIL_INDEX8;
{
- static constexpr TextureFormatInitInfo kInfo[] = {
+ static constexpr ImageFormatInitInfo kInfo[] = {
{angle::FormatID::S8_UINT, VK_FORMAT_S8_UINT, nullptr},
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
{angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
{angle::FormatID::S8_UINT, VK_FORMAT_S8_UINT, nullptr}};
- initTextureFallback(renderer, kInfo, ArraySize(kInfo));
+ initImageFallback(renderer, kInfo, ArraySize(kInfo));
}
bufferFormatID = angle::FormatID::S8_UINT;
vkBufferFormat = VK_FORMAT_S8_UINT;
diff --git a/src/libANGLE/renderer/vulkan/vk_format_utils.cpp b/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
index d668714..cfd2500 100644
--- a/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
@@ -36,13 +36,13 @@
const VkPhysicalDeviceLimits &physicalDeviceLimits =
renderer->getPhysicalDeviceProperties().limits;
bool hasColorAttachmentFeatureBit =
- renderer->hasTextureFormatFeatureBits(format, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT);
- bool hasDepthAttachmentFeatureBit = renderer->hasTextureFormatFeatureBits(
- format, VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT);
+ renderer->hasImageFormatFeatureBits(format, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT);
+ bool hasDepthAttachmentFeatureBit =
+ renderer->hasImageFormatFeatureBits(format, VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT);
outTextureCaps->texturable =
- renderer->hasTextureFormatFeatureBits(format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT);
- outTextureCaps->filterable = renderer->hasTextureFormatFeatureBits(
+ renderer->hasImageFormatFeatureBits(format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT);
+ outTextureCaps->filterable = renderer->hasImageFormatFeatureBits(
format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT);
outTextureCaps->textureAttachment =
hasColorAttachmentFeatureBit || hasDepthAttachmentFeatureBit;
@@ -103,11 +103,11 @@
Format::Format()
: angleFormatID(angle::FormatID::NONE),
internalFormat(GL_NONE),
- textureFormatID(angle::FormatID::NONE),
- vkTextureFormat(VK_FORMAT_UNDEFINED),
+ imageFormatID(angle::FormatID::NONE),
+ vkImageFormat(VK_FORMAT_UNDEFINED),
bufferFormatID(angle::FormatID::NONE),
vkBufferFormat(VK_FORMAT_UNDEFINED),
- textureInitializerFunction(nullptr),
+ imageInitializerFunction(nullptr),
textureLoadFunctions(),
vertexLoadRequiresConversion(false),
vkBufferFormatIsPacked(false),
@@ -116,17 +116,15 @@
vkFormatIsUnsigned(false)
{}
-void Format::initTextureFallback(RendererVk *renderer,
- const TextureFormatInitInfo *info,
- int numInfo)
+void Format::initImageFallback(RendererVk *renderer, const ImageFormatInitInfo *info, int numInfo)
{
size_t skip = renderer->getFeatures().forceFallbackFormat ? 1 : 0;
int i = FindSupportedFormat(renderer, info + skip, numInfo - skip, HasFullTextureFormatSupport);
i += skip;
- textureFormatID = info[i].format;
- vkTextureFormat = info[i].vkFormat;
- textureInitializerFunction = info[i].initializer;
+ imageFormatID = info[i].format;
+ vkImageFormat = info[i].vkFormat;
+ imageInitializerFunction = info[i].initializer;
}
void Format::initBufferFallback(RendererVk *renderer, const BufferFormatInitInfo *info, int numInfo)
@@ -163,7 +161,7 @@
// - else blockSize % 4 != 0 gives a 2x multiplier
// - else there's no multiplier.
//
- const angle::Format &format = textureFormat();
+ const angle::Format &format = imageFormat();
if (!format.isBlock)
{
@@ -178,10 +176,10 @@
return alignment;
}
-bool Format::hasEmulatedChannels() const
+bool Format::hasEmulatedImageChannels() const
{
const angle::Format &angleFmt = angleFormat();
- const angle::Format &textureFmt = textureFormat();
+ const angle::Format &textureFmt = imageFormat();
return (angleFmt.alphaBits == 0 && textureFmt.alphaBits > 0) ||
(angleFmt.blueBits == 0 && textureFmt.blueBits > 0) ||
@@ -228,13 +226,12 @@
format.vkBufferFormat, VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT);
gl::TextureCaps textureCaps;
- FillTextureFormatCaps(renderer, format.vkTextureFormat, &textureCaps);
+ FillTextureFormatCaps(renderer, format.vkImageFormat, &textureCaps);
outTextureCapsMap->set(formatID, textureCaps);
if (textureCaps.texturable)
{
- format.textureLoadFunctions =
- GetLoadFunctionsMap(internalFormat, format.textureFormatID);
+ format.textureLoadFunctions = GetLoadFunctionsMap(internalFormat, format.imageFormatID);
}
if (angleFormat.isBlock)
@@ -252,8 +249,8 @@
VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
constexpr uint32_t kBitsDepth = VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT;
- return renderer->hasTextureFormatFeatureBits(vkFormat, kBitsColor) ||
- renderer->hasTextureFormatFeatureBits(vkFormat, kBitsDepth);
+ return renderer->hasImageFormatFeatureBits(vkFormat, kBitsColor) ||
+ renderer->hasImageFormatFeatureBits(vkFormat, kBitsDepth);
}
size_t GetVertexInputAlignment(const vk::Format &format)
diff --git a/src/libANGLE/renderer/vulkan/vk_format_utils.h b/src/libANGLE/renderer/vulkan/vk_format_utils.h
index 8a4d6f2..d050132 100644
--- a/src/libANGLE/renderer/vulkan/vk_format_utils.h
+++ b/src/libANGLE/renderer/vulkan/vk_format_utils.h
@@ -34,7 +34,7 @@
// VkFormat values in range [0, kNumVkFormats) are used as indices in various tables.
constexpr uint32_t kNumVkFormats = 185;
-struct TextureFormatInitInfo final
+struct ImageFormatInitInfo final
{
angle::FormatID format;
VkFormat vkFormat;
@@ -56,32 +56,42 @@
bool valid() const { return internalFormat != 0; }
- // This is an auto-generated method in vk_format_table_autogen.cpp.
- void initialize(RendererVk *renderer, const angle::Format &angleFormat);
-
- void initTextureFallback(RendererVk *renderer, const TextureFormatInitInfo *info, int numInfo);
- void initBufferFallback(RendererVk *renderer, const BufferFormatInitInfo *info, int numInfo);
-
+ // The ANGLE format is the front-end format.
const angle::Format &angleFormat() const { return angle::Format::Get(angleFormatID); }
- const angle::Format &textureFormat() const { return angle::Format::Get(textureFormatID); }
+
+ // The Image format is the VkFormat used to implement the front-end format for VkImages.
+ const angle::Format &imageFormat() const { return angle::Format::Get(imageFormatID); }
+
+ // The Buffer format is the VkFormat used to implement the front-end format for VkBuffers.
const angle::Format &bufferFormat() const { return angle::Format::Get(bufferFormatID); }
- // Get buffer alignment for image-copy operations (to or from a buffer).
+ // Returns OpenGL format information for the front-end format.
const gl::InternalFormat &getInternalFormatInfo(GLenum type) const
{
return gl::GetInternalFormatInfo(internalFormat, type);
}
+
+ // Get buffer alignment for image-copy operations (to or from a buffer).
size_t getImageCopyBufferAlignment() const;
- bool hasEmulatedChannels() const;
+ // Returns true if the Image format has more channels than the ANGLE format.
+ bool hasEmulatedImageChannels() const;
+
+ // This is an auto-generated method in vk_format_table_autogen.cpp.
+ void initialize(RendererVk *renderer, const angle::Format &angleFormat);
+
+ // These are used in the format table init.
+ void initImageFallback(RendererVk *renderer, const ImageFormatInitInfo *info, int numInfo);
+ void initBufferFallback(RendererVk *renderer, const BufferFormatInitInfo *info, int numInfo);
angle::FormatID angleFormatID;
GLenum internalFormat;
- angle::FormatID textureFormatID;
- VkFormat vkTextureFormat;
+ angle::FormatID imageFormatID;
+ VkFormat vkImageFormat;
angle::FormatID bufferFormatID;
VkFormat vkBufferFormat;
- InitializeTextureDataFunction textureInitializerFunction;
+
+ InitializeTextureDataFunction imageInitializerFunction;
LoadFunctionMap textureLoadFunctions;
VertexCopyFunction vertexLoadFunction;
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
index 2035b5d..5c9f059 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -1324,7 +1324,7 @@
imageInfo.pNext = externalImageCreateInfo;
imageInfo.flags = GetImageCreateFlags(textureType);
imageInfo.imageType = gl_vk::GetImageType(textureType);
- imageInfo.format = format.vkTextureFormat;
+ imageInfo.format = format.vkImageFormat;
imageInfo.extent.width = static_cast<uint32_t>(extents.width);
imageInfo.extent.height = static_cast<uint32_t>(extents.height);
imageInfo.extent.depth = 1;
@@ -1419,7 +1419,7 @@
viewInfo.flags = 0;
viewInfo.image = mImage.getHandle();
viewInfo.viewType = gl_vk::GetImageViewType(textureType);
- viewInfo.format = mFormat->vkTextureFormat;
+ viewInfo.format = mFormat->vkImageFormat;
if (swizzleMap.swizzleRequired())
{
viewInfo.components.r = gl_vk::GetSwizzle(swizzleMap.swizzleRed);
@@ -1491,7 +1491,7 @@
imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
imageInfo.flags = 0;
imageInfo.imageType = VK_IMAGE_TYPE_2D;
- imageInfo.format = format.vkTextureFormat;
+ imageInfo.format = format.vkImageFormat;
imageInfo.extent.width = static_cast<uint32_t>(extents.width);
imageInfo.extent.height = static_cast<uint32_t>(extents.height);
imageInfo.extent.depth = 1;
@@ -1516,7 +1516,7 @@
VkImageAspectFlags ImageHelper::getAspectFlags() const
{
- return GetFormatAspectFlags(mFormat->textureFormat());
+ return GetFormatAspectFlags(mFormat->imageFormat());
}
void ImageHelper::dumpResources(Serial serial, std::vector<GarbageObject> *garbageQueue)
@@ -1654,7 +1654,7 @@
if (isDepthStencil)
{
ASSERT(mipLevel == 0 && baseArrayLayer == 0 && layerCount == 1);
- const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(mFormat->textureFormat());
+ const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(mFormat->imageFormat());
clearDepthStencil(aspect, aspect, value.depthStencil, commandBuffer);
}
else
@@ -1828,7 +1828,7 @@
formatInfo.computeSkipBytes(type, inputRowPitch, inputDepthPitch, unpack,
applySkipImages, &inputSkipBytes));
- const angle::Format &storageFormat = vkFormat.textureFormat();
+ const angle::Format &storageFormat = vkFormat.imageFormat();
size_t outputRowPitch;
size_t outputDepthPitch;
@@ -1965,7 +1965,7 @@
RendererVk *renderer = contextVk->getRenderer();
const vk::Format &vkFormat = renderer->getFormat(formatInfo.sizedInternalFormat);
- const angle::Format &storageFormat = vkFormat.textureFormat();
+ const angle::Format &storageFormat = vkFormat.imageFormat();
LoadImageFunctionInfo loadFunction = vkFormat.textureLoadFunctions(formatInfo.type);
size_t outputRowPitch = storageFormat.pixelBytes * clippedRectangle.width;
@@ -2065,7 +2065,7 @@
const gl::ImageIndex &index,
const Format &format)
{
- if (format.hasEmulatedChannels())
+ if (format.hasEmulatedImageChannels())
{
stageSubresourceEmulatedClear(index, format.angleFormat());
ANGLE_TRY(flushAllStagedUpdates(context));
@@ -2124,7 +2124,7 @@
ANGLE_TRY(mStagingBuffer.flush(context));
std::vector<SubresourceUpdate> updatesToKeep;
- const VkImageAspectFlags aspectFlags = GetFormatAspectFlags(mFormat->textureFormat());
+ const VkImageAspectFlags aspectFlags = GetFormatAspectFlags(mFormat->imageFormat());
for (SubresourceUpdate &update : mSubresourceUpdates)
{
diff --git a/src/tests/gl_tests/VulkanFormatTablesTest.cpp b/src/tests/gl_tests/VulkanFormatTablesTest.cpp
index 06a6ea1..af2a854 100644
--- a/src/tests/gl_tests/VulkanFormatTablesTest.cpp
+++ b/src/tests/gl_tests/VulkanFormatTablesTest.cpp
@@ -73,17 +73,17 @@
// Now lets verify that that agaisnt vulkan.
VkFormatProperties formatProperties;
vkGetPhysicalDeviceFormatProperties(renderer->getPhysicalDevice(),
- vkFormat.vkTextureFormat, &formatProperties);
+ vkFormat.vkImageFormat, &formatProperties);
VkImageFormatProperties imageProperties;
// isTexturable?
bool isTexturable =
vkGetPhysicalDeviceImageFormatProperties(
- renderer->getPhysicalDevice(), vkFormat.vkTextureFormat, params.imageType,
+ renderer->getPhysicalDevice(), vkFormat.vkImageFormat, params.imageType,
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_SAMPLED_BIT, params.createFlags,
&imageProperties) == VK_SUCCESS;
- EXPECT_EQ(isTexturable, textureCaps.texturable) << vkFormat.vkTextureFormat;
+ EXPECT_EQ(isTexturable, textureCaps.texturable) << vkFormat.vkImageFormat;
// TODO(jmadill): Support ES3 textures.
@@ -91,23 +91,23 @@
bool isFilterable = (formatProperties.optimalTilingFeatures &
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT) ==
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
- EXPECT_EQ(isFilterable, textureCaps.filterable) << vkFormat.vkTextureFormat;
+ EXPECT_EQ(isFilterable, textureCaps.filterable) << vkFormat.vkImageFormat;
// isRenderable?
const bool isRenderableColor =
(vkGetPhysicalDeviceImageFormatProperties(
- renderer->getPhysicalDevice(), vkFormat.vkTextureFormat, params.imageType,
+ renderer->getPhysicalDevice(), vkFormat.vkImageFormat, params.imageType,
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
params.createFlags, &imageProperties)) == VK_SUCCESS;
const bool isRenderableDepthStencil =
(vkGetPhysicalDeviceImageFormatProperties(
- renderer->getPhysicalDevice(), vkFormat.vkTextureFormat, params.imageType,
+ renderer->getPhysicalDevice(), vkFormat.vkImageFormat, params.imageType,
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
params.createFlags, &imageProperties)) == VK_SUCCESS;
bool isRenderable = isRenderableColor || isRenderableDepthStencil;
- EXPECT_EQ(isRenderable, textureCaps.textureAttachment) << vkFormat.vkTextureFormat;
- EXPECT_EQ(isRenderable, textureCaps.renderbuffer) << vkFormat.vkTextureFormat;
+ EXPECT_EQ(isRenderable, textureCaps.textureAttachment) << vkFormat.vkImageFormat;
+ EXPECT_EQ(isRenderable, textureCaps.renderbuffer) << vkFormat.vkImageFormat;
}
}
}
