DisplayWgpu.cpp

Show log
Commit

Hash : 91deaea3
Author :
Date : 2025-02-13T13:57:37

Roll third_party/dawn/ 1eca38fa5..8119dbd27 (1982 commits; 30 trivial rolls)

https://dawn.googlesource.com/dawn.git/+log/1eca38fa5236..8119dbd27471

$ git log 1eca38fa5..8119dbd27 --date=short --no-merges --format='%ad %ae %s'
2025-02-12 zhuangxu Set MacOS deployment target to 11.0 when building with CMake
2025-02-12 dsinclair Revert "Remove stale WebGPU Compat CTS expectations"
2025-02-12 rharrison [tint][ir][fuzz] Add missing capability to tint::hlsl::writer::IRFuzzer
2025-02-11 shrekshao [Compat] Remove gles min31 end2end suppressions
2025-02-11 shrekshao [Compat] Fix toggle string for UseBlitForRG11B10UfloatTextureCopy
2025-02-11 rharrison [tint][ir][val] Add operand and result checks for MemberBuiltinCall
2025-02-11 rharrison [tint][ir][val] Check InstructionResult->Instruction is inst
2025-02-11 jrprice [node] Support subgroupMatrixConfigs query in dawn.node
2025-02-11 jrprice [vulkan] Enable subgroup matrix feature
2025-02-11 ynovikov Remove stale WebGPU Compat CTS expectations
2025-02-11 ynovikov Remove stale WebGPU CTS expectations
2025-02-11 dawn-autoroll Roll ANGLE from e746fb068fd3 to 19c5293e1347 (5 revisions)
2025-02-11 jrprice [metal] Enable subgroup matrix feature
2025-02-11 jrprice [dawn] Add SubgroupMatrixConfigs to adapter info
2025-02-11 kylechar Skip setting Vulkan object labels
2025-02-11 dsinclair [spirv-reader][ir] Add derivative operations.
2025-02-11 lehoangquyen D3D11: skip waiting on the fence that is owned by the same queue.
2025-02-11 dawn-autoroll Roll vulkan-deps from cd5e835851d1 to a88fd25a6a0d (8 revisions)
2025-02-11 dsinclair [spirv-reader][ir] Cleanup duplicate argument code.
2025-02-11 jrprice [dawn] Add feature for subgroup matrix extension
2025-02-11 dsinclair [spirv-reader][ir] Add support for `OpAny`.
2025-02-11 dsinclair [spirv-reader][ir] Add support for `OpAll`
2025-02-11 dsinclair [spirv-reader][ir] Add support for `OpBitReverse`.
2025-02-11 cwallez [tint] Make type::BindingArray use ArrayCount
2025-02-11 rharrison [tint][ir][val] Add additional checking to builtin calls
2025-02-11 dsinclair [spirv-reader][ir] Support `OpBitFieldUExtract`.
2025-02-11 lehoangquyen D3D11: return error if D3D feature level < 11.0
2025-02-11 shaoboyan Dawn Native: Setup ClampFragDepth offset in Vulkan Backend
2025-02-10 dawn-autoroll Roll ANGLE from c4caed5f649d to e746fb068fd3 (8 revisions)
2025-02-10 gman Compat: Fixup Device Limits
2025-02-10 dsinclair [spirv-reader][ir] Support `OpBitFieldSExtract`.
2025-02-10 dsinclair [spirv-reader][ir] Support `OpBitFieldInsert`.
2025-02-10 brandon1.jones Add Missing Synchronization For D3D12 Shared Buffers
2025-02-10 ynovikov Skip more textureSample tests on WebGPU CTS compat Android
2025-02-10 cwallez [dawn][frontend] Fix error message when @group > maxBindGroups
2025-02-10 dawn-autoroll Roll SwiftShader from 5017ce3c800e to 720189cae847 (1 revision)
2025-02-10 titouan Include tint fuzzers in high-end fuzzer build.
2025-02-10 dsinclair [spirv-reader][ir] Support `OpBitCount`.
2025-02-10 dawn-autoroll Roll ANGLE from 38aa0780bb36 to c4caed5f649d (28 revisions)
2025-02-10 jrprice [spirv] Require Vulkan Memory Model when fuzzing subgroup matrices
2025-02-10 jwata infra: Add project property to $build/siso
2025-02-10 dawn-autoroll Roll vulkan-deps from b4c8dd090b72 to cd5e835851d1 (1 revision)
2025-02-09 ynovikov Skip textureSample tests on WebGPU CTS compat Android
2025-02-09 dawn-autoroll Roll vulkan-deps from dbe0a14ab512 to b4c8dd090b72 (1 revision)
2025-02-08 ynovikov Remove stale WebGPU Compat CTS expectations
2025-02-08 ynovikov Remove stale WebGPU CTS expectations
2025-02-08 ynovikov Generalize Linux NVIDIA WebGPU CTS expectation
2025-02-07 dawn-autoroll Roll vulkan-deps from c32804ca5a39 to dbe0a14ab512 (9 revisions)
2025-02-07 shrekshao [Compat] fix glsl name collisions between stages for handle
2025-02-07 shrekshao Compat suppress min es31 failure tests
(...)
2024-08-15 rharrison [tint][ir][val] Improve checks on Returns
2024-08-15 petermcneeley [tint] Minor follow-up fix for insert before
2024-08-15 dawn-autoroll Roll ANGLE from 2003e06230b1 to 83ca89e58cef (6 revisions)
2024-08-15 dsinclair Allow marking expectations as INVALID.
2024-08-15 bsheedy Suppress additional Linux/NVIDIA failures
2024-08-15 chouinard Generate missing hlsl e2e tests
2024-08-15 petermcneeley [tint] MSL texture array negative integer clamp
2024-08-15 dsinclair Remove the CTS cache code
2024-08-15 amaiorano Generated missing tint e2e tests for ir.dxc.hlsl
2024-08-15 jiawei.shao Tint: Add validations on the type of `clip_distances`
2024-08-15 dawn-autoroll Roll ANGLE from 6fddb18d77a3 to 2003e06230b1 (6 revisions)
2024-08-15 jiawei.shao Tint: Add WGSL extension and built-in variable `clip_distances`
2024-08-15 jiawei.shao Remove `DeviceBase::ForceSetToggleForTesting`
2024-08-15 jiawei.shao Rename `BufferBase::GetUsage` and `BufferBase::GetUsageExternalOnly`
2024-08-15 bsheedy Suppress 16" Macbook failures
2024-08-14 rharrison [tint][ir][val] Check swizzles are well formed
2024-08-14 chouinard [tint] Implement quadSwapX, Y and Diagonal
2024-08-14 amaiorano [hlsl] Emit mip level 0 for storage textures
2024-08-14 amaiorano Regen ir.fxc.hlsl files
2024-08-14 jrprice [benchmark] Add --check-stale option
2024-08-14 dawn-autoroll Roll vulkan-deps from c297ee8a1d20 to 7660e21e64db (3 revisions)
2024-08-14 amaiorano Fix DXC roll
2024-08-14 dawn-autoroll Roll ANGLE from 5967afe70699 to 6fddb18d77a3 (3 revisions)
2024-08-14 dneto [tint] validate clamp const low <= const high when first arg is runtime-eval
2024-08-14 chouinard [tint] Implement quadBroadcast
2024-08-14 dawn-autoroll Roll ANGLE from fdd26da99a12 to 5967afe70699 (6 revisions)
2024-08-14 jrprice [benchmark][msl] Flatten bindings
2024-08-14 jrprice [benchmark] Split generated shaders into multiple lines
2024-08-14 jiawei.shao Don't check adapter nullability in the constructor of DeviceBase
2024-08-14 jrprice [benchmark] Generate map directly
2024-08-14 jrprice [benchmark] Convert SPIR-V when generating header
2024-08-14 jrprice [benchmark] Check in the generated header
2024-08-14 jrprice [benchmark] Remove spv_reader and wgsl_writer deps
2024-08-13 enga Add DeviceGetAdapter and AdapterGetInstance to client_side_commands
2024-08-13 jrprice [benchmark] Don't convert SPIR-V to WGSL at init
2024-08-13 rharrison [tint][ir][val] Check disards in validator
2024-08-13 chouinard [tint] Implement subgroupShuffleXor, Up and Down
2024-08-13 senorblanco Fix texture-only arg in combine samplers transform.
2024-08-13 jrprice [spirv] Remove ast_generate_bindings
2024-08-13 dawn-autoroll Roll vulkan-deps from 77d583f37170 to c297ee8a1d20 (3 revisions)
2024-08-13 jrprice [tint] Remove the quantizeToF16 AST polyfill
2024-08-13 jrprice [spirv] Remove AST backend
2024-08-13 jrprice [loopy] Switch to IR version of SPIR-V backend
2024-08-13 shrekshao [Compat] Use @size attribute for glsl pad struct
2024-08-13 jrprice Reland "[tint][benchmark] Generate depfile for inputs"
2024-08-13 jrprice [spirv] Move E2E expectations to default paths
2024-08-13 jrprice [spirv] Remove AST E2E expectations
2024-08-13 jrprice [tint] Only allow --use-ir with WIP IR backends
2024-08-13 dawn-autoroll Roll ANGLE from f8fc8ac36280 to fdd26da99a12 (4 revisions)
2024-08-13 dawn-autoroll Manual roll vulkan-deps from a5d4d42457c3 to 77d583f37170 (8 revisions)

Created with:
  roll-dep third_party/dawn

Bug: angleproject:396213611
Change-Id: I124bbd59dccd14d8609c37ef62ccdd4455897b2c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6270256
Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

Download

src/libANGLE/renderer/wgpu/DisplayWgpu.cpp

//
// Copyright 2024 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// DisplayWgpu.cpp:
//    Implements the class methods for DisplayWgpu.
//

#include "libANGLE/renderer/wgpu/DisplayWgpu.h"

#include <dawn/dawn_proc.h>

#include "common/debug.h"
#include "common/platform.h"

#include "libANGLE/Display.h"
#include "libANGLE/renderer/wgpu/ContextWgpu.h"
#include "libANGLE/renderer/wgpu/DeviceWgpu.h"
#include "libANGLE/renderer/wgpu/DisplayWgpu_api.h"
#include "libANGLE/renderer/wgpu/ImageWgpu.h"
#include "libANGLE/renderer/wgpu/SurfaceWgpu.h"

namespace rx
{

DisplayWgpu::DisplayWgpu(const egl::DisplayState &state) : DisplayImpl(state) {}

DisplayWgpu::~DisplayWgpu() {}

egl::Error DisplayWgpu::initialize(egl::Display *display)
{
    ANGLE_TRY(createWgpuDevice());

    mQueue = mDevice.GetQueue();
    mFormatTable.initialize();

    wgpu::SupportedLimits supportedLimits;
    mDevice.GetLimits(&supportedLimits);
    mLimitsWgpu = supportedLimits.limits;

    webgpu::GenerateCaps(mLimitsWgpu, &mGLCaps, &mGLTextureCaps, &mGLExtensions, &mGLLimitations,
                         &mEGLCaps, &mEGLExtensions, &mMaxSupportedClientVersion);

    return egl::NoError();
}

void DisplayWgpu::terminate() {}

egl::Error DisplayWgpu::makeCurrent(egl::Display *display,
                                    egl::Surface *drawSurface,
                                    egl::Surface *readSurface,
                                    gl::Context *context)
{
    // Ensure that the correct global DebugAnnotator is installed when the end2end tests change
    // the ANGLE back-end (done frequently).
    display->setGlobalDebugAnnotator();

    return egl::NoError();
}

egl::ConfigSet DisplayWgpu::generateConfigs()
{
    egl::Config config;
    config.renderTargetFormat    = GL_BGRA8_EXT;
    config.depthStencilFormat    = GL_DEPTH24_STENCIL8;
    config.bufferSize            = 32;
    config.redSize               = 8;
    config.greenSize             = 8;
    config.blueSize              = 8;
    config.alphaSize             = 8;
    config.alphaMaskSize         = 0;
    config.bindToTextureRGB      = EGL_TRUE;
    config.bindToTextureRGBA     = EGL_TRUE;
    config.colorBufferType       = EGL_RGB_BUFFER;
    config.configCaveat          = EGL_NONE;
    config.conformant            = EGL_OPENGL_ES2_BIT | EGL_OPENGL_ES3_BIT;
    config.depthSize             = 24;
    config.level                 = 0;
    config.matchNativePixmap     = EGL_NONE;
    config.maxPBufferWidth       = 0;
    config.maxPBufferHeight      = 0;
    config.maxPBufferPixels      = 0;
    config.maxSwapInterval       = 1;
    config.minSwapInterval       = 1;
    config.nativeRenderable      = EGL_TRUE;
    config.nativeVisualID        = 0;
    config.nativeVisualType      = EGL_NONE;
    config.renderableType        = EGL_OPENGL_ES2_BIT | EGL_OPENGL_ES3_BIT;
    config.sampleBuffers         = 0;
    config.samples               = 0;
    config.stencilSize           = 8;
    config.surfaceType           = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
    config.optimalOrientation    = 0;
    config.transparentType       = EGL_NONE;
    config.transparentRedValue   = 0;
    config.transparentGreenValue = 0;
    config.transparentBlueValue  = 0;

    egl::ConfigSet configSet;
    configSet.add(config);
    return configSet;
}

bool DisplayWgpu::testDeviceLost()
{
    return false;
}

egl::Error DisplayWgpu::restoreLostDevice(const egl::Display *display)
{
    return egl::NoError();
}

bool DisplayWgpu::isValidNativeWindow(EGLNativeWindowType window) const
{
    return true;
}

std::string DisplayWgpu::getRendererDescription()
{
    return "Wgpu";
}

std::string DisplayWgpu::getVendorString()
{
    return "Wgpu";
}

std::string DisplayWgpu::getVersionString(bool includeFullVersion)
{
    return std::string();
}

DeviceImpl *DisplayWgpu::createDevice()
{
    return new DeviceWgpu();
}

egl::Error DisplayWgpu::waitClient(const gl::Context *context)
{
    return egl::NoError();
}

egl::Error DisplayWgpu::waitNative(const gl::Context *context, EGLint engine)
{
    return egl::NoError();
}

gl::Version DisplayWgpu::getMaxSupportedESVersion() const
{
    return mMaxSupportedClientVersion;
}

gl::Version DisplayWgpu::getMaxConformantESVersion() const
{
    return mMaxSupportedClientVersion;
}

SurfaceImpl *DisplayWgpu::createWindowSurface(const egl::SurfaceState &state,
                                              EGLNativeWindowType window,
                                              const egl::AttributeMap &attribs)
{
    return CreateWgpuWindowSurface(state, window);
}

SurfaceImpl *DisplayWgpu::createPbufferSurface(const egl::SurfaceState &state,
                                               const egl::AttributeMap &attribs)
{
    return new OffscreenSurfaceWgpu(state);
}

SurfaceImpl *DisplayWgpu::createPbufferFromClientBuffer(const egl::SurfaceState &state,
                                                        EGLenum buftype,
                                                        EGLClientBuffer buffer,
                                                        const egl::AttributeMap &attribs)
{
    UNIMPLEMENTED();
    return nullptr;
}

SurfaceImpl *DisplayWgpu::createPixmapSurface(const egl::SurfaceState &state,
                                              NativePixmapType nativePixmap,
                                              const egl::AttributeMap &attribs)
{
    UNIMPLEMENTED();
    return nullptr;
}

ImageImpl *DisplayWgpu::createImage(const egl::ImageState &state,
                                    const gl::Context *context,
                                    EGLenum target,
                                    const egl::AttributeMap &attribs)
{
    return new ImageWgpu(state);
}

rx::ContextImpl *DisplayWgpu::createContext(const gl::State &state,
                                            gl::ErrorSet *errorSet,
                                            const egl::Config *configuration,
                                            const gl::Context *shareContext,
                                            const egl::AttributeMap &attribs)
{
    return new ContextWgpu(state, errorSet, this);
}

StreamProducerImpl *DisplayWgpu::createStreamProducerD3DTexture(
    egl::Stream::ConsumerType consumerType,
    const egl::AttributeMap &attribs)
{
    UNIMPLEMENTED();
    return nullptr;
}

ShareGroupImpl *DisplayWgpu::createShareGroup(const egl::ShareGroupState &state)
{
    return new ShareGroupWgpu(state);
}

angle::NativeWindowSystem DisplayWgpu::getWindowSystem() const
{
#if defined(ANGLE_PLATFORM_LINUX)
#    if defined(ANGLE_USE_X11)
    return angle::NativeWindowSystem::X11;
#    elif defined(ANGLE_USE_WAYLAND)
    return angle::NativeWindowSystem::Wayland;
#    endif
#else
    return angle::NativeWindowSystem::Other;
#endif
}

void DisplayWgpu::generateExtensions(egl::DisplayExtensions *outExtensions) const
{
    *outExtensions = mEGLExtensions;
}

void DisplayWgpu::generateCaps(egl::Caps *outCaps) const
{
    *outCaps = mEGLCaps;
}

egl::Error DisplayWgpu::createWgpuDevice()
{
    dawnProcSetProcs(&dawn::native::GetProcs());

    dawn::native::DawnInstanceDescriptor dawnInstanceDescriptor;

    wgpu::InstanceDescriptor instanceDescriptor;
    instanceDescriptor.capabilities.timedWaitAnyEnable = true;
    instanceDescriptor.nextInChain                 = &dawnInstanceDescriptor;
    mInstance                                      = wgpu::CreateInstance(&instanceDescriptor);

    struct RequestAdapterResult
    {
        wgpu::RequestAdapterStatus status;
        wgpu::Adapter adapter;
        std::string message;
    };
    RequestAdapterResult adapterResult;

    wgpu::RequestAdapterOptions requestAdapterOptions;

    wgpu::RequestAdapterCallback<RequestAdapterResult *> *requestAdapterCallback =
        [](wgpu::RequestAdapterStatus status, wgpu::Adapter adapter, wgpu::StringView message,
           RequestAdapterResult *result) {
            result->status  = status;
            result->adapter = adapter;
            result->message = message;
        };
    wgpu::FutureWaitInfo futureWaitInfo;
    futureWaitInfo.future =
        mInstance.RequestAdapter(&requestAdapterOptions, wgpu::CallbackMode::WaitAnyOnly,
                                 requestAdapterCallback, &adapterResult);

    wgpu::WaitStatus status = mInstance.WaitAny(1, &futureWaitInfo, -1);
    if (webgpu::IsWgpuError(status))
    {
        std::ostringstream err;
        err << "Failed to get WebGPU adapter: " << adapterResult.message;
        return egl::Error(EGL_BAD_ALLOC, err.str());
    }

    mAdapter = adapterResult.adapter;

    std::vector<wgpu::FeatureName> requiredFeatures;  // empty for now

    wgpu::DeviceDescriptor deviceDesc;
    deviceDesc.requiredFeatureCount = requiredFeatures.size();
    deviceDesc.requiredFeatures     = requiredFeatures.data();
    deviceDesc.SetUncapturedErrorCallback(
        [](const wgpu::Device &device, wgpu::ErrorType type, wgpu::StringView message) {
            ERR() << "Error: " << static_cast<std::underlying_type<wgpu::ErrorType>::type>(type)
                  << " - message: " << std::string(message);
        });

    mDevice = mAdapter.CreateDevice(&deviceDesc);
    return egl::NoError();
}

DisplayImpl *CreateWgpuDisplay(const egl::DisplayState &state)
{
    return new DisplayWgpu(state);
}

}  // namespace rx

Download