OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: add vs_inputs_dual_locations compiler option

Browse Source 
Allows nir drivers to either use a single or dual locations for
vs double inputs.

i965 uses dual locations for both OpenGL and Vulkan drivers, for
now gallium OpenGL drivers only use a single location.

The following patch will also make use of this option when
calling nir_shader_gather_info().

Reviewed-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Timothy Arceri
2018-01-08 10:37:27 +11:00
parent f63e05ae9e
commit 5b8de4bdff
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -130,11 +130,15 @@ private:
} /* end of anonymous namespace */
static void
nir_remap_attributes(nir_shader *shader)
nir_remap_attributes(nir_shader *shader,
const nir_shader_compiler_options *options)
{
nir_foreach_variable(var, &shader->inputs) {
var->data.location += _mesa_bitcount_64(shader->info.vs.double_inputs &
BITFIELD64_MASK(var->data.location));
if (options->vs_inputs_dual_locations) {
nir_foreach_variable(var, &shader->inputs) {
var->data.location +=
_mesa_bitcount_64(shader->info.vs.double_inputs &
BITFIELD64_MASK(var->data.location));
}
}
/* Once the remap is done, reset double_inputs_read, so later it will have
@@ -164,7 +168,7 @@ glsl_to_nir(const struct gl_shader_program *shader_prog,
* location 0 and vec4 attr1 in location 1, in NIR attr0 will use
* locations/slots 0 and 1, and attr1 will use location/slot 2 */
if (shader->info.stage == MESA_SHADER_VERTEX)
nir_remap_attributes(shader);
nir_remap_attributes(shader, options);
shader->info.name = ralloc_asprintf(shader, "GLSL%d", shader_prog->Name);
if (shader_prog->Label)