#include <msp/gl/extensions/khr_debug.h>
#include <msp/gl/extensions/nv_non_square_matrices.h>
#include <msp/io/print.h>
+#include "device.h"
#include "error.h"
#include "program.h"
#include "program_backend.h"
void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values, TransientData &transient)
{
- SL::Compiler compiler;
+ SL::Compiler compiler(Device::get_current().get_info().glsl_features);
compiler.set_source(mod.get_prepared_source(), "<module>");
compiler.specialize(spec_values);
compiler.compile(SL::Compiler::PROGRAM);
#endif
}
-void OpenGLProgram::add_spirv_stages(const SpirVModule &mod, const map<string, int> &spec_values, TransientData &transient)
+void OpenGLProgram::add_spirv_stages(const SpirVModule &mod, const map<string, int> &spec_values)
{
static Require _req(ARB_gl_spirv);
static Require _req2(ARB_ES2_compatibility);
{
spec_id_array.push_back(c.constant_id);
spec_value_array.push_back(i->second);
- transient.spec_values[c.constant_id] = i->second;
}
}
if(func)
uniform_calls.push_back(UniformCall(u->location, u->array_size, func));
}
+
+ if(i->data_size<=0)
+ {
+ const ReflectData::UniformInfo &last = *i->uniforms.back();
+ i->data_size = last.location*16+last.array_size*get_type_size(last.type);
+ }
}
}