浏览代码

build: fix some badly merged headers.

undefined
Sam Hocevar 10 年前
父节点
当前提交
3ca9fb109a
共有 2 个文件被更改,包括 4 次插入20 次删除
  1. +0
    -18
      src/lol/gpu/renderer.h
  2. +4
    -2
      src/lol/sys/thread.h

+ 0
- 18
src/lol/gpu/renderer.h 查看文件

@@ -53,24 +53,6 @@ enum class BlendEquation : uint8_t
Max,
};

/* A safe enum to indicate the blend equation. */
struct BlendEquation
{
enum Value
{
Add,
Subtract,
ReverseSubtract,
Min,
Max,
}
m_value;

inline BlendEquation() : m_value(Add) {}
inline BlendEquation(Value v) : m_value(v) {}
inline operator Value() { return m_value; }
};

/* A safe enum to indicate the blending factors. */
enum class BlendFunc : uint8_t
{


+ 4
- 2
src/lol/sys/thread.h 查看文件

@@ -72,8 +72,10 @@ class ThreadJob
friend class BaseThreadManager;

public:
ThreadJob() { m_type = ThreadJobType::NONE; }
ThreadJob(ThreadJobType type) { m_type = type; }
inline ThreadJob() : m_type(ThreadJobType::NONE) {}
inline ThreadJob(ThreadJobType type) : m_type(type) {}
virtual ~ThreadJob() {}

ThreadJobType GetJobType() { return m_type; }
void SetJobType(ThreadJobType type) { m_type = type; }
bool operator==(const ThreadJobType& o) { return GetJobType() == o; }


正在加载...
取消
保存