Commit 2b280922 by Geoff Lang

Remove the unused ProgramImpl::getShaderVersion method.

BUG=angleproject:882 BUG=angleproject:1123 Change-Id: Iace1d6c2c594f0b00c18d595f14cef9bce6f3595 Reviewed-on: https://chromium-review.googlesource.com/303826Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 0ccd5aee
...@@ -35,8 +35,6 @@ class ProgramImpl : angle::NonCopyable ...@@ -35,8 +35,6 @@ class ProgramImpl : angle::NonCopyable
ProgramImpl(const gl::Program::Data &data) : mData(data) {} ProgramImpl(const gl::Program::Data &data) : mData(data) {}
virtual ~ProgramImpl() {} virtual ~ProgramImpl() {}
virtual int getShaderVersion() const = 0;
virtual GLenum getBinaryFormat() = 0; virtual GLenum getBinaryFormat() = 0;
virtual LinkResult load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) = 0; virtual LinkResult load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) = 0;
virtual gl::Error save(gl::BinaryOutputStream *stream) = 0; virtual gl::Error save(gl::BinaryOutputStream *stream) = 0;
......
...@@ -308,7 +308,6 @@ ProgramD3D::ProgramD3D(const gl::Program::Data &data, RendererD3D *renderer) ...@@ -308,7 +308,6 @@ ProgramD3D::ProgramD3D(const gl::Program::Data &data, RendererD3D *renderer)
mUsedVertexSamplerRange(0), mUsedVertexSamplerRange(0),
mUsedPixelSamplerRange(0), mUsedPixelSamplerRange(0),
mDirtySamplerMapping(true), mDirtySamplerMapping(true),
mShaderVersion(100),
mSerial(issueSerial()) mSerial(issueSerial())
{ {
mDynamicHLSL = new DynamicHLSL(renderer); mDynamicHLSL = new DynamicHLSL(renderer);
...@@ -476,8 +475,6 @@ LinkResult ProgramD3D::load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) ...@@ -476,8 +475,6 @@ LinkResult ProgramD3D::load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream)
return LinkResult(false, gl::Error(GL_NO_ERROR)); return LinkResult(false, gl::Error(GL_NO_ERROR));
} }
stream->readInt(&mShaderVersion);
// TODO(jmadill): replace MAX_VERTEX_ATTRIBS // TODO(jmadill): replace MAX_VERTEX_ATTRIBS
for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; ++i) for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; ++i)
{ {
...@@ -674,8 +671,6 @@ gl::Error ProgramD3D::save(gl::BinaryOutputStream *stream) ...@@ -674,8 +671,6 @@ gl::Error ProgramD3D::save(gl::BinaryOutputStream *stream)
stream->writeInt(ANGLE_COMPILE_OPTIMIZATION_LEVEL); stream->writeInt(ANGLE_COMPILE_OPTIMIZATION_LEVEL);
stream->writeInt(mShaderVersion);
// TODO(jmadill): replace MAX_VERTEX_ATTRIBS // TODO(jmadill): replace MAX_VERTEX_ATTRIBS
for (unsigned int i = 0; i < gl::MAX_VERTEX_ATTRIBS; ++i) for (unsigned int i = 0; i < gl::MAX_VERTEX_ATTRIBS; ++i)
{ {
...@@ -1004,7 +999,6 @@ LinkResult ProgramD3D::link(const gl::Data &data, gl::InfoLog &infoLog) ...@@ -1004,7 +999,6 @@ LinkResult ProgramD3D::link(const gl::Data &data, gl::InfoLog &infoLog)
mVertexHLSL = vertexShader->getTranslatedSource(); mVertexHLSL = vertexShader->getTranslatedSource();
vertexShaderD3D->generateWorkarounds(&mVertexWorkarounds); vertexShaderD3D->generateWorkarounds(&mVertexWorkarounds);
mShaderVersion = vertexShader->getShaderVersion();
mPixelHLSL = fragmentShader->getTranslatedSource(); mPixelHLSL = fragmentShader->getTranslatedSource();
fragmentShaderD3D->generateWorkarounds(&mPixelWorkarounds); fragmentShaderD3D->generateWorkarounds(&mPixelWorkarounds);
...@@ -1767,7 +1761,6 @@ void ProgramD3D::reset() ...@@ -1767,7 +1761,6 @@ void ProgramD3D::reset()
mVertexHLSL.clear(); mVertexHLSL.clear();
mVertexWorkarounds = D3DCompilerWorkarounds(); mVertexWorkarounds = D3DCompilerWorkarounds();
mShaderVersion = 100;
mPixelHLSL.clear(); mPixelHLSL.clear();
mPixelWorkarounds = D3DCompilerWorkarounds(); mPixelWorkarounds = D3DCompilerWorkarounds();
......
...@@ -77,7 +77,6 @@ class ProgramD3D : public ProgramImpl ...@@ -77,7 +77,6 @@ class ProgramD3D : public ProgramImpl
virtual ~ProgramD3D(); virtual ~ProgramD3D();
const std::vector<PixelShaderOutputVariable> &getPixelShaderKey() { return mPixelShaderKey; } const std::vector<PixelShaderOutputVariable> &getPixelShaderKey() { return mPixelShaderKey; }
int getShaderVersion() const { return mShaderVersion; }
GLint getSamplerMapping(gl::SamplerType type, unsigned int samplerIndex, const gl::Caps &caps) const; GLint getSamplerMapping(gl::SamplerType type, unsigned int samplerIndex, const gl::Caps &caps) const;
GLenum getSamplerTextureType(gl::SamplerType type, unsigned int samplerIndex) const; GLenum getSamplerTextureType(gl::SamplerType type, unsigned int samplerIndex) const;
...@@ -269,8 +268,6 @@ class ProgramD3D : public ProgramImpl ...@@ -269,8 +268,6 @@ class ProgramD3D : public ProgramImpl
// Cache for getPixelExecutableForFramebuffer // Cache for getPixelExecutableForFramebuffer
std::vector<GLenum> mPixelShaderOutputFormatCache; std::vector<GLenum> mPixelShaderOutputFormatCache;
int mShaderVersion;
SemanticIndexArray mSemanticIndexes; SemanticIndexArray mSemanticIndexes;
SemanticIndexArray mAttributesByLayout; SemanticIndexArray mAttributesByLayout;
......
...@@ -34,12 +34,6 @@ ProgramGL::~ProgramGL() ...@@ -34,12 +34,6 @@ ProgramGL::~ProgramGL()
mProgramID = 0; mProgramID = 0;
} }
int ProgramGL::getShaderVersion() const
{
UNIMPLEMENTED();
return int();
}
GLenum ProgramGL::getBinaryFormat() GLenum ProgramGL::getBinaryFormat()
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
......
...@@ -31,8 +31,6 @@ class ProgramGL : public ProgramImpl ...@@ -31,8 +31,6 @@ class ProgramGL : public ProgramImpl
StateManagerGL *stateManager); StateManagerGL *stateManager);
~ProgramGL() override; ~ProgramGL() override;
int getShaderVersion() const override;
GLenum getBinaryFormat() override; GLenum getBinaryFormat() override;
LinkResult load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) override; LinkResult load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) override;
gl::Error save(gl::BinaryOutputStream *stream) override; gl::Error save(gl::BinaryOutputStream *stream) override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment