Commit aae1e4ae by Corentin Wallez Committed by Commit Bot

ShCheckVariablesWithinPackingLimits: remove deprecated overload

BUG=621031 Change-Id: Ib4cdd88ecd58f617813a91379a8b8b518fba149b Reviewed-on: https://chromium-review.googlesource.com/364910Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
parent 5655b849
...@@ -446,13 +446,7 @@ typedef struct ...@@ -446,13 +446,7 @@ typedef struct
// flag above. // flag above.
// Parameters: // Parameters:
// maxVectors: the available rows of registers. // maxVectors: the available rows of registers.
// varInfoArray / variables: an array of variables. // variables: an array of variables.
// varInfoArraySize: the size of the variable array.
// TODO(cwallez) remove the first overload once the second is rolled in Chromium
COMPILER_EXPORT bool ShCheckVariablesWithinPackingLimits(
int maxVectors,
ShVariableInfo *varInfoArray,
size_t varInfoArraySize);
COMPILER_EXPORT bool ShCheckVariablesWithinPackingLimits( COMPILER_EXPORT bool ShCheckVariablesWithinPackingLimits(
int maxVectors, int maxVectors,
const std::vector<sh::ShaderVariable> &variables); const std::vector<sh::ShaderVariable> &variables);
......
...@@ -327,20 +327,6 @@ const std::vector<sh::InterfaceBlock> *ShGetInterfaceBlocks(const ShHandle handl ...@@ -327,20 +327,6 @@ const std::vector<sh::InterfaceBlock> *ShGetInterfaceBlocks(const ShHandle handl
return GetShaderVariables<sh::InterfaceBlock>(handle); return GetShaderVariables<sh::InterfaceBlock>(handle);
} }
bool ShCheckVariablesWithinPackingLimits(
int maxVectors, ShVariableInfo *varInfoArray, size_t varInfoArraySize)
{
if (varInfoArraySize == 0)
return true;
ASSERT(varInfoArray);
std::vector<sh::ShaderVariable> variables;
for (size_t ii = 0; ii < varInfoArraySize; ++ii)
{
sh::ShaderVariable var(varInfoArray[ii].type, varInfoArray[ii].size);
variables.push_back(var);
}
return ShCheckVariablesWithinPackingLimits(maxVectors, variables);
}
bool ShCheckVariablesWithinPackingLimits(int maxVectors, bool ShCheckVariablesWithinPackingLimits(int maxVectors,
const std::vector<sh::ShaderVariable> &variables) const std::vector<sh::ShaderVariable> &variables)
{ {
......
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