livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac shader and assertion fixes for DRTVWR-559

master
Brad Linden 2023-02-27 16:39:11 -08:00
parent 46b2c0660a
commit 78e7ada94b
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llvertexbuffer.cpp
View File

@ -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)
{

3
indra/newview/app_settings/shaders/class1/interface/splattexturerectV.glsl
View File

@ -26,15 +26,12 @@
uniform mat4 modelview_projection_matrix;
in vec3 position;
in vec4 diffuse_color;
out vec4 vertex_color;
out vec2 vary_texcoord0;
void main()
{
gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
vary_texcoord0 = position.xy*0.5+0.5;
vertex_color = diffuse_color;
}