mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings local variable hides parameter of the same name

Browse Source
This commit is contained in:
twinaphex 2021-04-10 19:28:30 +02:00
parent ca5ce839ce
commit 966dd62551
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/drivers_shader/shader_gl_core.cpp
View File

@ -189,9 +189,9 @@ GLuint gl_core_cross_compile_program(
for (auto &res : vertex_resources.stage_inputs)
{
char loc_buf[64];
uint32_t loc = vertex_compiler.get_decoration(res.id, spv::DecorationLocation);
snprintf(loc_buf, sizeof(loc_buf), "RARCH_ATTRIBUTE_%d", loc);
glBindAttribLocation(program, loc, loc_buf);
uint32_t _loc = vertex_compiler.get_decoration(res.id, spv::DecorationLocation);
snprintf(loc_buf, sizeof(loc_buf), "RARCH_ATTRIBUTE_%d", _loc);
glBindAttribLocation(program, _loc, loc_buf);
}
glLinkProgram(program);
glDeleteShader(vertex_shader);
@ -1128,12 +1128,12 @@ void Pass::build_semantic_vec4(uint8_t *data, slang_semantic semantic,
}
else
{
float *data = reinterpret_cast<float *>
float *_data = reinterpret_cast<float *>
(push_constant_buffer.data() + refl->push_constant_offset);
data[0] = (float)(width);
data[1] = (float)(height);
data[2] = 1.0f / (float)(width);
data[3] = 1.0f / (float)(height);
_data[0] = (float)(width);
_data[1] = (float)(height);
_data[2] = 1.0f / (float)(width);
_data[3] = 1.0f / (float)(height);
}
}
}
@ -1290,11 +1290,11 @@ void Pass::build_semantic_texture_array_vec4(uint8_t *data, slang_texture_semant
}
else
{
float *data = reinterpret_cast<float *>(push_constant_buffer.data() + refl[index].push_constant_offset);
data[0] = (float)(width);
data[1] = (float)(height);
data[2] = 1.0f / (float)(width);
data[3] = 1.0f / (float)(height);
float *_data = reinterpret_cast<float *>(push_constant_buffer.data() + refl[index].push_constant_offset);
_data[0] = (float)(width);
_data[1] = (float)(height);
_data[2] = 1.0f / (float)(width);
_data[3] = 1.0f / (float)(height);
}
}
}

20
gfx/drivers_shader/shader_vulkan.cpp
View File

@ -2039,11 +2039,11 @@ void Pass::build_semantic_texture_array_vec4(uint8_t *data, slang_texture_semant
if (refl[index].push_constant)
{
float *data = reinterpret_cast<float *>(push.buffer.data() + (refl[index].push_constant_offset >> 2));
data[0] = (float)(width);
data[1] = (float)(height);
data[2] = 1.0f / (float)(width);
data[3] = 1.0f / (float)(height);
float *_data = reinterpret_cast<float *>(push.buffer.data() + (refl[index].push_constant_offset >> 2));
_data[0] = (float)(width);
_data[1] = (float)(height);
_data[2] = 1.0f / (float)(width);
_data[3] = 1.0f / (float)(height);
}
}
@ -2069,12 +2069,12 @@ void Pass::build_semantic_vec4(uint8_t *data, slang_semantic semantic,
if (refl.push_constant)
{
float *data = reinterpret_cast<float *>
float *_data = reinterpret_cast<float *>
(push.buffer.data() + (refl.push_constant_offset >> 2));
data[0] = (float)(width);
data[1] = (float)(height);
data[2] = 1.0f / (float)(width);
data[3] = 1.0f / (float)(height);
_data[0] = (float)(width);
_data[1] = (float)(height);
_data[2] = 1.0f / (float)(width);
_data[3] = 1.0f / (float)(height);
}
}