KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv: Rename gs_vec4 to gs_kernel 

The code generated may be vec4 or simd8 depending on how we start the
compiler.

To run the GS in SIMD8, set the INTEL_SCALAR_GS environment variable.
This was added in:

    commit 36fd653817
    Author: Kenneth Graunke <kenneth@whitecape.org>
    Date:   Wed Mar 11 23:14:31 2015 -0700

        i965: Add scalar geometry shader support.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Jordan Justen 2015-12-14 18:16:38 -08:00
parent a3c5c339a8
commit 7edcc59a7b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vulkan/anv_pipeline.c
View File

@ -513,7 +513,7 @@ anv_pipeline_compile_gs(struct anv_pipeline *pipeline,
}
/* TODO: SIMD8 GS */
pipeline->gs_vec4 =
pipeline->gs_kernel =
anv_pipeline_upload_kernel(pipeline, shader_code, code_size);
pipeline->gs_vertex_count = nir->info.gs.vertices_in;
@ -966,7 +966,7 @@ anv_pipeline_init(struct anv_pipeline *pipeline, struct anv_device *device,
pipeline->vs_simd8 = NO_KERNEL;
pipeline->vs_vec4 = NO_KERNEL;
pipeline->gs_vec4 = NO_KERNEL;
pipeline->gs_kernel = NO_KERNEL;
pipeline->active_stages = 0;
pipeline->total_scratch = 0;

2
src/vulkan/anv_private.h
View File

@ -1272,7 +1272,7 @@ struct anv_pipeline {
uint32_t ps_ksp2;
uint32_t ps_grf_start0;
uint32_t ps_grf_start2;
uint32_t gs_vec4;
uint32_t gs_kernel;
uint32_t gs_vertex_count;
uint32_t cs_simd;

4
src/vulkan/gen7_pipeline.c
View File

@ -477,14 +477,14 @@ genX(graphics_pipeline_create)(
const struct brw_gs_prog_data *gs_prog_data = &pipeline->gs_prog_data;
if (pipeline->gs_vec4 == NO_KERNEL || (extra && extra->disable_vs)) {
if (pipeline->gs_kernel == NO_KERNEL || (extra && extra->disable_vs)) {
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_GS), .GSEnable = false);
} else {
urb_offset = 1;
urb_length = (gs_prog_data->base.vue_map.num_slots + 1) / 2 - urb_offset;
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_GS),
.KernelStartPointer = pipeline->gs_vec4,
.KernelStartPointer = pipeline->gs_kernel,
.ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_GEOMETRY],
.PerThreadScratchSpace = scratch_space(&gs_prog_data->base.base),

8
src/vulkan/gen8_pipeline.c
View File

@ -436,12 +436,12 @@ genX(graphics_pipeline_create)(
offset = 1;
length = (gs_prog_data->base.vue_map.num_slots + 1) / 2 - offset;
if (pipeline->gs_vec4 == NO_KERNEL)
if (pipeline->gs_kernel == NO_KERNEL)
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_GS), .Enable = false);
else
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_GS),
.SingleProgramFlow = false,
.KernelStartPointer = pipeline->gs_vec4,
.KernelStartPointer = pipeline->gs_kernel,
.VectorMaskEnable = Dmask,
.SamplerCount = 0,
.BindingTableEntryCount = 0,
@ -533,7 +533,7 @@ genX(graphics_pipeline_create)(
* shared with other gens.
*/
const struct brw_vue_map *fs_input_map;
if (pipeline->gs_vec4 == NO_KERNEL)
if (pipeline->gs_kernel == NO_KERNEL)
fs_input_map = &vue_prog_data->vue_map;
else
fs_input_map = &gs_prog_data->base.vue_map;
@ -700,7 +700,7 @@ VkResult genX(compute_pipeline_create)(
pipeline->vs_simd8 = NO_KERNEL;
pipeline->vs_vec4 = NO_KERNEL;
pipeline->gs_vec4 = NO_KERNEL;
pipeline->gs_kernel = NO_KERNEL;
pipeline->active_stages = 0;
pipeline->total_scratch = 0;