fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 17:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: add nir_texop_texture_samples and convert from glsl

Browse source 
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ilia Mirkin 2015-08-27 23:05:03 -04:00
parent f9052914e9
commit 1807a08e4f
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/nir/glsl_to_nir.cpp
View file

@ -1718,6 +1718,11 @@ nir_visitor::visit(ir_texture *ir)
num_srcs = 0; num_srcs = 0;
break; break;
case ir_texture_samples:
op = nir_texop_texture_samples;
num_srcs = 0;
break;
default: default:
unreachable("not reached"); unreachable("not reached");
} }

4
src/glsl/nir/nir.h
View file

@ -944,7 +944,8 @@ typedef enum {
nir_texop_txs, /**< Texture size */ nir_texop_txs, /**< Texture size */
nir_texop_lod, /**< Texture lod query */ nir_texop_lod, /**< Texture lod query */
nir_texop_tg4, /**< Texture gather */ 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; } nir_texop;
typedef struct { typedef struct {
@ -1016,6 +1017,7 @@ nir_tex_instr_dest_size(nir_tex_instr *instr)
case nir_texop_lod: case nir_texop_lod:
return 2; return 2;
case nir_texop_texture_samples:
case nir_texop_query_levels: case nir_texop_query_levels:
return 1; return 1;

3
src/glsl/nir/nir_print.c
View file

@ -417,6 +417,9 @@ print_tex_instr(nir_tex_instr *instr, print_var_state *state, FILE *fp)
case nir_texop_query_levels: case nir_texop_query_levels:
fprintf(fp, "query_levels "); fprintf(fp, "query_levels ");
break; break;
case nir_texop_texture_samples:
fprintf(fp, "texture_samples ");
break;
default: default:
unreachable("Invalid texture operation"); unreachable("Invalid texture operation");