diff --git a/src/renderer_webgpu.cpp b/src/renderer_webgpu.cpp index e5bb8c1e6..be4dd64bb 100644 --- a/src/renderer_webgpu.cpp +++ b/src/renderer_webgpu.cpp @@ -41,15 +41,15 @@ namespace bgfx { namespace webgpu T defaultDescriptor() { return T(); } template <> wgpu::BlendDescriptor defaultDescriptor() { return { wgpu::BlendOperation::Add, wgpu::BlendFactor::One, wgpu::BlendFactor::Zero }; } - template <> wgpu::ColorStateDescriptor defaultDescriptor() { return { nullptr, wgpu::TextureFormat::RGBA8Unorm, defaultDescriptor(), defaultDescriptor(), wgpu::ColorWriteMask::All }; } + template <> wgpu::ColorStateDescriptor defaultDescriptor() { return { NULL, wgpu::TextureFormat::RGBA8Unorm, defaultDescriptor(), defaultDescriptor(), wgpu::ColorWriteMask::All }; } template <> wgpu::StencilStateFaceDescriptor defaultDescriptor() { return { wgpu::CompareFunction::Always, wgpu::StencilOperation::Keep, wgpu::StencilOperation::Keep, wgpu::StencilOperation::Keep }; } - template <> wgpu::VertexStateDescriptor defaultDescriptor() { return { nullptr, wgpu::IndexFormat::Uint32, 0, nullptr }; } - template <> wgpu::VertexBufferLayoutDescriptor defaultDescriptor() { return { 0, wgpu::InputStepMode::Vertex, 0, nullptr }; } + template <> wgpu::VertexStateDescriptor defaultDescriptor() { return { NULL, wgpu::IndexFormat::Uint32, 0, NULL }; } + template <> wgpu::VertexBufferLayoutDescriptor defaultDescriptor() { return { 0, wgpu::InputStepMode::Vertex, 0, NULL }; } template <> wgpu::VertexAttributeDescriptor defaultDescriptor() { return { wgpu::VertexFormat::Float, 0, 0 }; } - template <> wgpu::RasterizationStateDescriptor defaultDescriptor() { return { nullptr, wgpu::FrontFace::CCW, wgpu::CullMode::None, 0, 0.f, 0.f }; } - template <> wgpu::ProgrammableStageDescriptor defaultDescriptor() { return { nullptr, {}, "main" }; } - template <> wgpu::DepthStencilStateDescriptor defaultDescriptor() { return { nullptr, wgpu::TextureFormat::Depth24PlusStencil8, false, wgpu::CompareFunction::Always, defaultDescriptor(), defaultDescriptor(), 0xff, 0xff }; } - template <> wgpu::PipelineLayoutDescriptor defaultDescriptor() { return { nullptr, "", 0, nullptr }; } + template <> wgpu::RasterizationStateDescriptor defaultDescriptor() { return { NULL, wgpu::FrontFace::CCW, wgpu::CullMode::None, 0, 0.f, 0.f }; } + template <> wgpu::ProgrammableStageDescriptor defaultDescriptor() { return { NULL, {}, "main" }; } + template <> wgpu::DepthStencilStateDescriptor defaultDescriptor() { return { NULL, wgpu::TextureFormat::Depth24PlusStencil8, false, wgpu::CompareFunction::Always, defaultDescriptor(), defaultDescriptor(), 0xff, 0xff }; } + template <> wgpu::PipelineLayoutDescriptor defaultDescriptor() { return { NULL, "", 0, NULL }; } template <> wgpu::TextureViewDescriptor defaultDescriptor() { return {}; } template <> wgpu::RenderPassColorAttachmentDescriptor defaultDescriptor() { return { {}, {}, wgpu::LoadOp::Clear, wgpu::StoreOp::Store, { 0.0f, 0.0f, 0.0f, 0.0f } }; } @@ -115,7 +115,7 @@ namespace bgfx { namespace webgpu desc.fragmentStage = &fragmentStage; //desc.vertexState = &inputState; desc.rasterizationState = &rasterizationState; - desc.depthStencilState = nullptr; + desc.depthStencilState = NULL; desc.colorStates = colorStates; } // TODO (hugoam) cleanup (end) @@ -520,7 +520,7 @@ namespace bgfx { namespace webgpu s_ignoreError = false; }; - m_device.SetUncapturedErrorCallback(PrintDeviceError, nullptr); + m_device.SetUncapturedErrorCallback(PrintDeviceError, NULL); if (!m_device) { @@ -1209,7 +1209,7 @@ namespace bgfx { namespace webgpu } } - m_cmd.m_encoder = nullptr; + m_cmd.m_encoder = NULL; } void updateResolution(const Resolution& _resolution) @@ -2164,7 +2164,7 @@ namespace bgfx { namespace webgpu wgpu::ComputePipelineDescriptor desc; desc.layout = pso->m_layout; - desc.computeStage = { nullptr, program.m_vsh->m_module, "main" }; + desc.computeStage = { NULL, program.m_vsh->m_module, "main" }; pso->m_cps = m_device.CreateComputePipeline(&desc); } @@ -2321,13 +2321,13 @@ namespace bgfx { namespace webgpu if (m_renderEncoder) { m_renderEncoder.EndPass(); - m_renderEncoder = nullptr; + m_renderEncoder = NULL; } if (m_computeEncoder) { m_computeEncoder.EndPass(); - m_computeEncoder = nullptr; + m_computeEncoder = NULL; } } @@ -3361,7 +3361,7 @@ namespace bgfx { namespace webgpu void BindStateWgpu::clear() { - m_bindGroup = nullptr; + m_bindGroup = NULL; } void StagingBufferWgpu::create(uint32_t _size, bool mapped) @@ -3397,14 +3397,14 @@ namespace bgfx { namespace webgpu void StagingBufferWgpu::unmap() { - m_data = nullptr; + m_data = NULL; m_size = 0; m_buffer.Unmap(); } void StagingBufferWgpu::destroy() { - m_buffer = nullptr; + m_buffer = NULL; } void StagingBufferWgpu::mapped(void* _data, uint64_t _size) @@ -3433,14 +3433,14 @@ namespace bgfx { namespace webgpu { for (uint8_t ii = 0; ii < WEBGPU_NUM_UNIFORM_BUFFERS; ++ii) { - if (nullptr != s_renderWgpu->m_uniformBuffers[ii].m_data) + if (NULL != s_renderWgpu->m_uniformBuffers[ii].m_data) { m_staging = &s_renderWgpu->m_uniformBuffers[ii]; break; } } - BX_CHECK(nullptr != m_staging, "No available mapped uniform buffer"); + BX_CHECK(NULL != m_staging, "No available mapped uniform buffer"); } uint32_t ScratchBufferWgpu::write(void* data, uint64_t _size, uint64_t _offset) @@ -3470,7 +3470,7 @@ namespace bgfx { namespace webgpu void ScratchBufferWgpu::release() { m_staging->map(); - m_staging = nullptr; + m_staging = NULL; m_offset = 0; } @@ -3545,7 +3545,7 @@ namespace bgfx { namespace webgpu desc.presentMode = wgpu::PresentMode::Immediate; desc.format = wgpu::TextureFormat::RGBA8Unorm; desc.implementation = reinterpret_cast(&m_impl); - m_swapChain = _device.CreateSwapChain(nullptr, &desc); + m_swapChain = _device.CreateSwapChain(NULL, &desc); #else wgpu::SurfaceDescriptorFromHTMLCanvasId canvasDesc{}; canvasDesc.id = "canvas"; @@ -3716,7 +3716,7 @@ namespace bgfx { namespace webgpu m_swapChain->init(s_renderWgpu->m_device, _nwh, _width, _height); m_swapChain->resize(*this, _width, _height, 0); - return m_swapChain->m_swapChain != nullptr; + return m_swapChain->m_swapChain != NULL; } void FrameBufferWgpu::postReset() @@ -3792,7 +3792,7 @@ namespace bgfx { namespace webgpu #endif } - m_encoder = nullptr; + m_encoder = NULL; } } @@ -4029,7 +4029,7 @@ namespace bgfx { namespace webgpu ProgramHandle currentProgram = BGFX_INVALID_HANDLE; uint32_t currentBindHash = 0; uint32_t currentBindLayoutHash = 0; - BindStateWgpu* previousBindState = nullptr; + BindStateWgpu* previousBindState = NULL; SortKey key; uint16_t view = UINT16_MAX; FrameBufferHandle fbh = { BGFX_CONFIG_MAX_FRAME_BUFFERS }; diff --git a/src/renderer_webgpu.h b/src/renderer_webgpu.h index cce983752..636d0ac7d 100644 --- a/src/renderer_webgpu.h +++ b/src/renderer_webgpu.h @@ -142,7 +142,7 @@ namespace bgfx m_constantBuffer = NULL; } - m_module = nullptr; + m_module = NULL; } const char* name() const { return getName(m_handle); } @@ -153,10 +153,10 @@ namespace bgfx wgpu::ShaderStage m_stage; wgpu::ShaderModule m_module; - uint32_t* m_code = nullptr; + uint32_t* m_code = NULL; size_t m_codeSize = 0; - UniformBuffer* m_constantBuffer = nullptr; + UniformBuffer* m_constantBuffer = NULL; PredefinedUniform m_predefined[PredefinedUniform::Count]; uint16_t m_attrMask[Attrib::Count]; @@ -298,7 +298,7 @@ namespace bgfx void mapped(void* _data, uint64_t _size); wgpu::Buffer m_buffer; - void* m_data = nullptr; + void* m_data = NULL; uint64_t m_size = 0; }; @@ -313,7 +313,7 @@ namespace bgfx void submit(); void release(); - StagingBufferWgpu* m_staging = nullptr; + StagingBufferWgpu* m_staging = NULL; wgpu::Buffer m_stagingAlloc; wgpu::Buffer m_buffer; uint32_t m_offset; @@ -450,13 +450,13 @@ namespace bgfx { void create(uint8_t _num, const Attachment* _attachment); bool create( - uint16_t _denseIdx + uint16_t _denseIdx , void* _nwh , uint32_t _width , uint32_t _height , TextureFormat::Enum _format , TextureFormat::Enum _depthFormat - ); + ); void postReset(); uint16_t destroy();