diff options
author | Jason Ekstrand <[email protected]> | 2015-10-01 18:27:38 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2015-10-02 14:22:53 -0700 |
commit | 7a8d06b6dd7800caab5c5c51d16b34e03aa45f25 (patch) | |
tree | 751c2ec4a64826e88e6136327ead5e75d7f15381 /src/glsl/nir/glsl_to_nir.cpp | |
parent | e4fea486da6ee2964ae15380bcdc8676dcc2a515 (diff) |
nir: Move GS data to nir_shader_info
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/nir/glsl_to_nir.cpp')
-rw-r--r-- | src/glsl/nir/glsl_to_nir.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp index 6820962b38e..4dd62870065 100644 --- a/src/glsl/nir/glsl_to_nir.cpp +++ b/src/glsl/nir/glsl_to_nir.cpp @@ -150,8 +150,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog, if (sh->Program->SamplersUsed & (1 << i)) num_textures = i; - shader->gs.vertices_out = sh->Geom.VerticesOut; - shader->gs.invocations = sh->Geom.Invocations; shader->info.name = ralloc_asprintf(shader, "GLSL%d", sh->Name); shader->info.num_textures = num_textures; shader->info.num_ubos = sh->NumUniformBlocks; @@ -164,6 +162,8 @@ glsl_to_nir(const struct gl_shader_program *shader_prog, shader->info.uses_texture_gather = sh->Program->UsesGather; shader->info.uses_clip_distance_out = sh->Program->UsesClipDistanceOut; shader->info.separate_shader = shader_prog->SeparateShader; + shader->info.gs.vertices_out = sh->Geom.VerticesOut; + shader->info.gs.invocations = sh->Geom.Invocations; return shader; } |