diff --git a/Common/GPU/OpenGL/GLQueueRunner.h b/Common/GPU/OpenGL/GLQueueRunner.h index 87d9a76be6..d7832a9b52 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.h +++ b/Common/GPU/OpenGL/GLQueueRunner.h @@ -95,13 +95,13 @@ struct GLRRenderData { GLenum func; } depth; struct { - GLboolean enabled; GLenum func; - uint8_t ref; - uint8_t compareMask; GLenum sFail; GLenum zFail; GLenum pass; + GLboolean enabled; + uint8_t ref; + uint8_t compareMask; uint8_t writeMask; } stencil; struct { @@ -160,8 +160,8 @@ struct GLRRenderData { uint8_t *data; // owned, delete[]-d } texture_subimage; struct { + GLRFramebuffer* framebuffer; int slot; - GLRFramebuffer *framebuffer; int aspect; } bind_fb_texture; struct { @@ -192,9 +192,9 @@ struct GLRRenderData { GLRect2D rc; } scissor; struct { - GLboolean cullEnable; GLenum frontFace; GLenum cullFace; + GLboolean cullEnable; GLboolean ditherEnable; GLboolean depthClampEnable; } raster; @@ -326,9 +326,9 @@ struct GLRStep { GLboolean filter; } blit; struct { - int aspectMask; - GLRFramebuffer *src; + GLRFramebuffer* src; GLRect2D srcRect; + int aspectMask; Draw::DataFormat dstFormat; } readback; struct { diff --git a/Common/GPU/Vulkan/VulkanRenderManager.h b/Common/GPU/Vulkan/VulkanRenderManager.h index c1af6cc342..ed65c0c4b4 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.h +++ b/Common/GPU/Vulkan/VulkanRenderManager.h @@ -159,7 +159,7 @@ struct CompileQueueEntry { Type type; VkRenderPass compatibleRenderPass; RenderPassType renderPassType; - VKRGraphicsPipeline *graphics = nullptr; + VKRGraphicsPipeline* graphics = nullptr; VkSampleCountFlagBits sampleCount; };