removing vulkan references from mac builds
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
#include "TextureAsset.h"
|
||||
#include "Graphics/Graphics.h"
|
||||
#include "Graphics/Texture.h"
|
||||
#include "Graphics/Vulkan/Enums.h"
|
||||
#include "Window/WindowManager.h"
|
||||
#include "ktx.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
#include <assert.h>
|
||||
#include <memory>
|
||||
#include <memory_resource>
|
||||
#include <memory>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include <memory_resource>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
@@ -34,7 +34,7 @@ void DescriptorLayout::create() {
|
||||
MTL::ArgumentDescriptor** objects = new MTL::ArgumentDescriptor*[descriptorBindings.size()];
|
||||
uint32 mappingCounter = 0;
|
||||
for (uint32 i = 0; i < descriptorBindings.size(); ++i) {
|
||||
if (descriptorBindings[i].descriptorType != Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER) {
|
||||
if (descriptorBindings[i].descriptorType != Gfx::SE_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) {
|
||||
plainDescriptor = false;
|
||||
}
|
||||
objects[i] = MTL::ArgumentDescriptor::alloc()->init();
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include "Enums.h"
|
||||
#include "Graphics.h"
|
||||
#include "Graphics/Query.h"
|
||||
#include <vulkan/vulkan_core.h>
|
||||
|
||||
using namespace Seele;
|
||||
using namespace Seele::Metal;
|
||||
@@ -71,4 +70,4 @@ Gfx::Timestamp TimestampQuery::getResult() {
|
||||
.name = "Test",
|
||||
.time = 0,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ CachedDepthPass::CachedDepthPass(Gfx::PGraphics graphics, PScene scene) : Render
|
||||
.stageFlags = Gfx::SE_SHADER_STAGE_TASK_BIT_EXT | Gfx::SE_SHADER_STAGE_VERTEX_BIT,
|
||||
.offset = 0,
|
||||
.size = sizeof(VertexData::DrawCallOffsets),
|
||||
.name = "pOffsets"
|
||||
});
|
||||
if (graphics->supportMeshShading()) {
|
||||
graphics->getShaderCompiler()->registerRenderPass("CachedDepthPass", Gfx::PassConfig{
|
||||
|
||||
@@ -25,6 +25,7 @@ DepthCullingPass::DepthCullingPass(Gfx::PGraphics graphics, PScene scene) : Rend
|
||||
.stageFlags = Gfx::SE_SHADER_STAGE_TASK_BIT_EXT | Gfx::SE_SHADER_STAGE_VERTEX_BIT,
|
||||
.offset = 0,
|
||||
.size = sizeof(VertexData::DrawCallOffsets),
|
||||
.name = "pOffsets"
|
||||
});
|
||||
|
||||
depthComputeLayout = graphics->createPipelineLayout("DepthComputeLayout");
|
||||
@@ -34,6 +35,7 @@ DepthCullingPass::DepthCullingPass(Gfx::PGraphics graphics, PScene scene) : Rend
|
||||
.stageFlags = Gfx::SE_SHADER_STAGE_COMPUTE_BIT,
|
||||
.offset = 0,
|
||||
.size = sizeof(MipParam),
|
||||
.name = "pMipParam"
|
||||
});
|
||||
|
||||
if (graphics->supportMeshShading()) {
|
||||
|
||||
@@ -53,6 +53,7 @@ RayTracingPass::RayTracingPass(Gfx::PGraphics graphics, PScene scene) : RenderPa
|
||||
.stageFlags = Gfx::SE_SHADER_STAGE_RAYGEN_BIT_KHR,
|
||||
.offset = 0,
|
||||
.size = sizeof(SampleParams),
|
||||
.name = "pSamps",
|
||||
});
|
||||
graphics->getShaderCompiler()->registerRenderPass("RayTracing", Gfx::PassConfig{
|
||||
.baseLayout = pipelineLayout,
|
||||
|
||||
@@ -16,6 +16,7 @@ ShadowPass::ShadowPass(Gfx::PGraphics graphics, PScene scene) : RenderPass(graph
|
||||
.stageFlags = Gfx::SE_SHADER_STAGE_TASK_BIT_EXT | Gfx::SE_SHADER_STAGE_VERTEX_BIT,
|
||||
.offset = 0,
|
||||
.size = sizeof(VertexData::DrawCallOffsets),
|
||||
.name = "pOffsets",
|
||||
});
|
||||
if (graphics->supportMeshShading()) {
|
||||
graphics->getShaderCompiler()->registerRenderPass("ShadowPass", Gfx::PassConfig{
|
||||
@@ -253,7 +254,6 @@ void ShadowPass::render() {
|
||||
}
|
||||
graphics->executeCommands(std::move(commands));
|
||||
graphics->endRenderPass();
|
||||
graphics->waitDeviceIdle();
|
||||
}
|
||||
graphics->endDebugRegion();
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ void ShaderCompiler::createShaders(ShaderPermutation permutation, Gfx::OPipeline
|
||||
}
|
||||
// createInfo.typeParameter.add({Pair<const char*, const char*>("IVertexData", permutation.vertexDataName)});
|
||||
createInfo.modules.add(permutation.vertexDataName);
|
||||
// createInfo.dumpIntermediate = true;
|
||||
createInfo.dumpIntermediate = true;
|
||||
|
||||
if (permutation.useMeshShading) {
|
||||
if (permutation.hasTaskShader) {
|
||||
|
||||
Reference in New Issue
Block a user