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

Merge pull request #97 from secondlife/brad/DRTVWR-559 

brad/drtvwr-559 mac shader and assert fixes
master
Brad Linden 2023-02-28 10:33:37 -08:00 committed by GitHub
parent 9a024172da 78e7ada94b
commit 3947bd13fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llrender/llimagegl.cpp
View File

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

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

2
indra/newview/app_settings/shaders/class1/interface/gaussianF.glsl
View File

@ -41,7 +41,7 @@ void main()
{
vec3 col = vec3(0,0,0);
float w[] = { 0.0002, 0.0060, 0.0606, 0.2417, 0.3829, 0.2417, 0.0606, 0.0060, 0.0002 };
float w[9] = float[9]( 0.0002, 0.0060, 0.0606, 0.2417, 0.3829, 0.2417, 0.0606, 0.0060, 0.0002 );
for (int i = 0; i < 9; ++i)
{

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;
}

1
indra/newview/featuretable_mac.txt
View File

@ -71,6 +71,7 @@ RenderGLMultiThreaded 1 0
RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 2
RenderScreenSpaceReflections 1 1
RenderReflectionProbeCount 1 8
//
// Low Graphics Settings