update UTI, remove blur from CompDraw mask

This commit is contained in:
2019-07-12 21:07:30 +02:00
parent e78047149a
commit 6e97a29058
8 changed files with 38 additions and 15 deletions

View File

@@ -88,10 +88,10 @@ class Shader
std::string read(const std::string& path);
public:
kShader name;
void parse_error(const char* msg, const char* code);
void parse_error(const std::string& msg, const std::string& code);
bool load(const std::string& path);
bool reload();
bool create(const char* vertex, const char* fragment);
bool create(const std::string& vertex, const std::string& fragment);
void destroy();
void use();
void u_vec4(kShaderUniform id, const glm::vec4& v);
@@ -99,6 +99,7 @@ public:
void u_vec2(kShaderUniform id, const glm::vec2& v);
void u_mat4(kShaderUniform id, const glm::mat4& m);
void u_int(kShaderUniform id, int i);
void u_int(const char* name, int i);
void u_float(kShaderUniform id, float f);
GLint GetAttribLocation(const char* name);
};
@@ -111,7 +112,7 @@ public:
static bool ext_framebuffer_fetch;
static bool load(kShader id, const std::string& path);
static bool reload();
static bool create(kShader id, const char* vertex, const char* fragment);
static bool create(kShader id, const std::string& vertex, const std::string& fragment);
static void use(kShader id);
static void use(const char* name);
static Shader* get(kShader id);
@@ -120,6 +121,7 @@ public:
static void u_vec2(kShaderUniform id, const glm::vec2& v);
static void u_mat4(kShaderUniform id, const glm::mat4& m);
static void u_int(kShaderUniform id, int i);
static void u_int(const char* name, int i);
static void u_float(kShaderUniform id, float f);
static void invalidate();
};