Skip to content

Render: Geometry shaders #722 #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 3 commits into from
Apr 3, 2024
Merged

Render: Geometry shaders #722 #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4412898
Render: Geometry shaders #722
eprikazchikov Apr 3, 2024
880a3f3
Mobile platforms excluded
eprikazchikov Apr 3, 2024
1dbe272
Syntax
eprikazchikov Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions modules/renders/rendergl/includes/resources/materialgl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,20 @@ class MaterialGL : public Material {
A_NOENUMS()

enum ShaderType {
Static = 1,
StaticInst,
Skinned,
SkinnedInst,
Particle,
Fullscreen,
LastVertex,

Default = 20,
Visibility,
LastFragment
VertexStatic = 1,
VertexStaticInst,
VertexSkinned,
VertexSkinnedInst,
VertexParticle,
VertexFullscreen,
VertexLast,

FragmentDefault,
FragmentVisibility,
FragmentLast,

GeometryDefault,
GeometryLast
};

typedef unordered_map<uint32_t, uint32_t> ObjectMap;
Expand All @@ -75,9 +78,10 @@ class MaterialGL : public Material {
protected:
uint32_t buildShader(uint16_t type, const string &src = string());

uint32_t buildProgram(uint32_t vertex, uint32_t fragment);
uint32_t buildProgram(uint32_t vertex, uint32_t fragment, uint32_t geometry = 0);

bool checkShader(uint32_t shader, bool link = false);
bool checkShader(uint32_t shader);
bool checkProgram(uint32_t program);

MaterialInstance *createInstance(SurfaceType type = SurfaceType::Static) override;

Expand Down
136 changes: 84 additions & 52 deletions modules/renders/rendergl/src/resources/materialgl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,24 @@ namespace {
const char *gSkinned("Skinned");
const char *gParticle("Particle");
const char *gFullscreen("Fullscreen");

const char *gGeometry("Geometry");
};

void MaterialGL::loadUserData(const VariantMap &data) {
Material::loadUserData(data);

static map<string, uint32_t> pairs = {
{gVisibility, Visibility},
{gDefault, Default},

{gStatic, Static},
{gStaticInst, StaticInst},
{gSkinned, Skinned},
{gParticle, Particle},
{gFullscreen, Fullscreen}
{gVisibility, FragmentVisibility},
{gDefault, FragmentDefault},

{gStatic, VertexStatic},
{gStaticInst, VertexStaticInst},
{gSkinned, VertexSkinned},
{gParticle, VertexParticle},
{gFullscreen, VertexFullscreen},

{gGeometry, GeometryDefault}
};

for(auto &pair : pairs) {
Expand Down Expand Up @@ -60,16 +64,22 @@ uint32_t MaterialGL::getProgram(uint16_t type) {
}
m_programs.clear();

for(uint16_t v = Static; v < LastVertex; v++) {
uint32_t geometry = 0;
auto itg = m_shaderSources.find(GeometryDefault);
if(itg != m_shaderSources.end()) {
geometry = buildShader(itg->first, itg->second);
}

for(uint16_t v = Static; v < VertexLast; v++) {
auto itv = m_shaderSources.find(v);
if(itv != m_shaderSources.end()) {
for(uint16_t f = Default; f < LastFragment; f++) {
for(uint16_t f = FragmentDefault; f < FragmentLast; f++) {
auto itf = m_shaderSources.find(f);
if(itf != m_shaderSources.end()) {
uint32_t vertex = buildShader(itv->first, itv->second);
uint32_t fragment = buildShader(itf->first, itf->second);
uint32_t index = v * f;
m_programs[index] = buildProgram(vertex, fragment);
m_programs[index] = buildProgram(vertex, fragment, geometry);
}
}
}
Expand All @@ -95,9 +105,9 @@ uint32_t MaterialGL::bind(uint32_t layer, uint16_t vertex) {
return 0;
}

uint16_t type = MaterialGL::Default;
uint16_t type = MaterialGL::FragmentDefault;
if((layer & CommandBuffer::RAYCAST) || (layer & CommandBuffer::SHADOWCAST)) {
type = Visibility;
type = FragmentVisibility;
}

uint32_t program = getProgram(vertex * type);
Expand All @@ -109,30 +119,33 @@ uint32_t MaterialGL::bind(uint32_t layer, uint16_t vertex) {
}

uint32_t MaterialGL::buildShader(uint16_t type, const string &src) {
const char *data = src.c_str();

uint32_t t;
switch(type) {
case Default:
case Visibility: {
t = GL_FRAGMENT_SHADER;
} break;
default: {
t = GL_VERTEX_SHADER;
} break;
uint32_t t = 0;
if(type >= FragmentDefault && type < FragmentLast) {
t = GL_FRAGMENT_SHADER;
} else if(type >= VertexStatic && type < VertexLast) {
t = GL_VERTEX_SHADER;
} else if(type >= GeometryDefault && type < GeometryLast) {
#ifndef THUNDER_MOBILE
t = GL_GEOMETRY_SHADER;
#else
return 0;
#endif
}

uint32_t shader = glCreateShader(t);
if(shader) {
const char *data = src.c_str();

glShaderSource(shader, 1, &data, nullptr);
glCompileShader(shader);

checkShader(shader, "");
checkShader(shader);
}

return shader;
}

uint32_t MaterialGL::buildProgram(uint32_t vertex, uint32_t fragment) {
uint32_t MaterialGL::buildProgram(uint32_t vertex, uint32_t fragment, uint32_t geometry) {
uint32_t result = glCreateProgram();
if(result) {
#ifndef THUNDER_MOBILE
Expand All @@ -143,14 +156,24 @@ uint32_t MaterialGL::buildProgram(uint32_t vertex, uint32_t fragment) {

glAttachShader(result, vertex);
glAttachShader(result, fragment);
if(geometry > 0) {
glAttachShader(result, geometry);
}

glLinkProgram(result);

glDetachShader(result, vertex);
glDeleteShader(vertex);

glDetachShader(result, fragment);
glDeleteShader(fragment);

checkShader(result, true);
if(geometry > 0) {
glDetachShader(result, geometry);
glDeleteShader(geometry);
}

glDeleteShader(vertex);
glDeleteShader(fragment);
checkProgram(result);

glUseProgram(result);
uint8_t t = 0;
Expand All @@ -166,30 +189,39 @@ uint32_t MaterialGL::buildProgram(uint32_t vertex, uint32_t fragment) {
return result;
}

bool MaterialGL::checkShader(uint32_t shader, bool link) {
bool MaterialGL::checkShader(uint32_t shader) {
int value = 0;

if(!link) {
glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
} else {
glGetProgramiv(shader, GL_LINK_STATUS, &value);
}
glGetShaderiv(shader, GL_COMPILE_STATUS, &value);

if(value != GL_TRUE) {
if(!link) {
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &value);
} else {
glGetProgramiv(shader, GL_INFO_LOG_LENGTH, &value);
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &value);

if(value) {
string buff;
buff.resize(value + 1);
glGetShaderInfoLog(shader, value, nullptr, &buff[0]);

aError() << "[ Render::ShaderGL ]" << name() << "\n[ Shader Said ]" << buff;
}
return false;
}
return true;
}

bool MaterialGL::checkProgram(uint32_t program) {
int value = 0;

glGetProgramiv(program, GL_LINK_STATUS, &value);

if(value != GL_TRUE) {
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &value);
if(value) {
char *buff = new char[value + 1];
if(!link) {
glGetShaderInfoLog(shader, value, nullptr, buff);
} else {
glGetProgramInfoLog(shader, value, nullptr, buff);
}
aError() << "[ Render::ShaderGL ]" << name().c_str() << "\n[ Said ]" << buff;
delete []buff;
string buff;
buff.resize(value + 1);
glGetProgramInfoLog(program, value, nullptr, &buff[0]);

aError() << "[ Render::ShaderGL ]" << name() << "\n[ Program Said ]" << buff;
}
return false;
}
Expand All @@ -202,12 +234,12 @@ MaterialInstance *MaterialGL::createInstance(SurfaceType type) {
initInstance(result);

if(result) {
uint16_t t = StaticInst;
uint16_t t = VertexStaticInst;
switch(type) {
case SurfaceType::Static: t = ShaderType::Static; break;
case SurfaceType::Skinned: t = ShaderType::Skinned; break;
case SurfaceType::Billboard: t = ShaderType::Particle; break;
case SurfaceType::Fullscreen: t = ShaderType::Fullscreen; break;
case SurfaceType::Static: t = VertexStatic; break;
case SurfaceType::Skinned: t = VertexSkinned; break;
case SurfaceType::Billboard: t = VertexParticle; break;
case SurfaceType::Fullscreen: t = VertexFullscreen; break;
default: break;
}

Expand Down