eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

geometry shader changes

Browse Source
This commit is contained in:
milek7
2019-03-17 23:17:35 +01:00
parent 4383b0c7e0
commit a0738d109b
5 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gl/shader.cpp
View File

@@ -202,6 +202,17 @@ void gl::shader::log_error(const std::string &str)
gl::shader::shader(const std::string &filename)
{
name = filename;
GLuint type;
if (strcend(filename, ".vert"))
type = GL_VERTEX_SHADER;
else if (strcend(filename, ".frag"))
type = GL_FRAGMENT_SHADER;
else if (strcend(filename, ".geom"))
type = GL_GEOMETRY_SHADER;
else
throw shader_exception("unknown shader " + filename);
std::string str;
if (!Global.gfx_usegles)
{
@@ -209,7 +220,13 @@ gl::shader::shader(const std::string &filename)
}
else
{
str += "#version 300 es\n";
if (type == GL_GEOMETRY_SHADER) {
str += "#version 310 es\n";
str += "#extension EXT_geometry_shader : require\n";
}
else {
str += "#version 300 es\n";
}
str += "precision highp float;\n";
str += "precision highp sampler2DShadow;\n";
}
@@ -223,16 +240,6 @@ gl::shader::shader(const std::string &filename)
if (!cstr[0])
throw shader_exception("cannot read shader: " + filename);
GLuint type;
if (strcend(filename, ".vert"))
type = GL_VERTEX_SHADER;
else if (strcend(filename, ".frag"))
type = GL_FRAGMENT_SHADER;
else if (strcend(filename, ".geom"))
type = GL_GEOMETRY_SHADER;
else
throw shader_exception("unknown shader " + filename);
**this = glCreateShader(type);
glShaderSource(*this, 1, &cstr, 0);
glCompileShader(*this);