diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-28 12:52:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-28 12:52:57 -0600 |
| commit | 0982c44b46bfcbbf0d9a7a9a93605112fd1a4bd4 (patch) | |
| tree | 48532bcab1f64cdd2ba7a1457b8f57ec0da42d3c /indra/llrender | |
| parent | e42d97d027282a76923f85fd1f61e55ee8b1eeea (diff) | |
| parent | 3947bd13fdb00e9b21db151258c404c094b06675 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 7 | ||||
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index b3b79bd6c4..50d4532fa7 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1408,8 +1408,11 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt LL_PROFILE_ZONE_NUM(height); free_cur_tex_image(); -#if 0 - glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels); +#if LL_DARWIN + { + LL_PROFILE_ZONE_NAMED("glTexImage2D alloc"); + glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels); + } #else // break up calls to a manageable size for the GL command buffer { diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 11e2b6e5c4..9fb5eef3a2 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1363,7 +1363,7 @@ void LLVertexBuffer::setBuffer() U32 data_mask = LLGLSLShader::sCurBoundShaderPtr->mAttributeMask; // this Vertex Buffer must provide all necessary attributes for currently bound shader - llassert(((~data_mask & mTypeMask) > 0) || (mTypeMask == data_mask)); + llassert((data_mask & mTypeMask) == data_mask); if (sGLRenderBuffer != mGLBuffer) { |