diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-09-08 14:26:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-09-11 10:17:54 -0700 |
| commit | 2bbde6903adbea1dc7accce591c79a1d9b33b00c (patch) | |
| tree | a83a1bbd8d8f50effc9d7f58d73ba1776fc3bea1 /src/mbgl/gl/value.cpp | |
| parent | 437f243d657e9ddb1d48b7c0eeabf261209de61e (diff) | |
| download | qtlocation-mapboxgl-2bbde6903adbea1dc7accce591c79a1d9b33b00c.tar.gz | |
[core] Rename for clarity: ActiveTexture → ActiveTextureUnit
Diffstat (limited to 'src/mbgl/gl/value.cpp')
| -rw-r--r-- | src/mbgl/gl/value.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp index 89014fe6bc..092403af0d 100644 --- a/src/mbgl/gl/value.cpp +++ b/src/mbgl/gl/value.cpp @@ -242,13 +242,13 @@ LineWidth::Type LineWidth::Get() { return lineWidth; } -const constexpr ActiveTexture::Type ActiveTexture::Default; +const constexpr ActiveTextureUnit::Type ActiveTextureUnit::Default; -void ActiveTexture::Set(const Type& value) { +void ActiveTextureUnit::Set(const Type& value) { MBGL_CHECK_ERROR(glActiveTexture(GL_TEXTURE0 + value)); } -ActiveTexture::Type ActiveTexture::Get() { +ActiveTextureUnit::Type ActiveTextureUnit::Get() { GLint activeTexture; MBGL_CHECK_ERROR(glGetIntegerv(GL_ACTIVE_TEXTURE, &activeTexture)); return static_cast<Type>(activeTexture - GL_TEXTURE0); |