MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Correct set shader uniforms.

Browse Source
This commit is contained in:
Sergey Lipskiy 2014-12-24 15:51:18 +06:00
parent 3c9cdf5694
commit 7f6dd67db9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
GLSLCombiner.h
View File

@ -67,26 +67,26 @@ private:
void _locate_attributes() const;
void _locateUniforms();
void _setIUniform(iUniform & _u, int _val, bool _force) {
if (_force|| _u.val != _val) {
if (_u.loc >= 0 && (_force || _u.val != _val)) {
_u.val = _val;
glUniform1i(_u.loc, _val);
}
}
void _setFUniform(fUniform & _u, float _val, bool _force) {
if (_force|| _u.val != _val) {
if (_u.loc >= 0 && (_force || _u.val != _val)) {
_u.val = _val;
glUniform1f(_u.loc, _val);
}
}
void _setFV2Uniform(fv2Uniform & _u, float _val1, float _val2, bool _force) {
if (_force|| _u.val[0] != _val1 || _u.val[1] != _val2) {
if (_u.loc >= 0 && (_force || _u.val[0] != _val1 || _u.val[1] != _val2)) {
_u.val[0] = _val1;
_u.val[1] = _val2;
glUniform2f(_u.loc, _val1, _val2);
}
}
void _setIV2Uniform(iv2Uniform & _u, int _val1, int _val2, bool _force) {
if (_force|| _u.val[0] != _val1 || _u.val[1] != _val2) {
if (_u.loc >= 0 && (_force || _u.val[0] != _val1 || _u.val[1] != _val2)) {
_u.val[0] = _val1;
_u.val[1] = _val2;
glUniform2i(_u.loc, _val1, _val2);
@ -94,14 +94,14 @@ private:
}
void _setV3Uniform(fv3Uniform & _u, float * _pVal, bool _force) {
const size_t szData = sizeof(float)*3;
if (_force|| memcmp(_u.val, _pVal, szData) > 0) {
if (_u.loc >= 0 && (_force || memcmp(_u.val, _pVal, szData) > 0)) {
memcpy(_u.val, _pVal, szData);
glUniform3fv(_u.loc, 1, _pVal);
}
}
void _setV4Uniform(fv4Uniform & _u, float * _pVal, bool _force) {
const size_t szData = sizeof(float)*4;
if (_force|| memcmp(_u.val, _pVal, szData) > 0) {
if (_u.loc >= 0 && (_force || memcmp(_u.val, _pVal, szData) > 0)) {
memcpy(_u.val, _pVal, szData);
glUniform4fv(_u.loc, 1, _pVal);
}