diff options
author | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
commit | 522c4b4f0925463d5f30a4a0f314999a11d5def3 (patch) | |
tree | 9e6f25155182f643ace380179592516a08792646 /indra/llrender/llrender.cpp | |
parent | afc943acbc2bb79e2e1aa5d5eaf448e01b6c2b00 (diff) | |
parent | 5fca8915d8f44cdb2a4f7bb4715d61ba47043e5d (diff) |
Merge branch '965-eep-skies-too-bright-after-hdri-local-preview-merge' of https://github.com/secondlife/viewer into 965-eep-skies-too-bright-after-hdri-local-preview-merge
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() |