diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-07 19:46:10 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-07 19:46:10 +0800 |
| commit | e600f6504cd7edd9d2883ea7dc17c2574b1ff468 (patch) | |
| tree | efc0aa6d3b75e2877a0a323c5c24b75ff8ac902c /indra/llrender/llglslshader.cpp | |
| parent | 0aa43b264a76bb46cec2381b66708052b6b0ced9 (diff) | |
Bring back GL funcs & macros that work on macOS
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 58a9e28270..f587fb414c 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -797,16 +797,21 @@ 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 - type == GL_SAMPLER_2D_MULTISAMPLE) +#if GL_VERSION_3_2 + || type == GL_SAMPLER_2D_MULTISAMPLE +#endif + ) { //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; } |