0

Avoid shadowed parameters in GPU command buffer header files.

Add a "_" prefix (which is consistent with the namings in the files)
for parameter attributes for SetHeader/ComputeSize/ComputeDataSize

BUG=794619

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ia5fe1f145383fbd35a4cf00ab286b4f0ba859894
Reviewed-on: https://chromium-review.googlesource.com/852434
Reviewed-by: Victor Miura <vmiura@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#527388}
This commit is contained in:
Dave Tapuska
2018-01-05 14:38:07 -05:00
committed by Commit Bot
parent d06c2a7152
commit eed94eefc2
3 changed files with 283 additions and 286 deletions

@ -6253,21 +6253,21 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs) {
def WriteImmediateCmdComputeSize(self, func, f):
"""Overrriden from TypeHandler."""
f.write(" static uint32_t ComputeDataSize(GLsizei n) {\n")
f.write(" static uint32_t ComputeDataSize(GLsizei _n) {\n")
f.write(
" return static_cast<uint32_t>(sizeof(GLuint) * n); // NOLINT\n")
" return static_cast<uint32_t>(sizeof(GLuint) * _n); // NOLINT\n")
f.write(" }\n")
f.write("\n")
f.write(" static uint32_t ComputeSize(GLsizei n) {\n")
f.write(" static uint32_t ComputeSize(GLsizei _n) {\n")
f.write(" return static_cast<uint32_t>(\n")
f.write(" sizeof(ValueType) + ComputeDataSize(n)); // NOLINT\n")
f.write(" sizeof(ValueType) + ComputeDataSize(_n)); // NOLINT\n")
f.write(" }\n")
f.write("\n")
def WriteImmediateCmdSetHeader(self, func, f):
"""Overrriden from TypeHandler."""
f.write(" void SetHeader(GLsizei n) {\n")
f.write(" header.SetCmdByTotalSize<ValueType>(ComputeSize(n));\n")
f.write(" void SetHeader(GLsizei _n) {\n")
f.write(" header.SetCmdByTotalSize<ValueType>(ComputeSize(_n));\n")
f.write(" }\n")
f.write("\n")
@ -6662,21 +6662,21 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs) {
def WriteImmediateCmdComputeSize(self, func, f):
"""Overrriden from TypeHandler."""
f.write(" static uint32_t ComputeDataSize(GLsizei n) {\n")
f.write(" static uint32_t ComputeDataSize(GLsizei _n) {\n")
f.write(
" return static_cast<uint32_t>(sizeof(GLuint) * n); // NOLINT\n")
" return static_cast<uint32_t>(sizeof(GLuint) * _n); // NOLINT\n")
f.write(" }\n")
f.write("\n")
f.write(" static uint32_t ComputeSize(GLsizei n) {\n")
f.write(" static uint32_t ComputeSize(GLsizei _n) {\n")
f.write(" return static_cast<uint32_t>(\n")
f.write(" sizeof(ValueType) + ComputeDataSize(n)); // NOLINT\n")
f.write(" sizeof(ValueType) + ComputeDataSize(_n)); // NOLINT\n")
f.write(" }\n")
f.write("\n")
def WriteImmediateCmdSetHeader(self, func, f):
"""Overrriden from TypeHandler."""
f.write(" void SetHeader(GLsizei n) {\n")
f.write(" header.SetCmdByTotalSize<ValueType>(ComputeSize(n));\n")
f.write(" void SetHeader(GLsizei _n) {\n")
f.write(" header.SetCmdByTotalSize<ValueType>(ComputeSize(_n));\n")
f.write(" }\n")
f.write("\n")
@ -7609,24 +7609,24 @@ TEST_F(GLES2ImplementationTest, %(name)sInvalidConstantArg%(invalid_index)d) {
def WriteImmediateCmdComputeSize(self, func, f):
"""Overrriden from TypeHandler."""
f.write(" static uint32_t ComputeDataSize(GLsizei count) {\n")
f.write(" static uint32_t ComputeDataSize(GLsizei _n) {\n")
f.write(" return static_cast<uint32_t>(\n")
f.write(" sizeof(%s) * %d * count); // NOLINT\n" %
f.write(" sizeof(%s) * %d * _n); // NOLINT\n" %
(self.GetArrayType(func), self.GetArrayCount(func)))
f.write(" }\n")
f.write("\n")
f.write(" static uint32_t ComputeSize(GLsizei count) {\n")
f.write(" static uint32_t ComputeSize(GLsizei _n) {\n")
f.write(" return static_cast<uint32_t>(\n")
f.write(
" sizeof(ValueType) + ComputeDataSize(count)); // NOLINT\n")
" sizeof(ValueType) + ComputeDataSize(_n)); // NOLINT\n")
f.write(" }\n")
f.write("\n")
def WriteImmediateCmdSetHeader(self, func, f):
"""Overrriden from TypeHandler."""
f.write(" void SetHeader(GLsizei count) {\n")
f.write(" void SetHeader(GLsizei _n) {\n")
f.write(
" header.SetCmdByTotalSize<ValueType>(ComputeSize(count));\n")
" header.SetCmdByTotalSize<ValueType>(ComputeSize(_n));\n")
f.write(" }\n")
f.write("\n")

@ -373,9 +373,7 @@ struct SetBucketDataImmediate {
static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
void SetHeader(uint32_t size) {
header.SetCmdBySize<ValueType>(size);
}
void SetHeader(uint32_t _size) { header.SetCmdBySize<ValueType>(_size); }
void Init(uint32_t _bucket_id,
uint32_t _offset,
@ -561,4 +559,3 @@ static_assert(offsetof(GetBucketData, shared_memory_offset) == 20,
} // namespace gpu
#endif // GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_

File diff suppressed because it is too large Load Diff