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

material work, use multibind and dsa in main texture binding

Browse Source
This commit is contained in:
milek7
2018-07-19 00:20:42 +02:00
parent ee16821509
commit a53224b47d
16 changed files with 128 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gl/shader.cpp
View File

@@ -104,11 +104,7 @@ void gl::shader::parse_texture_entries(std::string &str)
if (arg == 0)
token_ss >> name;
else if (arg == 1)
{
token_ss >> conf.id;
if (conf.id >= gl::MAX_TEXTURES)
log_error("invalid texture binding: " + std::to_string(conf.id));
}
else if (arg == 2)
{
std::string comp;
@@ -122,7 +118,14 @@ void gl::shader::parse_texture_entries(std::string &str)
}
if (arg == 3)
texture_conf.emplace(std::make_pair(name, conf));
{
if (name.empty())
log_error("empty name");
else if (conf.id >= gl::MAX_TEXTURES)
log_error("invalid texture binding: " + std::to_string(conf.id));
else
texture_conf.emplace(std::make_pair(name, conf));
}
else
log_error("invalid argument count to #texture");
@@ -155,11 +158,7 @@ void gl::shader::parse_param_entries(std::string &str)
if (arg == 0)
token_ss >> name;
else if (arg == 1)
{
token_ss >> conf.location;
if (conf.location >= gl::MAX_PARAMS)
log_error("invalid param binding: " + std::to_string(conf.location));
}
else if (arg == 2)
token_ss >> conf.offset;
else if (arg == 3)
@@ -176,7 +175,18 @@ void gl::shader::parse_param_entries(std::string &str)
}
if (arg == 5)
param_conf.emplace(std::make_pair(name, conf));
{
if (name.empty())
log_error("empty name");
else if (conf.location >= gl::MAX_PARAMS)
log_error("invalid param binding: " + std::to_string(conf.location));
else if (conf.offset > 3)
log_error("invalid offset: " + std::to_string(conf.offset));
else if (conf.offset + conf.size > 4)
log_error("invalid size: " + std::to_string(conf.size));
else
param_conf.emplace(std::make_pair(name, conf));
}
else
log_error("invalid argument count to #param");

4
gl/ubo.h
View File

@@ -31,7 +31,7 @@ namespace gl
#pragma pack(push, 1)
const size_t MAX_TEXTURES = 4;
const size_t MAX_TEXTURES = 8;
struct scene_ubs
{
@@ -91,7 +91,7 @@ namespace gl
static_assert(sizeof(light_element_ubs) == 64, "bad size of ubs");
const size_t MAX_LIGHTS = 4;
const size_t MAX_LIGHTS = 8;
struct light_ubs
{