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

Fixups after merge for DRTVWR-559

meow-7.2.2
Brad Linden 2023-02-02 13:07:57 -08:00
parent dc1dd7a274
commit be8c7a42b5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llimagej2coj/llimagej2coj.cpp
View File

@ -169,7 +169,6 @@ static OPJ_SIZE_T opj_write(void * buffer, OPJ_SIZE_T bytes, void* user_data)
static OPJ_OFF_T opj_skip(OPJ_OFF_T bytes, void* user_data)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
JPEG2KBase* jpeg_codec = static_cast<JPEG2KBase*>(user_data);
jpeg_codec->offset += bytes;
@ -727,6 +726,7 @@ bool LLImageJ2COJ::initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int disca
bool LLImageJ2COJ::initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size, int precincts_size, int levels)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
// No specific implementation for this method in the OpenJpeg case
return false;
}

3
indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
View File

@ -26,7 +26,7 @@
/*[EXTRA_CODE_HERE]*/
// Inputs
VARYING vec4 vary_HazeColor;
VARYING vec3 vary_HazeColor;
VARYING float vary_LightNormPosDot;
uniform sampler2D rainbow_map;
@ -46,7 +46,6 @@ out vec4 frag_data[3];
// The fragment shader for the sky
/////////////////////////////////////////////////////////////////////////
VARYING vec3 vary_HazeColor;
vec3 rainbow(float d)
{