diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:13:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:13:05 +0200 |
| commit | bcb5210f6b51b65174425849fbe4cbc53e424c8d (patch) | |
| tree | 04420f59b47894d7945a44d995b72d6badb1c02c /indra/llrender/llrender.cpp | |
| parent | f25f51a20a7bcefcf51de5e71f827c74c659571a (diff) | |
| parent | ccefd2f719e97c353dd85b51098a29786924190c (diff) | |
Merge pull request #1063 from secondlife/marchcat/b-merge
Merge main into maint B
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index ee66122774..4d64dc9e10 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -857,7 +857,7 @@ LLRender::~LLRender() shutdown(); } -void LLRender::init(bool needs_vertex_buffer) +bool LLRender::init(bool needs_vertex_buffer) { #if LL_WINDOWS if (gGLManager.mHasDebugOutput && gDebugGL) @@ -879,6 +879,13 @@ void LLRender::init(bool needs_vertex_buffer) // necessary for reflection maps glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); +#if LL_WINDOWS + if (glGenVertexArrays == nullptr) + { + return false; + } +#endif + { //bind a dummy vertex array object so we're core profile compliant U32 ret; glGenVertexArrays(1, &ret); @@ -889,6 +896,7 @@ void LLRender::init(bool needs_vertex_buffer) { initVertexBuffer(); } + return true; } void LLRender::initVertexBuffer() |