зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1241042 - remove the original implementation. r=jgilbert
This commit is contained in:
Родитель
b44cfb7256
Коммит
c801d201b6
|
@ -1193,17 +1193,6 @@ WebGLProgram::LinkAndUpdate()
|
|||
MOZ_RELEASE_ASSERT(mMostRecentLinkInfo, "GFX: most recent link info not set.");
|
||||
}
|
||||
|
||||
bool
|
||||
WebGLProgram::FindActiveOutputMappedNameByUserName(const nsACString& userName,
|
||||
nsCString* const out_mappedName) const
|
||||
{
|
||||
if (mFragShader->FindActiveOutputMappedNameByUserName(userName, out_mappedName)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
WebGLProgram::FindAttribUserNameByMappedName(const nsACString& mappedName,
|
||||
nsDependentCString* const out_userName) const
|
||||
|
|
|
@ -160,8 +160,6 @@ public:
|
|||
|
||||
////////////////
|
||||
|
||||
bool FindActiveOutputMappedNameByUserName(const nsACString& userName,
|
||||
nsCString* const out_mappedName) const;
|
||||
bool FindAttribUserNameByMappedName(const nsACString& mappedName,
|
||||
nsDependentCString* const out_userName) const;
|
||||
bool FindVaryingByMappedName(const nsACString& mappedName,
|
||||
|
|
|
@ -329,22 +329,6 @@ WebGLShader::BindAttribLocation(GLuint prog, const nsCString& userName,
|
|||
mContext->gl->fBindAttribLocation(prog, index, mappedNameStr->c_str());
|
||||
}
|
||||
|
||||
bool
|
||||
WebGLShader::FindActiveOutputMappedNameByUserName(const nsACString& userName,
|
||||
nsCString* const out_mappedName) const
|
||||
{
|
||||
if (!mValidator)
|
||||
return false;
|
||||
|
||||
const std::string userNameStr(userName.BeginReading());
|
||||
const std::string* mappedNameStr;
|
||||
if (!mValidator->FindActiveOutputMappedNameByUserName(userNameStr, &mappedNameStr))
|
||||
return false;
|
||||
|
||||
*out_mappedName = mappedNameStr->c_str();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
WebGLShader::FindAttribUserNameByMappedName(const nsACString& mappedName,
|
||||
nsDependentCString* const out_userName) const
|
||||
|
|
|
@ -52,8 +52,6 @@ public:
|
|||
size_t CalcNumSamplerUniforms() const;
|
||||
size_t NumAttributes() const;
|
||||
void BindAttribLocation(GLuint prog, const nsCString& userName, GLuint index) const;
|
||||
bool FindActiveOutputMappedNameByUserName(const nsACString& userName,
|
||||
nsCString* const out_mappedName) const;
|
||||
bool FindAttribUserNameByMappedName(const nsACString& mappedName,
|
||||
nsDependentCString* const out_userName) const;
|
||||
bool FindVaryingByMappedName(const nsACString& mappedName,
|
||||
|
|
|
@ -399,21 +399,6 @@ ShaderValidator::FindAttribUserNameByMappedName(const std::string& mappedName,
|
|||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
ShaderValidator::FindActiveOutputMappedNameByUserName(const std::string& userName,
|
||||
const std::string** const out_mappedName) const
|
||||
{
|
||||
const std::vector<sh::OutputVariable>& varibles = *ShGetOutputVariables(mHandle);
|
||||
for (auto itr = varibles.begin(); itr != varibles.end(); ++itr) {
|
||||
if (itr->name == userName) {
|
||||
*out_mappedName = &(itr->mappedName);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
ShaderValidator::FindAttribMappedNameByUserName(const std::string& userName,
|
||||
const std::string** const out_mappedName) const
|
||||
|
|
|
@ -48,9 +48,6 @@ public:
|
|||
bool FindAttribUserNameByMappedName(const std::string& mappedName,
|
||||
const std::string** const out_userName) const;
|
||||
|
||||
bool FindActiveOutputMappedNameByUserName(const std::string& userName,
|
||||
const std::string** const out_mappedName) const;
|
||||
|
||||
bool FindAttribMappedNameByUserName(const std::string& userName,
|
||||
const std::string** const out_mappedName) const;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче