Skip to content

A
angle
Commit e1a27751 by Geoff Lang
Options

Make more gl::Program methods const.

BUG=angleproject:1123 Change-Id: Ib48c523538322871a0deec7ba6497c8797967ef1 Reviewed-on: https://chromium-review.googlesource.com/303305Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 7c10269d
Showing with 42 additions and 32 deletions
src/libANGLE/Program.cpp
...@@ -209,7 +209,7 @@ size_t InfoLog::getLength() const ...@@ -209,7 +209,7 @@ size_t InfoLog::getLength() const
return logString.empty() ? 0 : logString.length() + 1; return logString.empty() ? 0 : logString.length() + 1;
} }
void InfoLog::getLog(GLsizei bufSize, GLsizei *length, char *infoLog) void InfoLog::getLog(GLsizei bufSize, GLsizei *length, char *infoLog) const
{ {
size_t index = 0; size_t index = 0;
...@@ -571,7 +571,7 @@ void Program::unlink(bool destroy) ...@@ -571,7 +571,7 @@ void Program::unlink(bool destroy)
mLinked = false; mLinked = false;
} }
bool Program::isLinked() bool Program::isLinked() const
{ {
return mLinked; return mLinked;
} }
...@@ -861,12 +861,12 @@ int Program::getInfoLogLength() const ...@@ -861,12 +861,12 @@ int Program::getInfoLogLength() const
return static_cast<int>(mInfoLog.getLength()); return static_cast<int>(mInfoLog.getLength());
} }
void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) const
{ {
return mInfoLog.getLog(bufSize, length, infoLog); return mInfoLog.getLog(bufSize, length, infoLog);
} }
void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shaders) void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shaders) const
{ {
int total = 0; int total = 0;
...@@ -896,7 +896,7 @@ void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shade ...@@ -896,7 +896,7 @@ void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shade
} }
} }
GLuint Program::getAttributeLocation(const std::string &name) GLuint Program::getAttributeLocation(const std::string &name) const
{ {
for (const sh::Attribute &attribute : mData.mAttributes) for (const sh::Attribute &attribute : mData.mAttributes)
{ {
...@@ -970,7 +970,7 @@ void Program::getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length, ...@@ -970,7 +970,7 @@ void Program::getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length,
*type = attrib.type; *type = attrib.type;
} }
GLint Program::getActiveAttributeCount() GLint Program::getActiveAttributeCount() const
{ {
if (!mLinked) if (!mLinked)
{ {
...@@ -987,7 +987,7 @@ GLint Program::getActiveAttributeCount() ...@@ -987,7 +987,7 @@ GLint Program::getActiveAttributeCount()
return count; return count;
} }
GLint Program::getActiveAttributeMaxLength() GLint Program::getActiveAttributeMaxLength() const
{ {
if (!mLinked) if (!mLinked)
{ {
...@@ -1022,7 +1022,12 @@ GLint Program::getFragDataLocation(const std::string &name) const ...@@ -1022,7 +1022,12 @@ GLint Program::getFragDataLocation(const std::string &name) const
return -1; return -1;
} }
void Program::getActiveUniform(GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name) void Program::getActiveUniform(GLuint index,
GLsizei bufsize,
GLsizei *length,
GLint *size,
GLenum *type,
GLchar *name) const
{ {
if (mLinked) if (mLinked)
{ {
...@@ -1067,7 +1072,7 @@ void Program::getActiveUniform(GLuint index, GLsizei bufsize, GLsizei *length, G ...@@ -1067,7 +1072,7 @@ void Program::getActiveUniform(GLuint index, GLsizei bufsize, GLsizei *length, G
} }
} }
GLint Program::getActiveUniformCount() GLint Program::getActiveUniformCount() const
{ {
if (mLinked) if (mLinked)
{ {
...@@ -1079,7 +1084,7 @@ GLint Program::getActiveUniformCount() ...@@ -1079,7 +1084,7 @@ GLint Program::getActiveUniformCount()
} }
} }
GLint Program::getActiveUniformMaxLength() GLint Program::getActiveUniformMaxLength() const
{ {
size_t maxLength = 0; size_t maxLength = 0;
...@@ -1271,17 +1276,17 @@ void Program::setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean tra ...@@ -1271,17 +1276,17 @@ void Program::setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean tra
mProgram->setUniformMatrix4x3fv(location, count, transpose, v); mProgram->setUniformMatrix4x3fv(location, count, transpose, v);
} }
void Program::getUniformfv(GLint location, GLfloat *v) void Program::getUniformfv(GLint location, GLfloat *v) const
{ {
getUniformInternal(location, v); getUniformInternal(location, v);
} }
void Program::getUniformiv(GLint location, GLint *v) void Program::getUniformiv(GLint location, GLint *v) const
{ {
getUniformInternal(location, v); getUniformInternal(location, v);
} }
void Program::getUniformuiv(GLint location, GLuint *v) void Program::getUniformuiv(GLint location, GLuint *v) const
{ {
getUniformInternal(location, v); getUniformInternal(location, v);
} }
...@@ -1391,7 +1396,7 @@ bool Program::isValidated() const ...@@ -1391,7 +1396,7 @@ bool Program::isValidated() const
return mValidated; return mValidated;
} }
GLuint Program::getActiveUniformBlockCount() GLuint Program::getActiveUniformBlockCount() const
{ {
return static_cast<GLuint>(mData.mUniformBlocks.size()); return static_cast<GLuint>(mData.mUniformBlocks.size());
} }
...@@ -1459,7 +1464,7 @@ void Program::getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pname, GL ...@@ -1459,7 +1464,7 @@ void Program::getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pname, GL
} }
} }
GLint Program::getActiveUniformBlockMaxLength() GLint Program::getActiveUniformBlockMaxLength() const
{ {
int maxLength = 0; int maxLength = 0;
...@@ -1484,7 +1489,7 @@ GLint Program::getActiveUniformBlockMaxLength() ...@@ -1484,7 +1489,7 @@ GLint Program::getActiveUniformBlockMaxLength()
return maxLength; return maxLength;
} }
GLuint Program::getUniformBlockIndex(const std::string &name) GLuint Program::getUniformBlockIndex(const std::string &name) const
{ {
size_t subscript = GL_INVALID_INDEX; size_t subscript = GL_INVALID_INDEX;
std::string baseName = gl::ParseUniformName(name, &subscript); std::string baseName = gl::ParseUniformName(name, &subscript);
......
src/libANGLE/Program.h
...@@ -69,7 +69,7 @@ class InfoLog : angle::NonCopyable ...@@ -69,7 +69,7 @@ class InfoLog : angle::NonCopyable
~InfoLog(); ~InfoLog();
size_t getLength() const; size_t getLength() const;
void getLog(GLsizei bufSize, GLsizei *length, char *infoLog); void getLog(GLsizei bufSize, GLsizei *length, char *infoLog) const;
void appendSanitized(const char *message); void appendSanitized(const char *message);
void reset(); void reset();
...@@ -250,29 +250,34 @@ class Program : angle::NonCopyable ...@@ -250,29 +250,34 @@ class Program : angle::NonCopyable
void bindAttributeLocation(GLuint index, const char *name); void bindAttributeLocation(GLuint index, const char *name);
Error link(const gl::Data &data); Error link(const gl::Data &data);
bool isLinked(); bool isLinked() const;
Error loadBinary(GLenum binaryFormat, const void *binary, GLsizei length); Error loadBinary(GLenum binaryFormat, const void *binary, GLsizei length);
Error saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, GLsizei *length) const; Error saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, GLsizei *length) const;
GLint getBinaryLength() const; GLint getBinaryLength() const;
int getInfoLogLength() const; int getInfoLogLength() const;
void getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog); void getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) const;
void getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shaders); void getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shaders) const;
GLuint getAttributeLocation(const std::string &name); GLuint getAttributeLocation(const std::string &name) const;
bool isAttribLocationActive(size_t attribLocation) const; bool isAttribLocationActive(size_t attribLocation) const;
void getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); void getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
GLint getActiveAttributeCount(); GLint getActiveAttributeCount() const;
GLint getActiveAttributeMaxLength(); GLint getActiveAttributeMaxLength() const;
const std::vector<sh::Attribute> &getAttributes() const { return mData.mAttributes; } const std::vector<sh::Attribute> &getAttributes() const { return mData.mAttributes; }
GLint getFragDataLocation(const std::string &name) const; GLint getFragDataLocation(const std::string &name) const;
void getActiveUniform(GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); void getActiveUniform(GLuint index,
GLint getActiveUniformCount(); GLsizei bufsize,
GLint getActiveUniformMaxLength(); GLsizei *length,
GLint *size,
GLenum *type,
GLchar *name) const;
GLint getActiveUniformCount() const;
GLint getActiveUniformMaxLength() const;
GLint getActiveUniformi(GLuint index, GLenum pname) const; GLint getActiveUniformi(GLuint index, GLenum pname) const;
bool isValidUniformLocation(GLint location) const; bool isValidUniformLocation(GLint location) const;
const LinkedUniform &getUniformByLocation(GLint location) const; const LinkedUniform &getUniformByLocation(GLint location) const;
...@@ -301,16 +306,16 @@ class Program : angle::NonCopyable ...@@ -301,16 +306,16 @@ class Program : angle::NonCopyable
void setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); void setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
void setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); void setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
void getUniformfv(GLint location, GLfloat *params); void getUniformfv(GLint location, GLfloat *params) const;
void getUniformiv(GLint location, GLint *params); void getUniformiv(GLint location, GLint *params) const;
void getUniformuiv(GLint location, GLuint *params); void getUniformuiv(GLint location, GLuint *params) const;
void getActiveUniformBlockName(GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName) const; void getActiveUniformBlockName(GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName) const;
void getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pname, GLint *params) const; void getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pname, GLint *params) const;
GLuint getActiveUniformBlockCount(); GLuint getActiveUniformBlockCount() const;
GLint getActiveUniformBlockMaxLength(); GLint getActiveUniformBlockMaxLength() const;
GLuint getUniformBlockIndex(const std::string &name); GLuint getUniformBlockIndex(const std::string &name) const;
void bindUniformBlock(GLuint uniformBlockIndex, GLuint uniformBlockBinding); void bindUniformBlock(GLuint uniformBlockIndex, GLuint uniformBlockBinding);
GLuint getUniformBlockBinding(GLuint uniformBlockIndex) const; GLuint getUniformBlockBinding(GLuint uniformBlockIndex) const;
......
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