Skip to content

A
angle
Commit ba365939 by Jamie Madill Committed by Commit Bot
Options

Rename angle::Format::ID to angle::FormatID.

This allow for predeclaring the enum. It solves some include dependency issues. Bug: angleproject:2729 Change-Id: Ibbbab0796e466c62848404ba277c5f454fd9ac62 Reviewed-on: https://chromium-review.googlesource.com/1142299 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarFrank Henigman <fjhenigman@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent d754eb56
Showing with 138 additions and 147 deletions
scripts/run_code_generation_hashes.json
......@@ -6,15 +6,15 @@
"ANGLE format:src/libANGLE/renderer/angle_format_map.json":
"ea6dfe3ebbc86e04f0d4b9f568ba22ae",
"ANGLE format:src/libANGLE/renderer/gen_angle_format_table.py":
"dcb81c64e2c89f57a7105ab07ef0ffd0",
"68e7a56c323a44170656478f2bcc9ff8",
"ANGLE load functions table:src/libANGLE/renderer/gen_load_functions_table.py":
"3fa54bf0a8911fa0cb102e569f1facbb",
"8afc7eecce2a3ba9f0b4beacb1aa7fe2",
"ANGLE load functions table:src/libANGLE/renderer/load_functions_data.json":
"21a603f6224d3b6cd606b71dca0ae181",
"D3D11 format:src/libANGLE/renderer/angle_format.py":
"b18ca0fe4835114a4a2f54977b19e798",
"D3D11 format:src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py":
"1ab3a192c6bb23a926d0a5d0ed84cbf3",
"15fb2a9b3f81e39a22090bce2f071185",
"D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_data.json":
"fde460b6823388a8f27082ec266ad64f",
"D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_map.json":
......@@ -66,7 +66,7 @@
"Vulkan format:src/libANGLE/renderer/angle_format_map.json":
"ea6dfe3ebbc86e04f0d4b9f568ba22ae",
"Vulkan format:src/libANGLE/renderer/vulkan/gen_vk_format_table.py":
"2ecc99c12cd41bda7107a7d9ffe3786c",
"4a69cb1e69194ca237b94642edbd3f69",
"Vulkan format:src/libANGLE/renderer/vulkan/vk_format_map.json":
"d1afcd16318ca0a19550d713eb23b85a",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
......
src/libANGLE/Caps.cpp
......@@ -102,8 +102,8 @@ TextureCapsMap::~TextureCapsMap()
void TextureCapsMap::insert(GLenum internalFormat, const TextureCaps &caps)
{
angle::Format::ID formatID = angle::Format::InternalFormatToID(internalFormat);
get(formatID) = caps;
angle::FormatID formatID = angle::Format::InternalFormatToID(internalFormat);
get(formatID) = caps;
}
void TextureCapsMap::clear()
......@@ -113,21 +113,21 @@ void TextureCapsMap::clear()
const TextureCaps &TextureCapsMap::get(GLenum internalFormat) const
{
angle::Format::ID formatID = angle::Format::InternalFormatToID(internalFormat);
angle::FormatID formatID = angle::Format::InternalFormatToID(internalFormat);
return get(formatID);
}
const TextureCaps &TextureCapsMap::get(angle::Format::ID formatID) const
const TextureCaps &TextureCapsMap::get(angle::FormatID formatID) const
{
return mFormatData[static_cast<size_t>(formatID)];
}
TextureCaps &TextureCapsMap::get(angle::Format::ID formatID)
TextureCaps &TextureCapsMap::get(angle::FormatID formatID)
{
return mFormatData[static_cast<size_t>(formatID)];
}
void TextureCapsMap::set(angle::Format::ID formatID, const TextureCaps &caps)
void TextureCapsMap::set(angle::FormatID formatID, const TextureCaps &caps)
{
get(formatID) = caps;
}
......
src/libANGLE/Caps.h
......@@ -71,13 +71,13 @@ class TextureCapsMap final : angle::NonCopyable
void clear();
// Prefer using angle::Format methods.
const TextureCaps &get(angle::Format::ID formatID) const;
void set(angle::Format::ID formatID, const TextureCaps &caps);
const TextureCaps &get(angle::FormatID formatID) const;
void set(angle::FormatID formatID, const TextureCaps &caps);
private:
TextureCaps &get(angle::Format::ID formatID);
TextureCaps &get(angle::FormatID formatID);
// Indexed by angle::Format::ID
// Indexed by angle::FormatID
std::array<TextureCaps, angle::kNumANGLEFormats> mFormatData;
};
......
src/libANGLE/formatutils.h
......@@ -314,11 +314,11 @@ struct VertexFormat : private angle::NonCopyable
bool pureInteger;
};
angle::Format::ID GetVertexFormatID(GLenum type,
GLboolean normalized,
GLuint components,
bool pureInteger);
angle::Format::ID GetVertexFormatID(const VertexAttribute &attrib);
angle::FormatID GetVertexFormatID(GLenum type,
GLboolean normalized,
GLuint components,
bool pureInteger);
angle::FormatID GetVertexFormatID(const VertexAttribute &attrib);
VertexFormatType GetVertexFormatType(GLenum type,
GLboolean normalized,
GLuint components,
......
src/libANGLE/renderer/Format.h
......@@ -16,12 +16,11 @@
namespace angle
{
enum class FormatID;
struct Format final : private angle::NonCopyable
{
enum class ID;
constexpr Format(ID id,
constexpr Format(FormatID id,
GLenum glFormat,
GLenum fboFormat,
rx::MipGenerationFunction mipGen,
......@@ -38,12 +37,12 @@ struct Format final : private angle::NonCopyable
GLuint pixelBytes,
bool isBlock);
static const Format &Get(ID id);
static ID InternalFormatToID(GLenum internalFormat);
static const Format &Get(FormatID id);
static FormatID InternalFormatToID(GLenum internalFormat);
constexpr bool hasDepthOrStencilBits() const;
ID id;
FormatID id;
// The closest matching GL internal format for the storage this format uses. Note that this
// may be a different internal format than the one this ANGLE format is used for.
......@@ -75,7 +74,7 @@ struct Format final : private angle::NonCopyable
bool isBlock;
};
constexpr Format::Format(ID id,
constexpr Format::Format(FormatID id,
GLenum glFormat,
GLenum fboFormat,
rx::MipGenerationFunction mipGen,
......@@ -116,6 +115,6 @@ constexpr bool Format::hasDepthOrStencilBits() const
}
} // namespace angle
#include "libANGLE/renderer/Format_ID_autogen.inl"
#include "libANGLE/renderer/FormatID_autogen.inc"
#endif // LIBANGLE_RENDERER_FORMAT_H_
src/libANGLE/renderer/Format_ID_autogen.inl → src/libANGLE/renderer/FormatID_autogen.inc
......@@ -10,7 +10,7 @@
namespace angle
{
enum class Format::ID
enum class FormatID
{
NONE,
A16_FLOAT,
......
src/libANGLE/renderer/d3d/SurfaceD3D.cpp
......@@ -18,8 +18,8 @@
#include "libANGLE/renderer/d3d/SwapChainD3D.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include <tchar.h>
#include <EGL/eglext.h>
#include <tchar.h>
#include <algorithm>
namespace rx
......@@ -101,29 +101,29 @@ egl::Error SurfaceD3D::initialize(const egl::Display *display)
&mColorFormat));
if (mState.attributes.contains(EGL_GL_COLORSPACE))
{
if (mColorFormat->id != angle::Format::ID::R8G8B8A8_TYPELESS &&
mColorFormat->id != angle::Format::ID::B8G8R8A8_TYPELESS)
if (mColorFormat->id != angle::FormatID::R8G8B8A8_TYPELESS &&
mColorFormat->id != angle::FormatID::B8G8R8A8_TYPELESS)
{
return egl::EglBadMatch()
<< "EGL_GL_COLORSPACE may only be specified for TYPELESS textures";
}
}
if (mColorFormat->id == angle::Format::ID::R8G8B8A8_TYPELESS)
if (mColorFormat->id == angle::FormatID::R8G8B8A8_TYPELESS)
{
EGLAttrib colorspace =
mState.attributes.get(EGL_GL_COLORSPACE, EGL_GL_COLORSPACE_LINEAR);
if (colorspace == EGL_GL_COLORSPACE_SRGB)
{
mColorFormat = &angle::Format::Get(angle::Format::ID::R8G8B8A8_TYPELESS_SRGB);
mColorFormat = &angle::Format::Get(angle::FormatID::R8G8B8A8_TYPELESS_SRGB);
}
}
if (mColorFormat->id == angle::Format::ID::B8G8R8A8_TYPELESS)
if (mColorFormat->id == angle::FormatID::B8G8R8A8_TYPELESS)
{
EGLAttrib colorspace =
mState.attributes.get(EGL_GL_COLORSPACE, EGL_GL_COLORSPACE_LINEAR);
if (colorspace == EGL_GL_COLORSPACE_SRGB)
{
mColorFormat = &angle::Format::Get(angle::Format::ID::B8G8R8A8_TYPELESS_SRGB);
mColorFormat = &angle::Format::Get(angle::FormatID::B8G8R8A8_TYPELESS_SRGB);
}
}
mRenderTargetFormat = mColorFormat->fboImplementationInternalFormat;
......@@ -171,13 +171,13 @@ egl::Error SurfaceD3D::resetSwapChain(const egl::Display *display)
return egl::EglBadSurface() << "Could not retrieve the window dimensions";
}
width = windowRect.right - windowRect.left;
width = windowRect.right - windowRect.left;
height = windowRect.bottom - windowRect.top;
}
else
{
// non-window surface - size is determined at creation
width = mWidth;
width = mWidth;
height = mHeight;
}
......@@ -221,7 +221,7 @@ egl::Error SurfaceD3D::resizeSwapChain(DisplayD3D *displayD3D,
return egl::Error(status);
}
mWidth = backbufferWidth;
mWidth = backbufferWidth;
mHeight = backbufferHeight;
return egl::NoError();
......@@ -247,8 +247,8 @@ egl::Error SurfaceD3D::resetSwapChain(DisplayD3D *displayD3D,
return egl::Error(status);
}
mWidth = backbufferWidth;
mHeight = backbufferHeight;
mWidth = backbufferWidth;
mHeight = backbufferHeight;
mSwapIntervalDirty = false;
return egl::NoError();
......@@ -298,23 +298,24 @@ egl::Error SurfaceD3D::swapRect(DisplayD3D *displayD3D,
egl::Error SurfaceD3D::checkForOutOfDateSwapChain(DisplayD3D *displayD3D)
{
RECT client;
int clientWidth = getWidth();
int clientWidth = getWidth();
int clientHeight = getHeight();
bool sizeDirty = false;
bool sizeDirty = false;
if (!mFixedSize && !mNativeWindow->isIconic())
{
// The window is automatically resized to 150x22 when it's minimized, but the swapchain shouldn't be resized
// because that's not a useful size to render to.
// The window is automatically resized to 150x22 when it's minimized, but the swapchain
// shouldn't be resized because that's not a useful size to render to.
if (!mNativeWindow->getClientRect(&client))
{
UNREACHABLE();
return egl::NoError();
}
// Grow the buffer now, if the window has grown. We need to grow now to avoid losing information.
clientWidth = client.right - client.left;
// Grow the buffer now, if the window has grown. We need to grow now to avoid losing
// information.
clientWidth = client.right - client.left;
clientHeight = client.bottom - client.top;
sizeDirty = clientWidth != getWidth() || clientHeight != getHeight();
sizeDirty = clientWidth != getWidth() || clientHeight != getHeight();
}
if (mSwapIntervalDirty)
......@@ -357,7 +358,7 @@ void SurfaceD3D::setSwapInterval(EGLint interval)
return;
}
mSwapInterval = interval;
mSwapInterval = interval;
mSwapIntervalDirty = true;
}
......@@ -392,7 +393,8 @@ egl::Error SurfaceD3D::querySurfacePointerANGLE(EGLint attribute, void **value)
{
*value = mSwapChain->getKeyedMutex();
}
else UNREACHABLE();
else
UNREACHABLE();
return egl::NoError();
}
......@@ -437,13 +439,7 @@ WindowSurfaceD3D::WindowSurfaceD3D(const egl::SurfaceState &state,
egl::Display *display,
EGLNativeWindowType window,
const egl::AttributeMap &attribs)
: SurfaceD3D(state,
renderer,
display,
window,
0,
static_cast<EGLClientBuffer>(0),
attribs)
: SurfaceD3D(state, renderer, display, window, 0, static_cast<EGLClientBuffer>(0), attribs)
{
}
......
src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
......@@ -9,10 +9,10 @@
#include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
namespace rx
......@@ -30,7 +30,7 @@ bool GetTextureProperties(ID3D11Resource *resource, unsigned int *mipLevels, uns
SafeRelease(texture1D);
*mipLevels = texDesc.MipLevels;
*samples = 0;
*samples = 0;
return true;
}
......@@ -43,7 +43,7 @@ bool GetTextureProperties(ID3D11Resource *resource, unsigned int *mipLevels, uns
SafeRelease(texture2D);
*mipLevels = texDesc.MipLevels;
*samples = texDesc.SampleDesc.Count > 1 ? texDesc.SampleDesc.Count : 0;
*samples = texDesc.SampleDesc.Count > 1 ? texDesc.SampleDesc.Count : 0;
return true;
}
......@@ -56,7 +56,7 @@ bool GetTextureProperties(ID3D11Resource *resource, unsigned int *mipLevels, uns
SafeRelease(texture3D);
*mipLevels = texDesc.MipLevels;
*samples = 0;
*samples = 0;
return true;
}
......@@ -69,7 +69,7 @@ unsigned int GetRTVSubresourceIndex(ID3D11Resource *resource, ID3D11RenderTarget
D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
view->GetDesc(&rtvDesc);
unsigned int mipSlice = 0;
unsigned int mipSlice = 0;
unsigned int arraySlice = 0;
switch (rtvDesc.ViewDimension)
......@@ -130,7 +130,7 @@ unsigned int GetDSVSubresourceIndex(ID3D11Resource *resource, ID3D11DepthStencil
D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
view->GetDesc(&dsvDesc);
unsigned int mipSlice = 0;
unsigned int mipSlice = 0;
unsigned int arraySlice = 0;
switch (dsvDesc.ViewDimension)
......@@ -229,7 +229,7 @@ TextureRenderTarget11::TextureRenderTarget11(d3d11::RenderTargetView &&rtv,
{
mSubresourceIndex = GetRTVSubresourceIndex(mTexture.get(), mRenderTarget.get());
}
ASSERT(mFormatSet.formatID != angle::Format::ID::NONE || mWidth == 0 || mHeight == 0);
ASSERT(mFormatSet.formatID != angle::FormatID::NONE || mWidth == 0 || mHeight == 0);
}
TextureRenderTarget11::TextureRenderTarget11(d3d11::DepthStencilView &&dsv,
......@@ -258,7 +258,7 @@ TextureRenderTarget11::TextureRenderTarget11(d3d11::DepthStencilView &&dsv,
{
mSubresourceIndex = GetDSVSubresourceIndex(mTexture.get(), mDepthStencil.get());
}
ASSERT(mFormatSet.formatID != angle::Format::ID::NONE || mWidth == 0 || mHeight == 0);
ASSERT(mFormatSet.formatID != angle::FormatID::NONE || mWidth == 0 || mHeight == 0);
}
TextureRenderTarget11::~TextureRenderTarget11()
......
src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
......@@ -141,7 +141,7 @@ def get_blit_srv_format(angle_format):
format_entry_template = """{space}{{
{space} static constexpr Format info({internalFormat},
{space} angle::Format::ID::{formatName},
{space} angle::FormatID::{formatName},
{space} {texFormat},
{space} {srvFormat},
{space} {uavFormat},
......@@ -157,7 +157,7 @@ format_entry_template = """{space}{{
split_format_entry_template = """{space} {condition}
{space} {{
{space} static constexpr Format info({internalFormat},
{space} angle::Format::ID::{formatName},
{space} angle::FormatID::{formatName},
{space} {texFormat},
{space} {srvFormat},
{space} {uavFormat},
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
......@@ -15,8 +15,8 @@
#include "common/angleutils.h"
#include "common/platform.h"
#include "libANGLE/renderer/Format.h"
#include "libANGLE/renderer/renderer_utils.h"
#include "libANGLE/renderer/d3d/formatutilsD3D.h"
#include "libANGLE/renderer/renderer_utils.h"
namespace rx
{
......@@ -34,7 +34,7 @@ struct Format final : private angle::NonCopyable
{
constexpr Format();
constexpr Format(GLenum internalFormat,
angle::Format::ID formatID,
angle::FormatID formatID,
DXGI_FORMAT texFormat,
DXGI_FORMAT srvFormat,
DXGI_FORMAT uavFormat,
......@@ -51,7 +51,7 @@ struct Format final : private angle::NonCopyable
const angle::Format &format() const;
GLenum internalFormat;
angle::Format::ID formatID;
angle::FormatID formatID;
DXGI_FORMAT texFormat;
DXGI_FORMAT srvFormat;
......@@ -68,7 +68,7 @@ struct Format final : private angle::NonCopyable
constexpr Format::Format()
: internalFormat(GL_NONE),
formatID(angle::Format::ID::NONE),
formatID(angle::FormatID::NONE),
texFormat(DXGI_FORMAT_UNKNOWN),
srvFormat(DXGI_FORMAT_UNKNOWN),
uavFormat(DXGI_FORMAT_UNKNOWN),
......@@ -81,7 +81,7 @@ constexpr Format::Format()
}
constexpr Format::Format(GLenum internalFormat,
angle::Format::ID formatID,
angle::FormatID formatID,
DXGI_FORMAT texFormat,
DXGI_FORMAT srvFormat,
DXGI_FORMAT uavFormat,
......
src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
......@@ -780,7 +780,7 @@ egl::Error Renderer9::getD3DTextureInfo(const egl::Config *config,
if (angleFormat)
{
const auto &d3dFormatInfo = d3d9::GetD3DFormatInfo(desc.Format);
ASSERT(d3dFormatInfo.info().id != angle::Format::ID::NONE);
ASSERT(d3dFormatInfo.info().id != angle::FormatID::NONE);
*angleFormat = &d3dFormatInfo.info();
}
......@@ -1004,7 +1004,7 @@ gl::Error Renderer9::setTexture(const gl::Context *context,
gl::Texture *texture)
{
int d3dSamplerOffset = (type == gl::ShaderType::Fragment) ? 0 : D3DVERTEXTEXTURESAMPLER0;
int d3dSampler = index + d3dSamplerOffset;
int d3dSampler = index + d3dSamplerOffset;
IDirect3DBaseTexture9 *d3dTexture = nullptr;
bool forceSetTexture = false;
......
src/libANGLE/renderer/d3d/d3d9/formatutils9.h
......@@ -41,7 +41,7 @@ struct D3DFormat
GLuint luminanceBits,
GLuint depthBits,
GLuint stencilBits,
angle::Format::ID formatID);
angle::FormatID formatID);
const angle::Format &info() const { return angle::Format::Get(formatID); }
......@@ -58,7 +58,7 @@ struct D3DFormat
GLuint depthBits;
GLuint stencilBits;
angle::Format::ID formatID;
angle::FormatID formatID;
};
const D3DFormat &GetD3DFormatInfo(D3DFORMAT format);
......@@ -73,7 +73,8 @@ struct VertexFormat
D3DDECLTYPE nativeFormat;
GLenum componentType;
};
const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, gl::VertexFormatType vertexFormatType);
const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes,
gl::VertexFormatType vertexFormatType);
struct TextureFormat
{
......@@ -87,9 +88,7 @@ struct TextureFormat
LoadImageFunction loadFunction;
};
const TextureFormat &GetTextureFormatInfo(GLenum internalFormat);
}
}
#endif // LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_
#endif // LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_
src/libANGLE/renderer/gen_angle_format_table.py
......@@ -27,7 +27,7 @@ template_autogen_h = """// GENERATED FILE - DO NOT EDIT.
namespace angle
{{
enum class Format::ID
enum class FormatID
{{
{angle_format_enum}
}};
......@@ -63,12 +63,12 @@ static constexpr rx::FastCopyFunctionMap NoCopyFunctions;
constexpr Format g_formatInfoTable[] = {{
// clang-format off
{{ Format::ID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0, 0, false }},
{{ FormatID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0, 0, false }},
{angle_format_info_cases} // clang-format on
}};
// static
Format::ID Format::InternalFormatToID(GLenum internalFormat)
FormatID Format::InternalFormatToID(GLenum internalFormat)
{{
switch (internalFormat)
{{
......@@ -77,7 +77,7 @@ Format::ID Format::InternalFormatToID(GLenum internalFormat)
}}
// static
const Format &Format::Get(ID id)
const Format &Format::Get(FormatID id)
{{
return g_formatInfoTable[static_cast<size_t>(id)];
}}
......@@ -146,7 +146,7 @@ def get_color_write_function(angle_format):
return 'WriteColor<' + channel_struct + ', '+ write_component_type + '>'
format_entry_template = """ {{ Format::ID::{id}, {glInternalFormat}, {fboImplementationInternalFormat}, {mipGenerationFunction}, {fastCopyFunctions}, {colorReadFunction}, {colorWriteFunction}, {namedComponentType}, {R}, {G}, {B}, {A}, {D}, {S}, {pixelBytes}, {isBlock} }},
format_entry_template = """ {{ FormatID::{id}, {glInternalFormat}, {fboImplementationInternalFormat}, {mipGenerationFunction}, {fastCopyFunctions}, {colorReadFunction}, {colorWriteFunction}, {namedComponentType}, {R}, {G}, {B}, {A}, {D}, {S}, {pixelBytes}, {isBlock} }},
"""
def get_named_component_type(component_type):
......@@ -234,7 +234,7 @@ def gen_enum_string(all_angle):
return enum_data
case_template = """ case {gl_format}:
return Format::ID::{angle_format};
return FormatID::{angle_format};
"""
def gen_map_switch_string(gl_to_angle):
......@@ -245,7 +245,7 @@ def gen_map_switch_string(gl_to_angle):
gl_format=gl_format,
angle_format=angle_format)
switch_data += " default:\n"
switch_data += " return Format::ID::NONE;"
switch_data += " return FormatID::NONE;"
return switch_data;
gl_to_angle = angle_format.load_forward_table('angle_format_map.json')
......@@ -275,6 +275,6 @@ output_h = template_autogen_h.format(
angle_format_enum = enum_data,
data_source_name = data_source_name,
num_angle_formats = num_angle_formats)
with open('Format_ID_autogen.inl', 'wt') as out_file:
with open('FormatID_autogen.inc', 'wt') as out_file:
out_file.write(output_h)
out_file.close()
src/libANGLE/renderer/gen_load_functions_table.py
......@@ -75,7 +75,7 @@ void UnreachableLoadFunction(size_t width,
{load_functions_data}}} // namespace
LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, Format::ID {angle_format})
LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, FormatID {angle_format})
{{
// clang-format off
switch ({internal_format})
......@@ -151,7 +151,7 @@ def parse_json(json_data):
func_name = load_functions_name(internal_format, angle_format)
# Main case statements
table_data += s + 'case Format::ID::' + angle_format + ':\n'
table_data += s + 'case FormatID::' + angle_format + ':\n'
table_data += s + ' return ' + func_name + ';\n'
if angle_format_unknown in angle_to_type_map:
......
src/libANGLE/renderer/gl/BlitGL.cpp
......@@ -606,7 +606,6 @@ gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
uint8_t *sourceMemory = buffer->data();
uint8_t *destMemory = buffer->data() + sourceBufferSize;
GLenum readPixelsFormat = GL_NONE;
ColorReadFunction readFunction = nullptr;
if (sourceComponentType == GL_UNSIGNED_INT)
......@@ -628,7 +627,7 @@ gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
mFunctions->readPixels(sourceArea.x, sourceArea.y, sourceArea.width, sourceArea.height,
readPixelsFormat, GL_UNSIGNED_BYTE, sourceMemory);
angle::Format::ID destFormatID =
angle::FormatID destFormatID =
angle::Format::InternalFormatToID(destInternalFormatInfo.sizedInternalFormat);
const auto &destFormatInfo = angle::Format::Get(destFormatID);
CopyImageCHROMIUM(
......
src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
......@@ -134,7 +134,7 @@ egl::Error GetD3D9TextureInfo(EGLenum buftype,
if (angleFormat)
{
const auto &d3dFormatInfo = d3d9::GetD3DFormatInfo(surfaceDesc.Format);
ASSERT(d3dFormatInfo.info().id != angle::Format::ID::NONE);
ASSERT(d3dFormatInfo.info().id != angle::FormatID::NONE);
*angleFormat = &d3dFormatInfo.info();
}
......@@ -306,8 +306,8 @@ egl::Error D3DTextureSurfaceWGL::initialize(const egl::Display *display)
{
if (mState.attributes.contains(EGL_GL_COLORSPACE))
{
if (mColorFormat->id != angle::Format::ID::R8G8B8A8_TYPELESS &&
mColorFormat->id != angle::Format::ID::B8G8R8A8_TYPELESS)
if (mColorFormat->id != angle::FormatID::R8G8B8A8_TYPELESS &&
mColorFormat->id != angle::FormatID::B8G8R8A8_TYPELESS)
{
return egl::EglBadMatch()
<< "EGL_GL_COLORSPACE may only be specified for TYPELESS textures";
......
src/libANGLE/renderer/load_functions_table.h
......@@ -14,9 +14,7 @@
namespace angle
{
rx::LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleFormat);
rx::LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, FormatID angleFormat);
} // namespace angle
#endif // LIBANGLE_RENDERER_LOADFUNCTIONSTABLE_H_
src/libANGLE/renderer/vulkan/FramebufferVk.cpp
......@@ -498,9 +498,9 @@ gl::Error FramebufferVk::blit(const gl::Context *context,
const gl::State &glState = context->getGLState();
const gl::Framebuffer *sourceFramebuffer = glState.getReadFramebuffer();
bool blitColorBuffer = (mask & GL_COLOR_BUFFER_BIT) != 0;
bool blitDepthBuffer = (mask & GL_DEPTH_BUFFER_BIT) != 0;
bool blitStencilBuffer = (mask & GL_STENCIL_BUFFER_BIT) != 0;
bool blitColorBuffer = (mask & GL_COLOR_BUFFER_BIT) != 0;
bool blitDepthBuffer = (mask & GL_DEPTH_BUFFER_BIT) != 0;
bool blitStencilBuffer = (mask & GL_STENCIL_BUFFER_BIT) != 0;
vk::CommandBuffer *commandBuffer = nullptr;
ANGLE_TRY(beginWriteResource(contextVk, &commandBuffer));
......@@ -637,11 +637,11 @@ void FramebufferVk::blitWithCommand(vk::CommandBuffer *commandBuffer,
readRect.y = sourceFrameBufferExtents.height - readRect.y - readRect.height;
}
VkImageBlit blit = {};
blit.srcOffsets[0] = {readRect.x0(), flipSource ? readRect.y1() : readRect.y0(), 0};
blit.srcOffsets[1] = {readRect.x1(), flipSource ? readRect.y0() : readRect.y1(), 1};
blit.srcSubresource.aspectMask = aspectMask;
blit.srcSubresource.mipLevel = 0;
VkImageBlit blit = {};
blit.srcOffsets[0] = {readRect.x0(), flipSource ? readRect.y1() : readRect.y0(), 0};
blit.srcOffsets[1] = {readRect.x1(), flipSource ? readRect.y0() : readRect.y1(), 1};
blit.srcSubresource.aspectMask = aspectMask;
blit.srcSubresource.mipLevel = 0;
blit.srcSubresource.baseArrayLayer = 0;
blit.srcSubresource.layerCount = 1;
blit.dstSubresource.aspectMask = aspectMask;
......@@ -1148,11 +1148,11 @@ angle::Result FramebufferVk::readPixelsImpl(ContextVk *contextVk,
pixelBytes = angleFormat.stencilBits / 8;
}
VkBuffer bufferHandle = VK_NULL_HANDLE;
uint8_t *readPixelBuffer = nullptr;
bool newBufferAllocated = false;
uint32_t stagingOffset = 0;
size_t allocationSize = area.width * pixelBytes * area.height;
VkBuffer bufferHandle = VK_NULL_HANDLE;
uint8_t *readPixelBuffer = nullptr;
bool newBufferAllocated = false;
uint32_t stagingOffset = 0;
size_t allocationSize = area.width * pixelBytes * area.height;
ANGLE_TRY(mReadPixelBuffer.allocate(contextVk, allocationSize, &readPixelBuffer, &bufferHandle,
&stagingOffset, &newBufferAllocated));
......
src/libANGLE/renderer/vulkan/RendererVk.h
......@@ -95,13 +95,13 @@ class RendererVk : angle::NonCopyable
const vk::MemoryProperties &getMemoryProperties() const { return mMemoryProperties; }
// TODO(jmadill): We could pass angle::Format::ID here.
// TODO(jmadill): We could pass angle::FormatID here.
const vk::Format &getFormat(GLenum internalFormat) const
{
return mFormatTable[internalFormat];
}
const vk::Format &getFormat(angle::Format::ID formatID) const { return mFormatTable[formatID]; }
const vk::Format &getFormat(angle::FormatID formatID) const { return mFormatTable[formatID]; }
angle::Result getCompatibleRenderPass(vk::Context *context,
const vk::RenderPassDesc &desc,
......
src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
......@@ -282,7 +282,7 @@ void VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
mCurrentArrayBufferOffsets[attribIndex] = 0;
mCurrentArrayBufferStrides[attribIndex] = 0;
mCurrentArrayBufferFormats[attribIndex] =
&renderer->getFormat(angle::Format::ID::R32G32B32A32_FLOAT);
&renderer->getFormat(angle::FormatID::R32G32B32A32_FLOAT);
}
}
......@@ -610,7 +610,7 @@ void VertexArrayVk::updateDefaultAttrib(RendererVk *renderer,
mCurrentArrayBufferResources[attribIndex] = nullptr;
mCurrentArrayBufferStrides[attribIndex] = 0;
mCurrentArrayBufferFormats[attribIndex] =
&renderer->getFormat(angle::Format::ID::R32G32B32A32_FIXED);
&renderer->getFormat(angle::FormatID::R32G32B32A32_FIXED);
mDirtyPackedInputs.set(attribIndex);
}
}
......
src/libANGLE/renderer/vulkan/gen_vk_format_table.py
......@@ -57,41 +57,41 @@ void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &an
}} // namespace rx
"""
empty_format_entry_template = """case angle::Format::ID::{format_id}:
empty_format_entry_template = """case angle::FormatID::{format_id}:
// This format is not implemented in Vulkan.
break;
"""
format_entry_template = """case angle::Format::ID::{format_id}:
format_entry_template = """case angle::FormatID::{format_id}:
internalFormat = {internal_format};
{texture_template}
{buffer_template}
break;
"""
texture_basic_template = """textureFormatID = angle::Format::ID::{texture};
texture_basic_template = """textureFormatID = angle::FormatID::{texture};
vkTextureFormat = {vk_texture_format};
textureInitializerFunction = {texture_initializer};"""
texture_fallback_template = """initTextureFallback(physicalDevice,
angle::Format::ID::{texture},
angle::FormatID::{texture},
{vk_texture_format},
{texture_initializer},
angle::Format::ID::{texture_fallback},
angle::FormatID::{texture_fallback},
{vk_texture_format_fallback},
{texture_initializer_fallback});"""
buffer_basic_template = """bufferFormatID = angle::Format::ID::{buffer};
buffer_basic_template = """bufferFormatID = angle::FormatID::{buffer};
vkBufferFormat = {vk_buffer_format};
vertexLoadFunction = {vertex_load_function};
vertexLoadRequiresConversion = {vertex_load_converts};"""
buffer_fallback_template = """initBufferFallback(physicalDevice,
angle::Format::ID::{buffer},
angle::FormatID::{buffer},
{vk_buffer_format},
{vertex_load_function},
{vertex_load_converts},
angle::Format::ID::{buffer_fallback},
angle::FormatID::{buffer_fallback},
{vk_buffer_format_fallback},
{vertex_load_function_fallback});"""
......
src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libANGLE/renderer/vulkan/vk_format_utils.cpp
......@@ -93,11 +93,11 @@ void GetFormatProperties(VkPhysicalDevice physicalDevice,
// Format implementation.
Format::Format()
: angleFormatID(angle::Format::ID::NONE),
: angleFormatID(angle::FormatID::NONE),
internalFormat(GL_NONE),
textureFormatID(angle::Format::ID::NONE),
textureFormatID(angle::FormatID::NONE),
vkTextureFormat(VK_FORMAT_UNDEFINED),
bufferFormatID(angle::Format::ID::NONE),
bufferFormatID(angle::FormatID::NONE),
vkBufferFormat(VK_FORMAT_UNDEFINED),
textureInitializerFunction(nullptr),
textureLoadFunctions()
......@@ -105,15 +105,15 @@ Format::Format()
}
void Format::initTextureFallback(VkPhysicalDevice physicalDevice,
angle::Format::ID format,
angle::FormatID format,
VkFormat vkFormat,
InitializeTextureDataFunction initializer,
angle::Format::ID fallbackFormat,
angle::FormatID fallbackFormat,
VkFormat fallbackVkFormat,
InitializeTextureDataFunction fallbackInitializer)
{
ASSERT(format != angle::Format::ID::NONE);
ASSERT(fallbackFormat != angle::Format::ID::NONE);
ASSERT(format != angle::FormatID::NONE);
ASSERT(fallbackFormat != angle::FormatID::NONE);
if (HasFullTextureFormatSupport(physicalDevice, vkFormat))
{
......@@ -131,16 +131,16 @@ void Format::initTextureFallback(VkPhysicalDevice physicalDevice,
}
void Format::initBufferFallback(VkPhysicalDevice physicalDevice,
angle::Format::ID format,
angle::FormatID format,
VkFormat vkFormat,
VertexCopyFunction function,
bool functionConverts,
angle::Format::ID fallbackFormat,
angle::FormatID fallbackFormat,
VkFormat fallbackVkFormat,
VertexCopyFunction fallbackFunction)
{
ASSERT(format != angle::Format::ID::NONE);
ASSERT(fallbackFormat != angle::Format::ID::NONE);
ASSERT(format != angle::FormatID::NONE);
ASSERT(fallbackFormat != angle::FormatID::NONE);
if (HasFullBufferFormatSupport(physicalDevice, vkFormat))
{
......@@ -199,7 +199,7 @@ void FormatTable::initialize(VkPhysicalDevice physicalDevice,
{
for (size_t formatIndex = 0; formatIndex < angle::kNumANGLEFormats; ++formatIndex)
{
const auto formatID = static_cast<angle::Format::ID>(formatIndex);
const auto formatID = static_cast<angle::FormatID>(formatIndex);
const angle::Format &angleFormat = angle::Format::Get(formatID);
mFormatData[formatIndex].initialize(physicalDevice, angleFormat);
const GLenum internalFormat = mFormatData[formatIndex].internalFormat;
......@@ -231,11 +231,11 @@ void FormatTable::initialize(VkPhysicalDevice physicalDevice,
const Format &FormatTable::operator[](GLenum internalFormat) const
{
angle::Format::ID formatID = angle::Format::InternalFormatToID(internalFormat);
angle::FormatID formatID = angle::Format::InternalFormatToID(internalFormat);
return mFormatData[static_cast<size_t>(formatID)];
}
const Format &FormatTable::operator[](angle::Format::ID formatID) const
const Format &FormatTable::operator[](angle::FormatID formatID) const
{
return mFormatData[static_cast<size_t>(formatID)];
}
......
src/libANGLE/renderer/vulkan/vk_format_utils.h
......@@ -43,19 +43,19 @@ struct Format final : private angle::NonCopyable
void initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat);
void initTextureFallback(VkPhysicalDevice physicalDevice,
angle::Format::ID format,
angle::FormatID format,
VkFormat vkFormat,
InitializeTextureDataFunction initializer,
angle::Format::ID fallbackFormat,
angle::FormatID fallbackFormat,
VkFormat fallbackVkFormat,
InitializeTextureDataFunction fallbackInitializer);
void initBufferFallback(VkPhysicalDevice physicalDevice,
angle::Format::ID format,
angle::FormatID format,
VkFormat vkFormat,
VertexCopyFunction function,
bool functionConverts,
angle::Format::ID fallbackFormat,
angle::FormatID fallbackFormat,
VkFormat fallbackVkFormat,
VertexCopyFunction fallbackFunction);
......@@ -63,11 +63,11 @@ struct Format final : private angle::NonCopyable
const angle::Format &bufferFormat() const;
const angle::Format &angleFormat() const;
angle::Format::ID angleFormatID;
angle::FormatID angleFormatID;
GLenum internalFormat;
angle::Format::ID textureFormatID;
angle::FormatID textureFormatID;
VkFormat vkTextureFormat;
angle::Format::ID bufferFormatID;
angle::FormatID bufferFormatID;
VkFormat vkBufferFormat;
InitializeTextureDataFunction textureInitializerFunction;
LoadFunctionMap textureLoadFunctions;
......@@ -90,10 +90,10 @@ class FormatTable final : angle::NonCopyable
std::vector<GLenum> *outCompressedTextureFormats);
const Format &operator[](GLenum internalFormat) const;
const Format &operator[](angle::Format::ID formatID) const;
const Format &operator[](angle::FormatID formatID) const;
private:
// The table data is indexed by angle::Format::ID.
// The table data is indexed by angle::FormatID.
std::array<Format, angle::kNumANGLEFormats> mFormatData;
};
......
src/libGLESv2.gypi
......@@ -275,7 +275,7 @@
'libANGLE/renderer/DisplayImpl.h',
'libANGLE/renderer/EGLImplFactory.h',
'libANGLE/renderer/FenceNVImpl.h',
'libANGLE/renderer/Format_ID_autogen.inl',
'libANGLE/renderer/FormatID_autogen.inc',
'libANGLE/renderer/Format_table_autogen.cpp',
'libANGLE/renderer/Format.h',
'libANGLE/renderer/FramebufferAttachmentObjectImpl.h',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment