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

Fix compilation on VS 2013

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-11-30 20:20:13 +07:00
parent 4706bb5231
commit d5eb2cdd85
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GLSLCombiner.h
View File

@ -72,11 +72,11 @@ private:
struct fv2Uniform {
GLint loc = -1;
float val[2] = {-9999.9f, -9999.9f};
float val1 = -9999.9f, val2 = -9999.9f;
void set(float _val1, float _val2, bool _force) {
if (loc >= 0 && (_force || val[0] != _val1 || val[1] != _val2)) {
val[0] = _val1;
val[1] = _val2;
if (loc >= 0 && (_force || val1 != _val1 || val2 != _val2)) {
val1 = _val1;
val2 = _val2;
glUniform2f(loc, _val1, _val2);
}
}
@ -84,11 +84,11 @@ private:
struct iv2Uniform {
GLint loc = -1;
int val[2] = {-990, -999};
int val1 = -999, val2 = -999;
void set(int _val1, int _val2, bool _force) {
if (loc >= 0 && (_force || val[0] != _val1 || val[1] != _val2)) {
val[0] = _val1;
val[1] = _val2;
if (loc >= 0 && (_force || val1 != _val1 || val2 != _val2)) {
val1 = _val1;
val2 = _val2;
glUniform2i(loc, _val1, _val2);
}
}