diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-03-28 11:05:36 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-03-28 11:05:36 +0800 |
| commit | 1a4517e5af8f43433fc2547658615dce4073d9a3 (patch) | |
| tree | 7a2dd9d392e7651674f17e342b44461ab47e5327 /indra/llrender/llrender.cpp | |
| parent | 9f20741e02491e009090211ac29bd37c31369378 (diff) | |
| parent | c810a409e22b90ebacb9946f8a4084ef0ad78d64 (diff) | |
Merge tag '7.1.4-release'
source for viewer 7.1.4.8149792635
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 05a98bff1b..67be49963e 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -871,7 +871,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) @@ -895,6 +895,13 @@ void LLRender::init(bool needs_vertex_buffer) glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); #endif +#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); @@ -905,6 +912,7 @@ void LLRender::init(bool needs_vertex_buffer) { initVertexBuffer(); } + return true; } void LLRender::initVertexBuffer() |