LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '12.0-development' into metal

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-28 23:21:08 -04:00
parent 7c1a344c23 e188740c18
commit a5b87a10d1
58 changed files with 26065 additions and 6331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Shader.cpp
+5 -5
View File
@@ -429,7 +429,7 @@ void Shader::attach()
{
if (current != this)
{
Graphics::flushStreamDrawsGlobal();
Graphics::flushBatchedDrawsGlobal();
gl.useProgram(program);
current = this;
@@ -480,7 +480,7 @@ void Shader::updateUniform(const UniformInfo *info, int count, bool internalupda
}
if (!internalupdate)
flushStreamDraws();
flushBatchedDraws();
int location = info->location;
UniformType type = info->baseType;
@@ -578,7 +578,7 @@ void Shader::sendTextures(const UniformInfo *info, love::graphics::Texture **tex
bool shaderactive = current == this;
if (!internalUpdate && shaderactive)
flushStreamDraws();
flushBatchedDraws();
count = std::min(count, info->count);
@@ -644,10 +644,10 @@ void Shader::sendTextures(const UniformInfo *info, love::graphics::Texture **tex
}
}
void Shader::flushStreamDraws() const
void Shader::flushBatchedDraws() const
{
if (current == this)
Graphics::flushStreamDrawsGlobal();
Graphics::flushBatchedDrawsGlobal();
}
bool Shader::hasUniform(const std::string &name) const