diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-03-04 17:43:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 17:43:08 -0800 |
| commit | dd74c2cbd542daa8d6cedba7ba7a68268f7b73d3 (patch) | |
| tree | be09c6b71ce5e7a1546bb8e9d48be9b6e34e8fb7 /indra/llrender/llrender.cpp | |
| parent | 1013ea51a88aba820d41db7fc259296291504c11 (diff) | |
| parent | 6c43baf0298929ee315bdb3d95f0bd23f589a4cf (diff) | |
Merge pull request #928 from secondlife/andreyk/issue_54
Issue #54 LLRender::init crash and SL-17896
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() |