From b811085b797c79396e59372085293a82fabcf069 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 18 Aug 2015 02:07:47 -0700 Subject: nir: Store some geometry shader data in nir_shader. This makes it possible for NIR shaders to know the number of output vertices and the number of invocations. Drivers could also access these directly without going through gl_program. We should probably add InputType and OutputType here too, but currently those are stored as GL_* enums, and I wanted to avoid using those in NIR, as I suspect Vulkan/SPIR-V will use different enums. (We should probably make our own.) We could add VerticesIn, but it's easily computable from the input topology, so I'm not sure whether it's worth it. It's also currently not stored in gl_shader (only gl_shader_program), which would require changes to the glsl_to_nir interface or require us to store it there. This is a bit of duplication of data...ideally, we would factor these substructs out of gl_program, gl_shader_program, and nir_shader, creating a gl_geometry_info class...but it would need to go in a new place (in src/glsl?) that isn't mtypes.h nor nir.h. Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/glsl/nir/glsl_to_nir.cpp | 3 +++ src/glsl/nir/nir.c | 3 +++ src/glsl/nir/nir.h | 8 ++++++++ 3 files changed, 14 insertions(+) (limited to 'src/glsl/nir') diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp index 944f7462911..c13f953d914 100644 --- a/src/glsl/nir/glsl_to_nir.cpp +++ b/src/glsl/nir/glsl_to_nir.cpp @@ -140,6 +140,9 @@ glsl_to_nir(struct gl_shader *sh, const nir_shader_compiler_options *options) nir_lower_outputs_to_temporaries(shader); + shader->gs.vertices_out = sh->Geom.VerticesOut; + shader->gs.invocations = sh->Geom.Invocations; + return shader; } diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index ab06ea2bc19..1dc7e12445f 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -54,6 +54,9 @@ nir_shader_create(void *mem_ctx, shader->stage = stage; + shader->gs.vertices_out = 0; + shader->gs.invocations = 0; + return shader; } diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index a93ff11f01b..f9c829570c5 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -1479,6 +1479,14 @@ typedef struct nir_shader { /** The shader stage, such as MESA_SHADER_VERTEX. */ gl_shader_stage stage; + + struct { + /** The maximum number of vertices the geometry shader might write. */ + unsigned vertices_out; + + /** 1 .. MAX_GEOMETRY_SHADER_INVOCATIONS */ + unsigned invocations; + } gs; } nir_shader; #define nir_foreach_overload(shader, overload) \ -- cgit v1.2.3