Fix GCC 6.3 warnings in aosp/master
Change-Id: I0a90ba7ed2e52fdadf554236850533298b2e1a9e
diff --git a/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp b/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp
index bddd035..358b7a2 100644
--- a/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp
+++ b/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp
@@ -76,16 +76,7 @@
void setSingleValue (const SsboArgData argData);
bool setAllValues (const std::vector<SsboArgData> argDataList);
- const std::string& getContextVersion (void) const;
- const std::string& getStdFormat (void) const;
- const std::string& getBindingPoint (void) const;
- const std::string& getMatrixOrder (void) const;
- const std::string& getMemberType (void) const;
- const std::string& getMemberName (void) const;
- const std::string& getMemberFixedArrayName (void) const;
- const std::string& getMemberVariableArray (void) const;
bool getMemberReorder (void) const;
- int getNumberMembers (void) const;
void resetValues (void);
@@ -177,56 +168,11 @@
return true;
}
-const std::string& SsboArgs::getContextVersion (void) const
-{
- return m_negativeContextVersion;
-}
-
-const std::string& SsboArgs::getStdFormat (void) const
-{
- return m_stdFormat;
-}
-
-const std::string& SsboArgs::getBindingPoint (void) const
-{
- return m_bindingPoint;
-}
-
-const std::string& SsboArgs::getMatrixOrder (void) const
-{
- return m_matrixOrder;
-}
-
-const std::string& SsboArgs::getMemberType (void) const
-{
- return m_memberType;
-}
-
-const std::string& SsboArgs::getMemberName (void) const
-{
- return m_memberName;
-}
-
-const std::string& SsboArgs::getMemberFixedArrayName (void) const
-{
- return m_memberFixedArrayerName;
-}
-
-const std::string& SsboArgs::getMemberVariableArray (void) const
-{
- return m_memberVariableArray;
-}
-
bool SsboArgs::getMemberReorder (void) const
{
return m_memberReorder;
}
-int SsboArgs::getNumberMembers (void) const
-{
- return m_numberMembers;
-}
-
void SsboArgs::resetValues (void)
{
setDefaultValues();
diff --git a/modules/gles31/functional/es31fSRGBDecodeTests.cpp b/modules/gles31/functional/es31fSRGBDecodeTests.cpp
index d3f947f..114a624 100644
--- a/modules/gles31/functional/es31fSRGBDecodeTests.cpp
+++ b/modules/gles31/functional/es31fSRGBDecodeTests.cpp
@@ -311,11 +311,9 @@
void setTextureUnit (const deUint32 textureUnit);
void setIsActive (const bool isActive);
- deUint32 getHandle (void) const;
bool getIsActive (void) const;
void bindToTexture (void);
- void unbindFromTexture (void);
private:
const glw::Functions* m_gl;
@@ -387,11 +385,6 @@
m_isActive = isActive;
}
-deUint32 SRGBTestSampler::getHandle (void) const
-{
- return m_samplerHandle;
-}
-
bool SRGBTestSampler::getIsActive (void) const
{
return m_isActive;
@@ -402,11 +395,6 @@
m_gl->bindSampler(m_textureUnit, m_samplerHandle);
}
-void SRGBTestSampler::unbindFromTexture (void)
-{
- m_gl->bindSampler(m_textureUnit, 0);
-}
-
class SRGBTestTexture
{
public:
@@ -430,7 +418,6 @@
deUint32 getHandle (void) const;
deUint32 getGLTargetType (void) const;
SRGBDecode getDecode (void) const;
- bool getHasSampler (void) const;
void upload (void);
@@ -565,11 +552,6 @@
return m_decoding;
}
-bool SRGBTestTexture::getHasSampler (void) const
-{
- return m_hasSampler;
-}
-
void SRGBTestTexture::upload (void)
{
m_source.upload();
@@ -604,14 +586,11 @@
void setToggleRequired (bool toggleRequired);
void setUniformToggle (int location, bool toggleDecodeValue);
- int getUniformTotal (void) const;
const std::vector<UniformData>& getUniformDataList (void) const;
const UniformData& getUniformAtLocation (int location) const;
int getUniformLocation (const std::string& name);
deUint32 getHandle (void) const;
bool getBlendRequired (void) const;
- bool getToggleRequired (void) const;
- const std::string& getFragmentShader (void) const;
private:
std::string genFunctionCall (ShaderSamplingType samplingType, const int uniformIdx);
@@ -713,11 +692,6 @@
}
}
-int SRGBTestProgram::getUniformTotal (void) const
-{
- return (int)m_uniformDataList.size();
-}
-
const std::vector<UniformData>& SRGBTestProgram::getUniformDataList (void) const
{
return m_uniformDataList;
@@ -752,16 +726,6 @@
return m_blendRequired;
}
-bool SRGBTestProgram::getToggleRequired (void) const
-{
- return m_toggleRequired;
-}
-
-const std::string& SRGBTestProgram::getFragmentShader (void) const
-{
- return m_shaderFragment;
-}
-
std::string SRGBTestProgram::genFunctionCall (ShaderSamplingType samplingType, const int uniformIdx)
{
std::ostringstream functionCall;
@@ -904,13 +868,8 @@
void setSamplingGroup (const ShaderSamplingGroup samplingGroup);
void setSamplingLocations (const int px, const int py);
- void setShaderProgramBlendRequired (const int programIdx, const bool blend);
- void setShaderProgramToggleRequired (const int programIdx, const bool toggle);
void setUniformToggle (const int programIdx, const std::string& uniformName, bool toggleDecode);
- deUint32 getShaderProgramHandle (const int programIdx) const;
- deUint32 getTextureHandle (const int textureIdx) const;
-
void addTexture (const glu::TextureTestUtil::TextureType targetType,
const int width,
const int height,
@@ -1104,32 +1063,6 @@
m_py = py;
}
-void SRGBTestCase::setShaderProgramBlendRequired (const int programIdx, const bool blend)
-{
- m_shaderProgramList[programIdx]->setBlendRequired(blend);
-}
-
-void SRGBTestCase::setShaderProgramToggleRequired (const int programIdx, const bool toggle)
-{
- m_shaderProgramList[programIdx]->setToggleRequired(toggle);
-}
-
-void SRGBTestCase::setUniformToggle (const int programIdx, const std::string& uniformName, bool toggleDecodeValue)
-{
- int uniformLocation = m_shaderProgramList[programIdx]->getUniformLocation(uniformName);
- m_shaderProgramList[programIdx]->setUniformToggle(uniformLocation, toggleDecodeValue);
-}
-
-deUint32 SRGBTestCase::getShaderProgramHandle (const int programIdx) const
-{
- return m_shaderProgramList[programIdx]->getHandle();
-}
-
-deUint32 SRGBTestCase::getTextureHandle (const int textureIdx) const
-{
- return m_textureSourceList[textureIdx]->getHandle();
-}
-
void SRGBTestCase::addTexture ( const glu::TextureTestUtil::TextureType targetType,
const int width,
const int height,
