[Mesa-dev] [PATCH 1/2] glsl: add support for textureSamples function
Tapani Pälli
tapani.palli at intel.com
Tue Aug 11 23:34:48 PDT 2015
Hi Ilia;
Some comments below;
On 08/12/2015 04:51 AM, Ilia Mirkin wrote:
> ---
> src/glsl/builtin_functions.cpp | 32 +++++++++++++++++++++++++++++-
> src/glsl/glcpp/glcpp-parse.y | 3 +++
> src/glsl/glsl_parser_extras.cpp | 1 +
> src/glsl/glsl_parser_extras.h | 2 ++
> src/glsl/ir.cpp | 5 +++--
> src/glsl/ir.h | 3 ++-
> src/glsl/ir_clone.cpp | 1 +
> src/glsl/ir_equals.cpp | 1 +
> src/glsl/ir_hv_accept.cpp | 1 +
> src/glsl/ir_print_visitor.cpp | 6 ++++--
> src/glsl/ir_reader.cpp | 6 +++++-
> src/glsl/ir_rvalue_visitor.cpp | 1 +
> src/glsl/nir/glsl_to_nir.cpp | 5 +++++
> src/glsl/nir/nir.h | 4 +++-
> src/glsl/nir/nir_print.c | 3 +++
> src/glsl/opt_tree_grafting.cpp | 1 +
> src/mesa/main/mtypes.h | 1 +
> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 ++
> 18 files changed, 70 insertions(+), 8 deletions(-)
>
> diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
> index 2175c66..1a71d74 100644
> --- a/src/glsl/builtin_functions.cpp
> +++ b/src/glsl/builtin_functions.cpp
> @@ -399,6 +399,13 @@ shader_image_load_store(const _mesa_glsl_parse_state *state)
> }
>
> static bool
> +shader_samples(const _mesa_glsl_parse_state *state)
> +{
> + return state->is_version(450, 0) ||
> + state->ARB_shader_texture_image_samples_enable;
According to the extension spec, 4.30 should be enough for this.
> +}
> +
> +static bool
> gs_streams(const _mesa_glsl_parse_state *state)
> {
> return gpu_shader5(state) && gs_only(state);
> @@ -630,10 +637,10 @@ private:
> B1(any);
> B1(all);
> B1(not);
> - B2(textureSize);
unrelated cleanup?
> ir_function_signature *_textureSize(builtin_available_predicate avail,
> const glsl_type *return_type,
> const glsl_type *sampler_type);
> + B1(textureSamples);
>
> /** Flags to _texture() */
> #define TEX_PROJECT 1
> @@ -1372,6 +1379,16 @@ builtin_builder::create_builtins()
> _textureSize(texture_multisample, glsl_type::ivec3_type, glsl_type::usampler2DMSArray_type),
> NULL);
>
> + add_function("textureSamples",
> + _textureSamples(glsl_type::sampler2DMS_type),
> + _textureSamples(glsl_type::isampler2DMS_type),
> + _textureSamples(glsl_type::usampler2DMS_type),
> +
> + _textureSamples(glsl_type::sampler2DMSArray_type),
> + _textureSamples(glsl_type::isampler2DMSArray_type),
> + _textureSamples(glsl_type::usampler2DMSArray_type),
> + NULL);
> +
> add_function("texture",
> _texture(ir_tex, v130, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
> _texture(ir_tex, v130, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::float_type),
> @@ -4079,6 +4096,19 @@ builtin_builder::_textureSize(builtin_available_predicate avail,
> }
>
> ir_function_signature *
> +builtin_builder::_textureSamples(const glsl_type *sampler_type)
> +{
> + ir_variable *s = in_var(sampler_type, "sampler");
> + MAKE_SIG(glsl_type::int_type, shader_samples, 1, s);
> +
> + ir_texture *tex = new(mem_ctx) ir_texture(ir_texture_samples);
> + tex->set_sampler(new(mem_ctx) ir_dereference_variable(s), glsl_type::int_type);
> + body.emit(ret(tex));
> +
> + return sig;
> +}
> +
> +ir_function_signature *
> builtin_builder::_texture(ir_texture_opcode opcode,
> builtin_available_predicate avail,
> const glsl_type *return_type,
> diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
> index dd5ec2a..52cae08 100644
> --- a/src/glsl/glcpp/glcpp-parse.y
> +++ b/src/glsl/glcpp/glcpp-parse.y
> @@ -2478,6 +2478,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
> if (extensions->ARB_shader_image_load_store)
> add_builtin_define(parser, "GL_ARB_shader_image_load_store", 1);
>
> + if (extensions->ARB_shader_texture_image_samples)
> + add_builtin_define(parser, "GL_ARB_shader_texture_image_samples", 1);
> +
Now that we have GL_ARB_shader_image_load_store, before exposing this
extension we should have imageSamples() supported too. Otherwise these
changes look good for me.
> if (extensions->ARB_derivative_control)
> add_builtin_define(parser, "GL_ARB_derivative_control", 1);
>
> diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
> index 46896d7..530cdcc 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -599,6 +599,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
> EXT(ARB_shader_atomic_counters, true, false, ARB_shader_atomic_counters),
> EXT(ARB_shader_bit_encoding, true, false, ARB_shader_bit_encoding),
> EXT(ARB_shader_image_load_store, true, false, ARB_shader_image_load_store),
> + EXT(ARB_shader_texture_image_samples, true, false, ARB_shader_texture_image_samples),
> EXT(ARB_shader_precision, true, false, ARB_shader_precision),
> EXT(ARB_shader_stencil_export, true, false, ARB_shader_stencil_export),
> EXT(ARB_shader_storage_buffer_object, true, false, ARB_shader_storage_buffer_object),
> diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
> index eb325f0..04e7f7d 100644
> --- a/src/glsl/glsl_parser_extras.h
> +++ b/src/glsl/glsl_parser_extras.h
> @@ -503,6 +503,8 @@ struct _mesa_glsl_parse_state {
> bool ARB_shader_storage_buffer_object_warn;
> bool ARB_shader_subroutine_enable;
> bool ARB_shader_subroutine_warn;
> + bool ARB_shader_texture_image_samples_enable;
> + bool ARB_shader_texture_image_samples_warn;
> bool ARB_shader_texture_lod_enable;
> bool ARB_shader_texture_lod_warn;
> bool ARB_shading_language_420pack_enable;
> diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
> index 724861b..fb58c3b 100644
> --- a/src/glsl/ir.cpp
> +++ b/src/glsl/ir.cpp
> @@ -1398,7 +1398,7 @@ ir_dereference::is_lvalue() const
> }
>
>
> -static const char * const tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4", "query_levels" };
> +static const char * const tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4", "query_levels", "texture_samples" };
>
> const char *ir_texture::opcode_string()
> {
> @@ -1427,7 +1427,8 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
> this->sampler = sampler;
> this->type = type;
>
> - if (this->op == ir_txs || this->op == ir_query_levels) {
> + if (this->op == ir_txs || this->op == ir_query_levels ||
> + this->op == ir_texture_samples) {
> assert(type->base_type == GLSL_TYPE_INT);
> } else if (this->op == ir_lod) {
> assert(type->vector_elements == 2);
> diff --git a/src/glsl/ir.h b/src/glsl/ir.h
> index ede8caa..e31812d 100644
> --- a/src/glsl/ir.h
> +++ b/src/glsl/ir.h
> @@ -1914,7 +1914,8 @@ enum ir_texture_opcode {
> ir_txs, /**< Texture size */
> ir_lod, /**< Texture lod query */
> ir_tg4, /**< Texture gather */
> - ir_query_levels /**< Texture levels query */
> + ir_query_levels, /**< Texture levels query */
> + ir_texture_samples, /**< Texture samples query */
> };
>
>
> diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
> index a8fac18..a2cd672 100644
> --- a/src/glsl/ir_clone.cpp
> +++ b/src/glsl/ir_clone.cpp
> @@ -222,6 +222,7 @@ ir_texture::clone(void *mem_ctx, struct hash_table *ht) const
> case ir_tex:
> case ir_lod:
> case ir_query_levels:
> + case ir_texture_samples:
> break;
> case ir_txb:
> new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht);
> diff --git a/src/glsl/ir_equals.cpp b/src/glsl/ir_equals.cpp
> index cc1964e..5f0785e 100644
> --- a/src/glsl/ir_equals.cpp
> +++ b/src/glsl/ir_equals.cpp
> @@ -151,6 +151,7 @@ ir_texture::equals(const ir_instruction *ir, enum ir_node_type ignore) const
> case ir_tex:
> case ir_lod:
> case ir_query_levels:
> + case ir_texture_samples:
> break;
> case ir_txb:
> if (!lod_info.bias->equals(other->lod_info.bias, ignore))
> diff --git a/src/glsl/ir_hv_accept.cpp b/src/glsl/ir_hv_accept.cpp
> index d3662cf..6495cc4 100644
> --- a/src/glsl/ir_hv_accept.cpp
> +++ b/src/glsl/ir_hv_accept.cpp
> @@ -194,6 +194,7 @@ ir_texture::accept(ir_hierarchical_visitor *v)
> case ir_tex:
> case ir_lod:
> case ir_query_levels:
> + case ir_texture_samples:
> break;
> case ir_txb:
> s = this->lod_info.bias->accept(v);
> diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
> index 8dbd938..5cfac94 100644
> --- a/src/glsl/ir_print_visitor.cpp
> +++ b/src/glsl/ir_print_visitor.cpp
> @@ -274,7 +274,8 @@ void ir_print_visitor::visit(ir_texture *ir)
> ir->sampler->accept(this);
> fprintf(f, " ");
>
> - if (ir->op != ir_txs && ir->op != ir_query_levels) {
> + if (ir->op != ir_txs && ir->op != ir_query_levels &&
> + ir->op != ir_texture_samples) {
> ir->coordinate->accept(this);
>
> fprintf(f, " ");
> @@ -290,7 +291,7 @@ void ir_print_visitor::visit(ir_texture *ir)
>
> if (ir->op != ir_txf && ir->op != ir_txf_ms &&
> ir->op != ir_txs && ir->op != ir_tg4 &&
> - ir->op != ir_query_levels) {
> + ir->op != ir_query_levels && ir->op != ir_texture_samples) {
> if (ir->projector)
> ir->projector->accept(this);
> else
> @@ -310,6 +311,7 @@ void ir_print_visitor::visit(ir_texture *ir)
> case ir_tex:
> case ir_lod:
> case ir_query_levels:
> + case ir_texture_samples:
> break;
> case ir_txb:
> ir->lod_info.bias->accept(this);
> diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
> index 469837f..4953ec4 100644
> --- a/src/glsl/ir_reader.cpp
> +++ b/src/glsl/ir_reader.cpp
> @@ -960,6 +960,8 @@ ir_reader::read_texture(s_expression *expr)
> { "tg4", s_type, s_sampler, s_coord, s_offset, s_component };
> s_pattern query_levels_pattern[] =
> { "query_levels", s_type, s_sampler };
> + s_pattern texture_samples_pattern[] =
> + { "samples", s_type, s_sampler };
> s_pattern other_pattern[] =
> { tag, s_type, s_sampler, s_coord, s_offset, s_proj, s_shadow, s_lod };
>
> @@ -977,6 +979,8 @@ ir_reader::read_texture(s_expression *expr)
> op = ir_tg4;
> } else if (MATCH(expr, query_levels_pattern)) {
> op = ir_query_levels;
> + } else if (MATCH(expr, texture_samples_pattern)) {
> + op = ir_texture_samples;
> } else if (MATCH(expr, other_pattern)) {
> op = ir_texture::get_opcode(tag->value());
> if (op == (ir_texture_opcode) -1)
> @@ -1029,7 +1033,7 @@ ir_reader::read_texture(s_expression *expr)
>
> if (op != ir_txf && op != ir_txf_ms &&
> op != ir_txs && op != ir_lod && op != ir_tg4 &&
> - op != ir_query_levels) {
> + op != ir_query_levels && op != ir_texture_samples) {
> s_int *proj_as_int = SX_AS_INT(s_proj);
> if (proj_as_int && proj_as_int->value() == 1) {
> tex->projector = NULL;
> diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/glsl/ir_rvalue_visitor.cpp
> index 2eee3da..a6966f5 100644
> --- a/src/glsl/ir_rvalue_visitor.cpp
> +++ b/src/glsl/ir_rvalue_visitor.cpp
> @@ -58,6 +58,7 @@ ir_rvalue_base_visitor::rvalue_visit(ir_texture *ir)
> case ir_tex:
> case ir_lod:
> case ir_query_levels:
> + case ir_texture_samples:
> break;
> case ir_txb:
> handle_rvalue(&ir->lod_info.bias);
> diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp
> index 77327b6..2f8d873 100644
> --- a/src/glsl/nir/glsl_to_nir.cpp
> +++ b/src/glsl/nir/glsl_to_nir.cpp
> @@ -1709,6 +1709,11 @@ nir_visitor::visit(ir_texture *ir)
> num_srcs = 0;
> break;
>
> + case ir_texture_samples:
> + op = nir_texop_texture_samples;
> + num_srcs = 0;
> + break;
> +
> default:
> unreachable("not reached");
> }
> diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
> index 9aae6d7..bbd45b7 100644
> --- a/src/glsl/nir/nir.h
> +++ b/src/glsl/nir/nir.h
> @@ -944,7 +944,8 @@ typedef enum {
> nir_texop_txs, /**< Texture size */
> nir_texop_lod, /**< Texture lod query */
> nir_texop_tg4, /**< Texture gather */
> - nir_texop_query_levels /**< Texture levels query */
> + nir_texop_query_levels, /**< Texture levels query */
> + nir_texop_texture_samples, /**< Texture samples query */
> } nir_texop;
>
> typedef struct {
> @@ -1016,6 +1017,7 @@ nir_tex_instr_dest_size(nir_tex_instr *instr)
> case nir_texop_lod:
> return 2;
>
> + case nir_texop_texture_samples:
> case nir_texop_query_levels:
> return 1;
>
> diff --git a/src/glsl/nir/nir_print.c b/src/glsl/nir/nir_print.c
> index f591c4b..69cadba 100644
> --- a/src/glsl/nir/nir_print.c
> +++ b/src/glsl/nir/nir_print.c
> @@ -417,6 +417,9 @@ print_tex_instr(nir_tex_instr *instr, print_var_state *state, FILE *fp)
> case nir_texop_query_levels:
> fprintf(fp, "query_levels ");
> break;
> + case nir_texop_texture_samples:
> + fprintf(fp, "texture_samples ");
> + break;
>
> default:
> unreachable("Invalid texture operation");
> diff --git a/src/glsl/opt_tree_grafting.cpp b/src/glsl/opt_tree_grafting.cpp
> index 7f2ee6c..a7a219c 100644
> --- a/src/glsl/opt_tree_grafting.cpp
> +++ b/src/glsl/opt_tree_grafting.cpp
> @@ -274,6 +274,7 @@ ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
> case ir_tex:
> case ir_lod:
> case ir_query_levels:
> + case ir_texture_samples:
> break;
> case ir_txb:
> if (do_graft(&ir->lod_info.bias))
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 4e00fb6..452364d 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -3866,6 +3866,7 @@ struct gl_extensions
> GLboolean ARB_shader_stencil_export;
> GLboolean ARB_shader_storage_buffer_object;
> GLboolean ARB_shader_subroutine;
> + GLboolean ARB_shader_texture_image_samples;
> GLboolean ARB_shader_texture_lod;
> GLboolean ARB_shading_language_packing;
> GLboolean ARB_shading_language_420pack;
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index 6f00727..c8e1b8f 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -3205,6 +3205,8 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
> case ir_lod:
> opcode = TGSI_OPCODE_LODQ;
> break;
> + case ir_texture_samples:
> + unreachable("unexpected texture op");
> }
>
> if (ir->projector) {
>
More information about the mesa-dev
mailing list