Skip to content

Commit 71c1228

Browse files
rohvanirohvani
committed
fix llappearanceutility compiling against latest maint-b develop changes
- this included replacing llappearanceutilities use of BOOLs with bools - and updating LLBakingAvatar::applyMorphMask signature
1 parent f1f33b6 commit 71c1228

18 files changed

+46
-46
lines changed

‎indra/llappearanceutility/llappappearanceutility.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,10 @@ bool LLAppAppearanceUtility::init()
471471

472472
// Initialize classes.
473473
// Values taken from settings.xml.
474-
const BOOL USE_TEXTURE_NEW_BYTE_RANGE=TRUE;
474+
const bool USE_TEXTURE_NEW_BYTE_RANGE=TRUE;
475475
const S32 TEXTURE_REVERSE_BYTE_RANGE=50;
476476
LLImage::initClass(USE_TEXTURE_NEW_BYTE_RANGE, TEXTURE_REVERSE_BYTE_RANGE);
477-
const BOOL SKIP_ANALYZE_ALPHA=TRUE;
477+
const bool SKIP_ANALYZE_ALPHA=TRUE;
478478

479479
LLTranslationBridge::ptr_t trans = std::make_shared<LLPassthroughTranslationBridge>();
480480
LLWearableType::initParamSingleton(trans);

‎indra/llappearanceutility/llappappearanceutility.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class LLAppAppearanceUtility : public LLApp
8383
void initializeIO();
8484
public:
8585
void usage(std::ostream& ostr);
86-
BOOL isDebugMode() const { return mDebugMode; }
86+
bool isDebugMode() const { return mDebugMode; }
8787
S32 bakeTextureSize() const { return mBakeTextureSize; }
8888

8989
private:
@@ -97,7 +97,7 @@ class LLAppAppearanceUtility : public LLApp
9797
std::string mOutputFilename;
9898
LLUUID mAgentID;
9999
S32 mBakeTextureSize;
100-
BOOL mDebugMode;
100+
bool mDebugMode;
101101
LLTrace::Recording mRecording;
102102
S32 mTreeMapThreshold;
103103
std::string mTreeMapFilename;

‎indra/llappearanceutility/llbakingavatar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ void LLBakingAvatar::bakedTextureDatasAsLLSD(LLSD& sd) const
9292
//-----------------------------------------------------------------------------
9393

9494
void LLBakingAvatar::bodySizeChanged() {}
95-
void LLBakingAvatar::applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components,
95+
void LLBakingAvatar::applyMorphMask(const U8* tex_data, S32 width, S32 height, S32 num_components,
9696
LLAvatarAppearanceDefines::EBakedTextureIndex index) {}
9797
void LLBakingAvatar::invalidateComposite(LLTexLayerSet* layerset) {}
9898
void LLBakingAvatar::updateMeshTextures() {}
9999
void LLBakingAvatar::dirtyMesh() {}
100100
void LLBakingAvatar::dirtyMesh(S32 priority) {}
101101
void LLBakingAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color) {}
102102

103-
BOOL LLBakingAvatar::isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
103+
bool LLBakingAvatar::isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
104104
{
105105
return TRUE;
106106
}

‎indra/llappearanceutility/llbakingavatar.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ class LLBakingAvatar : public LLAvatarAppearance
8484
//--------------------------------------------------------------------
8585
public:
8686
/*virtual*/ void bodySizeChanged();
87-
/*virtual*/ void applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components,
87+
/*virtual*/ void applyMorphMask(const U8* tex_data, S32 width, S32 height, S32 num_components,
8888
LLAvatarAppearanceDefines::EBakedTextureIndex index);
8989
/*virtual*/ void invalidateComposite(LLTexLayerSet* layerset);
9090
/*virtual*/ void updateMeshTextures();
9191
/*virtual*/ void dirtyMesh(); // Dirty the avatar mesh
9292
/*virtual*/ void onGlobalColorChanged(const LLTexGlobalColor* global_color);
93-
/*virtual*/ BOOL isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index = 0) const;
94-
/*virtual*/ BOOL isUsingLocalAppearance() const { return FALSE; }
95-
/*virtual*/ BOOL isUsingServerBakes() const { return FALSE; }
96-
/*virtual*/ BOOL isEditingAppearance() const { return FALSE; }
93+
/*virtual*/ bool isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index = 0) const;
94+
/*virtual*/ bool isUsingLocalAppearance() const { return FALSE; }
95+
/*virtual*/ bool isUsingServerBakes() const { return FALSE; }
96+
/*virtual*/ bool isEditingAppearance() const { return FALSE; }
9797
private:
9898
/*virtual*/ void dirtyMesh(S32 priority); // Dirty the avatar mesh, with priority
9999

@@ -115,8 +115,8 @@ class LLBakingAvatar : public LLAvatarAppearance
115115
**/
116116
public:
117117
/*virtual*/ bool isSelf() const { return true; }
118-
/*virtual*/ BOOL isValid() const { return TRUE; }
119-
/*virtual*/ BOOL isUsingBakedTextures() const { return TRUE; }
118+
/*virtual*/ bool isValid() const { return TRUE; }
119+
/*virtual*/ bool isUsingBakedTextures() const { return TRUE; }
120120

121121
/** State
122122
** **

‎indra/llappearanceutility/llbakingjoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ LLBakingJoint::~LLBakingJoint()
4646
}
4747

4848
// virtual
49-
U32 LLBakingJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
49+
U32 LLBakingJoint::render( F32 pixelArea, bool first_pass, bool is_dummy)
5050
{
5151
LL_ERRS() << "LLBakingJoint::render() should never be called!" << LL_ENDL;
5252
return 0;

‎indra/llappearanceutility/llbakingjoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class LLBakingJoint : public virtual LLAvatarJoint
3737
virtual ~LLBakingJoint();
3838

3939
// LLViewerJoint interface
40-
virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );
40+
virtual U32 render( F32 pixelArea, bool first_pass = TRUE, bool is_dummy = FALSE );
4141
};
4242

4343
#endif /* LL_LLBAKINGJOINT_H */

‎indra/llappearanceutility/llbakingjointmesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class LLBakingJointMesh : public LLAvatarJointMesh, public LLBakingJoint
3737
LLBakingJointMesh(S32 joint_num);
3838
virtual ~LLBakingJointMesh();
3939

40-
U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE )
40+
U32 render( F32 pixelArea, bool first_pass = TRUE, bool is_dummy = FALSE )
4141
{ return LLBakingJoint::render(pixelArea,first_pass,is_dummy); }
4242
};
4343

‎indra/llappearanceutility/llbakingshadermgr.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ using std::pair;
5151
using std::make_pair;
5252
using std::string;
5353

54-
BOOL LLBakingShaderMgr::sInitialized = FALSE;
54+
bool LLBakingShaderMgr::sInitialized = FALSE;
5555
bool LLBakingShaderMgr::sSkipReload = false;
5656

5757
//utility shaders
@@ -137,7 +137,7 @@ void LLBakingShaderMgr::setShaders()
137137
mMaxAvatarShaderLevel = 0;
138138

139139
LLVertexBuffer::unbind();
140-
BOOL loaded = FALSE;
140+
bool loaded = FALSE;
141141
if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 10)
142142
{
143143
S32 light_class = 2;
@@ -213,15 +213,15 @@ void LLBakingShaderMgr::unloadShaders()
213213
//gPipeline.mVertexShadersLoaded = 0;
214214
}
215215

216-
BOOL LLBakingShaderMgr::loadShadersInterface()
216+
bool LLBakingShaderMgr::loadShadersInterface()
217217
{
218218
gAlphaMaskProgram.mName = "Alpha Mask Shader";
219219
gAlphaMaskProgram.mShaderFiles.clear();
220220
gAlphaMaskProgram.mShaderFiles.push_back(make_pair("interface/alphamaskV.glsl", GL_VERTEX_SHADER_ARB));
221221
gAlphaMaskProgram.mShaderFiles.push_back(make_pair("interface/alphamaskF.glsl", GL_FRAGMENT_SHADER_ARB));
222222
gAlphaMaskProgram.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE];
223223

224-
if( !gAlphaMaskProgram.createShader(NULL, NULL) )
224+
if( !gAlphaMaskProgram.createShader() )
225225
{
226226
mVertexShaderLevel[SHADER_INTERFACE] = 0;
227227
return FALSE;

‎indra/llappearanceutility/llbakingshadermgr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
class LLBakingShaderMgr: public LLShaderMgr
3333
{
3434
public:
35-
static BOOL sInitialized;
35+
static bool sInitialized;
3636
static bool sSkipReload;
3737

3838
LLBakingShaderMgr();
@@ -45,7 +45,7 @@ class LLBakingShaderMgr: public LLShaderMgr
4545
void setShaders();
4646
void unloadShaders();
4747
S32 getVertexShaderLevel(S32 type);
48-
BOOL loadShadersInterface();
48+
bool loadShadersInterface();
4949

5050
std::vector<S32> mVertexShaderLevel;
5151
S32 mMaxAvatarShaderLevel;

‎indra/llappearanceutility/llbakingtexlayer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ LLBakingTexLayerSetBuffer::~LLBakingTexLayerSetBuffer()
5555
destroyGLTexture();
5656
}
5757

58-
BOOL LLBakingTexLayerSetBuffer::render()
58+
bool LLBakingTexLayerSetBuffer::render()
5959
{
60-
BOOL result = FALSE;
60+
bool result = FALSE;
6161

6262
preRenderTexLayerSet();
6363
result = renderTexLayerSet(nullptr);
@@ -68,7 +68,7 @@ BOOL LLBakingTexLayerSetBuffer::render()
6868

6969
static LLFastTimer::DeclareTimer FTM_MID_RENDER("midRenderTexLayerSet");
7070
static LLFastTimer::DeclareTimer FTM_CREATE_J2C("Encode J2C image.");
71-
void LLBakingTexLayerSetBuffer::midRenderTexLayerSet(BOOL success)
71+
void LLBakingTexLayerSetBuffer::midRenderTexLayerSet(bool success)
7272
{
7373
LL_RECORD_BLOCK_TIME(FTM_MID_RENDER);
7474
if (!mTexLayerSet->isVisible())

0 commit comments

Comments
 (0)