Merge pull request #9347 from lioncash/vcast

video_core/surface: Eliminate casts in GetFormatType()
master
liamwhite 2022-11-29 08:26:39 +07:00 committed by GitHub
commit 55b546a110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions

@ -214,23 +214,16 @@ PixelFormat PixelFormatFromGPUPixelFormat(Service::android::PixelFormat format)
} }
SurfaceType GetFormatType(PixelFormat pixel_format) { SurfaceType GetFormatType(PixelFormat pixel_format) {
if (static_cast<std::size_t>(pixel_format) < if (pixel_format < PixelFormat::MaxColorFormat) {
static_cast<std::size_t>(PixelFormat::MaxColorFormat)) {
return SurfaceType::ColorTexture; return SurfaceType::ColorTexture;
} }
if (pixel_format < PixelFormat::MaxDepthFormat) {
if (static_cast<std::size_t>(pixel_format) <
static_cast<std::size_t>(PixelFormat::MaxDepthFormat)) {
return SurfaceType::Depth; return SurfaceType::Depth;
} }
if (pixel_format < PixelFormat::MaxStencilFormat) {
if (static_cast<std::size_t>(pixel_format) <
static_cast<std::size_t>(PixelFormat::MaxStencilFormat)) {
return SurfaceType::Stencil; return SurfaceType::Stencil;
} }
if (pixel_format < PixelFormat::MaxDepthStencilFormat) {
if (static_cast<std::size_t>(pixel_format) <
static_cast<std::size_t>(PixelFormat::MaxDepthStencilFormat)) {
return SurfaceType::DepthStencil; return SurfaceType::DepthStencil;
} }