History

add a emissive parameter value to the lightmap shaders

Sam Gateau committed 11 years ago

Commit 68e2df81 parent f67b4b913 files · +45 −12Browse files

Showing the changes to interface/src/gpu/GLBackend.cpp (1 of 13 files). Show all

Unified · Split

interface/src/gpu/GLBackend.cpp+18−0
@@ -53,6 +53,7 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] = · 52 unmodified lines
53 53
54 (&::gpu::GLBackend::do_glUseProgram),54 (&::gpu::GLBackend::do_glUseProgram),
55 (&::gpu::GLBackend::do_glUniform1f),55 (&::gpu::GLBackend::do_glUniform1f),
56 (&::gpu::GLBackend::do_glUniform2f),
56 (&::gpu::GLBackend::do_glUniformMatrix4fv),57 (&::gpu::GLBackend::do_glUniformMatrix4fv),
57 58
58 (&::gpu::GLBackend::do_glMatrixMode),59 (&::gpu::GLBackend::do_glMatrixMode),
@@ -691,6 +692,23 @@ void GLBackend::do_glUniform1f(Batch& batch, uint32 paramOffset) { · 632 unmodified lines
691 CHECK_GL_ERROR();692 CHECK_GL_ERROR();
692}693}
693 694
695void Batch::_glUniform2f(GLint location, GLfloat v0, GLfloat v1) {
696 ADD_COMMAND_GL(glUniform2f);
697
698 _params.push_back(v1);
699 _params.push_back(v0);
700 _params.push_back(location);
701
702 DO_IT_NOW(_glUniform2f, 1);
703}
704void GLBackend::do_glUniform2f(Batch& batch, uint32 paramOffset) {
705 glUniform2f(
706 batch._params[paramOffset + 2]._int,
707 batch._params[paramOffset + 1]._float,
708 batch._params[paramOffset + 0]._float);
709 CHECK_GL_ERROR();
710}
711
694void Batch::_glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) {712void Batch::_glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) {
695 ADD_COMMAND_GL(glUniformMatrix4fv);713 ADD_COMMAND_GL(glUniformMatrix4fv);
696 714