From 46598480c4d85081ca3fd2c7b22f421684687a69 Mon Sep 17 00:00:00 2001 From: niki Date: Tue, 13 Sep 2022 14:34:11 +0200 Subject: [PATCH] vulkan: try fix github actions linux build --- .github/workflows/main.yml | 3 ++- src/modules/graphics/vulkan/Graphics.h | 14 ++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 888f0aa97..0ec27df9d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,8 @@ jobs: libxfixes-dev libxi-dev libxinerama-dev libxxf86vm-dev libxss-dev \ libgl1-mesa-dev libdbus-1-dev libudev-dev libgles2-mesa-dev \ libegl1-mesa-dev libibus-1.0-dev fcitx-libs-dev libsamplerate0-dev \ - libsndio-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev + libsndio-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev \ + libvulkan-dev - name: Checkout love-appimage-source uses: actions/checkout@v2 with: diff --git a/src/modules/graphics/vulkan/Graphics.h b/src/modules/graphics/vulkan/Graphics.h index 63b1c578f..59ad187af 100644 --- a/src/modules/graphics/vulkan/Graphics.h +++ b/src/modules/graphics/vulkan/Graphics.h @@ -275,25 +275,20 @@ public: graphics::GraphicsReadback *newReadbackInternal(ReadbackMethod method, love::graphics::Buffer *buffer, size_t offset, size_t size, data::ByteData *dest, size_t destoffset) override; graphics::GraphicsReadback *newReadbackInternal(ReadbackMethod method, love::graphics::Texture *texture, int slice, int mipmap, const Rect &rect, image::ImageData *dest, int destx, int desty) override; - VkCommandBuffer getCommandBufferForDataTransfer(); + // internal functions. + VkCommandBuffer getCommandBufferForDataTransfer(); void queueCleanUp(std::function cleanUp); void addReadbackCallback(std::function callback); - void submitGpuCommands(bool present); - uint32_t getNumImagesInFlight() const; uint32_t getFrameIndex() const; - const VkDeviceSize getMinUniformBufferOffsetAlignment() const; graphics::Texture *getDefaultTexture() const; VkSampler getCachedSampler(const SamplerState &samplerState); - void setComputeShader(Shader *computeShader); std::set &getUsedShadersInFrame(); - graphics::Shader::BuiltinUniformData getCurrentBuiltinUniformData(); - const OptionalDeviceFeatures &getEnabledOptionalDeviceExtensions() const; protected: @@ -352,7 +347,10 @@ private: VertexAttributes vertexAttributes, std::vector &bindingDescriptions, std::vector &attributeDescriptions); - void prepareDraw(const VertexAttributes &attributes, const BufferBindings &buffers, graphics::Texture *texture, PrimitiveType, CullMode); + void prepareDraw( + const VertexAttributes &attributes, + const BufferBindings &buffers, graphics::Texture *texture, + PrimitiveType, CullMode); void setRenderPass(const RenderTargets &rts, int pixelw, int pixelh, bool hasSRGBtexture); void setDefaultRenderPass(); void startRenderPass();