From 40c76d4efa7e67d4412ecbcf4cd4481387abbe6d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 17 Feb 2016 20:16:11 -0800 Subject: [PATCH] Delete nir_lower_samplers.cpp Somehow, in one of the merges with mesa master, the old file must have been kept when nir_lower_samplers.cpp was moved to nir_lower_samplers.c. --- src/glsl/nir/nir_lower_samplers.cpp | 248 ---------------------------- 1 file changed, 248 deletions(-) delete mode 100644 src/glsl/nir/nir_lower_samplers.cpp diff --git a/src/glsl/nir/nir_lower_samplers.cpp b/src/glsl/nir/nir_lower_samplers.cpp deleted file mode 100644 index 438caacfd4d..00000000000 --- a/src/glsl/nir/nir_lower_samplers.cpp +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) 2005-2007 Brian Paul All Rights Reserved. - * Copyright (C) 2008 VMware, Inc. All Rights Reserved. - * Copyright © 2014 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include "nir.h" -#include "../program.h" -#include "program/hash_table.h" -#include "ir_uniform.h" - -extern "C" { -#include "main/compiler.h" -#include "main/mtypes.h" -#include "program/prog_parameter.h" -#include "program/program.h" -} - -static void -add_indirect_to_tex(nir_tex_instr *instr, nir_src indirect) -{ - /* First, we have to resize the array of texture sources */ - nir_tex_src *new_srcs = rzalloc_array(instr, nir_tex_src, - instr->num_srcs + 1); - - for (unsigned i = 0; i < instr->num_srcs; i++) { - new_srcs[i].src_type = instr->src[i].src_type; - nir_instr_move_src(&instr->instr, &new_srcs[i].src, &instr->src[i].src); - } - - ralloc_free(instr->src); - instr->src = new_srcs; - - /* Now we can go ahead and move the source over to being a - * first-class texture source. - */ - instr->src[instr->num_srcs].src_type = nir_tex_src_sampler_offset; - instr->num_srcs++; - nir_instr_rewrite_src(&instr->instr, &instr->src[instr->num_srcs - 1].src, - indirect); -} - -static unsigned -get_sampler_index(const struct gl_shader_program *shader_program, - gl_shader_stage stage, const char *name) -{ - unsigned location; - if (!shader_program->UniformHash->get(location, name)) { - assert(!"failed to find sampler"); - return 0; - } - - if (!shader_program->UniformStorage[location].sampler[stage].active) { - assert(!"cannot return a sampler"); - return 0; - } - - return shader_program->UniformStorage[location].sampler[stage].index; -} - -static void -lower_sampler(nir_tex_instr *instr, const struct gl_shader_program *shader_program, - gl_shader_stage stage, void *mem_ctx) -{ - if (instr->sampler == NULL) - return; - - /* Get the name and the offset */ - instr->sampler_index = 0; - char *name = ralloc_strdup(mem_ctx, instr->sampler->var->name); - - for (nir_deref *deref = &instr->sampler->deref; - deref->child; deref = deref->child) { - switch (deref->child->deref_type) { - case nir_deref_type_array: { - nir_deref_array *deref_array = nir_deref_as_array(deref->child); - - assert(deref_array->deref_array_type != nir_deref_array_type_wildcard); - - if (deref_array->deref.child) { - ralloc_asprintf_append(&name, "[%u]", - deref_array->deref_array_type == nir_deref_array_type_direct ? - deref_array->base_offset : 0); - } else { - assert(deref->child->type->base_type == GLSL_TYPE_SAMPLER); - instr->sampler_index = deref_array->base_offset; - } - - /* XXX: We're assuming here that the indirect is the last array - * thing we have. This should be ok for now as we don't support - * arrays_of_arrays yet. - */ - if (deref_array->deref_array_type == nir_deref_array_type_indirect) { - /* First, we have to resize the array of texture sources */ - nir_tex_src *new_srcs = rzalloc_array(instr, nir_tex_src, - instr->num_srcs + 1); - - for (unsigned i = 0; i < instr->num_srcs; i++) { - new_srcs[i].src_type = instr->src[i].src_type; - nir_instr_move_src(&instr->instr, &new_srcs[i].src, - &instr->src[i].src); - } - - ralloc_free(instr->src); - instr->src = new_srcs; - - /* Now we can go ahead and move the source over to being a - * first-class texture source. - */ - instr->src[instr->num_srcs].src_type = nir_tex_src_sampler_offset; - instr->num_srcs++; - nir_instr_move_src(&instr->instr, - &instr->src[instr->num_srcs - 1].src, - &deref_array->indirect); - - instr->sampler_array_size = glsl_get_length(deref->type); - } - break; - } - - case nir_deref_type_struct: { - nir_deref_struct *deref_struct = nir_deref_as_struct(deref->child); - const char *field = glsl_get_struct_elem_name(deref->type, - deref_struct->index); - ralloc_asprintf_append(&name, ".%s", field); - break; - } - - default: - unreachable("Invalid deref type"); - break; - } - } - - instr->sampler_index += get_sampler_index(shader_program, stage, name); - - instr->sampler = NULL; -} - -typedef struct { - void *mem_ctx; - const struct gl_shader_program *shader_program; - gl_shader_stage stage; -} lower_state; - -static bool -lower_block_cb(nir_block *block, void *_state) -{ - lower_state *state = (lower_state *) _state; - - nir_foreach_instr(block, instr) { - if (instr->type == nir_instr_type_tex) { - nir_tex_instr *tex_instr = nir_instr_as_tex(instr); - lower_sampler(tex_instr, state->shader_program, state->stage, - state->mem_ctx); - } - } - - return true; -} - -static void -lower_impl(nir_function_impl *impl, const struct gl_shader_program *shader_program, - gl_shader_stage stage) -{ - lower_state state; - - state.mem_ctx = ralloc_parent(impl); - state.shader_program = shader_program; - state.stage = stage; - - nir_foreach_block(impl, lower_block_cb, &state); -} - -extern "C" void -nir_lower_samplers(nir_shader *shader, - const struct gl_shader_program *shader_program) -{ - nir_foreach_overload(shader, overload) { - if (overload->impl) - lower_impl(overload->impl, shader_program, shader->stage); - } -} - -static bool -lower_samplers_for_vk_block(nir_block *block, void *data) -{ - nir_foreach_instr(block, instr) { - if (instr->type != nir_instr_type_tex) - continue; - - nir_tex_instr *tex = nir_instr_as_tex(instr); - - assert(tex->sampler); - - tex->sampler_set = tex->sampler->var->data.descriptor_set; - tex->sampler_index = tex->sampler->var->data.binding; - - if (tex->sampler->deref.child) { - assert(tex->sampler->deref.child->deref_type == nir_deref_type_array); - nir_deref_array *arr = nir_deref_as_array(tex->sampler->deref.child); - - /* Only one-level arrays are allowed in vulkan */ - assert(arr->deref.child == NULL); - - tex->sampler_index += arr->base_offset; - if (arr->deref_array_type == nir_deref_array_type_indirect) { - add_indirect_to_tex(tex, arr->indirect); - nir_instr_rewrite_src(instr, &arr->indirect, NIR_SRC_INIT); - - tex->sampler_array_size = glsl_get_length(tex->sampler->deref.type); - } - } - - tex->sampler = NULL; - } - - return true; -} - -extern "C" void -nir_lower_samplers_for_vk(nir_shader *shader) -{ - nir_foreach_overload(shader, overload) { - if (overload->impl) { - nir_foreach_block(overload->impl, lower_samplers_for_vk_block, NULL); - } - } -} -- 2.30.2