mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-03 11:46:09 +00:00
4408b7f20c
When both the vert and frag shaders have a UBO binding, the D3D12 backend was using register offset 0 for both, causing a collision, and the wrong constant value used in one of the shaders. The fix is to use the binding offsets computed by the BindGroupLayout, since they know about all of the bindings, not just the ones computed for each shader. This made it necessary to defer shader compilation until pipeline layout creation time (as is done in the Metal backend for similar reasons). Finally, those bindings offsets computed by the BGL include an offset for the CBV, UAV and SRV subgroups, so we must add the same register offset when assigning the BaseShaderRegister to the descriptor ranges in the PipelineLayout constructor so that they match. Bug: dawn:20 Change-Id: I18287bf1c06f06dd61288e12da64752f54634466 Reviewed-on: https://dawn-review.googlesource.com/c/1960 Reviewed-by: Stephen White <senorblanco@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Stephen White <senorblanco@chromium.org>
38 lines
1.2 KiB
C++
38 lines
1.2 KiB
C++
// Copyright 2017 The Dawn Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#ifndef DAWNNATIVE_D3D12_SHADERMODULED3D12_H_
|
|
#define DAWNNATIVE_D3D12_SHADERMODULED3D12_H_
|
|
|
|
#include "dawn_native/ShaderModule.h"
|
|
|
|
namespace dawn_native { namespace d3d12 {
|
|
|
|
class Device;
|
|
class PipelineLayout;
|
|
|
|
class ShaderModule : public ShaderModuleBase {
|
|
public:
|
|
ShaderModule(Device* device, const ShaderModuleDescriptor* descriptor);
|
|
|
|
const std::string GetHLSLSource(PipelineLayout* layout) const;
|
|
|
|
private:
|
|
std::vector<uint32_t> mSpirv;
|
|
};
|
|
|
|
}} // namespace dawn_native::d3d12
|
|
|
|
#endif // DAWNNATIVE_D3D12_SHADERMODULED3D12_H_
|