From e7195d5a99a7fbf03160ef4fc526898d954d65ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 8 Sep 2022 09:18:13 +0200 Subject: [PATCH] Match FragmentShaderFlags definition with the other PR. --- GPU/Common/FragmentShaderGenerator.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GPU/Common/FragmentShaderGenerator.h b/GPU/Common/FragmentShaderGenerator.h index 325c368f7328..85c651cf8bf6 100644 --- a/GPU/Common/FragmentShaderGenerator.h +++ b/GPU/Common/FragmentShaderGenerator.h @@ -17,6 +17,7 @@ #pragma once +#include "Common/Common.h" #include "Common/GPU/Shader.h" #include "Common/GPU/thin3d.h" @@ -40,8 +41,9 @@ struct FShaderID; #define CONST_PS_STENCILVALUE 11 // Can technically be deduced from the fragment shader ID, but this is safer. -enum FragmentShaderFlags { - FS_FLAG_INPUT_ATTACHMENT, +enum class FragmentShaderFlags : u32 { + FS_FLAG_INPUT_ATTACHMENT = 1, }; +ENUM_CLASS_BITOPS(FragmentShaderFlags); bool GenerateFragmentShader(const FShaderID &id, char *buffer, const ShaderLanguageDesc &compat, Draw::Bugs bugs, uint64_t *uniformMask, FragmentShaderFlags *fragmentShaderFlags, std::string *errorString);