diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-07 21:12:38 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-07 21:12:38 +0800 |
| commit | d0b773094d5a3129f5b6db7d9de0da41791b2852 (patch) | |
| tree | 39f105213ba151355bdb19f54f39a008091be463 /indra/llrender/llglslshader.cpp | |
| parent | 3da53b180139d2a79811c1ed7384beaad3a86a48 (diff) | |
Revert "Bring back GL funcs & macros that work on macOS"
This reverts commit e600f6504cd7edd9d2883ea7dc17c2574b1ff468.
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index f587fb414c..58a9e28270 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -797,21 +797,16 @@ GLint LLGLSLShader::mapUniformTextureChannel(GLint location, GLenum type) { LL_PROFILE_ZONE_SCOPED_CATEGORY_SHADER; -#if GL_VERSION_2_0 || GL_VERSION_3_2 if ( #if GL_VERSION_2_0 - (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB) + (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB) || #endif -#if GL_VERSION_3_2 - || type == GL_SAMPLER_2D_MULTISAMPLE -#endif - ) + type == GL_SAMPLER_2D_MULTISAMPLE) { //this here is a texture glUniform1i(location, mActiveTextureChannels); LL_DEBUGS("ShaderUniform") << "Assigned to texture channel " << mActiveTextureChannels << LL_ENDL; return mActiveTextureChannels++; } -#endif // GL_VERSION_2_0 || GL_VERSION_3_2 return -1; } |