mirror of
https://github.com/overte-org/overte.git
synced 2025-04-26 01:16:35 +02:00
Add _glUniform1i to Batches
This commit is contained in:
parent
db56e15410
commit
a486ed1a57
3 changed files with 26 additions and 0 deletions
|
@ -148,6 +148,7 @@ public:
|
||||||
void _glDrawBuffers(GLsizei n, const GLenum* bufs);
|
void _glDrawBuffers(GLsizei n, const GLenum* bufs);
|
||||||
|
|
||||||
void _glUseProgram(GLuint program);
|
void _glUseProgram(GLuint program);
|
||||||
|
void _glUniform1i(GLint location, GLint v0);
|
||||||
void _glUniform1f(GLint location, GLfloat v0);
|
void _glUniform1f(GLint location, GLfloat v0);
|
||||||
void _glUniform2f(GLint location, GLfloat v0, GLfloat v1);
|
void _glUniform2f(GLint location, GLfloat v0, GLfloat v1);
|
||||||
void _glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
|
void _glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
|
||||||
|
@ -210,6 +211,7 @@ public:
|
||||||
COMMAND_glDrawBuffers,
|
COMMAND_glDrawBuffers,
|
||||||
|
|
||||||
COMMAND_glUseProgram,
|
COMMAND_glUseProgram,
|
||||||
|
COMMAND_glUniform1i,
|
||||||
COMMAND_glUniform1f,
|
COMMAND_glUniform1f,
|
||||||
COMMAND_glUniform2f,
|
COMMAND_glUniform2f,
|
||||||
COMMAND_glUniform3f,
|
COMMAND_glUniform3f,
|
||||||
|
|
|
@ -59,6 +59,7 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
|
||||||
(&::gpu::GLBackend::do_glDrawBuffers),
|
(&::gpu::GLBackend::do_glDrawBuffers),
|
||||||
|
|
||||||
(&::gpu::GLBackend::do_glUseProgram),
|
(&::gpu::GLBackend::do_glUseProgram),
|
||||||
|
(&::gpu::GLBackend::do_glUniform1i),
|
||||||
(&::gpu::GLBackend::do_glUniform1f),
|
(&::gpu::GLBackend::do_glUniform1f),
|
||||||
(&::gpu::GLBackend::do_glUniform2f),
|
(&::gpu::GLBackend::do_glUniform2f),
|
||||||
(&::gpu::GLBackend::do_glUniform3f),
|
(&::gpu::GLBackend::do_glUniform3f),
|
||||||
|
@ -433,6 +434,28 @@ void GLBackend::do_glUseProgram(Batch& batch, uint32 paramOffset) {
|
||||||
(void) CHECK_GL_ERROR();
|
(void) CHECK_GL_ERROR();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Batch::_glUniform1i(GLint location, GLint v0) {
|
||||||
|
if (location < 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ADD_COMMAND_GL(glUniform1i);
|
||||||
|
_params.push_back(v0);
|
||||||
|
_params.push_back(location);
|
||||||
|
|
||||||
|
DO_IT_NOW(_glUniform1i, 1);
|
||||||
|
}
|
||||||
|
void GLBackend::do_glUniform1i(Batch& batch, uint32 paramOffset) {
|
||||||
|
if (_pipeline._program == 0) {
|
||||||
|
// We should call updatePipeline() to bind the program but we are not doing that
|
||||||
|
// because these uniform setters are deprecated and we don;t want to create side effect
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
glUniform1f(
|
||||||
|
batch._params[paramOffset + 1]._int,
|
||||||
|
batch._params[paramOffset + 0]._int);
|
||||||
|
(void) CHECK_GL_ERROR();
|
||||||
|
}
|
||||||
|
|
||||||
void Batch::_glUniform1f(GLint location, GLfloat v0) {
|
void Batch::_glUniform1f(GLint location, GLfloat v0) {
|
||||||
if (location < 0) {
|
if (location < 0) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -377,6 +377,7 @@ protected:
|
||||||
void do_glDrawBuffers(Batch& batch, uint32 paramOffset);
|
void do_glDrawBuffers(Batch& batch, uint32 paramOffset);
|
||||||
|
|
||||||
void do_glUseProgram(Batch& batch, uint32 paramOffset);
|
void do_glUseProgram(Batch& batch, uint32 paramOffset);
|
||||||
|
void do_glUniform1i(Batch& batch, uint32 paramOffset);
|
||||||
void do_glUniform1f(Batch& batch, uint32 paramOffset);
|
void do_glUniform1f(Batch& batch, uint32 paramOffset);
|
||||||
void do_glUniform2f(Batch& batch, uint32 paramOffset);
|
void do_glUniform2f(Batch& batch, uint32 paramOffset);
|
||||||
void do_glUniform3f(Batch& batch, uint32 paramOffset);
|
void do_glUniform3f(Batch& batch, uint32 paramOffset);
|
||||||
|
|
Loading…
Reference in a new issue