зеркало из https://github.com/mozilla/gecko-dev.git
Bug 756171 - Fix warning in LayerManagerOGLProgram.h. r=bgirard
This commit is contained in:
Родитель
1d50496f1a
Коммит
21841cc405
|
@ -78,24 +78,24 @@ struct ProgramProfileOGL
|
|||
* returns true if such a shader program exists
|
||||
*/
|
||||
static bool ProgramExists(gl::ShaderProgramType aType, MaskType aMask)
|
||||
{
|
||||
if (aType < 0 ||
|
||||
aType >= gl::NumProgramTypes)
|
||||
return false;
|
||||
|
||||
if (aMask < MaskNone ||
|
||||
aMask >= NumMaskTypes)
|
||||
return false;
|
||||
|
||||
if (aMask == Mask2d &&
|
||||
(aType == gl::Copy2DProgramType ||
|
||||
aType == gl::Copy2DRectProgramType))
|
||||
return false;
|
||||
|
||||
return aMask != Mask3d ||
|
||||
aType == gl::RGBARectLayerProgramType ||
|
||||
aType == gl::RGBALayerProgramType;
|
||||
}
|
||||
{
|
||||
if (aType < 0 ||
|
||||
aType >= gl::NumProgramTypes)
|
||||
return false;
|
||||
|
||||
if (aMask < MaskNone ||
|
||||
aMask >= NumMaskTypes)
|
||||
return false;
|
||||
|
||||
if (aMask == Mask2d &&
|
||||
(aType == gl::Copy2DProgramType ||
|
||||
aType == gl::Copy2DRectProgramType))
|
||||
return false;
|
||||
|
||||
return aMask != Mask3d ||
|
||||
aType == gl::RGBARectLayerProgramType ||
|
||||
aType == gl::RGBALayerProgramType;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
@ -170,8 +170,8 @@ public:
|
|||
typedef mozilla::gl::GLContext GLContext;
|
||||
|
||||
ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile) :
|
||||
mGL(aGL), mProgram(0), mProgramState(STATE_NEW),
|
||||
mIsProjectionMatrixStale(false), mProfile(aProfile) { }
|
||||
mIsProjectionMatrixStale(false), mGL(aGL), mProgram(0),
|
||||
mProfile(aProfile), mProgramState(STATE_NEW) { }
|
||||
|
||||
|
||||
~ShaderProgramOGL() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче